Adjust order of error output

[misc/kostenrechnung] / lib / mask.php

diff --git a/lib/mask.php b/lib/mask.php
index a66252f..8d90654 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -10,30 +10,47 @@
 #   return $ret;
 # }
 
-function build_form($fields)
+function build_form($name, $fields)
 {
   $ret = array();
 
-  $ret[] = '<div class="form">';
+  $ret[] = '<div class="form" style="clear: both;">';
   $ret[] = '<form id="form_edit">';
 
   $ret[] = '<input type="hidden" id="edit_id" name="id" value="">';
+  $ret[] = sprintf('<input type="hidden" id="edit_source" name="source" value="%s">', $name);
 
-  foreach ($fields as $id => $data) {
-    if ($data['type'] == 'text') {
+  foreach ($fields as $id => $info) {
+    if ($info['type'] == 'text' || $info['type'] == 'number') {
       $v = array('id="edit_'.$id.'"',
                 'name="'.$id.'"',
-                'size="'.$data['size'].'"',
+                'size="'.$info['size'].'"',
                 'type="text"');
-      $ret[] = sprintf('<label for="edit_%s"><b>%s</b></label><br>', $id, $data['name']);
+      $ret[] = sprintf('<label for="edit_%s">%s</label><br>', $id, $info['name']);
       $ret[] = sprintf('<input %s><br>', implode(' ', $v));
-
-    } elseif ($data['type'] == 'date') {
+    } 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);
+    } 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);
+      if (is_array($info['options'])) $options = $info['options'];
+      else $options = query_db($info['options']);
+      foreach ($options as $row)
+       $ret[] = sprintf('<option value="%s">%s</option>', $row['id'], $row['text']);
+      $ret[] = '</select><br>';
+    } elseif ($info['type'] == 'date') {
       error_log('type = date');
     }
   }
 
-  $ret[] = '<div align="center"><button onclick="return form_save(this);">Speichern</button></div>';
+  $ret[] = '<div class="buttons">';
+  $ret[] = '<button id="button_save" onclick="return form_save(this);">Speichern</button>';
+  $ret[] = '<span></span>';
+  $ret[] = '<button id="button_insert" onclick="return form_insert(this);">Hinzufügen</button>';
+  $ret[] = '<span></span>';
+  $ret[] = '<button id="button_delete" onclick="return form_delete(this);">Löschen</button>';
+  $ret[] = '</div>';
 
   $ret[] = '</form>';
   $ret[] = '</div>';
@@ -41,9 +58,10 @@ function build_form($fields)
   return $ret;
 }
 
-function mask_grid($name, $mask)
+function build_grid($name, $mask)
 {
   global $jscode;
+  $ret = array();
 
   $jscode[] = 'Rico.writeDebugMsg = function(msg, resetFlag) {};';
 
@@ -80,6 +98,7 @@ function mask_grid($name, $mask)
   $_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'];
 
   $ret[] = '  </tr>';
   $ret[] = '</table>';
@@ -98,12 +117,54 @@ function mask_grid($name, $mask)
   $jscode[] = "Rico.acceptLanguage('de-de,de;q=0.8,en;q=0.5,en-us;q=0.3');";
   $jscode[] = "Rico.loadModule('Effect','Calendar','LiveGridForms','LiveGridAjax','LiveGridMenu');";
 
-  if (array_key_exists('edit', $mask))
-    $ret = array_merge($ret, build_form($mask['edit']));
+  return $ret;
+}
+
+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))
+    $ret[] = sprintf('<p class="subtitle">%s</p>', $details['subtitle']);
+  $ret[] = '<ul>';
+  foreach ($details['list'] as $name => $info) {
+    $ret[] = sprintf('<li>%s: <span id="detail_%s"></span></li>', $info['name'], $name);
+  }
+  $ret[] = '</ul>';
+  $ret[] = '</div>';
 
   return $ret;
 }
 
+function build_mask($name, $mask)
+{
+  $grid = build_grid($name, $mask);
+  $status = array('<span id="status"></span><br>');
+
+  if (array_key_exists('details', $mask))
+    $details = build_details($name, $mask['details']);
+  else
+    $details = array();
+
+  $title = $mask['title'];
+  if (array_key_exists('subtitle', $mask))
+    $title .= ' &ndash; ' . $mask['subtitle'];
+
+  $head = array();
+  $head[] = sprintf('<h3>%s</h3>', $title);
+  $head[] = '<div class="right">';
+
+  return array_merge($head,
+                    $grid,
+                    array('</div>','<div class="left">'),
+                    $status,
+                    $details,
+                    array('</div>'));
+}
+
 function mask($name)
 {
   global $jsfiles;
@@ -117,9 +178,11 @@ function mask($name)
   $jsfiles[] = 'lib/functions.js';
   $jsfiles[] = 'lib/rico/rico.js';
 
-  if (array_key_exists('table',$mask) && array_key_exists('list',$mask)) {
-    $ret = mask_grid($name, $mask);
-  }
+  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']));
 
   return implode("\n", $ret);
 }