$fortune
@@ -334,11 +342,11 @@ EOF;
}
function render_barcode($barcode,$opts=false) {
- return $this->img_link($this->internal_url("barcode/$barcode"),$this->internal_url("barcode/$barcode"),$barcode,false,false,$opts);
+ return $this->img_link($this->internal_url("barcodeimg/$barcode"),$this->internal_url("barcodeimg/$barcode"),$barcode,false,false,$opts);
}
function table_add_barcodes(&$table) {
- $image = array('model_barcode', 'item_serial');
+ $image = array('barcode_name', 'model_barcode', 'item_serial');
foreach($table as $id => $row) {
foreach($image as $column) if(isset($table[$id][$column])) {
$table[$id][$column]=$this->render_barcode($table[$id][$column]);
@@ -357,12 +365,19 @@ EOF;
function table_add_relations(&$table, $class, $suffix_relations='_relations') {
$where_url = '%d/?where[%c]==%v';
- $relations = array( //TODO: Autodetect???
+ $insert_url = '%d/new?insert[%c]=%v';
+ $relations = array( //TODO: Autodetect??? //TODO: Add [edit] link to all classes
'model' => array(
- 'model_id' => array(array('item',$where_url),array('edit','model/%v/edit/')),
+ 'model_id' => array(array('item',$where_url),array('barcode',$where_url),array('edit','model/%v/edit/'),array('barcode',$insert_url,false,'add barcode')),
'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
+ 'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
'model_name' => array(array('google','http://google.com/search?q=%v')) //TODO: add manufacturer to google query
),
+ 'barcode' => array(
+ 'model_id' => array(array('model',$where_url)),
+ 'barcode_id' => array(array('item',$where_url),array('edit','barcode/%v/edit/')),
+ 'barcode_name' => array(array('store','assistant/%d?barcode=%v')),
+ ),
'item' => array(
'item_serial' => array(array('dispose','assistant/%d?serial=%v','in_stock'),array('sell','assistant/%d?serial=%v','in_stock')),
'item_id' => array(array('edit','item/%v/edit/'))
@@ -373,7 +388,7 @@ EOF;
'room' => array('room_id' => array(array('item',$where_url))),
'status' => array('status_id' => array(array('item',$where_url))),
'location' => array(
- 'location_id' => array(array('item',$where_url)),
+ 'location_id' => array(array('item',$where_url),array('edit','location/%v/edit/')),
'location_name' => array(array('smokeping','http://tartarus.brevnov.czf/cgi-bin/smokeping.cgi?filter=%v'))
)
);
@@ -395,7 +410,8 @@ EOF;
//$condition = $relations_conditions[$destination[2]]($table,$id);
if(!eval($relations_conditions[$destination[2]])) continue;
}
- @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
+ $destination_title = isset($destination[3]) ? $destination[3] : $destination[0];
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination_title, $destination_url, !preg_match('/http/', $destination_url) ).',';
}
}
}
@@ -414,6 +430,7 @@ EOF;
'status_id' => 'status_name',
'item_author' => 'item_author_backend',
'item_customer' => 'item_customer',
+ 'lock_id' => 'lock_name',
);
foreach($table as $id => $row) {
@@ -451,7 +468,10 @@ EOF;
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','location_author','location_gps','location_description')
+ 'model' => array('barcode_name'),
+ 'barcode' => array('model_price_in','model_price_out','model_reserve','producer_name','producer_note','model_eshop_hide','category_name','model_countable','model_descript'),
+ 'item' => array('model_descript','model_price_in','model_price_out','barcode_name','model_barcode','model_countable','model_reserve','model_eshop_hide','room_descript','room_author','producer_name','producer_note','vendor_note','location_author','location_gps','location_description'),
+ 'transaction' => array('transaction_author')
);
//print_r($table); die();
if(isset($fields_hide[$class])) foreach($table as $id => $row) {
@@ -460,7 +480,6 @@ EOF;
}
function render_item_table($table,$class=false) {
-
$cellspan = array(
'break_after' => array(
'item' => array('category_name'),
@@ -487,7 +506,13 @@ EOF;
$this->table_collapse($table);
if($class) $this->table_hide_columns($table,$class);
$this->table_sort($table);
- return $this->table($table,$colspan,$rowspan,$break_after);
+
+ //Orderby:
+ $path = $_GET;
+ unset($path['orderby']);
+ $path = $_SERVER['PATH_INFO'].'?'.Query::build($path).'orderby';
+
+ return $this->table($table,$colspan,$rowspan,$break_after,$path);
}
function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
@@ -552,9 +577,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();
@@ -567,7 +597,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 $selectbox;
//return array_filter($selectbox, 'ksort');
return array_filter($selectbox, 'natcasesort');
//array_multisort($selectbox); return $selectbox;
@@ -880,13 +941,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);
}
@@ -950,7 +1015,8 @@ class Sklad_UI {
function post_redirect_get($location, $message='', $error=false, $translate=true) {
$messaget = $translate ? T($message) : $message;
- $url_args = $messaget != '' ? '?message='.urlencode($messaget) : '';
+ $separator = preg_match('/\?/', $location) ? '&' : '?';
+ $url_args = $messaget != '' ? $separator.'message='.urlencode($messaget) : '';
$location = $this->html->internal_url($location).$url_args;
header('Location: '.$location);
if($error) trigger_error($message);
@@ -976,6 +1042,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]*$/'
));
@@ -983,6 +1050,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!!!!
@@ -994,6 +1069,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) {
@@ -1014,6 +1090,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
@@ -1024,6 +1101,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 :'-(");
@@ -1061,8 +1139,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');
@@ -1079,7 +1160,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: //?