';
- $html .= $this->form("$script/assistant/go", 'GET', array(
+ $html .= $this->form("$script/api/go", 'GET', array(
array('q','','text','smart id...', 'autofocus'),
array(false,'go','submit')
), 'style="float: left;"');
@@ -258,6 +280,9 @@ EOF;
$message
+
+$fortune
+
EOF;
return $html;
@@ -297,13 +322,13 @@ EOF;
'model' => array(
'model_id' => array(array('item',$where_url)),
'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
- 'model_name' => array(array('google','http://google.com/search?q=%v',true))
+ 'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
),
'item' => array(
'item_serial' => array(array('dispose','assistant/%d?serial=%v'),array('sell','assistant/%d?serial=%v'))
),
- 'category' => array('category_id' => array(array('item',$where_url))),
- 'producer' => array('producer_id' => array(array('item',$where_url))),
+ 'category' => array('category_id' => array(array('item',$where_url), array('model',$where_url))),
+ 'producer' => array('producer_id' => array(array('item',$where_url), array('model',$where_url))),
'vendor' => array('vendor_id' => array(array('item',$where_url))),
'room' => array('room_id' => array(array('item',$where_url))),
'status' => array('status_id' => array(array('item',$where_url)))
@@ -359,16 +384,32 @@ EOF;
$table = $table_sorted;
}
+ function table_hide_columns(&$table, $class) { //TODO: Move to build_query_select() !!! :-)))
+ $fields_hide = array(
+ 'item' => array('model_descript','model_price_in','model_price_out','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note')
+ );
+ //print_r($table); die();
+ if(isset($fields_hide[$class])) foreach($table as $id => $row) {
+ foreach($fields_hide[$class] as $field) unset($table[$id][$field]);
+ }
+ }
+
function render_item_table($table,$class=false) {
+ if(empty($table)) return '
'.T('holy primordial emptiness is all you can find here...').'
';
$this->table_add_images($table);
if($class) $this->table_add_relations($table,$class);
$this->table_add_barcodes($table);
$this->table_collapse($table);
+ if($class) $this->table_hide_columns($table,$class);
$this->table_sort($table);
return $this->table($table);
}
function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
+ $textarea = array(
+ 'item' => array('item_note'),
+ 'model' => array('model_descript')
+ );
$html = '';
foreach($columns as $column) {
$html.=T($class).':
'.T($column['Field']).': ';
@@ -383,6 +424,9 @@ EOF;
case isset($selectbox[$column['Field']]):
$html.=$this->select($name,$selectbox[$column['Field']],$val);
break;
+ case isset($textarea[$class]) && in_array($column['Field'],$textarea[$class]):
+ $html.=$this->input($name, $val, 'textarea');
+ break;
default:
$html.=$this->input($name, $val);
break;
@@ -489,8 +533,9 @@ class Sklad_DB extends PDO {
'item' => array('model', 'category', 'producer', 'vendor', 'room', 'status'),
'model' => array('category', 'producer')
); //TODO Autodetect using foreign keys?
- $search_fields = array(
- 'item' => array('item_id','item_serial','model_name','model_barcode','model_descript','producer_name','vendor_name')
+ $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')
); //TODO Autodetect
//Init
@@ -506,16 +551,16 @@ class Sklad_DB extends PDO {
//WHERE/REGEXP
if($search) {
$search = $this->quote($search);
- if(!isset($search_fields[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
+ if(!isset($fields_search[$class])) die(trigger_error(T("Can't search in $class table yet :-("))); //TODO: post_redirect_get
$sql_search = '';
- foreach($search_fields[$class] as $column) $sql_search .= "OR $column REGEXP $search ";
+ foreach($fields_search[$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";
//ORDER
- if(!$order) $order = $class.$suffix_id;
+ if(!$order) $order = $class.$suffix_id.' DESC';
if($this->contains_history($class)) $order .= ",${class}_valid_from DESC";
$sql .= "ORDER BY $order\n";
//LIMIT/OFFSET
@@ -575,7 +620,11 @@ class Sklad_DB extends PDO {
}
function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
- $selectbox=array();
+ $selectbox=array( //TODO: Hardcoded...
+ 'model_countable' => array(0 => 'no', 1 => 'yes'),
+ 'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
+ 'vendor_id' => array('COMPULSORY' => 'select...')
+ );
foreach($columns as $column) {
if($column['Field'] == 'user_id') continue; //TODO HACK Blacklist: tabulka nemusi obsahovat *_name!!! momentalne se to tyka jen tabulky user (a item - u ty to nevadi)!
if($class && $column['Field'] == $class.$suffix_id) continue;
@@ -824,7 +873,8 @@ class Sklad_UI {
function check_input_validity($field, $value='', $ruleset=0) {
$rules = array(0 => array(
'model_barcode' => '/./',
- 'item_serial' => '/./'
+ 'item_serial' => '/./',
+ 'vendor_id' => '/^[0-9]*$/'
));
if(isset($rules[$ruleset][$field]) && !preg_match($rules[$ruleset][$field], trim($value))) return false;
return true;
@@ -902,22 +952,27 @@ class Sklad_UI {
}
$PATH_INFO=@trim($_SERVER[PATH_INFO]);
+ if($PATH_INFO == '' || $PATH_INFO == '/') $PATH_INFO = FRONTEND_PAGE_WELCOME;
$PATH_CHUNKS = preg_split('/\//', $PATH_INFO);
//Sephirot:
if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
- if($_SERVER['REQUEST_METHOD'] != 'POST' && $PATH_CHUNKS[1]!='barcode') //TODO: tyhle podminky naznacujou, ze je v navrhu nejaka drobna nedomyslenost...
+ 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());
switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
case 'test': //test
die('Tell me why you cry');
break;
- case 'assistant': //assistant
+ case 'assistant': case 'api': //assistant|api
+ $incdirs = array(
+ 'assistant' => DIR_ASSISTANTS,
+ 'api' => DIR_APIS
+ );
$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'];
$assistant_vars['ASSISTANT'] = $PATH_CHUNKS[2];
- echo $this->safe_include(DIR_ASSISTANTS,$PATH_CHUNKS[2],$assistant_vars);
+ echo $this->safe_include($incdirs[$PATH_CHUNKS[1]],$PATH_CHUNKS[2],$assistant_vars);
break;
case 'barcode': //barcode
Barcode::download_barcode(implode('/',array_slice($PATH_CHUNKS, 2)));
@@ -943,8 +998,8 @@ class Sklad_UI {
$edit=true;
default: //?/?/?
$history = $PATH_CHUNKS[3] == 'history' ? true : false;
- $limit = (int) (isset($PATH_CHUNKS[3]) ? $PATH_CHUNKS[3] : '0');
- $offset = (int) (isset($PATH_CHUNKS[4]) ? $PATH_CHUNKS[4] : '0');
+ $limit = is_numeric($PATH_CHUNKS[3]) ? (int) $PATH_CHUNKS[3] : FRONTEND_LISTING_LIMIT;
+ $offset = isset($PATH_CHUNKS[4]) ? (int) $PATH_CHUNKS[4] : 0;
$where = @is_array($_GET['where']) ? $_GET['where'] : false;
echo $this->render_items($class, $id, $limit, $offset, $where, $search, $history);
echo $this->render_listing_extensions($class, $id, $limit, $offset, $edit);