Support required fields - report information into backend

[misc/kostenrechnung] / ajax / ajax.php

diff --git a/ajax/ajax.php b/ajax/ajax.php
index 8e92c7b..e973776 100644 (file)
--- a/ajax/ajax.php
+++ b/ajax/ajax.php
@@ -53,6 +53,12 @@ function details($mask)
   return $row;
 }
 
+function format_decimal($value)
+{
+  $value = str_replace(',','.',$value);
+  return sprintf("%.2f", $value);
+}
+
 function save($mask)
 {
   if (empty($_POST['id']))
@@ -62,15 +68,30 @@ function save($mask)
                  "sys_edit = now()");
 
   foreach ($mask['edit'] as $field => $info)
+    if ($info['required'] === true && empty($_POST[$field]))
+      return array('error' => sprintf('Pflichtfeld %s nicht ausgefüllt', $info['name']),
+                  'errormsg' => 'Pflichtfelder nicht ausgefüllt');
+
     if ($info['type'] == 'boolean') {
       $update[] = sprintf("%s=%d", $field, $_POST[$field] == 'on'?1:0);
     } elseif ($info['type'] == 'number') {
-      $update[] = sprintf("%s=%d", $field, $_POST[$field]);
+      if (empty($_POST[$field]) && $info['null'] === true)
+        $update[] = sprintf("%s=NULL", $field);
+      else
+       $update[] = sprintf("%s=%d", $field, $_POST[$field]);
+    } elseif ($info['type'] == 'decimal') {
+      if (empty($_POST[$field]) && $info['null'] === true)
+        $update[] = sprintf("%s=NULL", $field);
+      else
+       $update[] = sprintf("%s=%s", $field, format_decimal($_POST[$field]));
     } elseif ($info['type'] == 'passwd') {
       if (!empty($_POST[$field]))
        $update[] = sprintf("%s='%s'", $field, pg_escape_string(passwd($_SESSION['sys']['login'],$_POST[$field])));
     } else {
-      $update[] = sprintf("%s='%s'", $field, pg_escape_string($_POST[$field]));
+      if (empty($_POST[$field]) && $info['null'] === true)
+        $update[] = sprintf("%s=NULL", $field);
+      else
+        $update[] = sprintf("%s='%s'", $field, pg_escape_string($_POST[$field]));
     }
 
   $sql = 'UPDATE ' . $mask['table'] . ' SET ';
@@ -94,12 +115,24 @@ function insert($mask)
   $values = array("'".pg_escape_string($_SESSION['sys']['login'])."'", 'now()');
 
   foreach ($mask['edit'] as $field => $info)
+    if ($info['required'] === true && empty($_POST[$field]))
+      return array('error' => sprintf('Pflichtfeld %s nicht ausgefüllt', $info['name']),
+                  'errormsg' => 'Pflichtfelder nicht ausgefüllt');
     if ($info['type'] == 'boolean') {
       $fields[] = $field;
       $values[] = $_POST[$field] == 'on'?1:0;
     } elseif ($info['type'] == 'number') {
       $fields[] = $field;
-      $values[] = intval($_POST[$field]);
+      if (empty($_POST[$field]) && $info['null'] === true)
+       $values[] = 'NULL';
+      else
+       $values[] = intval($_POST[$field]);
+    } elseif ($info['type'] == 'decimal') {
+      $fields[] = $field;
+      if (empty($_POST[$field]) && $info['null'] === true)
+       $values[] = 'NULL';
+      else
+       $values[] = format_decimal($_POST[$field]);
     } elseif ($info['type'] == 'passwd') {
       if (!empty($_POST[$field])) {
        $fields[] = $field;
@@ -107,7 +140,10 @@ function insert($mask)
       }
     } else {
       $fields[] = $field;
-      $values[] = sprintf("'%s'", pg_escape_string($_POST[$field]));
+      if (empty($_POST[$field]) && $info['null'] === true)
+       $values[] = 'NULL';
+      else
+       $values[] = sprintf("'%s'", pg_escape_string($_POST[$field]));
     }
 
   $sql = 'INSERT INTO ' . $mask['table'] . ' (' . implode(',', $fields) . ') ';