X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=768a1845c7b1ba300ce4b385a09f458173a520db;hb=928bb5a6f34a0edb17af5d5a96fecd523473951a;hp=c554f6dc273b89326756af37c0bce8ac865f41c7;hpb=725edff747298064559301efa77f73b8950cb336;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index c554f6d..768a184 100755
--- 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 "".basename($src).'';
$options = $options ? " $options" : '';
return "
";
}
@@ -266,7 +267,7 @@ EOF;
if($count) $assistants[$item] = "assistant/$item";
}
- $tables=array('item','model','category','producer','vendor','room','status');
+ $tables=array('item','model','category','producer','vendor','room','status','location');
foreach($tables as $table) {
$listable[$table] = $table;
@@ -360,7 +361,7 @@ EOF;
'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
+ 'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
),
'item' => array(
'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
@@ -370,7 +371,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)),
+ '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 +395,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).',';
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
}
}
}
@@ -405,6 +410,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 +451,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','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) {
@@ -610,7 +616,7 @@ 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'),
+ 'item' => array('model', 'category', 'producer', 'vendor', 'room', 'location', 'status'),
'model' => array('category', 'producer')
); //TODO Autodetect using foreign keys?
$fields_search = array(
@@ -901,9 +907,12 @@ 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$moreget".'noimgs');
+ $html.= '-';
$html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get");
$html.= ' ';
$html.= $this->html->link('new', "$class/new/$get");