X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=3c078e98f38039ca4c34e18686a04bdc977aeead;hb=7f1203c4b619b9ece292aa38fbf0d264c1291de7;hp=c944d1a0866f196b16d4914f8ba414cf3db898c7;hpb=ea921a95b65ffaae5b008f864494553d73289612;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index c944d1a..3c078e9 100755
--- a/index.php
+++ b/index.php
@@ -185,7 +185,7 @@ class HTML {
 * @author   Tomas Mudrunka
 */
 class Sklad_HTML extends HTML { //TODO: Split into few more methods
-	function header($title='', $user=array()) {
+	function header($title='', $user=array(), $headerhtml) {
 		$home = URL_HOME;
 		$script = $_SERVER['SCRIPT_NAME'];
 		$search = htmlspecialchars(@trim($_GET['q']));
@@ -267,7 +267,7 @@ EOF;
 		if($count) $assistants[$item] = "assistant/$item";
 	}
 
-	$tables=array('item','model','category','producer','vendor','room','status','location');
+	$tables=array('item','barcode','model','category','producer','vendor','room','status','location');
 
 	foreach($tables as $table) {
 		$listable[$table] = $table;
@@ -308,7 +308,7 @@ EOF;
 </div>
 <hr style="clear: both;" />
 <div style="background-color:#FFDDDD;">
-	<font color="red">$message</font>
+	<font color="red">$headerhtml $message</font>
 </div>
 <div style="text-align:right; color:darkgreen;">
 $fortune
@@ -357,13 +357,19 @@ EOF;
 
 	function table_add_relations(&$table, $class, $suffix_relations='_relations') {
 		$where_url = '%d/?where[%c]==%v';
+		$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('edit','model/%v/edit/')),
+				'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url)),
 				'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
 			),
+			'barcode' => array(
+				'model_id' => array(array('model',$where_url)),
+				'barcode_id' => array(array('item',$where_url),array('edit','barcode/%v/edit/')),
+				'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+			),
 			'item' => array(
 				'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
 				'item_id' => array(array('edit','item/%v/edit/'))
@@ -415,6 +421,7 @@ EOF;
 			'status_id' => 'status_name',
 			'item_author' => 'item_author_backend',
 			'item_customer' => 'item_customer',
+			'lock_id' => 'lock_name',
 		);
 
 		foreach($table as $id => $row) {
@@ -452,6 +459,8 @@ EOF;
 
 	function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-)))
 		$fields_hide = array(
+			'model' => array('barcode_name'),
+			'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'),
 			'item' => array('model_descript','model_price_in','model_price_out','barcode_name','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();
@@ -553,9 +562,14 @@ EOF;
 		//echo('<pre>'); print_r($selectbox);
 		//echo('<pre>'); print_r($current);
 		$update = false;
+		$current_new=array();
 		if(is_array($current)) {
 			$update = true;
-			$current = array_shift($current);
+			$current_new = array_merge($current_new,array_shift($current));
+		}
+		if(isset($_GET['insert']) && is_array($_GET['insert'])) {
+			$update = true;
+			$current_new = array_merge($current_new,$_GET['insert']);
 		}
 
 		if(!is_array($hidecols)) $hidecols = array();
@@ -568,7 +582,7 @@ EOF;
 		}
 
 		if(!is_array($parts) || in_array('inputs', $parts))
-			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update);
+			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current_new,$hidecols,$update);
 
 		if(!is_array($parts) || in_array('foot', $parts)) {
 			$html .= '</div></span><br style="clear:both" />';
@@ -584,7 +598,7 @@ EOF;
 EOF;
 			}
 
-			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$btn = count($current_new)>0 ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
 			$html.=$this->input(false, $btn, 'submit');
 			$html.='</form>';
 		}
@@ -623,10 +637,16 @@ class Sklad_DB extends PDO {
 			'item'	=> array('barcode', 'model', 'category', 'producer', 'vendor', 'room', 'location', 'status'),
 			'model'	=> array('category', 'producer')
 		); //TODO Autodetect using foreign keys?
+		$join2 = array(
+			'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')
 		); //TODO Autodetect
+		$group_concat = array(
+			'model' => array('barcode_name'=>'model_id')
+		);
 
 		//Init
 		if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!!
@@ -634,10 +654,19 @@ class Sklad_DB extends PDO {
 		//Escaping
 		$class = $this->escape($class);
 
+		//GROUP_CONCAT
+		$group_concat_query = '';
+		$group_by = '';
+		if(isset($group_concat[$class])) foreach($group_concat[$class] as $gc => $gb) {
+			$group_concat_query .= ",group_concat($gc separator ', ')";
+			$group_by .= "GROUP BY $gb\n";
+		}
+
 		//SELECT
-		$sql="SELECT * FROM `$class`\n";
+		$sql="SELECT *$group_concat_query FROM `$class`\n";
 		//JOIN
 		if(isset($join[$class])) foreach($join[$class] as $j) $sql .= "LEFT JOIN `$j` USING($j$suffix_id)\n";
+		if(isset($join2[$class])) foreach($join2[$class] as $j => $c) $sql .= "LEFT JOIN `$j` USING($c)\n";
 		//WHERE/REGEXP
 		if($search) {
 			$search = $this->quote($search);
@@ -649,10 +678,14 @@ class Sklad_DB extends PDO {
 		if(!$history && $this->contains_history($class)) $where[] = $class.'_valid_till=0';
 
 		if($where) $sql .= 'WHERE ('.implode(') AND (', $where).")\n";
+
+		//GROUP BY
+		$sql.=$group_by;
+
 		//ORDER
 		if(!$order) $order = $class.$suffix_id.' DESC';
 		if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
-		//$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
+		$sql .= "ORDER BY $order\n";
 		//LIMIT/OFFSET
 		if($limit) {
 			$limit = $this->escape((int)$limit);
@@ -711,7 +744,7 @@ class Sklad_DB extends PDO {
 
 	function get_columns($class,$disable_cols=array()) { //TODO: Not sure if compatible with non-MySQL DBs
 		$class = $this->escape($class);
-		$sql = "SHOW COLUMNS FROM $class;";
+		$sql = "SHOW COLUMNS FROM `$class`;";
 		$columns = $this->safe_query_fetch($sql);
 		/*foreach($columns as $colk => $col) foreach($col as $key => $val) {
 			if(in_array($col['Field'],$disable_cols)) $columns[$colk]['Extra']='auto_increment';
@@ -1064,8 +1097,11 @@ class Sklad_UI {
 		$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
 		//Sephirot:
 		if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
-		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
-			echo $this->html->header($PATH_INFO,$this->db->auth->get_user());
+		if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $PATH_CHUNKS[1]!='api') { //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+	    $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+    	$headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
+			echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
+		}
 		switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
 			case 'test':	//test
 				die('Tell me why you cry');