X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=ef5d5b51cbe7659ad048b41ae67cdf7c18e6e1f2;hb=2158110429d1927b2a0f8fc3904a7edab0559e90;hp=2f92066682e8a62a4a1ac4fea6cd9b3929a6f329;hpb=a1545cbd97c44f28a54b0ec5780f4ec85b468785;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index 2f92066..ef5d5b5 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
$var$td>";
+ $html.="<$td$rs$cs$tdclass title='$id'>$var$td>";
if(in_array($id,$break_after,true)) $html.=''."
";
}
$html.=' ';
@@ -55,7 +56,7 @@ class HTML {
return $html;
}
- function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
+ function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$orderby=false,$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
$html="";
$header=true;
$even=false;
@@ -63,8 +64,13 @@ class HTML {
$params = isset($row[$row_classes_field]) ? $row[$row_classes_field] : '';
unset($row[$row_classes_field]);
if($header) {
- $keys = array(); foreach($row as $key => $val) $keys[$key]=$key;
- $html.=$this->row(T($keys),'thead',false,'',$colspan,$rowspan,$break_after);
+ $keys = array(); foreach($row as $key => $val) {
+ $order= $orderby ? ' '.
+ $this->link('↑', $orderby."[$key]=ASC").
+ $this->link('↓', $orderby."[$key]=DESC") : '';
+ $keys[$key]=T($key).$order;
+ }
+ $html.=$this->row($keys,'thead',false,'',$colspan,$rowspan,$break_after);
$header=false;
}
$class = $parity_class ? $parity_class[$even] : false;
@@ -102,6 +108,8 @@ class HTML {
function input($name=false, $value=false, $type='text', $placeholder=false, $options=false, $prefix='') {
if($type == 'textarea') return $this->textarea($name, $value, $placeholder, $options, $prefix);
+ if($type == 'select') return $this->select($name, $placeholder, $value, $prefix);
+ //select(vendor, $selectbox ,false, prefix:);
$html = T($prefix)." '); print_r($selectbox);
- $html = "";
+ $html = T($prefix)."";
if(!is_bool($default)) {
$value=$default; $title=$selectbox[$value];
@@ -360,7 +368,7 @@ EOF;
$insert_url = '%d/new?insert[%c]=%v';
$relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
'model' => array(
- 'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url)),
+ 'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url,false,'add barcode')),
'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
'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
@@ -402,7 +410,8 @@ 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, !preg_match('/http/', $destination_url) ).',';
+ $destination_title = isset($destination[3]) ? $destination[3] : $destination[0];
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination_title, $destination_url, !preg_match('/http/', $destination_url) ).',';
}
}
}
@@ -470,7 +479,6 @@ EOF;
}
function render_item_table($table,$class=false) {
-
$cellspan = array(
'break_after' => array(
'item' => array('category_name'),
@@ -497,7 +505,13 @@ EOF;
$this->table_collapse($table);
if($class) $this->table_hide_columns($table,$class);
$this->table_sort($table);
- return $this->table($table,$colspan,$rowspan,$break_after);
+
+ //Orderby:
+ $path = $_GET;
+ unset($path['orderby']);
+ $path = '?'.Query::build($path).'orderby';
+
+ return $this->table($table,$colspan,$rowspan,$break_after,$path);
}
function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
@@ -641,8 +655,8 @@ class Sklad_DB extends PDO {
'model' => array('barcode'=>'model_id')
);
$fields_search = array(
- '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')
+ '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')
); //TODO Autodetect
$group_concat = array(
'model' => array('barcode_name'=>'model_id')
@@ -773,6 +787,7 @@ class Sklad_DB extends PDO {
foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
}
//echo(''); print_r($selectbox);
+ //return $selectbox;
//return array_filter($selectbox, 'ksort');
return array_filter($selectbox, 'natcasesort');
//array_multisort($selectbox); return $selectbox;