[Fmsystem-commits] [11960] property: add custom column at ticket-list

[Sigurd Nes]

Revision: 11960
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11960
Author:   sigurdne
Date:     2014-05-09 08:36:41 +0000 (Fri, 09 May 2014)
Log Message:
-----------
property: add custom column at ticket-list

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      2014-05-08 13:26:07 UTC (rev 
11959)
+++ trunk/property/inc/class.botts.inc.php      2014-05-09 08:36:41 UTC (rev 
11960)
@@ -267,6 +267,11 @@
                                        );
                        }
 
+                       $columns['ecodimb'] = array
+                               (
+                                       'id' => 'ecodimb',
+                                       'name'=> lang('dim b')
+                               );
                        $columns['vendor'] = array
                                (
                                        'id' => 'vendor',

Modified: trunk/property/inc/class.sotts.inc.php
===================================================================
--- trunk/property/inc/class.sotts.inc.php      2014-05-08 13:26:07 UTC (rev 
11959)
+++ trunk/property/inc/class.sotts.inc.php      2014-05-09 08:36:41 UTC (rev 
11960)
@@ -459,7 +459,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.actual_cost,"
-                       . 
"fm_tts_tickets.budget,fm_tts_tickets.billable_hours,fm_district.descr as 
district,fm_tts_views.id as view,fm_location1.loc1_name {$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 
{$result_order_field}";
 
                        $custom_cols = $this->custom->find('property', 
'.ticket', 0, '', 'ASC', 'attrib_sort', true, true);
                        
@@ -604,6 +604,7 @@
                                                        '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')
                                        );
 
                                        foreach ($custom_cols as $custom_col)