<?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');
unset($row[$row_classes_field]);
if($header) {
$keys = array(); foreach($row as $key => $val) {
- $order= $orderby ? ' '.
+ $order= $orderby ? ' '.
$this->link('↑', $orderby."[$key]=ASC").
$this->link('↓', $orderby."[$key]=DESC") : '';
$keys[$key]=T($key).$order;
}
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) {
$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 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;