X-Git-Url: http://git.harvie.cz/?a=blobdiff_plain;f=index.php;h=71651ed5584e1d1e4125424cea9ff2ad2ecfba06;hb=5ef6c52f74756cfd5fc08f5af74b970d560b0293;hp=db9e514f7d129b11f98af87188bbe0286dbd8ae1;hpb=81ab8aef27da2a93a06296fd3b80cdba3376d956;p=mirrors%2FSokoMan.git

diff --git a/index.php b/index.php
index db9e514..71651ed 100755
--- a/index.php
+++ b/index.php
@@ -34,13 +34,17 @@ require_once('Barcode.class.php');
 * @author   Tomas Mudrunka
 */
 class HTML {
-	function row($row) {
-		$html='<tr>';
+	function row($row,$type=false) {
+		$html = '';
+		if($type) $html.="<$type>";
+		$html.='<tr>';
+		$td = $type == 'thead' ? 'th' : 'td';
 		foreach($row as $var) {
 			if(trim($var) == '') $var = '&nbsp;';
-			$html.="<td>$var</td>";
+			$html.="<$td>$var</$td>";
 		}
 		$html.='</tr>';
+		if($type) $html.="</$type>";
 		return $html;
 	}
 
@@ -49,7 +53,7 @@ class HTML {
 		$header=true;
 		foreach($table as $row) {
 			if($header) {
-				$html.=$this->row(array_keys($row));
+				$html.=$this->row(array_keys($row),'thead');
 				$header=false;
 			}
 			$html.=$this->row($row);
@@ -128,6 +132,14 @@ class HTML {
 		$options = $options ? " $options" : '';
 		return "<div$options>$html</div>";
 	}
+
+	function head($title=false,$charset='UTF-8',$more='') {
+		$title = $title ? "\n<title>$title</title>" : '';
+		$html= '<head>';
+		$html.= '<meta http-equiv="Content-Type" content="text/html; charset='.$charset.'" />'.$title.$more;
+		$html.= '</head>';
+		return $html;
+	}
 }
 
 /**
@@ -146,15 +158,17 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
 		$message = strip_tags(@trim($_GET['message']),'<a><b><u><i>');
 		$instance = INSTANCE_ID != '' ? '/'.INSTANCE_ID : '';
 		//$title = T($title); //TODO
-		$html = <<<EOF
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-	<title>SÅkoMan$title</title>
-</head>
+
+		$html = $this->head("SÅkoMan$title");
+		$html .= <<<EOF
 <h1><a href="$script/">SÅkoMan</a><small>$instance$title</small></h1>
 
 <style type="text/css">
 * { font-family: arial; }
+td,body { background-color: white; }
+table { background-color: orange; border: orange; }
+a, a img { text-decoration:none; color: darkblue; border:none; }
+li a, a:hover { text-decoration:underline; }
 
 .menu li {
 	float: left;
@@ -205,11 +219,11 @@ EOF;
 	}
 
 	$html .= $this->ul(array(
-		'Logout' => '?logout',
 		'Home' => '',
+		'Logout' => '?logout',
 		0 => $this->ul($assistants,'menu',$this->link('Assistants','#')),
-		1 => $this->ul($listable,'menu',$this->link('List','#')),
-		2 => $this->ul($insertable,'menu',$this->link('New','#'))
+		1 => $this->ul($insertable,'menu',$this->link('New','#')),
+		2 => $this->ul($listable,'menu',$this->link('List','#'))
 	),'menu', '', 'menu');
 
 	$html .= '<div style="float: right;">';
@@ -308,21 +322,8 @@ EOF;
 		return $this->table($table);
 	}
 
-	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;
-		if(is_array($current)) {
-			$update = true;
-			$current = array_shift($current);
-		}
-
-		if(!is_array($hidecols)) $hidecols = array('item_author', 'item_valid_from', 'item_valid_till'); //TODO Autodetect
-
-		$action = $action ? " action='$action'" : false;
-		$html="<form$action method='POST'>"; //TODO: use $this->form()
-		if($multi_insert) $html.='<div name="input_set" style="float:left; border:1px solid grey;">';
-		//$html.=$this->input('table', $class, 'hidden');
+	function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+		$html = '';
 		foreach($columns as $column)	{
 			$html.=T($class).':<b>'.T($column['Field']).'</b>: ';
 			$name="values[$class][".$column['Field'].'][]';
@@ -342,26 +343,71 @@ EOF;
 			}
 			$html.='<br />';
 		}
+		return $html;
+	}
 
-		if($multi_insert) {
-			//TODO, move to separate JS file
-			$html.=<<<EOF
-			</div>
-			<span name="input_set_next"></span><br style="clear:both" />
-			<script>
-				function duplicate_element(what, where) {
-					document.getElementsByName(where)[0].outerHTML =
-						document.getElementsByName(what)[0].outerHTML
-						+ document.getElementsByName(where)[0].outerHTML;
-				}
-			</script>
-			<a href='#' onClick="duplicate_element('input_set', 'input_set_next')">+</a>
-EOF;
+	function render_insert_form_multi($array) {
+		$html = '';
+		$head=false;
+
+		foreach($array as $key => $args) {
+			$parts=array('inputs');
+			if(!$head) { $head = true;
+				$parts[]='head';
+			}
+			if(!isset($array[$key+1])) {
+				$parts[]='foot';
+				$hr = '';
+			} else $hr = '<hr />';
+			//$args[] = false;
+			$args[] = $parts;
+			$html .= call_user_func_array(array($this, 'render_insert_form'), $args);
+			$html .= $hr;
 		}
+		return $html;
+	}
 
-		$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
-		$html.=$this->input(false, $btn, 'submit');
-		$html.='</form>';
+	function render_insert_form($class, $columns, $selectbox=array(), $current=false, $hidecols=false, $action=false, $multi_insert=true, $parts=false) {
+		$html = '';
+		//print_r($parts);
+		//echo('<pre>'); print_r($selectbox);
+		//echo('<pre>'); print_r($current);
+		$update = false;
+		if(is_array($current)) {
+			$update = true;
+			$current = array_shift($current);
+		}
+
+		if(!is_array($hidecols)) $hidecols = array();
+		$hidecols = array_merge($hidecols, array('item_author', 'item_valid_from', 'item_valid_till')); //TODO Autodetect
+
+		if(!is_array($parts) || in_array('head', $parts)) {
+			$action = $action ? " action='$action'" : false;
+			$html.="<form$action method='POST'>"; //TODO: use $this->form()
+			$html.='<span><div name="input_set" style="float:left; border:1px solid grey; padding: 1px; margin: 1px;">';
+		}
+
+		if(!is_array($parts) || in_array('inputs', $parts))
+			$html.=$this->render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update);
+
+		if(!is_array($parts) || in_array('foot', $parts)) {
+			$html .= '</div></span><br style="clear:both" />';
+			if($multi_insert) { //TODO, move to separate JS file
+				$html.=<<<EOF
+				<script>
+					function duplicate_element(what, where) {
+						var node = document.getElementsByName(what)[0];
+						node.parentNode.appendChild(node.cloneNode(true));
+					}
+				</script>
+				<a href='#' onClick="duplicate_element('input_set')">+</a>
+EOF;
+			}
+
+			$btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
+			$html.=$this->input(false, $btn, 'submit');
+			$html.='</form>';
+		}
 		return $html;
 	}
 }
@@ -464,10 +510,14 @@ class Sklad_DB extends PDO {
 		return $indexed;
 	}
 
-	function get_columns($class) {
+	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;";
-		return $this->safe_query_fetch($sql);
+		$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';
+		}*/
+		return $columns;
 	}
 
 	function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
@@ -488,12 +538,12 @@ 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
+	function map_unique($key, $value, $select, $table, $fatal=true) { //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_fetch($sql);
-		if(isset($result[0][$select])) return $result[0][$select]; else die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
+		if(isset($result[0][$select])) return $result[0][$select]; else if($fatal) die(trigger_error(T('Record not found!'))); //TODO post_redirect_get...
 	}
 
 	function contains_history($table) {
@@ -524,7 +574,7 @@ class Sklad_DB extends PDO {
 				$sql .= " WHERE ${table}_valid_till=0 AND (";
 				$or = '';
 				foreach($values as $row) {
-					$sql .= $or.' '.$table.'_id='.$row[$table.'_id'];
+					$sql .= $or.' '.$table.'_id='.$this->quote($row[$table.'_id']);
 					$or = ' OR';
 				}
 				$sql .= " );\n\n";
@@ -646,9 +696,9 @@ class Sklad_UI {
 		$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.= $this->html->link('edit', "$class/$id/edit/");
 		if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
-		$html.='<br />'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id"));
 		return $html;
 	}
 
@@ -794,6 +844,7 @@ class Sklad_UI {
 				$assistant_vars['SUBPATH'] = array_slice($PATH_CHUNKS, 3);
 				$assistant_vars['URL_INTERNAL'] = 'assistant/'.$PATH_CHUNKS[2];
 				$assistant_vars['URL'] = $_SERVER['SCRIPT_NAME'].'/'.$assistant_vars['URL_INTERNAL'];
+				$assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
 				echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
 				break;
 			case 'barcode': //barcode
@@ -838,4 +889,4 @@ class Sklad_UI {
 $sklad = new Sklad_UI();
 $sklad->process_http_request();
 
-echo("<hr/>");
+echo('<br style="clear:both;" /><hr />');
