X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=c2ffb64d242e70f108db455368826f2657745168;hb=ec28d06c976780c7cba78aa7d85d8d8d06095df3;hp=f1a3751405fbdc35ec3b476820f0bb56ac30b123;hpb=b4dcae05cf03872a232a9c36dafbb69d3dcf9b6f;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index f1a3751..c2ffb64 100755
--- a/index.php
+++ b/index.php
@@ -111,14 +111,18 @@ class Sklad_HTML extends HTML {
 <h1><a href="$script/">SystémSklad</a><small>$title</small></h1>
 
 <style type="text/css">
-.menu li, .menu * li {
+.menu li {
 	float: left;
-	margin: 0.2em;
+	padding: 0.2em;
+}
+
+.menu * li {
+	float: none;
 }
 
 .menu * menu {
 	position: absolute;
-	background-color: yellow;
+	padding: 0.2em;
 }
 
 .menu, .menu * menu {
@@ -126,22 +130,28 @@ class Sklad_HTML extends HTML {
 }
 
 .menu * menu {
+	border: 1px solid orange;
 	display: none;
 	margin: 0;
 }
 
-.menu li:hover menu {
+.menu li:hover menu, .menu li:hover {
 	display: block;
+	background-color: yellow;
 }
+
 </style>
 
 <div>
 	<menu class="menu">
 		<li><a href="?logout">Logout</a></li>
 		<li><a href="$script/">Home</a></li>
-		<li><a href="#">Assistants</A>
+		<li><a href="#">Assistants</a>
 			<menu>
 				<li><a href="$script/assistant/store">store</a></li>
+				<li><a href="$script/assistant/dispose">dispose</a></li>
+				<li><a href="$script/assistant/sell">sell</a></li>
+				<li>&darr;&darr; BETA &darr;&darr;</li>
 				<li><a href="$script/assistant/new-item">new-item</a></li>
 			</menu>
 		</li>
@@ -243,7 +253,7 @@ EOF;
 		return $this->table($table);
 	}
 
-	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $multi_insert=true) {
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true) {
 		//echo('<pre>'); print_r($selectbox);
 		//echo('<pre>'); print_r($current);
 		$update = false;
@@ -254,13 +264,14 @@ EOF;
 
 		if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
 
-		$html='<form method="POST">';
+		$action = $action ? " action='$action'" : false;
+		$html="<form$action method='POST'>";
 		if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
 		//$html.=$this->input('table', $class, 'hidden');
 		foreach($columns as $column)	{
 			$html.=$class.':<b>'.$column['Field'].'</b>: ';
 			$name="values[$class][".$column['Field'].'][]';
-			$val = $update ? $current[$column['Field']] : false;
+			$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(!$val) $val = '';
@@ -327,7 +338,7 @@ class Sklad_DB extends PDO {
 			'model'	=> array('category', 'producer')
 		); //TODO Autodetect using foreign keys?
 		$search_fields = array(
-			'item'	=> array('item_id','model_name','model_barcode','model_descript','producer_name','vendor_name')
+			'item'	=> array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
 		); //TODO Autodetect
 
 		//Escaping
@@ -341,13 +352,13 @@ class Sklad_DB extends PDO {
 		if($search) {
 			$search = $this->quote($search);
 			if(!isset($search_fields[$class])) $this->post_redirect_get($class, "Ve tride $class zatim vyhledavat nemozno :-(");
-			$search = '';
-			foreach($search_fields[$class] as $column) $search .= "OR $column REGEXP $search ";
-			$where[] = "FALSE $search";
+			$sql_search = '';
+			foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search ";
+			$where[] = "FALSE $sql_search";
 		}	elseif($id) $where[] = "$class$suffix_id = $id";
 		if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
 
-		if($where) $sql .= 'WHERE '.implode(' AND ', $where)."\n";
+		if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
 		//ORDER
 		if(!$order) $order = $class.$suffix_id;
 		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
@@ -406,6 +417,14 @@ class Sklad_DB extends PDO {
 		return array_filter($selectbox, 'ksort');
 	}
 
+	function map_unique($key, $value, $select, $table) { //TODO: Guess $select and $table if not passed
+		$history = $this->contains_history($table) ? " AND ${table}_valid_till=0" : '';
+		$value=$this->quote($value);
+		$sql = "SELECT $select FROM $table WHERE $key=$value$history LIMIT 1;"; //TODO use build_query_select()!!!
+		$result = $this->safe_query($sql)->fetchAll(PDO::FETCH_ASSOC);
+		if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error('Položka nenalezena!')); //TODO post_redirect_get...
+	}
+
 	function contains_history($table) {
 		$history_tables = array('item'); //TODO Autodetect
 		return in_array($table, $history_tables);