[Fmsystem-commits] [14032] property: fix filter on tts

[Sigurd Nes]

Revision: 14032
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14032
Author:   sigurdne
Date:     2015-09-28 14:30:28 +0000 (Mon, 28 Sep 2015)
Log Message:
-----------
property: fix filter on tts

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.botts.inc.php
    branches/dev-syncromind/property/inc/class.uitts.inc.php

Modified: branches/dev-syncromind/property/inc/class.botts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.botts.inc.php    2015-09-28 
11:56:58 UTC (rev 14031)
+++ branches/dev-syncromind/property/inc/class.botts.inc.php    2015-09-28 
14:30:28 UTC (rev 14032)
@@ -503,7 +503,7 @@
                        return $locations;
                }
 
-               function read($data = array()/* $start_date='',$end_date='', 
$external='',$dry_run = '', $download = '' */)
+               function read($data = array())
                {
                        static $category_name    = array();
                        static $account                  = array();
@@ -513,13 +513,6 @@
                        $start_date      = 
$this->bocommon->date_to_timestamp($start_date);
                        $end_date        = 
$this->bocommon->date_to_timestamp($end_date);
 
-                       /* $tickets = $this->so->read(array('start' => 
$this->start,'query' => $this->query,'sort' => $this->sort,'order' => 
$this->order,
-                         'status_id' => $this->status_id,'cat_id' => 
$this->cat_id,'district_id' => $this->district_id,
-                         'part_of_town_id' => $this->part_of_town_id, 
'start_date'=>$start_date,'end_date'=>$end_date,
-                         'allrows'=>$this->allrows,'user_id' => 
$this->user_id,'reported_by' => $this->reported_by, 'external'=>$external, 
'dry_run' => $dry_run,
-                         'location_code' => $this->location_code, 'p_num' => 
$this->p_num, 'vendor_id' => $this->vendor_id,
-                         'ecodimb' => $this->ecodimb, 'b_account' => 
$this->b_account, 'building_part' => $this->building_part,
-                         'branch_id' => $this->branch_id ,'order_dim1' => 
$this->order_dim1)); */
                        $tickets = $this->so->read($data);
 
                        $this->total_records     = $this->so->total_records;

Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-09-28 
11:56:58 UTC (rev 14031)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-09-28 
14:30:28 UTC (rev 14032)
@@ -142,6 +142,9 @@
                                'end_date'                       => 
$this->bo->end_date,
                                'location_code'          => 
$this->bo->location_code,
                                'p_num'                          => 
$this->bo->p_num,
+                               'building_part'          => 
$this->bo->building_part,
+                               'b_account'                      => 
$this->bo->b_account,
+                               'ecodimb'                        => 
$this->bo->ecodimb,
                                'branch_id'                      => 
phpgw::get_var('branch_id'),
                                'order_dim1'             => 
phpgw::get_var('order_dim1'),
                        );
@@ -720,13 +723,17 @@
                                        $_filter_buildingpart = 
array("filter_{$filter_key}" => 1);
                                }
 
+                               $buildingpart_list = 
$this->bocommon->select_category_list(array('type' => 'building_part',
+                                               'selected' => 
$this->building_part, 'order' => 'id', 'id_in_name' => 'num',
+                                               'filter' => 
$_filter_buildingpart));
+
+                               array_unshift($buildingpart_list, array('id' => 
'', 'name' => lang('select')));
+
                                $combos[] = array('type'         => 'filter',
                                        'name'   => 'building_part',
                                        'extra'  => '',
                                        'text'   => lang('building part'),
-                                       'list'   => 
$this->bocommon->select_category_list(array('type' => 'building_part',
-                                               'selected' => 
$this->building_part, 'order' => 'id', 'id_in_name' => 'num',
-                                               'filter' => 
$_filter_buildingpart))
+                                       'list'   => $buildingpart_list
                                );
 
                                
if(isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'])
 && 
$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_branch_list'] == 
1)