[Fmsystem-commits] [10998] property: condition survey / request

[Sigurd Nes]

Revision: 10998
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10998
Author:   sigurdne
Date:     2013-03-18 12:40:32 +0000 (Mon, 18 Mar 2013)
Log Message:
-----------
property: condition survey / request

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

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2013-03-18 11:56:29 UTC (rev 
10997)
+++ trunk/property/inc/class.sorequest.inc.php  2013-03-18 12:40:32 UTC (rev 
10998)
@@ -593,6 +593,13 @@
                                
'uicols'=>array(),'joinmethod'=>$joinmethod,'paranthesis'=>$paranthesis,
                                'query'=>$query,'force_location'=>true, 
'location_level' => $_location_level));
 
+
+                       for ($i=2; $i< ($_location_level +1); $i++)
+                       {
+                               $cols_group[] = "fm_location{$i}.loc{$i}_name";
+                       }
+
+
                        $cols_group[] = "{$entity_table}.id";
                        $cols_group[] = 'fm_request_status.descr';
                        $cols_group[] = "{$entity_table}.address";
@@ -769,7 +776,8 @@
 
                        $this->_db->fetchmode = 'ASSOC';
 
-                       $sql2 = "SELECT count(*) as cnt, sum(amount_investment) 
as sum_investment, sum(amount_operation) as sum_operation, 
sum(amount_potential_grants) as sum_potential_grants FROM ({$sql}) as t";
+//                     $sql2 = "SELECT count(*) as cnt, sum(amount_investment) 
as sum_investment, sum(amount_operation) as sum_operation, 
sum(amount_potential_grants) as sum_potential_grants FROM ({$sql}) as t";
+                       $sql2 = "SELECT count(*) as cnt, sum(amount_investment) 
as sum_investment, sum(amount_operation) as sum_operation, 
sum(amount_potential_grants) as sum_potential_grants FROM {$sql_arr[1]}";
 
                        $this->_db->query($sql2,__LINE__,__FILE__);
                        $this->_db->next_record();