X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=6296552329f21e584583511ee65a902658dcf5a6;hb=1f52346fa3205e61b1d0d406d60313095cbe5754;hp=bf7614a0bf73323b30142110739289e90e5ad886;hpb=c849b3eee66918d7872c40e7ddcfb6eee5d2f9c0;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index bf7614a..6296552 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 "";
}
@@ -219,7 +220,8 @@ li a, a:hover { text-decoration:underline; }
.item_status_stored td { font-weight:bold; }
.item_status_deleted td { text-decoration:line-through; }
.item_status_destroyed td { font-style:italic; }
-.floating_barcode { margin-top: 5px; }
+.floating_barcode { margin: 5px; }
+.disabled { color: grey; }
/* table, table * { table-layout:fixed; width:100%; overflow:hidden; word-wrap:break-word; } */
/* td { position:absolute; } */
/* .cell_model_name { float:left; } */
@@ -265,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;
@@ -359,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')),
@@ -369,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");',
@@ -389,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) ).',';
}
}
}
@@ -404,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',
@@ -444,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) {
@@ -489,15 +496,17 @@ EOF;
'model' => array('model_descript')
);
$html = '
'.T($class).':'.T($column['Field']).': | '; + $html.=' |
'.T($class).':'.T($column['Field']).': | ';
+ $even = !$even;
$name="values[$class][".$column['Field'].'][]';
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
if(is_bool($val) && !$val) $val = '';
$html.=$this->input($name, $val, 'hidden');
- $html.=$val.'(AUTO)';
+ $html.='[AUTO] '.$val.'';
break;
case isset($selectbox[$column['Field']]):
$html.=$this->select($name,$selectbox[$column['Field']],$val);
@@ -609,7 +618,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(
@@ -728,8 +737,8 @@ class Sklad_DB extends PDO {
}
//echo(''); print_r($selectbox); //return array_filter($selectbox, 'ksort'); - array_multisort($selectbox); - return $selectbox; + return array_filter($selectbox, 'natcasesort'); + //array_multisort($selectbox); return $selectbox; } function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed @@ -900,9 +909,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"); @@ -1035,6 +1047,8 @@ class Sklad_UI { } function process_http_request() { + $listing_limit_classes = array('item','model'); + $this->check_auth(); @ini_set('magic_quotes_gpc' , 'off'); @@ -1089,7 +1103,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); |