X-Git-Url: https://git.infodrom.org/?p=misc%2Fhallinta-metro;a=blobdiff_plain;f=ordersatz.php;h=b70b3f0ebd67b83529611f3a5ae6fadcf34c56f7;hp=132490dcb4fb8e80e2e79a2b8ebb2b64739dc49b;hb=9c47d4730bc70c7062fce35cdc48e1f7afed6dd9;hpb=27a99071edd0673a4380e78ee41a164e9eb3f88f

diff --git a/ordersatz.php b/ordersatz.php
index 132490d..b70b3f0 100644
--- a/ordersatz.php
+++ b/ordersatz.php
@@ -11,17 +11,6 @@
    */
 
 
-function get_title($id)
-{
-  global $db;
-
-  $query = sprintf('SELECT name FROM metro_ordersatz WHERE id = %d', $id);
-  $sth = $db->query($query);
-  $row = $sth->fetch();
-  if ($row) return 'Ordersatz für ' . $row['name'];
-  else return 'Unbekannter Ordersatz';
-}
-
 $href = "new Rico.TableColumn.link('./?mask=metro__ordersatz_pos&id={0}')";
 
 # INSERT INTO metro_ordersatz_pos (ordersatz,artikel,sys_user,sys_edit) SELECT ORDERID,id,'joey',now() FROM metro_artikel;
@@ -37,8 +26,7 @@ $mask = array(
 					    ),
 			      'erstellt' => array(
 					    'name' => 'Erstellt',
-					    'width' => 100,
-					    'specs' => "ClassName: 'alignrightpad'",
+					    'width' => 85,
 					    ),
 			      'name' => array(
 					    'name' => 'Name',
@@ -53,7 +41,7 @@ $mask = array(
 					    ),
 			      'datum' => array(
 					    'name' => 'Einkauf am',
-					    'width' => 100,
+					    'width' => 130,
 					    'sql' => "datum || ' ' || uhrzeit || ' Uhr'",
 					    ),
 			      'link' => array(
@@ -79,25 +67,25 @@ $mask = array(
 			      'name' => array(
 					    'name' => 'Name',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'required' => true,
 					    ),
 			      'koch' => array(
 					    'name' => 'Kochbetreuer',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'required' => true,
 					    ),
 			      'email' => array(
 					    'name' => 'E-Mail',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'null' => true,
 					    ),
 			      'telefon' => array(
 					    'name' => 'Telefon für Rückfragen',
 					    'type' => 'text',
-					    'size' => 25,
+					    'size' => 21,
 					    'required' => true,
 					    ),
 			      'datum' => array(
@@ -121,7 +109,8 @@ function ordersatz_insert($id)
 {
   global $db;
 
-  $sql = sprintf("INSERT INTO metro_ordersatz_pos (ordersatz,artikel,sys_user,sys_edit) SELECT %d,id,%s,now() FROM metro_artikel",
+  $sql = sprintf("INSERT INTO metro_ordersatz_pos (ordersatz,artikel,sys_user,sys_edit) SELECT %d,id,%s,now() " .
+		 "FROM metro_artikel WHERE removed = 0",
 		 $id, $db->quote($_SESSION['sys']['login']));
 
   $sth = $db->query($sql);