GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Pridani nekolikanasobnych carovych kodu do vypisu modelu
[mirrors/SokoMan.git] / index.php
diff --git a/index.php b/index.php
index 6f4e75f79b2c3fb8bdfa8c0b2d46bac3741acd9e..b69500f1352c77442aa21b651726aa7dbd7e79cb 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -82,6 +82,7 @@ class HTML {
        }
 
        function img($src='#void', $title='img', $options='height=64') {
+               if(isset($_GET['noimgs'])) return "<span title='$title'>".basename($src).'</span>';
                $options = $options ? " $options" : '';
                return "<img src='$src' alt='$title' title='$title'$options; />";
        }
@@ -266,7 +267,7 @@ EOF;
                if($count) $assistants[$item] = "assistant/$item";
        }
 
-       $tables=array('item','model','category','producer','vendor','room','status');
+       $tables=array('item','barcode','model','category','producer','vendor','room','status','location');
 
        foreach($tables as $table) {
                $listable[$table] = $table;
@@ -333,11 +334,11 @@ EOF;
        }
 
        function render_barcode($barcode,$opts=false) {
-               return $this->img_link($this->internal_url("barcode/$barcode"),$this->internal_url("barcode/$barcode"),$barcode,false,false,$opts);
+               return $this->img_link($this->internal_url("barcodeimg/$barcode"),$this->internal_url("barcodeimg/$barcode"),$barcode,false,false,$opts);
        }
 
        function table_add_barcodes(&$table) {
-               $image = array('model_barcode', 'item_serial');
+               $image = array('barcode_name', 'model_barcode', 'item_serial');
                foreach($table as $id => $row) {
                        foreach($image as $column) if(isset($table[$id][$column])) {
                                $table[$id][$column]=$this->render_barcode($table[$id][$column]);
@@ -356,11 +357,17 @@ EOF;
 
        function table_add_relations(&$table, $class, $suffix_relations='_relations') {
                $where_url = '%d/?where[%c]==%v';
-               $relations = array( //TODO: Autodetect???
+               $relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
                        'model' => array(
                                'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')),
                                'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
-                               'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
+                               'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+                               'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
+                       ),
+                       'barcode' => array(
+                               'model_id' => array(array('model',$where_url)),
+                               'barcode_id' => array(array('item',$where_url),array('edit','barcode/%v/edit/')),
+                               'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
                        ),
                        'item' => array(
                                'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
@@ -370,7 +377,11 @@ EOF;
                        'producer' => array('producer_id' => array(array('item',$where_url), array('model',$where_url))),
                        'vendor' => array('vendor_id' => array(array('item',$where_url))),
                        'room' => array('room_id' => array(array('item',$where_url))),
-                       'status' => array('status_id' => array(array('item',$where_url)))
+                       'status' => array('status_id' => array(array('item',$where_url))),
+                       'location' => array(
+                               'location_id' => array(array('item',$where_url),array('edit','location/%v/edit/')),
+                               'location_name' => array(array('smokeping','http://tartarus.brevnov.czf/cgi-bin/smokeping.cgi?filter=%v'))
+                       )
                );
                $relations_conditions=array(
                        'in_stock' => 'return(@$table[$id]["status_name"] == "stored");',
@@ -390,7 +401,7 @@ EOF;
                                                        //$condition = $relations_conditions[$destination[2]]($table,$id);
                                                        if(!eval($relations_conditions[$destination[2]])) continue;
                                                }
-                                               @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, false).',';
+                                               @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
                                        }
                                }
                        }
@@ -405,6 +416,7 @@ EOF;
                        'producer_id' => 'producer_name',
                        'vendor_id' => 'vendor_name',
                        'room_id' => 'room_name',
+                       'location_id' => 'location_name',
                        'status_id' => 'status_name',
                        'item_author' => 'item_author_backend',
                        'item_customer' => 'item_customer',
@@ -445,7 +457,7 @@ EOF;
 
        function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-)))
                $fields_hide = array(
-                       'item' => array('model_descript','model_price_in','model_price_out','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note')
+                       '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')
                );
                //print_r($table); die();
                if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -490,8 +502,10 @@ EOF;
                        'model' => array('model_descript')
                );
                $html = '<table>';
+               $even=false;
                foreach($columns as $column)    {
-                       $html.='<tr><td>'.T($class).':<b>'.T($column['Field']).'</b>:&nbsp;</td><td>';
+                       $html.='<tr class="'. ($even ? 'tr_even' : 'tr_odd') .'"><td>'.T($class).':<b>'.T($column['Field']).'</b>:&nbsp;</td><td>';
+                       $even = !$even;
                        $name="values[$class][".$column['Field'].'][]';
                        $val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
                        switch(true) {
@@ -610,13 +624,20 @@ class Sklad_DB extends PDO {
        function build_query_select($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $order=false, $suffix_id='_id') {
                //Configuration
                $join = array(
-                       'item'  => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
+                       'barcode'       => array('model', 'category', 'producer'),
+                       'item'  => array('barcode', 'model', 'category', 'producer', 'vendor', 'room', 'location', 'status'),
                        'model' => array('category', 'producer')
                ); //TODO Autodetect using foreign keys?
+               $join2 = array(
+                       'model' => array('barcode'=>'model_id')
+               );
                $fields_search = array(
-                       'item'  => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name'),
-                       'model' => array('model_id','model_name','model_barcode','model_descript','producer_name')
+                       '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')
                ); //TODO Autodetect
+               $group_concat = array(
+                       'model' => array('barcode_name'=>'model_id')
+               );
 
                //Init
                if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
@@ -624,10 +645,20 @@ class Sklad_DB extends PDO {
                //Escaping
                $class = $this->escape($class);
 
+               //GROUP_CONCAT
+               $group_concat_query = '';
+               $group_by = '';
+               if(isset($group_concat[$class])) foreach($group_concat[$class] as $gc => $gb) {
+                       $group_concat_query .= ",group_concat($gc separator ', ')";
+                       $group_by .= "GROUP BY $gb\n";
+               }
+
                //SELECT
-               $sql="SELECT * FROM `$class`\n";
+               $sql="SELECT *$group_concat_query FROM `$class`\n";
+               //$sql="SELECT * FROM `$class`\n";
                //JOIN
                if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
+               if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
                //WHERE/REGEXP
                if($search) {
                        $search = $this->quote($search);
@@ -639,10 +670,14 @@ class Sklad_DB extends PDO {
                if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
 
                if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+
+               //GROUP BY
+               $sql.=$group_by;
+
                //ORDER
                if(!$order) $order = $class.$suffix_id.' DESC';
                if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
-               $sql .= "ORDER BY $order\n";
+               //$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
                //LIMIT/OFFSET
                if($limit) {
                        $limit = $this->escape((int)$limit);
@@ -901,10 +936,11 @@ class Sklad_UI {
                $offset_next = $offset + $limit;
                $offset_prev = $offset - $limit > 0 ? $offset - $limit : 0;
                $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
+               $moreget = isset($get[0]) ? '&' : '?';
                $html='';
                $html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get");
                $html.= '-';
-               $html.= $this->html->link('[*]', "$class/$id/0/0/$get");
+               $html.= $this->html->link('[*]', "$class/$id/0/0/$get$moreget".'noimgs');
                $html.= '-';
                $html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
                $html.= '&nbsp;&nbsp;&nbsp;';
@@ -967,6 +1003,7 @@ class Sklad_UI {
        function check_input_validity($field, $value='', $ruleset=0) {
                $rules = array(0 => array(
                        'model_barcode' => '/./',
+                       'barcode_name' => '/./',
                        'item_serial' => '/./',
                        'vendor_id' => '/^[0-9]*$/'
                ));
@@ -1038,6 +1075,8 @@ class Sklad_UI {
        }
 
        function process_http_request() {
+               $listing_limit_classes = array('item','model');
+
                $this->check_auth();
 
                @ini_set('magic_quotes_gpc' , 'off');
@@ -1050,7 +1089,7 @@ class Sklad_UI {
                $PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
                //Sephirot:
                if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
-               if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode' && $PATH_CHUNKS[1]!='api') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+               if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
                        echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
                switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
                        case 'test':    //test
@@ -1068,7 +1107,7 @@ class Sklad_UI {
                                $assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
                                echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars);
                                break;
-                       case 'barcode': //barcode
+                       case 'barcodeimg': //barcode
                                Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
                                break;
                        default:        //?
@@ -1092,7 +1131,7 @@ class Sklad_UI {
                                                                $edit=true;
                                                        default:        //?/?/?
                                                                $history = $PATH_CHUNKS[3] == 'history' ? true : false;
-                                                               $limit  = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
+                                                               $limit  = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : (in_array($class, $listing_limit_classes) ? FRONTEND_LISTING_LIMIT : 0);
                                                                $offset = isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
                                                                $where = @is_array($_GET['where']) ? $_GET['where'] : false;
                                                                echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit, false);
https://github.com/Harvie/SokoMan.git (mirrored @ Sat, 01 Jun 2024 01:10:10 +0200)
This page took 0.154974 seconds and 4 git commands to generate.