<?php
/*
* SkladovySystem - Storage management system compatible with LMS
- * Copyright (C) 2011 Tomas Mudrunka
+ * Copyright (C) 2011-2012 Tomas Mudrunka
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as
require_once('Sklad_Auth.class/common.php');
require_once('HTTP_Auth.class.php');
+require_once('Query.class.php');
require_once('Locale.class.php');
require_once('Barcode.class.php');
require_once('Fortune.php');
<style type="text/css">
* { font-family: arial; }
-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; }
+
+td,body { background-color: white; font-size: 75%; }
+table { background-color: orange; border-collapse: collapse; }
+
+td { border: 2px solid darkorange; }
+th { border: 2px solid darkorange; }
+td textarea { width:100%; height:100%; }
+
.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; }
+/* table tr:nth-child(odd) td { background-color: lemonchiffon; } */
+
.item_status_stored td { font-weight:bold; }
.item_status_deleted td { text-decoration:line-through; }
.item_status_destroyed td { font-style:italic; }
$html .= $this->form("$script/item", 'GET', array(
array('q',$search,'text','regexp...','autofocus'),
- array(false,'search','submit')
+ array(false,'search item','submit')
), 'style="float: left;"');
$html .= '</div>';
$fields_hide = array(
'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')
+ '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'),
+ 'lock' => array('lock_author'),
+ 'transaction' => array('transaction_author')
);
//print_r($table); die();
if(isset($fields_hide[$class])) foreach($table as $id => $row) {
}
function render_item_table($table,$class=false) {
-
$cellspan = array(
'break_after' => array(
'item' => array('category_name'),
if($class) $this->table_hide_columns($table,$class);
$this->table_sort($table);
- //TODO: orderbaj fixme (napsat funkci na pridavani/ubirani soucasnych URL parametru)
- $get = $_SERVER['QUERY_STRING'] != '' ? '?'.$_SERVER['QUERY_STRING'] : '';
- $moreget = isset($get[0]) ? '&' : '?';
- $path=$_SERVER['PATH_INFO'].$get.$moreget;
+ //Orderby:
+ $path = $_GET;
+ unset($path['orderby']);
+ $path = $_SERVER['PATH_INFO'].'?'.Query::build($path).'orderby';
- return $this->table($table,$colspan,$rowspan,$break_after,$path.'orderby');
+ return $this->table($table,$colspan,$rowspan,$break_after,$path);
}
function render_insert_inputs($class,$columns,$selectbox,$current,$hidecols,$update) {
);
$fields_search = array(
'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')
+ 'barcode' => array('barcode_id','barcode_name'),
+ 'model' => array('model_id','model_name','barcode_name','model_descript','producer_name'),
+ 'location' => array('location_id','location_name')
); //TODO Autodetect
$group_concat = array(
'model' => array('barcode_name'=>'model_id')
$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
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]));',
+ 'transaction_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])){
}
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;
function columns_get_selectbox($columns, $class=false, $suffix_id='_id', $suffix_name='_name') {
$selectbox=array( //TODO: Hardcoded...
- 'model_countable' => array(0 => 'no', 1 => 'yes'),
+ 'model_countable' => array(1 => 'yes'),
'model_eshop_hide' => array(0 => 'no', 1 => 'yes'),
'vendor_id' => array('COMPULSORY' => 'select...')
);
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('<pre>');print_r($current);die();
return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
}
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);
}
function check_locks() {
- $result = $this->db->safe_query_fetch("SELECT * FROM `lock`;");
+ $user = $this->db->quote($this->db->auth->get_user_id());
+ $result = $this->db->safe_query_fetch("SELECT * FROM `lock` WHERE `lock_author` != $user;");
if(!empty($result)) {
- echo T('There are locks:').' '.$this->html->render_item_table($result);
+ echo T('There are locks:').' '.$this->html->render_item_table($result, 'lock');
$this->post_redirect_get('', 'There are locks!', true);
}
}
if(!isset($PATH_CHUNKS[1])) $PATH_CHUNKS[1]='';
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) : '';
+ $headerhtml = !empty($result) ? T('There are locks:').' '.$this->html->render_item_table($result, 'lock') : '';
echo $this->html->header($PATH_INFO,$this->db->auth->get_user(),$headerhtml);
}
switch($PATH_CHUNKS[1]) { //TODO: Move some branches to plugins if possible
GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff