Support comments for input fields

[misc/kostenrechnung] / lib / mask.php

diff --git a/lib/mask.php b/lib/mask.php
index 3b9c3fa..12a2d38 100644 (file)
--- a/lib/mask.php
+++ b/lib/mask.php
@@ -33,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);
@@ -44,10 +44,13 @@ 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');
     }
+    if (array_key_exists('comment',$info))
+      $ret[] = sprintf('<span class="comment">%s</span>', $info['comment']);
+    $ret[] = '<br>';
   }
 
   $ret[] = '<span id="form_status"></span>';
@@ -95,6 +98,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))
@@ -129,7 +133,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))
@@ -144,6 +147,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);
@@ -154,6 +183,11 @@ 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
@@ -171,6 +205,7 @@ function build_mask($name, $mask)
                     $grid,
                     array('</div>','<div class="left">'),
                     $details,
+                    $select,
                     $edit,
                     $status,
                     array('</div>'));