}
function img($src='#void', $title='img', $options='height=64') {
+ if(isset($_GET['noimgs'])) return "<span title='$title'>".basename($src).'</span>';
$options = $options ? " $options" : '';
return "<img src='$src' alt='$title' title='$title'$options; />";
}
if(!is_bool($default)) {
$value=$default; $title=$selectbox[$value];
- $html .= "<option value='$value'>$value :: $title</option>";
+ $html .= "<option value='$value'>$title (($value))</option>";
unset($selectbox[$value]);
}
foreach($selectbox as $value => $title) {
- $html .= "<option value='$value'>$value :: $title</option>";
+ $html .= "<option value='$value'>$title (($value))</option>";
}
$html .= "</select>";
return $html;
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;
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;
}
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]);
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)),
'model_barcode' => array(array('store','assistant/%d?barcode=%v')),
- 'model_name' => array(array('google','http://google.com/search?q=%v',true)) //TODO: add manufacturer to google query
+ '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')),
'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)))
+ 'status' => array('status_id' => array(array('item',$where_url))),
+ 'location' => array(
+ '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'))
+ )
);
$relations_conditions=array(
'in_stock' => 'return(@$table[$id]["status_name"] == "stored");',
- 'not_sold' => 'return(@$table[$id]["status_name"] != "saled");',
- 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "saled" && @$table[$id]["status_name"] != "disposed");'
+ 'not_sold' => 'return(@$table[$id]["status_name"] != "sold");',
+ 'not_sold_or_disposed' => 'return(@$table[$id]["status_name"] != "sold" && @$table[$id]["status_name"] != "disposed");'
);
foreach($table as $id => $row) {
foreach($row as $column => $value) {
//$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).',';
+ @$table[$id][$class.$suffix_relations] .= $this->link($destination[0], $destination_url, !preg_match('/http/', $destination_url) ).',';
}
}
}
'producer_id' => 'producer_name',
'vendor_id' => 'vendor_name',
'room_id' => 'room_name',
+ 'location_id' => 'location_name',
'status_id' => 'status_name',
'item_author' => 'item_author_backend',
'item_customer' => 'item_customer',
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')
+ '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')
);
//print_r($table); die();
if(isset($fields_hide[$class])) foreach($table as $id => $row) {
'item' => array('item_note'),
'model' => array('model_descript')
);
- $html = '';
+ $html = '<table>';
+ $even=false;
foreach($columns as $column) {
- $html.=T($class).':<b>'.T($column['Field']).'</b>: ';
+ $html.='<tr class="'. ($even ? 'tr_even' : 'tr_odd') .'"><td>'.T($class).':<b>'.T($column['Field']).'</b>: </td><td>';
+ $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.='<span class="disabled"><i>[AUTO]</i> '.$val.'</span>';
break;
case isset($selectbox[$column['Field']]):
$html.=$this->select($name,$selectbox[$column['Field']],$val);
$html.=$this->input($name, $val);
break;
}
- $html.='<br />';
+ $html.='</td></tr>';
}
+ $html.='</table>';
return $html;
}
//echo('<pre>'); print_r($selectbox);
//echo('<pre>'); 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();
}
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 .= '</div></span><br style="clear:both" />';
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.='</form>';
}
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!!!
//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);
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";
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';
foreach($result as $row) $selectbox[$table.$suffix_id][$row[$table.$suffix_id]]=$row[$table.$suffix_name];
}
//echo('<pre>'); 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
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'] : '';
$html.= $this->html->link('<<', "$class/$id_prev/");
$html.= '-';
$html.= $this->html->link('>>', "$class/$id_next/");
- $html.= '<br />';
- $html.='<span style="float:right;">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
+ $html.= ' ';
+ $barcode && $html.='<span style="float:right;" class="floating_barcode">'.$this->html->render_barcode(BARCODE_PREFIX.strtoupper("$class/$id")).'</span>';
$html.= $this->html->link('edit', "$class/$id/edit/");
if($this->db->contains_history($class)) $html.= ' ][ '.$this->html->link('history', "$class/$id/history/");
return $html;
$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.= '<br />';
+ $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(
function check_input_validity($field, $value='', $ruleset=0) {
$rules = array(0 => array(
'model_barcode' => '/./',
+ 'barcode_name' => '/./',
'item_serial' => '/./',
'vendor_id' => '/^[0-9]*$/'
));
}
function process_http_request() {
+ $listing_limit_classes = array('item','model');
+
$this->check_auth();
@ini_set('magic_quotes_gpc' , 'off');
$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
$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: //?
$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("<pre>",$_SERVER));
GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff