[Fmsystem-commits] [7748]

[Erik Holm-Larsen]

Revision: 7748
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7748
Author:   erikhl
Date:     2011-09-28 08:23:07 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_group.inc.php
    trunk/controller/inc/class.uicontrol_group.inc.php
    trunk/controller/inc/model/class.control_group.inc.php

Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php  2011-09-28 08:20:54 UTC 
(rev 7747)
+++ trunk/controller/inc/class.socontrol_group.inc.php  2011-09-28 08:23:07 UTC 
(rev 7748)
@@ -319,6 +319,8 @@
 
                $tables = "controller_control_group";
                $joins = "      {$this->left_join} fm_building_part ON 
(building_part_id = CAST(fm_building_part.id AS INT))";
+               $joins .= "     {$this->left_join} controller_procedure ON 
(procedure_id = controller_procedure.id)";
+               $joins .= "     {$this->left_join} controller_control_area ON 
(control_area_id = controller_control_area.id)";
                //$joins .= "   {$this->left_join} rental_contract_composite ON 
(rental_contract_composite.composite_id = rental_composite.id)";
                //$joins .= "   {$this->left_join} rental_contract ON 
(rental_contract.id = rental_contract_composite.contract_id)";
                
@@ -328,7 +330,7 @@
                }
                else
                {
-                       $cols .= "controller_control_group.id, group_name, 
procedure_id, control_area_id, building_part_id, fm_building_part.descr AS 
building_part_descr ";
+                       $cols .= "controller_control_group.id, group_name, 
procedure_id, control_area_id, building_part_id, fm_building_part.descr AS 
building_part_descr, controller_procedure.title as procedure_title, 
controller_control_area.title as control_area_name ";
                }
                $dir = $ascending ? 'ASC' : 'DESC';
                $order = $sort_field ? "ORDER BY {$this->marshal($sort_field, 
'field')} $dir ": '';
@@ -345,7 +347,9 @@
 
                        
$control_group->set_group_name($this->unmarshal($this->db->f('group_name'), 
'string'));
                        
$control_group->set_procedure_id($this->unmarshal($this->db->f('procedure_id'), 
'int'));
+                       
$control_group->set_procedure_name($this->unmarshal($this->db->f('procedure_title'),
 'string'));
                        
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
 'int'));
+                       
$control_group->set_control_area_name($this->unmarshal($this->db->f('control_area_name'),
 'string'));
                        
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
 'int'));
                        
$control_group->set_building_part_descr($this->unmarshal($this->db->f('building_part_descr'),
 'string'));
                }

Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php  2011-09-28 08:20:54 UTC 
(rev 7747)
+++ trunk/controller/inc/class.uicontrol_group.inc.php  2011-09-28 08:23:07 UTC 
(rev 7748)
@@ -113,12 +113,12 @@
                                                        'sotrable'      =>      
false
                                                ),
                                                array(
-                                                       'key' => 
'control_area_id',
+                                                       'key' => 'control_area',
                                                        'label' => 
lang('Control area'),
                                                        'sortable'      => false
                                                ),
                                                array(
-                                                       'key' => 'procedure_id',
+                                                       'key' => 'procedure',
                                                        'label' => 
lang('Procedure'),
                                                        'sortable'      => false
                                                ),

Modified: trunk/controller/inc/model/class.control_group.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_group.inc.php      2011-09-28 
08:20:54 UTC (rev 7747)
+++ trunk/controller/inc/model/class.control_group.inc.php      2011-09-28 
08:23:07 UTC (rev 7748)
@@ -8,7 +8,9 @@
                protected $id;
                protected $group_name;
                protected $procedure_id;
+               protected $procedure_name;
                protected $control_area_id;
+               protected $control_area_name;
                protected $building_part_id;
                protected $building_part_descr;
                
@@ -44,6 +46,13 @@
                
                public function get_procedure_id(){ return $this->procedure_id; 
}
                
+               public function set_procedure_name($procedure_name)
+               {
+                       $this->procedure_name = $procedure_name;
+               }
+               
+               public function get_procedure_name(){ return 
$this->procedure_name; }
+               
                public function set_control_area_id($control_area_id)
                {
                        $this->control_area_id = $control_area_id;
@@ -51,6 +60,13 @@
                
                public function get_control_area_id(){ return 
$this->control_area_id; }
                
+               public function set_control_area_name($control_area_name)
+               {
+                       $this->control_area_name = $control_area_name;
+               }
+               
+               public function get_control_area_name(){ return 
$this->control_area_name; }
+               
                public function set_building_part_id($building_part_id)
                {
                        $this->building_part_id = $building_part_id;
@@ -70,8 +86,8 @@
                        $result = array();
                        $result['id'] = $this->get_id();
                        $result['group_name'] = $this->get_group_name();
-                       $result['procedure_id'] = $this->get_procedure_id();
-                       $result['control_area_id'] = 
$this->get_control_area_id();
+                       $result['procedure'] = $this->get_procedure_name();
+                       $result['control_area'] = 
$this->get_control_area_name();
                        $result['building_part'] = 
$this->get_building_part_descr();
                        
                        return $result;