Vypis stavu pro konkretni mesice

[mirrors/SokoMan.git] / index.php

diff --git a/index.php b/index.php
index ef5d5b51cbe7659ad048b41ae67cdf7c18e6e1f2..bb5bb5e42868b4cb4a4671973e3553fa880de06e 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -307,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>';
@@ -509,7 +509,7 @@ EOF;
                //Orderby:
                $path = $_GET;
                unset($path['orderby']);
-               $path = '?'.Query::build($path).'orderby';
+               $path = $_SERVER['PATH_INFO'].'?'.Query::build($path).'orderby';
 
                return $this->table($table,$colspan,$rowspan,$break_after,$path);
        }
@@ -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
@@ -750,7 +755,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 +938,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);
        }