X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=4c2f12c6dc5b41374f587407a2684c76cb585d1a;hb=68cf81ddf80d09ed1acdde267a39835404790bba;hp=6b5df8b9d7f95f640af0e9cd059afae5ad33a1aa;hpb=d1686e10050e730500500eb474f0b2582917b950;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index 6b5df8b..4c2f12c 100755
--- a/index.php
+++ b/index.php
@@ -24,6 +24,7 @@ require_once('Sklad_Auth.class/common.php');
 require_once('HTTP_Auth.class.php');
 require_once('Locale.class.php');
 require_once('Barcode.class.php');
+require_once('Fortune.php');
 
 /**
 * Trida poskytuje vseobecne funkce pro generovani HTML kodu
@@ -34,32 +35,40 @@ require_once('Barcode.class.php');
 * @author   Tomas Mudrunka
 */
 class HTML {
-	function row($row,$type=false,$class=false) {
+	function row($row,$type=false,$class=false,$parameters='',$colspan=array(),$rowspan=array(),$break_after=array()) {
 		$html = '';
-		$class = $class ? $class=" class='$class' " : '';
+		$class_br = $class ? " class='$class' " : '';
+		$class = $class ? " class='$class tr_nobr' " : '';
 		if($type) $html.="<$type>";
-		$html.="<tr$class>";
+		$html.="<tr$class$parameters>";
 		$td = $type == 'thead' ? 'th' : 'td';
-		foreach($row as $var) {
+		foreach($row as $id => $var) {
+			$tdclass = " class='cell_$id'";
 			if(trim($var) == '') $var = '&nbsp;';
-			$html.="<$td>$var</$td>";
+			$rs = isset($rowspan[$id]) ? " rowspan='$rowspan[$id]'" : '';
+			$cs = isset($colspan[$id]) ? " colspan='$colspan[$id]'" : '';
+			$html.="<$td$rs$cs$tdclass>$var</$td>";
+			if(in_array($id,$break_after,true)) $html.='</tr>'."<tr$class_br$parameters>";
 		}
 		$html.='</tr>';
 		if($type) $html.="</$type>";
 		return $html;
 	}
 
-	function table(&$table, $parity_class=array('tr_odd','tr_even'), $params='border=1') {
+	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') {
 		$html="<table $params>";
 		$header=true;
 		$even=false;
 		foreach($table as $row) {
+			$params = isset($row[$row_classes_field]) ? $row[$row_classes_field] : '';
+			unset($row[$row_classes_field]);
 			if($header) {
-				$html.=$this->row(array_keys($row),'thead');
+				$keys = array(); foreach($row as $key => $val) $keys[$key]=$key;
+				$html.=$this->row(T($keys),'thead',false,'',$colspan,$rowspan,$break_after);
 				$header=false;
 			}
 			$class = $parity_class ? $parity_class[$even] : false;
-			$html.=$this->row($row,false,$class);
+			$html.=$this->row($row,false,$class.$params,'',$colspan,$rowspan,$break_after);
 			$even = !$even;
 		}
 		$html.='</table>';
@@ -72,12 +81,13 @@ class HTML {
 		return "<a href='$link'>".$title."</a>";
 	}
 
-	function img($src='#void', $title='img', $options='width=64') {
+	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; />";
 	}
 
-	function img_link($src, $link='#void', $title='img_link', $internal=true, $translate=true, $options='width=64') {
+	function img_link($src, $link='#void', $title='img_link', $internal=true, $translate=true, $options='height=64') {
 		return $this->link($this->img($src,$title,$options),$link,$internal,$translate);
 	}
 
@@ -120,11 +130,11 @@ class HTML {
 
 		if(!is_bool($default)) {
 			$value=$default; $title=$selectbox[$value];
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 			unset($selectbox[$value]);
 		}
 		foreach($selectbox as $value => $title) {
-			$html .= "<option value='$value'>$value :: $title</option>";
+			$html .= "<option value='$value'>$title (($value))</option>";
 		}
 		$html .= "</select>";
 		return $html;
@@ -180,7 +190,7 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 		$script = $_SERVER['SCRIPT_NAME'];
 		$search = htmlspecialchars(@trim($_GET['q']));
 		$message = strip_tags(@trim($_GET['message']),'<a><b><u><i><br>');
-		$fortune = 'test';
+		$fortune = fortune();
 		$instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
 		$user_id = htmlspecialchars($user['id']);
 		$user_gid = htmlspecialchars($user['gid']);
@@ -198,11 +208,23 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 
 <style type="text/css">
 * { font-family: arial; }
-td,body { background-color: white; }
+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;
@@ -245,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;
@@ -288,7 +310,7 @@ EOF;
 <div style="background-color:#FFDDDD;">
 	<font color="red">$message</font>
 </div>
-<div style="text-align:right;">
+<div style="text-align:right; color:darkgreen;">
 $fortune
 </div>
 EOF;
@@ -324,13 +346,22 @@ EOF;
 		}
 	}
 
+	function table_add_row_classes(&$table, $class_col='_row_classes') {
+		$image = array('status_name' => ' item_status_');
+		foreach($table as $id => $row) {
+			foreach($image as $column => $param) if(isset($table[$id][$column])) {
+				@$table[$id][$class_col] .= $param.$table[$id][$column];
+			}
+		}
+	}
+
 	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
+				'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')),
@@ -340,12 +371,16 @@ 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");',
-			'not_sold' => 'return(@$table[$id]["status_name"] != "saled");',
-			'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "saled" && @$table[$id]["status_name"] != "disposed");'
+			'not_sold' => 'return(@$table[$id]["status_name"] != "sold");',
+			'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "sold" && @$table[$id]["status_name"] != "disposed");'
 		);
 		foreach($table as $id => $row) {
 			foreach($row as $column => $value) {
@@ -360,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) ).',';
 					}
 				}
 			}
@@ -375,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',
@@ -404,18 +440,18 @@ EOF;
 		foreach($table as $id => $row) {
 			$table_sorted[$id] = array();
 			foreach($precedence as $column) if(isset($table[$id][$column])) {
-				$table_sorted[$id][T($column)]=$table[$id][$column];
+				$table_sorted[$id][$column]=$table[$id][$column];
 				unset($table[$id][$column]);
 			}
-			//$table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]);
-			foreach($table[$id] as $key => $val) $table_sorted[$id][T($key)] = $val; //array_merge with T() translating
+			$table_sorted[$id]=array_merge($table_sorted[$id],$table[$id]);
+			//foreach($table[$id] as $key => $val) $table_sorted[$id][T($key)] = $val; //array_merge with T() translating
 		}
 		$table = $table_sorted;
 	}
 
 	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) {
@@ -424,14 +460,34 @@ EOF;
 	}
 
 	function render_item_table($table,$class=false) {
+
+		$cellspan = array(
+			'break_after' => array(
+				'item' => array('category_name'),
+				'model'=> array('model_descript')
+			),
+			'rowspan' => array(
+				'item' => array('model_image'=>2,'item_id'=>2),
+				'model'=> array('model_image'=>2)
+			),
+			'colspan' => array(
+				'item' => array('model_name'=>6,'category_name'=>'100%'),
+				'model'=> array('model_name'=>4,'model_descript'=>'100%')
+			)
+		);
+
+		foreach(array_keys($cellspan) as $vari)
+			$$vari = isset($cellspan[$vari][$class]) ? $cellspan[$vari][$class] : array();
+
 		if(empty($table)) return '<h3>'.T('holy primordial emptiness is all you can find here...').'</h3><br />';
+		$this->table_add_row_classes($table);
 		$this->table_add_images($table);
 		if($class) $this->table_add_relations($table,$class);
 		$this->table_add_barcodes($table);
 		$this->table_collapse($table);
 		if($class) $this->table_hide_columns($table,$class);
 		$this->table_sort($table);
-		return $this->table($table);
+		return $this->table($table,$colspan,$rowspan,$break_after);
 	}
 
 	function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
@@ -439,16 +495,18 @@ EOF;
 			'item' => array('item_note'),
 			'model' => array('model_descript')
 		);
-		$html = '';
+		$html = '<table>';
+		$even=false;
 		foreach($columns as $column)	{
-			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
+			$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) {
 				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.='<span class="disabled"><i>[AUTO]</i> '.$val.'</span>';
 					break;
 				case isset($selectbox[$column['Field']]):
 					$html.=$this->select($name,$selectbox[$column['Field']],$val);
@@ -460,8 +518,9 @@ EOF;
 					$html.=$this->input($name, $val);
 					break;
 			}
-			$html.='<br />';
+			$html.='</td></tr>';
 		}
+		$html.='</table>';
 		return $html;
 	}
 
@@ -559,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(
@@ -677,7 +736,9 @@ class Sklad_DB extends PDO {
 			foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
 		}
 		//echo('<pre>'); 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
@@ -829,7 +890,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'] : '';
@@ -837,8 +898,8 @@ class Sklad_UI {
 		$html.= $this->html->link('<<', "$class/$id_prev/");
 		$html.= '-';
 		$html.= $this->html->link('>>', "$class/$id_next/");
-		$html.= '<br />';
-		$html.='<span style="float:right;">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
+		$html.= '&nbsp;&nbsp;&nbsp;';
+		$barcode && $html.='<span style="float:right;" class="floating_barcode">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
 		$html.= $this->html->link('edit', "$class/$id/edit/");
 		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
 		return $html;
@@ -848,23 +909,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.= '<br />';
+		$html.= '&nbsp;&nbsp;&nbsp;';
 		$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(
@@ -983,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');
@@ -1037,9 +1103,10 @@ 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);
 								echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
 								echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);
 								//print_r(array("<pre>",$_SERVER));