<?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');
if(trim($var) == '') $var = ' ';
$rs = isset($rowspan[$id]) ? " rowspan='$rowspan[$id]'" : '';
$cs = isset($colspan[$id]) ? " colspan='$colspan[$id]'" : '';
- $html.="<$td$rs$cs$tdclass>$var</$td>";
+ $html.="<$td$rs$cs$tdclass title='$id'>$var</$td>";
if(in_array($id,$break_after,true)) $html.='</tr>'."<tr$class_br$parameters>";
}
$html.='</tr>';
return $html;
}
- function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
+ function table(&$table,$colspan=array(),$rowspan=array(),$break_after=array(),$orderby=false,$parity_class=array('tr_odd','tr_even'),$params='border=1',$row_classes_field='_row_classes') {
$html="<table $params>";
$header=true;
$even=false;
$params = isset($row[$row_classes_field]) ? $row[$row_classes_field] : '';
unset($row[$row_classes_field]);
if($header) {
- $keys = array(); foreach($row as $key => $val) $keys[$key]=$key;
- $html.=$this->row(T($keys),'thead',false,'',$colspan,$rowspan,$break_after);
+ $keys = array(); foreach($row as $key => $val) {
+ $order= $orderby ? ' '.
+ $this->link('↑', $orderby."[$key]=ASC").
+ $this->link('↓', $orderby."[$key]=DESC") : '';
+ $keys[$key]=T($key).$order;
+ }
+ $html.=$this->row($keys,'thead',false,'',$colspan,$rowspan,$break_after);
$header=false;
}
$class = $parity_class ? $parity_class[$even] : false;
$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'),
+ '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'),
$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) {
$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 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);
GIT.Harvie.CZ / mirrors / SokoMan.git / blobdiff