[Fmsystem-commits] [13857] property: new custom column at helpdesk

[Sigurd Nes]

Revision: 13857
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13857
Author:   sigurdne
Date:     2015-09-07 13:13:20 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
property: new custom column at helpdesk

Modified Paths:
--------------
    trunk/property/inc/class.botts.inc.php
    trunk/property/inc/class.sotts.inc.php

Modified: trunk/property/inc/class.botts.inc.php
===================================================================
--- trunk/property/inc/class.botts.inc.php      2015-09-05 11:06:00 UTC (rev 
13856)
+++ trunk/property/inc/class.botts.inc.php      2015-09-07 13:13:20 UTC (rev 
13857)
@@ -270,6 +270,12 @@
                                                'id' => 'difference',
                                                'name'=> lang('difference')
                                        );
+
+                               $columns['order_dim1'] = array
+                                       (
+                                               'id' => 'order_dim1',
+                                               'name'=> lang('order_dim1')
+                                       );
                        }
 
                        $columns['ecodimb'] = array
@@ -539,6 +545,12 @@
                                        $closed_status[] =  "C{$custom['id']}";
                                }
                        }
+                       $order_dim1_list = $this->so->get_order_dim1();
+                       $order_dim1_arr = array();
+                       foreach($order_dim1_list as $_order_dim1)
+                       {
+                               $order_dim1_arr[$_order_dim1['id']] = 
$_order_dim1['name'];
+                       }
 
                        foreach ($tickets as & $ticket)
                        {
@@ -554,6 +566,11 @@
                                        $ticket['subject'] = 
$category_name[$ticket['cat_id']];
                                }
 
+                               if($ticket['order_dim1'])
+                               {
+                                       $ticket['order_dim1'] = 
$order_dim1_arr[$ticket['order_dim1']];
+                               }
+
                                if(!isset($account[$ticket['user_id']]))
                                {
                                        $ticket['user'] = 
$GLOBALS['phpgw']->accounts->id2name($ticket['user_id']);

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2015-09-05 11:06:00 UTC (rev 
13856)
+++ trunk/property/inc/class.sotts.inc.php      2015-09-07 13:13:20 UTC (rev 
13857)
@@ -482,7 +482,7 @@
                        $return_fields = 
"fm_tts_tickets.id,fm_tts_tickets.assignedto,fm_tts_tickets.status,fm_tts_tickets.user_id,"
                        . 
"fm_tts_tickets.subject,fm_tts_tickets.address,fm_tts_tickets.location_code,fm_tts_tickets.priority,fm_tts_tickets.cat_id,fm_tts_tickets.group_id,"
                        . 
"fm_tts_tickets.entry_date,fm_tts_tickets.modified_date,fm_tts_tickets.finnish_date,fm_tts_tickets.finnish_date2,fm_tts_tickets.order_id,fm_tts_tickets.vendor_id,"
-                       . 
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as 
district,fm_tts_views.id as view,fm_location1.loc1_name,fm_tts_tickets.ecodimb 
{$result_order_field}";
+                       . 
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as 
district,fm_tts_views.id as 
view,fm_location1.loc1_name,fm_tts_tickets.ecodimb,fm_tts_tickets.order_dim1 
{$result_order_field}";
 
                        $custom_cols = $this->custom->find('property', 
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
                        
@@ -626,7 +626,8 @@
                                                        'estimate'              
        => $this->db->f('budget'),
                                                        'new_ticket'            
=> $this->db->f('view') ? false : true,
                                                        'billable_hours'        
=> $this->db->f('billable_hours'),
-                                                       'ecodimb'               
        => $this->db->f('ecodimb')
+                                                       'ecodimb'               
        => $this->db->f('ecodimb'),
+                                                       'order_dim1'            
=> $this->db->f('order_dim1'),
                                        );
 
                                        foreach ($custom_cols as $custom_col)