| '.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);
@@ -609,13 +626,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_barcode','model_descript','producer_name','vendor_name'),
+ 'model' => array('model_id','model_name','barcode_name','model_barcode','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!!!
@@ -623,10 +647,20 @@ 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";
+ //$sql="SELECT * 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);
@@ -638,10 +672,14 @@ 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';
if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
- $sql .= "ORDER BY $order\n";
+ //$sql .= "ORDER BY $order\n"; //TODO: fixnout az budou opraveny vicenasobny carovy kody
//LIMIT/OFFSET
if($limit) {
$limit = $this->escape((int)$limit);
@@ -728,8 +766,8 @@ class Sklad_DB extends PDO {
}
//echo(''); print_r($selectbox);
//return array_filter($selectbox, 'ksort');
- array_multisort($selectbox);
- return $selectbox;
+ 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
@@ -900,9 +938,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");
@@ -964,6 +1005,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]*$/'
));
@@ -1035,6 +1077,8 @@ class Sklad_UI {
}
function process_http_request() {
+ $listing_limit_classes = array('item','model');
+
$this->check_auth();
@ini_set('magic_quotes_gpc' , 'off');
@@ -1047,7 +1091,7 @@ 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...
+ if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcodeimg' && $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());
switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
case 'test': //test
@@ -1065,7 +1109,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: //?
@@ -1089,7 +1133,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);
|