Malinka priprava locku

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index b9860e3d86ba03c4490376f272303a7976a1965a..c8a746d5d1781040f4af1a506f3ea95daa524fa7 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?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
@@ -22,6 +22,7 @@ set_include_path(DIR_LIB.PATH_SEPARATOR.get_include_path());
 
 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');
@@ -306,7 +307,7 @@ EOF;
 
        $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>';
@@ -478,7 +479,6 @@ EOF;
        }
 
        function render_item_table($table,$class=false) {
-
                $cellspan = array(
                        'break_after' => array(
                                'item' => array('category_name'),
@@ -506,12 +506,12 @@ EOF;
                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) {
@@ -697,7 +697,12 @@ class Sklad_DB extends PDO {
                $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
@@ -731,7 +736,8 @@ class Sklad_DB extends PDO {
 
        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]));'
                ); //TODO: Hardcoded
                foreach($result as $key => $row) {
                        foreach($translate_cols as $col => $backend) if(isset($result[$key][$col])){
@@ -750,7 +756,8 @@ class Sklad_DB extends PDO {
        }
 
        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;
 
@@ -932,13 +939,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('<pre>');print_r($current);die();
                return $this->html->render_insert_form($class, $columns, $selectbox, $current, false, false, $multi_insert);
        }