[Fmsystem-commits] [7494] property: list termination_date on agreements

[Sigurd Nes]

Revision: 7494
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7494
Author:   sigurdne
Date:     2011-08-11 12:01:19 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
property: list termination_date on agreements

Modified Paths:
--------------
    trunk/property/inc/class.boagreement.inc.php
    trunk/property/inc/class.soagreement.inc.php
    trunk/property/inc/class.uiagreement.inc.php

Modified: trunk/property/inc/class.boagreement.inc.php
===================================================================
--- trunk/property/inc/class.boagreement.inc.php        2011-08-11 11:54:02 UTC 
(rev 7493)
+++ trunk/property/inc/class.boagreement.inc.php        2011-08-11 12:01:19 UTC 
(rev 7494)
@@ -167,6 +167,11 @@
                                {
                                        $agreement['start_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['start_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
                                }
+                               if($agreement['termination_date'])
+                               {
+                                       $agreement['termination_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['termination_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+                               }
+
                                if($agreement['end_date'])
                                {
                                        $agreement['end_date']  = 
$GLOBALS['phpgw']->common->show_date($agreement['end_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);

Modified: trunk/property/inc/class.soagreement.inc.php
===================================================================
--- trunk/property/inc/class.soagreement.inc.php        2011-08-11 11:54:02 UTC 
(rev 7493)
+++ trunk/property/inc/class.soagreement.inc.php        2011-08-11 12:01:19 UTC 
(rev 7494)
@@ -130,6 +130,13 @@
                        $uicols['statustext'][]         = lang('start date');
                        $uicols['datatype'][]           = 'D';
 
+                       $cols_return[]                          = 
'termination_date';
+                       $uicols['input_type'][]         = 'text';
+                       $uicols['name'][]                       = 
'termination_date';
+                       $uicols['descr'][]                      = 
lang('termination date');
+                       $uicols['statustext'][]         = lang('termination 
date');
+                       $uicols['datatype'][]           = 'D';
+
                        $cols_return[]                          = 'end_date';
                        $uicols['input_type'][]         = 'text';
                        $uicols['name'][]                       = 'end_date';

Modified: trunk/property/inc/class.uiagreement.inc.php
===================================================================
--- trunk/property/inc/class.uiagreement.inc.php        2011-08-11 11:54:02 UTC 
(rev 7493)
+++ trunk/property/inc/class.uiagreement.inc.php        2011-08-11 12:01:19 UTC 
(rev 7494)
@@ -485,7 +485,7 @@
                                        
$datatable['headers']['header'][$i]['text']                     = 
$uicols['descr'][$i];
                                        
$datatable['headers']['header'][$i]['visible']                  = true;
                                        
$datatable['headers']['header'][$i]['sortable']                 = false;
-                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status')
+                                       if($uicols['name'][$i]=='id' || 
$uicols['name'][$i]=='name' || $uicols['name'][$i]=='org_name' || 
$uicols['name'][$i]=='category' || $uicols['name'][$i]=='start_date' || 
$uicols['name'][$i]=='end_date' || $uicols['name'][$i]=='status'|| 
$uicols['name'][$i]=='termination_date')
                                        {
                                                
$datatable['headers']['header'][$i]['sortable']         = true;
                                                
$datatable['headers']['header'][$i]['sort_field']       = $uicols['name'][$i];