X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=f03be33f7158c8d33a1009488de0c27e99ae9e28;hb=c1d9cefaa56d3fdd0ebc21a19a2abcb082108ed4;hp=f1744a4a17fe63cb429b2efaa180ee23df26bc74;hpb=f2a3e8b01989810cd7400ed061fc529fe4b26eee;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index f1744a4..f03be33 100755
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * SkladovySystem - Storage management system compatible with LMS
- * Copyright (C) 2011  Tomas Mudrunka
+ * Copyright (C) 2011-2012  Tomas Mudrunka
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -22,6 +22,7 @@ set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
 
 require_once('Sklad_Auth.class/common.php');
 require_once('HTTP_Auth.class.php');
+require_once('Query.class.php');
 require_once('Locale.class.php');
 require_once('Barcode.class.php');
 require_once('Fortune.php');
@@ -47,7 +48,7 @@ class HTML {
 			if(trim($var) == '') $var = '&nbsp;';
 			$rs = isset($rowspan[$id]) ? " rowspan='$rowspan[$id]'" : '';
 			$cs = isset($colspan[$id]) ? " colspan='$colspan[$id]'" : '';
-			$html.="<$td$rs$cs$tdclass>$var</$td>";
+			$html.="<$td$rs$cs$tdclass title='$id'>$var</$td>";
 			if(in_array($id,$break_after,true)) $html.='</tr>'."<tr$class_br$parameters>";
 		}
 		$html.='</tr>';
@@ -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="<table $params>";
 		$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 ? '&nbsp;'.
+						$this->link('&uarr;', $orderby."[$key]=ASC").
+						$this->link('&darr;', $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)."<input type='$type' ";
 		if($name) $html.= "name='$name' ";
 		if(!is_bool($value)) {
@@ -124,9 +132,9 @@ class HTML {
 		return $html;
 	}
 
-	function select($name, $selectbox, $default=false) {
+	function select($name, $selectbox, $default=false, $prefix='') {
 		//echo('<pre>'); print_r($selectbox);
-		$html = "<select name='$name'>";
+		$html = T($prefix)."<select name='$name'>";
 
 		if(!is_bool($default)) {
 			$value=$default; $title=$selectbox[$value];
@@ -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 .= '</div>';
@@ -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) ).',';
 					}
 				}
 			}
@@ -461,7 +470,9 @@ EOF;
 		$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')
+			'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'),
+			'lock' => array('lock_author'),
+			'transaction' => array('transaction_author')
 		);
 		//print_r($table); die();
 		if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -470,7 +481,6 @@ EOF;
 	}
 
 	function render_item_table($table,$class=false) {
-
 		$cellspan = array(
 			'break_after' => array(
 				'item' => array('category_name'),
@@ -497,7 +507,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) {
@@ -683,7 +699,12 @@ class Sklad_DB extends PDO {
 		$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";
 		//LIMIT/OFFSET
@@ -717,7 +738,9 @@ class Sklad_DB extends PDO {
 
 	function load_backend_data_to_query_results(&$result,$suffix_backend='_backend') {
 		$translate_cols = array(
-			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
+			'item_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'lock_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));',
+			'transaction_author' => 'return($this->auth->get_username_by_id($result[$key][$col]));'
 		); //TODO: Hardcoded
 		foreach($result as $key => $row) {
 			foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -736,7 +759,8 @@ class Sklad_DB extends PDO {
 	}
 
 	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;
 
@@ -773,6 +797,7 @@ 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 $selectbox;
 		//return array_filter($selectbox, 'ksort');
 		return array_filter($selectbox, 'natcasesort');
 		//array_multisort($selectbox); return $selectbox;
@@ -917,13 +942,17 @@ class Sklad_UI {
 	function render_form_add($class) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
-		return $this->html->render_insert_form($class, $columns, $selectbox);
+		$current=array('default'=>array(
+			'model_eshop_hide'=>1
+		));
+		return $this->html->render_insert_form($class, $columns, $selectbox, $current);
 	}
 
 	function render_form_edit($class, $id, $multi_insert) {
 		$columns = $this->db->get_columns($class);
 		$selectbox = $this->db->columns_get_selectbox($columns, $class);
 		$current = $this->db->get_listing($class, $id, 1);
+		//echo('<pre>');print_r($current);die();
 		return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
 	}
 
@@ -987,7 +1016,8 @@ class Sklad_UI {
 
 	function post_redirect_get($location, $message='', $error=false, $translate=true) {
 		$messaget = $translate ? T($message) : $message;
-		$url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+		$separator = preg_match('/\?/', $location) ? '&' : '?';
+		$url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
 		$location = $this->html->internal_url($location).$url_args;
 		header('Location: '.$location);
 		if($error) trigger_error($message);
@@ -1022,9 +1052,10 @@ class Sklad_UI {
 	}
 
 	function check_locks() {
-		$result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+		$user = $this->db->quote($this->db->auth->get_user_id());
+		$result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
 		if(!empty($result)) {
-			echo T('There are locks:').' '.$this->html->render_item_table($result);
+			echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
 			$this->post_redirect_get('', 'There are locks!', true);
 		}
 	}
@@ -1112,7 +1143,7 @@ class Sklad_UI {
 		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...
 			$result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
-			$headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result) : '';
+			$headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : '';
 			echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
 		}
 		switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible