Adjust to new framework

[misc/hallinta-metro] / ordersatz_pos.php

diff --git a/ordersatz_pos.php b/ordersatz_pos.php
index b4743b7..a131d0f 100644 (file)
--- a/ordersatz_pos.php
+++ b/ordersatz_pos.php
@@ -14,10 +14,13 @@ include_once($_SESSION['sys']['basedir'].'masks/metro/utils.php');
 include_once($_SESSION['sys']['basedir'].'lib/mail.php');
 
 if (substr($_SERVER["SCRIPT_FILENAME"],-10) == '/index.php' &&
-    !empty($_GET['id']))
+    !empty($_GET['id'])) {
   $_SESSION['ordersatz'] = $_GET['id'];
+  $done = is_done($_GET['id']);
+}
 
-$jscode[] = <<<EOC
+if (!$done) {
+  $jscode = <<<EOC
 grid_column_edit[1] = {
     default_menu: false,
     width: '9em',
@@ -96,6 +99,8 @@ function import_articles()
 }
 
 EOC;
+  $javascript->add($jscode);
+}
 
 $buttons = <<<EOC
 <p style="margin-top: 0px; margin-bottom: 4px; text-align: center;">
@@ -124,10 +129,10 @@ function get_title($id)
 $mask = array(
              'table' => 'metro_ordersatz',
              'join' => array('metro_ordersatz_pos ON ordersatz = metro_ordersatz.id',
-                             'metro_artikel ON artikel = metro_artikel.id'),
+                             'metro_artikel ON artikel = metro_artikel.id AND removed = 0'),
              'title' => get_title($_SESSION['ordersatz']),
              'edit_title' => 'Ordersatz',
-             'where' => sprintf('ordersatz = %d AND owner = %d AND done IS NULL', $_SESSION['ordersatz'], $_SESSION['sys']['uid']),
+             'where' => sprintf('ordersatz = %d AND owner = %d', $_SESSION['ordersatz'], $_SESSION['sys']['uid']),
              'list' => array(
                              'id' => array(
                                            'name' => 'ID',
@@ -224,6 +229,11 @@ $mask = array(
                                 ),
              );
 
+if ($done) {
+  unset($mask['edit']);
+  $mask['join'] = str_replace(' AND removed = 0','',$mask['join']);
+}
+
 function cb_cellsave()
 {
   global $db;