Dalsi vylepseni hromadnyho naskladnovani (bohuzel to rozbilo tipovani dodavatele...

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index 3c078e98f38039ca4c34e18686a04bdc977aeead..ab5d70a34dd45148e778da211d1da191dc45737b 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -102,6 +102,8 @@ class HTML {
 
        function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
                if($type == 'textarea') return $this->textarea($name, $value, $placeholder, $options, $prefix);
+               if($type == 'select') return $this->select($name, $placeholder, $value, $prefix);
+               //select(vendor, $selectbox ,false, prefix:);
                $html = T($prefix)."<input type='$type' ";
                if($name) $html.= "name='$name' ";
                if(!is_bool($value)) {
@@ -124,9 +126,9 @@ class HTML {
                return $html;
        }
 
-       function select($name, $selectbox, $default=false) {
+       function select($name, $selectbox, $default=false, $prefix='') {
                //echo('<pre>'); print_r($selectbox);
-               $html = "<select name='$name'>";
+               $html = T($prefix)."<select name='$name'>";
 
                if(!is_bool($default)) {
                        $value=$default; $title=$selectbox[$value];
@@ -641,8 +643,8 @@ class Sklad_DB extends PDO {
                        'model' => array('barcode'=>'model_id')
                );
                $fields_search = array(
-                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_barcode','model_descript','producer_name','vendor_name'),
-                       'model' => array('model_id','model_name','barcode_name','model_barcode','model_descript','producer_name')
+                       'item'  => array('item_id','item_serial','model_name','barcode_name','model_descript','producer_name','vendor_name'),
+                       'model' => array('model_id','model_name','barcode_name','model_descript','producer_name')
                ); //TODO Autodetect
                $group_concat = array(
                        'model' => array('barcode_name'=>'model_id')
@@ -727,7 +729,9 @@ class Sklad_DB extends PDO {
        }
 
        function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) {
-               $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags);
+               $result = $this->safe_query($sql, $fatal);
+               if(!$fatal && !$result) return $result;
+               $result = $result->fetchAll($fetch_flags);
                $this->load_backend_data_to_query_results($result);
                if($translate) $this->translate_query_results($result);
                return $result;
@@ -771,6 +775,7 @@ class Sklad_DB extends PDO {
                        foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
                }
                //echo('<pre>'); print_r($selectbox);
+               //return $selectbox;
                //return array_filter($selectbox, 'ksort');
                return array_filter($selectbox, 'natcasesort');
                //array_multisort($selectbox); return $selectbox;
@@ -1019,6 +1024,14 @@ class Sklad_UI {
                return true;
        }
 
+       function check_locks() {
+               $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+               if(!empty($result)) {
+                       echo T('There are locks:').' '.$this->html->render_item_table($result);
+                       $this->post_redirect_get('', 'There are locks!', true);
+               }
+       }
+
        function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
                if($_SERVER['REQUEST_METHOD'] != 'POST') return;
                //echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
@@ -1030,6 +1043,7 @@ class Sklad_UI {
                 * do:  $values[$table][$id][$column]
                 */
                if(isset($_POST['values'])) {
+                       $this->check_locks();
                        $values=array();
                        foreach($_POST['values'] as $table => $columns) {
                                foreach($columns as $column => $ids) {
@@ -1050,6 +1064,7 @@ class Sklad_UI {
                        case 'new':
                                $replace = false;
                        case 'edit':
+                               $this->check_locks();
                                if(!isset($replace)) $replace = true;
                                $table = $class ? $class : 'item';
                                //print_r($values); //debug
@@ -1060,6 +1075,7 @@ class Sklad_UI {
                                $this->post_redirect_get($last, $message);
                                break;
                        case 'delete':
+                               $this->check_locks();
                                if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
                                $this->db->delete($class, $id) || $this->post_redirect_get("$class/$id/edit", "V tabulce $class jentak neco mazat nebudes chlapecku :-P");
                                $this->post_redirect_get("$class", "Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-(");
@@ -1098,8 +1114,8 @@ class Sklad_UI {
                //Sephirot:
                if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
                if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
-           $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
-       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
+                       $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+                       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
                        echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
                }
                switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible