'.T($class).':'.T($column['Field']).': | ';
+ $even = !$even;
$name="values[$class][".$column['Field'].'][]';
$val = $update && isset($current[$column['Field']]) ? $current[$column['Field']] : false;
switch(true) {
@@ -544,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();
@@ -559,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 .= ' ';
@@ -575,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.='';
}
@@ -610,13 +647,20 @@ class Sklad_DB extends PDO {
function build_query_select($class, $id=false, $limit=false, $offset=0, $where=false, $search=false, $history=false, $order=false, $suffix_id='_id') {
//Configuration
$join = array(
- 'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
+ 'barcode' => array('model', 'category', 'producer'),
+ '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','model_barcode','model_descript','producer_name','vendor_name'),
- 'model' => array('model_id','model_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!!!
@@ -624,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);
@@ -639,8 +692,17 @@ 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";
//LIMIT/OFFSET
@@ -674,7 +736,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]));',
+ 'bank_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])){
@@ -684,14 +748,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;
@@ -701,7 +768,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';
@@ -728,6 +795,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;
@@ -872,13 +940,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('');print_r($current);die();
return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
}
@@ -901,9 +973,12 @@ 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.= $this->html->link('new', "$class/new/$get");
@@ -965,6 +1040,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]*$/'
));
@@ -972,6 +1048,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!!!!
@@ -983,6 +1067,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) {
@@ -1003,6 +1088,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
@@ -1013,6 +1099,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 :'-(");
@@ -1036,6 +1123,8 @@ class Sklad_UI {
}
function process_http_request() {
+ $listing_limit_classes = array('item','model');
+
$this->check_auth();
@ini_set('magic_quotes_gpc' , 'off');
@@ -1048,8 +1137,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');
@@ -1066,7 +1158,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: //?
@@ -1090,7 +1182,7 @@ 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);
|