<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 {
}
.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/stats">stats</a></li>
<li><a href="$script/assistant/store">store</a></li>
- <li><a href="$script/assistant/new-item">new-item</a></li>
+ <li><a href="$script/assistant/store-single">store-single</a></li>
+ <li><a href="$script/assistant/dispose">dispose</a></li>
+ <li><a href="$script/assistant/sell">sell</a></li>
+ <li>↓↓ BETA ↓↓</li>
</menu>
</li>
<li><a href="#">List</a>
</menu>
<div style="float: right;">
- <form action="?" method="GET">
+ <form action="$script/assistant/go" method="GET" style="float: left;"><!-- TODO: Display only when go plugin available -->
+ <input type="text" name="q" placeholder="smart id..." />
+ <input type="submit" value="go" />
+ </form>
+ <form action="?" method="GET" style="float: left;">
<input type="text" name="q" placeholder="regexp..." value="$search" />
<input type="submit" value="filter" />
</form>
);
foreach($table as $id => $row) {
foreach($collapse as $link => $title)
- if(isset($table[$id][$link])) {
+ if(isset($table[$id][$link]) && isset($row[$title])) {
$type = @array_shift(preg_split('/_/', $link));
if($link != $title) unset($table[$id][$link]);
$table[$id][$title]=$this->link($row[$title], $type.'/'.$row[$link].'/');
EOF;
}
- $btn = is_array($current) ? 'UPDATE' : 'INSERT';
+ $btn = is_array($current) ? 'UPDATE' : 'INSERT'; //TODO: $current may be set even when inserting...
$html.=$this->input(false, $btn, 'submit');
$html.='</form>';
return $html;
'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
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";
}
function post_redirect_get($location, $message='', $error=false) {
- $location = $this->html->internal_url($location).'?message='.urlencode($message);
+ $url_args = $message != '' ? '?message='.urlencode($message) : '';
+ $location = $this->html->internal_url($location).$url_args;
header('Location: '.$location);
if($error) trigger_error($message);
- die("Location: <a href='$location'>$location</a>");
+ $location=htmlspecialchars($location);
+ die(
+ "<meta http-equiv='refresh' content='0; url=$location'>".
+ "Location: <a href='$location'>$location</a>"
+ );
}
function safe_include($dir,$name,$vars=array(),$ext='.inc.php') {
return $out;
}
- function process_http_request_post($action=false, $class=false, $id=false) {
+ function process_http_request_post($action=false, $class=false, $id=false, $force_redirect=false) {
if($_SERVER['REQUEST_METHOD'] != 'POST') return;
//echo('<pre>'); //DEBUG (maybe todo remove), HEADERS ALREADY SENT!!!!
$table = $class ? $class : 'item';
//print_r($values); //debug
$last = $this->db->insert_or_update_multitab($values, $replace);
- $last = "$table/$last/";
+ $last = $force_redirect ? $force_redirect."?last=$last" : "$table/$last/";
$next = "$table/new/";
- $this->post_redirect_get($last, 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.');
+ $message = $force_redirect ? '' : 'Hotovo. Další záznam přidáte '.$this->html->link('zde', $next).'.';
+ $this->post_redirect_get($last, $message);
break;
case 'delete':
if(!isset($_POST['sure']) || !$_POST['sure']) $this->post_redirect_get("$class/$id/edit", 'Sure user expected :-)');
die('Tell me why you cry');
break;
case 'assistant': //assistant
- $assistant_vars['step'] = isset($PATH_CHUNKS[3]) && is_numeric($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+ $PATH_CHUNKS[3] = isset($PATH_CHUNKS[3]) ? trim($PATH_CHUNKS[3]) : false;
+ $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'];
echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
break;
default: //?
GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff