X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=67f38433d2d94180567ac6d3767feaae392471d0;hb=56ca207aa1d1e5b2b52fdf7c5db97a22b69f01e1;hp=b90738f1ff2884e1d79c671e3229ce5ba29ec1c8;hpb=c6831f3495cabc16fffce7d6fbb42e97cd69ac01;p=mirrors%2FSokoMan.git diff --git a/index.php b/index.php index b90738f..67f3843 100755 --- a/index.php +++ b/index.php @@ -1,7 +1,7 @@ $var"; + $html.="<$td$rs$cs$tdclass title='$id'>$var"; 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 = ""; if(!is_bool($default)) { $value=$default; $title=$selectbox[$value]; @@ -185,7 +193,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'])); @@ -299,7 +307,7 @@ EOF; $html .= $this->form("$script/item", 'GET', array( array('q',$search,'text','regexp...','autofocus'), - array(false,'search','submit') + array(false,'search item','submit') ), 'style="float: left;"'); $html .= ''; @@ -308,7 +316,7 @@ EOF;
- $message + $headerhtml $message
$fortune @@ -357,9 +365,10 @@ 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,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 @@ -401,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) ).','; } } } @@ -420,6 +430,7 @@ EOF; 'status_id' => 'status_name', 'item_author' => 'item_author_backend', 'item_customer' => 'item_customer', + 'lock_id' => 'lock_name', ); foreach($table as $id => $row) { @@ -457,6 +468,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(); @@ -466,7 +479,6 @@ EOF; } function render_item_table($table,$class=false) { - $cellspan = array( 'break_after' => array( 'item' => array('category_name'), @@ -493,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 = $_SERVER['PATH_INFO'].'?'.Query::build($path).'orderby'; + + return $this->table($table,$colspan,$rowspan,$break_after,$path); } function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) { @@ -558,9 +576,14 @@ EOF; //echo('
'); print_r($selectbox);
 		//echo('
'); 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();
@@ -573,7 +596,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 .= '

'; @@ -589,7 +612,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.=''; } @@ -628,10 +651,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') + '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') + ); //Init if(is_array($where)) foreach($where as $key => $value) $where[$key] = $key.' '.$value; //TODO: escape SQLi!!! @@ -639,10 +668,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); @@ -654,10 +692,19 @@ 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'; + $orders=$order; + $order=''; + if(is_array($orders)) foreach($orders as $column => $direction) { + $order="$column $direction,"; + } + $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); @@ -699,14 +746,17 @@ class Sklad_DB extends PDO { } function safe_query_fetch($sql, $fatal=true, $fetch_flags = PDO::FETCH_ASSOC, $translate=true) { - $result = $this->safe_query($sql, $fatal)->fetchAll($fetch_flags); + $result = $this->safe_query($sql, $fatal); + if(!$fatal && !$result) return $result; + $result = $result->fetchAll($fetch_flags); $this->load_backend_data_to_query_results($result); if($translate) $this->translate_query_results($result); return $result; } function get_listing($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $indexed=array(), $suffix_id='_id') { - $sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history); + $order = isset($_GET['orderby']) ? $_GET['orderby'] : false; + $sql = $this->build_query_select($class, $id, $limit, $offset, $where, $search, $history, $order); $result = $this->safe_query_fetch($sql); if(!$result || !is_array($indexed)) return $result; @@ -716,7 +766,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'; @@ -743,6 +793,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;
@@ -991,6 +1042,14 @@ class Sklad_UI {
 		return true;
 	}
 
+	function check_locks() {
+		$result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+		if(!empty($result)) {
+			echo T('There are locks:').' '.$this->html->render_item_table($result);
+			$this->post_redirect_get('', 'There are locks!', true);
+		}
+	}
+
 	function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
 		if($_SERVER['REQUEST_METHOD'] != 'POST') return;
 		//echo('
'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
@@ -1002,6 +1061,7 @@ class Sklad_UI {
 		 * do:	$values[$table][$id][$column]
 		 */
 		if(isset($_POST['values'])) {
+			$this->check_locks();
 			$values=array();
 			foreach($_POST['values'] as $table => $columns) {
 				foreach($columns as $column => $ids) {
@@ -1022,6 +1082,7 @@ class Sklad_UI {
 			case 'new':
 				$replace = false;
 			case 'edit':
+				$this->check_locks();
 				if(!isset($replace)) $replace = true;
 				$table = $class ? $class : 'item';
 				//print_r($values); //debug
@@ -1032,6 +1093,7 @@ class Sklad_UI {
 				$this->post_redirect_get($last, $message);
 				break;
 			case 'delete':
+				$this->check_locks();
 				if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
 				$this->db->delete($class, $id) || $this->post_redirect_get("$class/$id/edit", "V tabulce $class jentak neco mazat nebudes chlapecku :-P");
 				$this->post_redirect_get("$class", "Neco (pravdepodobne /$class/$id) bylo asi smazano. Fnuk :'-(");
@@ -1069,8 +1131,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');