X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=768a1845c7b1ba300ce4b385a09f458173a520db;hb=928bb5a6f34a0edb17af5d5a96fecd523473951a;hp=07937b04286720f06227298259e8c2a4850263d7;hpb=3b62698949ec9f94f06f0f7c7fe46a7ba59c9992;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index 07937b0..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 "";
}
@@ -129,11 +130,11 @@ class HTML {
if(!is_bool($default)) {
$value=$default; $title=$selectbox[$value];
- $html .= "";
+ $html .= "";
unset($selectbox[$value]);
}
foreach($selectbox as $value => $title) {
- $html .= "";
+ $html .= "";
}
$html .= "";
return $html;
@@ -210,17 +211,21 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
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; }
.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; }
.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: 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; } */
-
.menu li {
float: left;
padding: 0.2em;
@@ -262,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;
@@ -356,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')),
@@ -366,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");',
@@ -386,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) ).',';
}
}
}
@@ -401,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',
@@ -441,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) {
@@ -485,16 +495,16 @@ EOF;
'item' => array('item_note'),
'model' => array('model_descript')
);
- $html = '';
+ $html = '
'.T($class).':'.T($column['Field']).': | ';
$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);
@@ -506,8 +516,9 @@ EOF;
$html.=$this->input($name, $val);
break;
}
- $html.=' '; + $html.=' |
'); print_r($selectbox); - return array_filter($selectbox, 'ksort'); + //return array_filter($selectbox, 'ksort'); + 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 @@ -875,7 +888,7 @@ class Sklad_UI { return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert); } - function render_single_record_details($class, $id) { + function render_single_record_details($class, $id, $barcode=true) { $id_next = $id + 1; $id_prev = $id - 1 > 0 ? $id - 1 : 0; $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : ''; @@ -883,8 +896,8 @@ class Sklad_UI { $html.= $this->html->link('<<', "$class/$id_prev/"); $html.= '-'; $html.= $this->html->link('>>', "$class/$id_next/"); - $html.= '
'; - $html.=''.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).''; + $html.= ' '; + $barcode && $html.=' '; $html.= $this->html->link('edit', "$class/$id/edit/"); if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/"); return $html; @@ -894,23 +907,26 @@ 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.= ' '; $html.= $this->html->link('new', "$class/new/$get"); return $html; } - function render_listing_extensions($class, $id, $limit, $offset, $edit=false) { + function render_listing_extensions($class, $id, $limit, $offset, $edit=false, $barcode=true) { $html=''; if(is_numeric($id)) { - $html.=$this->render_single_record_details($class, $id); + $html.=$this->render_single_record_details($class, $id, $barcode); } else { $html.=$this->render_listing_navigation($class, '*', $limit, $offset); } - if($edit) { + if($edit && $barcode) { $html.= $this->render_form_edit($class, $id, false); $action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete"; $html.=$this->html->form($action,'POST',array( @@ -1086,6 +1102,7 @@ class Sklad_UI { $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT; $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); echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history); echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit); //print_r(array("",$_SERVER));