X-Git-Url: https://git.harvie.cz/?a=blobdiff_plain;ds=sidebyside;f=index.php;h=2f92066682e8a62a4a1ac4fea6cd9b3929a6f329;hb=e19f08cf3865593cb1dbc4458cd125361bd74f01;hp=6ea65511a8c304213c8632c97c55d6440bb8b238;hpb=f6464b5c78b26c449ce87cdf4cccdadc0b990b57;p=mirrors%2FSokoMan.git
diff --git a/index.php b/index.php
index 6ea6551..2f92066 100755
--- a/index.php
+++ b/index.php
@@ -82,6 +82,7 @@ class HTML {
}
function img($src='#void', $title='img', $options='height=64') {
+ if(isset($_GET['noimgs'])) return "".basename($src).'';
$options = $options ? " $options" : '';
return "";
}
@@ -129,11 +130,11 @@ class HTML {
if(!is_bool($default)) {
$value=$default; $title=$selectbox[$value];
- $html .= "";
+ $html .= "";
unset($selectbox[$value]);
}
foreach($selectbox as $value => $title) {
- $html .= "";
+ $html .= "";
}
$html .= "";
return $html;
@@ -184,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']));
@@ -210,17 +211,21 @@ class Sklad_HTML extends HTML { //TODO: Split into few more methods
td,body { background-color: white; border: orange; }
.tr_nobr td { border-top: 3px solid orange; }
table { background-color: orange; border: orange; }
+td textarea { width:100%; height:100%; }
a, a img { text-decoration:none; color: darkblue; border:none; }
li a, a:hover { text-decoration:underline; }
.tr_even td { background-color: lemonchiffon; }
+.tr_nobr.tr_even td:first-child { border-left: 5px solid orange; }
+.tr_nobr.tr_odd td:first-child { border-left: 5px solid white; }
.item_status_stored td { font-weight:bold; }
.item_status_deleted td { text-decoration:line-through; }
.item_status_destroyed td { font-style:italic; }
+.floating_barcode { margin: 5px; }
+.disabled { color: grey; }
/* table, table * { table-layout:fixed; width:100%; overflow:hidden; word-wrap:break-word; } */
/* td { position:absolute; } */
/* .cell_model_name { float:left; } */
-
.menu li {
float: left;
padding: 0.2em;
@@ -262,7 +267,7 @@ EOF;
if($count) $assistants[$item] = "assistant/$item";
}
- $tables=array('item','model','category','producer','vendor','room','status');
+ $tables=array('item','barcode','model','category','producer','vendor','room','status','location');
foreach($tables as $table) {
$listable[$table] = $table;
@@ -303,7 +308,7 @@ EOF;
'.T($class).':'.T($column['Field']).': | ';
+ $even = !$even;
$name="values[$class][".$column['Field'].'][]';
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
case (preg_match('/auto_increment/', $column['Extra']) || in_array($column['Field'], $hidecols)):
if(is_bool($val) && !$val) $val = '';
$html.=$this->input($name, $val, 'hidden');
- $html.=$val.'(AUTO)';
+ $html.='[AUTO] '.$val.'';
break;
case isset($selectbox[$column['Field']]):
$html.=$this->select($name,$selectbox[$column['Field']],$val);
@@ -506,8 +528,9 @@ EOF;
$html.=$this->input($name, $val);
break;
}
- $html.=' '; + $html.=' |
'); 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(); @@ -554,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 .= '
'); print_r($selectbox); - return array_filter($selectbox, 'ksort'); + //return array_filter($selectbox, 'ksort'); + return array_filter($selectbox, 'natcasesort'); + //array_multisort($selectbox); return $selectbox; } function map_unique($key, $value, $select, $table, $fatal=true) { //TODO: Guess $select and $table if not passed @@ -875,7 +927,7 @@ class Sklad_UI { return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert); } - function render_single_record_details($class, $id) { + function render_single_record_details($class, $id, $barcode=true) { $id_next = $id + 1; $id_prev = $id - 1 > 0 ? $id - 1 : 0; $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : ''; @@ -883,8 +935,8 @@ class Sklad_UI { $html.= $this->html->link('<<', "$class/$id_prev/"); $html.= '-'; $html.= $this->html->link('>>', "$class/$id_next/"); - $html.= '
'; - $html.=''.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).''; + $html.= ' '; + $barcode && $html.=' '; $html.= $this->html->link('edit', "$class/$id/edit/"); if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/"); return $html; @@ -894,23 +946,26 @@ class Sklad_UI { $offset_next = $offset + $limit; $offset_prev = $offset - $limit > 0 ? $offset - $limit : 0; $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : ''; + $moreget = isset($get[0]) ? '&' : '?'; $html=''; $html.= $this->html->link('<<', "$class/$id/$limit/$offset_prev/$get"); $html.= '-'; + $html.= $this->html->link('[*]', "$class/$id/0/0/$get$moreget".'noimgs'); + $html.= '-'; $html.= $this->html->link('>>', "$class/$id/$limit/$offset_next/$get"); - $html.= '
'; + $html.= ' '; $html.= $this->html->link('new', "$class/new/$get"); return $html; } - function render_listing_extensions($class, $id, $limit, $offset, $edit=false) { + function render_listing_extensions($class, $id, $limit, $offset, $edit=false, $barcode=true) { $html=''; if(is_numeric($id)) { - $html.=$this->render_single_record_details($class, $id); + $html.=$this->render_single_record_details($class, $id, $barcode); } else { $html.=$this->render_listing_navigation($class, '*', $limit, $offset); } - if($edit) { + if($edit && $barcode) { $html.= $this->render_form_edit($class, $id, false); $action = $_SERVER['SCRIPT_NAME']."/$class/$id/delete"; $html.=$this->html->form($action,'POST',array( @@ -958,6 +1013,7 @@ class Sklad_UI { function check_input_validity($field, $value='', $ruleset=0) { $rules = array(0 => array( 'model_barcode' => '/./', + 'barcode_name' => '/./', 'item_serial' => '/./', 'vendor_id' => '/^[0-9]*$/' )); @@ -965,6 +1021,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!!!! @@ -976,6 +1040,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) { @@ -996,6 +1061,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 @@ -1006,6 +1072,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 :'-("); @@ -1029,6 +1096,8 @@ class Sklad_UI { } function process_http_request() { + $listing_limit_classes = array('item','model'); + $this->check_auth(); @ini_set('magic_quotes_gpc' , 'off'); @@ -1041,8 +1110,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]!='barcode' && $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'); @@ -1059,7 +1131,7 @@ class Sklad_UI { $assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2]; echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars); break; - case 'barcode': //barcode + case 'barcodeimg': //barcode Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2))); break; default: //? @@ -1083,9 +1155,10 @@ class Sklad_UI { $edit=true; default: //?/?/? $history = $PATH_CHUNKS[3] == 'history' ? true : false; - $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT; + $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : (in_array($class, $listing_limit_classes) ? FRONTEND_LISTING_LIMIT : 0); $offset = isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0; $where = @is_array($_GET['where']) ? $_GET['where'] : false; + echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit, false); echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history); echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit); //print_r(array("",$_SERVER));