hledani v carovejch kodech

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index bb5bb5e42868b4cb4a4671973e3553fa880de06e..525c272194317093b5c48285ae19e62a2777fd76 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -216,15 +216,19 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 
 <style type="text/css">
 * { font-family: arial; }
-td,body { background-color: white; border: orange; }
-.tr_nobr td { border-top: 3px solid orange; }
-table { background-color: orange; border: orange; }
-td textarea { width:100%; height:100%; }
 a, a img { text-decoration:none; color: darkblue; border:none; }
 li a, a:hover { text-decoration:underline; }
+
+td,body { background-color: white; font-size: 75%; }
+table { background-color: orange; border-collapse: collapse; }
+
+td { border: 2px solid darkorange; }
+th { border: 2px solid darkorange; }
+td textarea { width:100%; height:100%; }
+
 .tr_even td { background-color: lemonchiffon; }
-.tr_nobr.tr_even td:first-child { border-left: 5px solid orange; }
-.tr_nobr.tr_odd td:first-child { border-left: 5px solid white; }
+/* table tr:nth-child(odd) td { background-color: lemonchiffon; } */
+
 .item_status_stored td { font-weight:bold; }
 .item_status_deleted td { text-decoration:line-through; }
 .item_status_destroyed td { font-style:italic; }
@@ -470,7 +474,9 @@ EOF;
                $fields_hide = array(
                        'model' => array('barcode_name'),
                        'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'),
-                       'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description')
+                       'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description'),
+                       'lock' => array('lock_author'),
+                       'transaction' => array('transaction_author')
                );
                //print_r($table); die();
                if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -656,7 +662,9 @@ class Sklad_DB extends PDO {
                );
                $fields_search = array(
                        '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')
+                       'barcode' => array('barcode_id','barcode_name'),
+                       'model' => array('model_id','model_name','barcode_name','model_descript','producer_name'),
+                       'location' => array('location_id','location_name')
                ); //TODO Autodetect
                $group_concat = array(
                        'model' => array('barcode_name'=>'model_id')
@@ -736,7 +744,9 @@ class Sklad_DB extends PDO {
 
        function load_backend_data_to_query_results(&$result,$suffix_backend='_backend') {
                $translate_cols = array(
-                       'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
+                       'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+                       'lock_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+                       'transaction_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
                ); //TODO: Hardcoded
                foreach($result as $key => $row) {
                        foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -776,7 +786,7 @@ class Sklad_DB extends PDO {
 
        function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
                $selectbox=array( //TODO: Hardcoded...
-                       'model_countable' => array(0 => 'no', 1 => 'yes'),
+                       'model_countable' => array(1 => 'yes'),
                        'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
                        'vendor_id' => array('COMPULSORY' => 'select...')
                );
@@ -1012,7 +1022,8 @@ class Sklad_UI {
 
        function post_redirect_get($location, $message='', $error=false, $translate=true) {
                $messaget = $translate ? T($message) : $message;
-               $url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+               $separator = preg_match('/\?/', $location) ? '&' : '?';
+               $url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
                $location = $this->html->internal_url($location).$url_args;
                header('Location: '.$location);
                if($error) trigger_error($message);
@@ -1047,9 +1058,10 @@ class Sklad_UI {
        }
 
        function check_locks() {
-               $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+               $user = $this->db->quote($this->db->auth->get_user_id());
+               $result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
                if(!empty($result)) {
-                       echo T('There are locks:').' '.$this->html->render_item_table($result);
+                       echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
                        $this->post_redirect_get('', 'There are locks!', true);
                }
        }
@@ -1137,7 +1149,7 @@ class Sklad_UI {
                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) : '';
+                       $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : '';
                        echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
                }
                switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible