Pull linebreak out of if construct

[misc/kostenrechnung] / lib / mask.php

diff --git a/lib/mask.php b/lib/mask.php
index 65ee93a..72d3b67 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -12,9 +12,15 @@
 
 function build_form($name, $fields)
 {
+  global $jscode;
   $ret = array();
 
-  $ret[] = '<div class="form" style="clear: both;">';
+  $jscode[] = 'Rico.onLoad( function() {';
+  $jscode[] = "form_init();";
+  $jscode[] = '});';
+
+  $ret[] = '<div class="form">';
+  $ret[] = '<p class="title">Datensatz bearbeiten</p>';
   $ret[] = '<form id="form_edit">';
 
   $ret[] = '<input type="hidden" id="edit_id" name="id" value="">';
@@ -27,10 +33,10 @@ function build_form($name, $fields)
       $v[] = 'size="'.(empty($info['size'])?'10':$info['size']).'"';
       $v[] = 'type="'.($info['type']=='passwd'?'password':'text').'"';
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
-      $ret[] = sprintf('<input %s><br>', implode(' ', $v));
+      $ret[] = sprintf('<input %s>', implode(' ', $v));
     } elseif ($info['type'] == 'boolean') {
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
-      $ret[] = sprintf('<input type="checkbox" id="edit_%s" name="%s"><br>', $id, $id);
+      $ret[] = sprintf('<input type="checkbox" id="edit_%s" name="%s">', $id, $id);
     } elseif ($info['type'] == 'select') {
       $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
       $ret[] = sprintf('<select id="edit_%s" name="%s">', $id, $id);
@@ -38,10 +44,11 @@ function build_form($name, $fields)
       else $options = query_db($info['options']);
       foreach ($options as $row)
        $ret[] = sprintf('<option value="%s">%s</option>', $row['id'], $row['text']);
-      $ret[] = '</select><br>';
+      $ret[] = '</select>';
     } elseif ($info['type'] == 'date') {
       error_log('type = date');
     }
+    $ret[] = '<br>';
   }
 
   $ret[] = '<span id="form_status"></span>';
@@ -89,6 +96,7 @@ function build_grid($name, $mask)
     if ($data['width'] > 0) $s[] = 'width: ' . $data['width'];
     if (array_key_exists('type', $data)) $s[] = "type: '" . $data['type'] . "'";
     if (array_key_exists('specs', $data)) $s[] = $data['specs'];
+    if (array_key_exists('control', $data)) $s[] = 'control: ' . $data['control'];
     $specs[] = '{' . implode(', ', $s) . '}';
 
     if (array_key_exists('sql', $data))
@@ -96,10 +104,8 @@ function build_grid($name, $mask)
     else
       $fields[] = $field;
   }
-  $_SESSION['grid_' . $name] = sprintf("SELECT %s FROM %s",
-                                      implode(',', $fields), $mask['table']);
-  if (array_key_exists('join', $mask)) $_SESSION['grid_' . $name] .= ' JOIN ' . join(' JOIN ', $mask['join']);
-  if (array_key_exists('where', $mask)) $_SESSION['grid_' . $name] .= ' WHERE ' . $mask['where'];
+
+  grid_sql($name, $mask);
 
   $ret[] = '  </tr>';
   $ret[] = '</table>';
@@ -125,7 +131,6 @@ function build_details($name, $details)
 {
   $ret = array();
 
-
   $ret[] = '<div class="box" id="details">';
   $ret[] = sprintf('<h3>%s</h3>', $details['title']);
   if (array_key_exists('subtitle', $details))
@@ -140,6 +145,32 @@ function build_details($name, $details)
   return $ret;
 }
 
+function build_select($name, $details)
+{
+  $ret = array();
+
+  $ret[] = '<div class="form">';
+  $ret[] = sprintf('<p class="title">%s</p>', $details['title']);
+  $ret[] = sprintf ('<select%s>', array_key_exists('onchange',$details)?sprintf(' onchange="%s"',$details['onchange']):'');
+  if (is_array($details['options']))
+    $options = $details['options'];
+  else
+    $options = query_db($details['options']);
+
+  if (array_key_exists('default',$details))
+    $ret[] = sprintf('<option value="">%s</option>', $details['default']);
+
+  foreach ($options as $row) {
+    $selected = array_key_exists('selected',$details) && $details['selected'] == $row['id'] ? true : false;
+    $ret[] = sprintf('<option value="%s"%s>%s</option>', $row['id'], $selected?' selected':'',$row['text']);
+  }
+
+  $ret[] = '</select>';
+  $ret[] = '</div>';
+
+  return $ret;
+}
+
 function build_mask($name, $mask)
 {
   $grid = build_grid($name, $mask);
@@ -150,6 +181,16 @@ function build_mask($name, $mask)
   else
     $details = array();
 
+  if (array_key_exists('select', $mask))
+    $select = build_select($name, $mask['select']);
+  else
+    $select = array();
+
+  if (array_key_exists('edit', $mask))
+    $edit = build_form($name, $mask['edit']);
+  else
+    $edit = array();
+
   $title = $mask['title'];
   if (array_key_exists('subtitle', $mask))
     $title .= ' &ndash; ' . $mask['subtitle'];
@@ -161,8 +202,10 @@ function build_mask($name, $mask)
   return array_merge($head,
                     $grid,
                     array('</div>','<div class="left">'),
-                    $status,
                     $details,
+                    $select,
+                    $edit,
+                    $status,
                     array('</div>'));
 }
 
@@ -182,9 +225,7 @@ function mask($name)
   if (array_key_exists('table',$mask) && array_key_exists('list',$mask))
     $ret = build_mask($name, $mask);
 
-  if (array_key_exists('edit', $mask))
-    $ret = array_merge($ret, build_form($name, $mask['edit']));
-
+  error_log(count($ret));
   return implode("\n", $ret);
 }