[Fmsystem-commits] [11161] property: more on condition survey

[Sigurd Nes]

Revision: 11161
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11161
Author:   sigurdne
Date:     2013-06-07 13:20:29 +0000 (Fri, 07 Jun 2013)
Log Message:
-----------
property: more on condition survey

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

Modified: trunk/property/inc/class.socondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.socondition_survey.inc.php 2013-06-07 11:55:07 UTC 
(rev 11160)
+++ trunk/property/inc/class.socondition_survey.inc.php 2013-06-07 13:20:29 UTC 
(rev 11161)
@@ -492,14 +492,12 @@
 
                public function get_summation($id)
                {
-                       $table = 'fm_request';
-
                        $condition_survey_id            = (int)$id;
                        $sql = "SELECT left(building_part,1) as building_part_,"
                        . " sum(amount_investment) as investment 
,sum(amount_operation) as operation,"
                        . " recommended_year as year"
-                       ." FROM {$table}"
-                       ." WHERE condition_survey_id={$condition_survey_id}"
+                       ." FROM fm_request {$this->_join} fm_request_status ON 
fm_request.status = fm_request_status.id"
+                       ." WHERE condition_survey_id={$condition_survey_id} AND 
fm_request_status.closed IS NULL"
                        ." GROUP BY building_part_ , year ORDER BY 
building_part_";
 
                        $this->_db->query($sql,__LINE__,__FILE__);