fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8251] property: list max condition degree


From: Sigurd Nes
Subject: [Fmsystem-commits] [8251] property: list max condition degree
Date: Thu, 08 Dec 2011 12:20:41 +0000

Revision: 8251
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8251
Author:   sigurdne
Date:     2011-12-08 12:20:38 +0000 (Thu, 08 Dec 2011)
Log Message:
-----------
property: list max condition degree

Modified Paths:
--------------
    trunk/property/inc/class.sorequest.inc.php

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2011-12-07 12:11:55 UTC (rev 
8250)
+++ trunk/property/inc/class.sorequest.inc.php  2011-12-08 12:20:38 UTC (rev 
8251)
@@ -242,6 +242,19 @@
                        $uicols['classname'][]          = '';
                        $uicols['sortable'][]           = false;
 
+                       $cols.= ",max(fm_request_condition.degree) as 
condition_degree";
+                       $cols_return[]                          = 
'condition_degree';
+                       $uicols['input_type'][]         = 'text';
+                       $uicols['name'][]                       = 
'condition_degree';
+                       $uicols['descr'][]                      = 
lang('condition degree');
+                       $uicols['statustext'][]         = lang('condition 
degree');
+                       $uicols['exchange'][]           = '';
+                       $uicols['align'][]                      = '';
+                       $uicols['datatype'][]           = '';
+                       $uicols['formatter'][]          = '';
+                       $uicols['classname'][]          = '';
+                       $uicols['sortable'][]           = true;
+
                        $cols.= 
",$entity_table.start_date,$entity_table.entry_date,$entity_table.closed_date,$entity_table.in_progress_date,$entity_table.delivered_date";
                        $cols_return[]                          = "start_date";
                        $cols_return[]                          = "entry_date";
@@ -394,10 +407,10 @@
 
                        $paranthesis = '(';
                        $joinmethod = "{$this->left_join} fm_request_status ON 
{$entity_table}.status = fm_request_status.id)";
-
-
                        $paranthesis .= '(';
                        $joinmethod .= "{$this->left_join} fm_request_consume 
ON {$entity_table}.id = fm_request_consume.request_id)";
+                       $paranthesis .= '(';
+                       $joinmethod .= "{$this->left_join} fm_request_condition 
ON {$entity_table}.id = fm_request_condition.request_id)";
 
                        $GLOBALS['phpgw']->config->read();
                        $_location_level = 
isset($GLOBALS['phpgw']->config->config_data['request_location_level']) && 
$GLOBALS['phpgw']->config->config_data['request_location_level'] ? 
$GLOBALS['phpgw']->config->config_data['request_location_level'] : 0;




reply via email to

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