[Fmsystem-commits] [10960] property: condition survey

[Sigurd Nes]

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

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

Modified: trunk/property/inc/class.sorequest.inc.php
===================================================================
--- trunk/property/inc/class.sorequest.inc.php  2013-03-04 18:24:46 UTC (rev 
10959)
+++ trunk/property/inc/class.sorequest.inc.php  2013-03-04 18:35:50 UTC (rev 
10960)
@@ -239,9 +239,9 @@
                        . " LEFT JOIN fm_request_consume ON fm_request.id = 
fm_request_consume.request_id)"
                        . " LEFT JOIN fm_request_condition ON fm_request.id = 
fm_request_condition.request_id)"
                        . " {$filtermethod}"
-                       . " GROUP BY fm_request_status.descr,fm_request.budget,"
+                       . " GROUP BY fm_request_status.descr,"
                        . " 
building_part,fm_request.start_date,fm_request.entry_date,fm_request.closed_date,"
-                       . " 
fm_request.in_progress_date,fm_request.delivered_date,title,budget,score,fm_request.id,fm_request_status.descr";
+                       . " 
fm_request.in_progress_date,fm_request.delivered_date,title,amount_investment,amount_operation,amount_potential_grants,score,fm_request.id,fm_request_status.descr";
 
                        $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";
 
@@ -276,17 +276,18 @@
                        {
                                $values[] = array
                                (
-                                       'id'                                    
=> $this->_db->f('request_id'),
-                                       'status'                                
=> $this->_db->f('status',true),
-                                       'building_part'                 => 
$this->_db->f('building_part'),
-                                       'title'                                 
=> $this->_db->f('title',true),
-                                       'condition_degree'              => 
$this->_db->f('condition_degree'),
-                                       'amount_investment'             => 
$this->_db->f('amount_investment'),
-                                       'amount_operation'              => 
$this->_db->f('amount_operation'),
-                                       'planned_budget'                => 
$this->_db->f('planned_budget'),
-                                       'score'                                 
=> $this->_db->f('score'),
-                                       'planned_year'                  => 
$this->_db->f('planned_year') ? date('Y', $this->_db->f('planned_year')) : '',
-                                       'cat_id'                                
=> $this->_db->f('cat_id'),
+                                       'id'                                    
        => $this->_db->f('request_id'),
+                                       'status'                                
        => $this->_db->f('status',true),
+                                       'building_part'                         
=> $this->_db->f('building_part'),
+                                       'title'                                 
        => $this->_db->f('title',true),
+                                       'condition_degree'                      
=> $this->_db->f('condition_degree'),
+                                       'amount_investment'                     
=> $this->_db->f('amount_investment'),
+                                       'amount_operation'                      
=> $this->_db->f('amount_operation'),
+                                       'amount_potential_grants'       => 
$this->_db->f('amount_potential_grants'),
+                                       'planned_budget'                        
=> $this->_db->f('planned_budget'),
+                                       'score'                                 
        => $this->_db->f('score'),
+                                       'planned_year'                          
=> $this->_db->f('planned_year') ? date('Y', $this->_db->f('planned_year')) : 
'',
+                                       'cat_id'                                
        => $this->_db->f('cat_id'),
                                );
                        }
                        return $values;

Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2013-03-04 18:24:46 UTC 
(rev 10959)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2013-03-04 18:35:50 UTC 
(rev 10960)
@@ -396,7 +396,9 @@
                                array('key' => 
'category','label'=>lang('category'),'sortable'=>false,'resizeable'=>true),
                                array('key' => 
'condition_degree','label'=>lang('condition 
degree'),'sortable'=>false,'resizeable'=>true),
                                array('key' => 
'score','label'=>lang('score'),'sortable'=>true,'resizeable'=>true),
-                               array('key' => 
'budget','label'=>lang('budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+                               array('key' => 
'amount_investment','label'=>lang('investment'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+                               array('key' => 
'amount_operation','label'=>lang('operation'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
+                               array('key' => 
'amount_potential_grants','label'=>lang('potential 
grants'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
 //                             array('key' => 
'planned_budget','label'=>lang('planned 
budget'),'sortable'=>true,'resizeable'=>true,'formatter'=>'YAHOO.portico.FormatterAmount0'),
                                array('key' => 
'planned_year','label'=>lang('year'),'sortable'=>true,'resizeable'=>true),
                                array('key' => 
'related','label'=>lang('related'),'sortable'=>false,'resizeable'=>true),