fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [6882] Merge 6880:6881 from trunk


From: Sigurd Nes
Subject: [Fmsystem-commits] [6882] Merge 6880:6881 from trunk
Date: Mon, 31 Jan 2011 12:01:02 +0000

Revision: 6882
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6882
Author:   sigurdne
Date:     2011-01-31 12:01:00 +0000 (Mon, 31 Jan 2011)
Log Message:
-----------
Merge 6880:6881 from trunk

Modified Paths:
--------------
    branches/Version-1_0-branch/property/inc/class.botts.inc.php
    branches/Version-1_0-branch/property/inc/class.sotts.inc.php
    branches/Version-1_0-branch/property/inc/class.uitts.inc.php
    branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
    branches/Version-1_0-branch/property/js/yahoo/tts.index.js

Property Changed:
----------------
    branches/Version-1_0-branch/


Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
   - 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879
   + 
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881

Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php        
2011-01-31 11:59:52 UTC (rev 6881)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php        
2011-01-31 12:01:00 UTC (rev 6882)
@@ -126,17 +126,18 @@
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','fm_tts');
 
-                       $this->start            = 
isset($data['start'])?$data['start']:'';
-                       $this->query            = 
isset($data['query'])?$data['query']:'';
-                       $this->user_id          = 
isset($data['user_id'])?$data['user_id']:'';
-                       $this->sort                     = 
isset($data['sort'])?$data['sort']:'';
-                       $this->order            = 
isset($data['order'])?$data['order']:'';
-                       $this->status_id        = 
isset($data['status_id'])?$data['status_id']:'';
-                       $this->cat_id           = 
isset($data['cat_id'])?$data['cat_id']:'';
-                       $this->district_id      = 
isset($data['district_id'])?$data['district_id']:'';
-                       $this->allrows          = 
isset($data['allrows'])?$data['allrows']:'';
-                       $this->start_date       = 
isset($data['start_date'])?$data['start_date']:'';
-                       $this->end_date         = 
isset($data['end_date'])?$data['end_date']:'';
+                       $this->start                    = 
isset($data['start'])?$data['start']:'';
+                       $this->query                    = 
isset($data['query'])?$data['query']:'';
+                       $this->user_id                  = 
isset($data['user_id'])?$data['user_id']:'';
+                       $this->sort                             = 
isset($data['sort'])?$data['sort']:'';
+                       $this->order                    = 
isset($data['order'])?$data['order']:'';
+                       $this->status_id                = 
isset($data['status_id'])?$data['status_id']:'';
+                       $this->cat_id                   = 
isset($data['cat_id'])?$data['cat_id']:'';
+                       $this->district_id              = 
isset($data['district_id'])?$data['district_id']:'';
+                       $this->part_of_town_id  = 
isset($data['part_of_town_id'])?$data['part_of_town_id']:'';
+                       $this->allrows                  = 
isset($data['allrows'])?$data['allrows']:'';
+                       $this->start_date               = 
isset($data['start_date'])?$data['start_date']:'';
+                       $this->end_date                 = 
isset($data['end_date'])?$data['end_date']:'';
                }
 
                function column_list($selected = 
array(),$type_id='',$allrows='')
@@ -303,7 +304,7 @@
 
                        $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,
-                               'start_date'=>$start_date,'end_date'=>$end_date,
+                               '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,'external'=>$external, 'dry_run' => $dry_run,
                                'location_code' => $this->location_code, 
'p_num' => $this->p_num));
 

Modified: branches/Version-1_0-branch/property/inc/class.sotts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.sotts.inc.php        
2011-01-31 11:59:52 UTC (rev 6881)
+++ branches/Version-1_0-branch/property/inc/class.sotts.inc.php        
2011-01-31 12:01:00 UTC (rev 6882)
@@ -115,7 +115,7 @@
 
                function read($data)
                {
-                       $start                  = isset($data['start']) && 
$data['start'] ? $data['start']:0;
+                       $start                  = isset($data['start']) && 
$data['start'] ? (int)$data['start']:0;
                        $status_id              = isset($data['status_id']) && 
$data['status_id'] ? $data['status_id']:'O'; //O='Open'
                        $user_id                = isset($data['user_id']) && 
$data['user_id'] ? (int)$data['user_id']: 0;
                        $owner_id               = 
isset($data['owner_id'])?$data['owner_id']:'';
@@ -123,7 +123,8 @@
                        $sort                   = isset($data['sort']) && 
$data['sort'] ? $data['sort']:'DESC';
                        $order                  = 
isset($data['order'])?$data['order']:'';
                        $cat_id                 = isset($data['cat_id']) && 
$data['cat_id'] ? $data['cat_id']:0;
-                       $district_id    = isset($data['district_id']) && 
$data['district_id'] ? $data['district_id']:0;
+                       $district_id    = isset($data['district_id']) && 
$data['district_id'] ? (int)$data['district_id']:0;
+                       $part_of_town_id= isset($data['part_of_town_id']) && 
$data['part_of_town_id'] ? (int)$data['part_of_town_id']:0;
                        $allrows                = 
isset($data['allrows'])?$data['allrows']:'';
                        $start_date             = isset($data['start_date']) && 
$data['start_date'] ? (int)$data['start_date'] : 0;
                        $end_date               = isset($data['end_date']) && 
$data['end_date'] ? (int)$data['end_date'] : 0;
@@ -333,6 +334,12 @@
                                $where = 'AND';
                        }
 
+                       if ($part_of_town_id > 0)
+                       {
+                               $filtermethod .= " $where 
fm_part_of_town.part_of_town_id= " . (int)$part_of_town_id;
+                               $where = 'AND';
+                       }
+
                        if ($start_date)
                        {
                                $end_date       = $end_date + 3600 * 16 + 
phpgwapi_datetime::user_timezone();

Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2011-01-31 11:59:52 UTC (rev 6881)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php        
2011-01-31 12:01:00 UTC (rev 6882)
@@ -98,6 +98,7 @@
                        $this->user_id                          = 
$this->bo->user_id;
                        $this->cat_id                           = 
$this->bo->cat_id;
                        $this->district_id                      = 
$this->bo->district_id;
+                       $this->part_of_town_id          = 
$this->bo->part_of_town_id;
                        $this->allrows                          = 
$this->bo->allrows;
                        $this->start_date                       = 
$this->bo->start_date;
                        $this->end_date                         = 
$this->bo->end_date;
@@ -140,6 +141,7 @@
                                        'user_id'               => 
$this->user_id,
                                        'cat_id'                => 
$this->cat_id,
                                        'district_id'   => $this->district_id,
+                                       'part_of_town_id'=> 
$this->part_of_town_id,
                                        'allrows'               => 
$this->allrows,
                                        'start_date'    => $this->start_date,
                                        'end_date'              => 
$this->end_date
@@ -467,6 +469,7 @@
                                        ."query: '{$this->query}',"
                                        ."p_num: '{$this->p_num}',"
                                        ."district_id: '{$this->district_id}',"
+                                       ."part_of_town_id: 
'{$this->part_of_town_id}',"
                                        ."start_date: '{$start_date}',"
                                        ."end_date: '{$end_date}',"
                                        ."location_code: 
'{$this->location_code}',"
@@ -474,33 +477,34 @@
 
                                $link_data = array
                                        (
-                                               'menuaction'    => 
'property.uitts.index',
-                                               'second_display'=> true,
-                                               'sort'                  => 
$this->sort,
-                                               'order'                 => 
$this->order,
-                                               'cat_id'                => 
$this->cat_id,
-                                               'status_id'             => 
$this->status_id,
-                                               'user_id'               => 
$this->user_id,
-                                               'query'                 => 
$this->query,
-                                               'district_id'   => 
$this->district_id,
-                                               'start_date'    => $start_date,
-                                               'end_date'              => 
$end_date,
-                                               'location_code' => 
$this->location_code,
-                                               'allrows'               => 
$this->allrows
+                                               'menuaction'            => 
'property.uitts.index',
+                                               'second_display'        => true,
+                                               'sort'                          
=> $this->sort,
+                                               'order'                         
=> $this->order,
+                                               'cat_id'                        
=> $this->cat_id,
+                                               'status_id'                     
=> $this->status_id,
+                                               'user_id'                       
=> $this->user_id,
+                                               'query'                         
=> $this->query,
+                                               'district_id'           => 
$this->district_id,
+                                               'part_of_town_id'   => 
$this->part_of_town_id,
+                                               'start_date'            => 
$start_date,
+                                               'end_date'                      
=> $end_date,
+                                               'location_code'         => 
$this->location_code,
+                                               'allrows'                       
=> $this->allrows
                                        );
 
                                $group_filters = 'select';
 
                                $values_combo_box = array();
 
-                               $values_combo_box[2]  = 
$this->bo->filter(array('format' => $group_filters, 'filter'=> 
$this->status_id,'default' => 'O'));
+                               $values_combo_box[3]  = 
$this->bo->filter(array('format' => $group_filters, 'filter'=> 
$this->status_id,'default' => 'O'));
 
                                
if(isset($this->bo->config->config_data['tts_lang_open']) && 
$this->bo->config->config_data['tts_lang_open'])
                                {
-                                       array_unshift 
($values_combo_box[2],array 
('id'=>'O2','name'=>$this->bo->config->config_data['tts_lang_open']));
+                                       array_unshift 
($values_combo_box[3],array 
('id'=>'O2','name'=>$this->bo->config->config_data['tts_lang_open']));
                                }
                                $default_value = array 
('id'=>'','name'=>lang('Open'));
-                               array_unshift 
($values_combo_box[2],$default_value);
+                               array_unshift 
($values_combo_box[3],$default_value);
 
                                if(!$this->_simple)
                                {
@@ -512,8 +516,12 @@
                                        $default_value = array 
('id'=>'','name'=>lang('no district'));
                                        array_unshift 
($values_combo_box[1],$default_value);
 
-                                       $values_combo_box[3]  = 
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_EDIT,$this->user_id,$this->acl_location);
-                                       array_unshift 
($values_combo_box[3],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('my
 assigned tickets')));
+                                       $values_combo_box[2] =  
$this->bocommon->select_part_of_town('filter',$this->part_of_town_id,$this->district_id);
+                                       $default_value = array 
('id'=>'','name'=>lang('no part of town'));
+                                       array_unshift 
($values_combo_box[2],$default_value);
+
+                                       $values_combo_box[4]  = 
$this->bocommon->get_user_list_right2('filter',PHPGW_ACL_EDIT,$this->user_id,$this->acl_location);
+                                       array_unshift 
($values_combo_box[4],array('id'=>$GLOBALS['phpgw_info']['user']['account_id'],'name'=>lang('my
 assigned tickets')));
                                        $_my_negative_self = (-1 * 
$GLOBALS['phpgw_info']['user']['account_id']);
        
                                        $default_value = array
@@ -523,10 +531,10 @@
                                                'selected'      => 
$_my_negative_self == $this->user_id
                                        );
                                        unset($_my_negative_self);
-                                       array_unshift 
($values_combo_box[3],$default_value);
+                                       array_unshift 
($values_combo_box[4],$default_value);
 
                                        $default_value = 
array('id'=>'','name'=>lang('no user'));
-                                       array_unshift 
($values_combo_box[3],$default_value);
+                                       array_unshift 
($values_combo_box[4],$default_value);
 
                                        $datatable['actions']['form'] = array
                                                (
@@ -566,13 +574,22 @@
                                                                                
'tab_index' => 2
                                                                        ),
                                                                        array
+                                                                       ( 
//boton       PART OF TOWN
+                                                                               
'id' => 'btn_part_of_town_id',
+                                                                               
'name' => 'part_of_town_id',
+                                                                               
'value' => lang('Part of Town'),
+                                                                               
'type' => 'button',
+                                                                               
'style' => 'filter',
+                                                                               
'tab_index' => 3
+                                                                       ),
+                                                                       array
                                                                        ( 
//boton       HOUR CATEGORY
                                                                                
'id' => 'btn_status_id',
                                                                                
'name' => 'status_id',
                                                                                
'value' => lang('Status'),
                                                                                
'type' => 'button',
                                                                                
'style' => 'filter',
-                                                                               
'tab_index' => 3
+                                                                               
'tab_index' => 4
                                                                        ),
                                                                        array
                                                                        ( 
//boton       USER
@@ -582,9 +599,9 @@
                                                                                
'value' => lang('User'),
                                                                                
'type' => 'select',
                                                                                
'style' => 'filter',
-                                                                               
'values' => $values_combo_box[3],
+                                                                               
'values' => $values_combo_box[4],
                                                                                
'onchange'=> 'onChangeSelect();',
-                                                                               
'tab_index' => 4
+                                                                               
'tab_index' => 5
                                                                        ),
                                                                        array
                                                                        (//for 
link "columns", next to Export button
@@ -597,21 +614,21 @@
                                                                                
)
                                                                        
)."','','width=300,height=600,scrollbars=1')",
                                                                        'value' 
=> lang('columns'),
-                                                                       
'tab_index' => 10
+                                                                       
'tab_index' => 11
                                                                ),
                                                                array
                                                                (
                                                                        'type'  
=> 'button',
                                                                        'id'    
=> 'btn_export',
                                                                        'value' 
=> lang('download'),
-                                                                       
'tab_index' => 9
+                                                                       
'tab_index' => 10
                                                                ),
                                                                array
                                                                (
                                                                        'type'  
=> 'button',
                                                                        'id'    
=> 'btn_new',
                                                                        'value' 
=> lang('add'),
-                                                                       
'tab_index' => 8
+                                                                       
'tab_index' => 9
                                                                ),
                                                                array
                                                                ( //hidden 
start_date
@@ -638,7 +655,7 @@
                                                                        (
                                                                                
'menuaction' => 
'property.uiproject.date_search'))."','','width=350,height=250')",
                                                                                
'value' => lang('Date search'),
-                                                                               
'tab_index' => 7
+                                                                               
'tab_index' => 8
                                                                        ),
                                                                        array
                                                                        ( 
//boton     SEARCH
@@ -646,7 +663,7 @@
                                                                                
'name' => 'search',
                                                                                
'value'    => lang('search'),
                                                                                
'type' => 'button',
-                                                                               
'tab_index' => 6
+                                                                               
'tab_index' => 7
                                                                        ),
                                                                        array
                                                                        ( // 
TEXT INPUT
@@ -656,7 +673,7 @@
                                                                                
'type' => 'text',
                                                                                
'onkeypress' => 'return pulsar(event)',
                                                                                
'size'    => 28,
-                                                                               
'tab_index' => 5
+                                                                               
'tab_index' => 6
                                                                        )
                                                                ),
                                                                'hidden_value' 
=> array
@@ -680,6 +697,11 @@
                                                                        ( //div 
values  combo_box_3
                                                                                
'id' => 'values_combo_box_3',
                                                                                
'value' => $this->bocommon->select2String($values_combo_box[3])
+                                                                       ),
+                                                                       array
+                                                                       ( //div 
values  combo_box_4
+                                                                               
'id' => 'values_combo_box_4',
+                                                                               
'value' => $this->bocommon->select2String($values_combo_box[4])
                                                                        )
                                                                )
                                                        )

Modified: branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php  
2011-01-31 11:59:52 UTC (rev 6881)
+++ branches/Version-1_0-branch/property/inc/class.uiworkorder.inc.php  
2011-01-31 12:01:00 UTC (rev 6882)
@@ -475,7 +475,6 @@
 
                        $workorder_list = $this->bo->read(array('start_date' => 
$start_date, 'end_date' => $end_date, 'allrows' =>$allrows, 'dry_run' => 
$dry_run));
                        $uicols =$this->bo->uicols;
-//_debug_Array($uicols);die();
                        $content = array();
                        $j=0;
                        if (isset($workorder_list) && is_array($workorder_list))

Modified: branches/Version-1_0-branch/property/js/yahoo/tts.index.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.index.js  2011-01-31 
11:59:52 UTC (rev 6881)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.index.js  2011-01-31 
12:01:00 UTC (rev 6882)
@@ -2,12 +2,13 @@
 // Declaration of location.index vars
 //--------------------------------------------------------
        //define SelectButton
-       var oMenuButton_0, oMenuButton_1, oMenuButton_2;
+       var oMenuButton_0, oMenuButton_1, oMenuButton_2, oMenuButton_3;
        var selectsButtons = [
-       {order:0, 
var_URL:'cat_id',name:'btn_cat_id',style:'categorybutton',dependiente:''},
-       {order:1, 
var_URL:'district_id',name:'btn_district_id',style:'districtbutton',dependiente:''},
-       {order:2, 
var_URL:'status_id',name:'btn_status_id',style:'partOFTownbutton',dependiente:''}
-//     {order:3, var_URL:'user_id', 
name:'btn_user_id',style:'ownerIdbutton',dependiente:''}
+       {order:0, 
var_URL:'cat_id',name:'btn_cat_id',style:'categorybutton',dependiente:[]},
+       {order:1, 
var_URL:'district_id',name:'btn_district_id',style:'districtbutton',dependiente:[2]},
+    {order:2, 
var_URL:'part_of_town_id',name:'btn_part_of_town_id',style:'partOFTownbutton',dependiente:[]},
+       {order:3, 
var_URL:'status_id',name:'btn_status_id',style:'partOFTownbutton',dependiente:[]}
+//     {order:4, var_URL:'user_id', 
name:'btn_user_id',style:'ownerIdbutton',dependiente:''}
        ];
 
        // define buttons
@@ -80,12 +81,18 @@
                        {
                                oMenuButton_1.set("label", ("<em>" + 
array_options[1][index][1] + "</em>"));
                        }
-                       //status
-                       index = 
locate_in_array_options(2,"value",path_values.status_id);
+                       //part of town
+                       index = 
locate_in_array_options(2,"value",path_values.part_of_town_id);
                        if(index)
                        {
                                oMenuButton_2.set("label", ("<em>" + 
array_options[2][index][1] + "</em>"));
                        }
+                       //status
+                       index = 
locate_in_array_options(3,"value",path_values.status_id);
+                       if(index)
+                       {
+                               oMenuButton_3.set("label", ("<em>" + 
array_options[3][index][1] + "</em>"));
+                       }
 /*
                        //user
                        index = 
locate_in_array_options(3,"value",path_values.user_id);




reply via email to

[Prev in Thread] Current Thread [Next in Thread]