[Fmsystem-commits] [7749]

[Erik Holm-Larsen]

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


Modified Paths:
--------------
    trunk/controller/inc/class.socontrol_item.inc.php
    trunk/controller/inc/class.uicontrol_item.inc.php
    trunk/controller/inc/model/class.control_item.inc.php

Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php   2011-09-28 08:23:07 UTC 
(rev 7748)
+++ trunk/controller/inc/class.socontrol_item.inc.php   2011-09-28 08:47:30 UTC 
(rev 7749)
@@ -207,7 +207,8 @@
                $condition =  join(' AND ', $clauses);
 
                $tables = "controller_control_item";
-               //$joins = " {$this->left_join} rental_document_types ON 
(rental_document.type_id = rental_document_types.id)";
+               $joins = " {$this->left_join} controller_control_group ON 
(controller_control_item.control_group_id = controller_control_group.id)";
+               $joins .= " {$this->left_join} controller_control_area ON 
(controller_control_item.control_area_id = controller_control_area.id)";
                
                if($return_count)
                {
@@ -215,7 +216,7 @@
                }
                else
                {
-                       $cols = 'id, title, required, what_to_do, how_to_do, 
control_group_id, control_area_id';
+                       $cols = 'controller_control_item.id, 
controller_control_item.title, required, what_to_do, how_to_do, 
controller_control_item.control_group_id, 
controller_control_item.control_area_id, controller_control_group.group_name AS 
control_group_name, controller_control_area.title AS control_area_name';
                }
                
                $dir = $ascending ? 'ASC' : 'DESC';
@@ -228,7 +229,7 @@
                //var_dump("SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}");
                //return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
                
-               return "SELECT {$cols} FROM {$tables} WHERE {$condition} 
{$order}";
+               return "SELECT {$cols} FROM {$tables} {$joins} WHERE 
{$condition} {$order}";
        }
        
        function get_control_items($control_group_id)
@@ -291,7 +292,9 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
+                       
//$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
 true), 'string'));
                        
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
+                       
//$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                        
                        $results[] = $control_item->toArray();
                }
@@ -310,7 +313,9 @@
                        
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do', 
true), 'string'));
                        
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true), 
'string'));
                        
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
+                       
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
 true), 'string'));
                        
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
 true), 'int'));
+                       
$control_item->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
                }
                
                return $control_item;

Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php   2011-09-28 08:23:07 UTC 
(rev 7748)
+++ trunk/controller/inc/class.uicontrol_item.inc.php   2011-09-28 08:47:30 UTC 
(rev 7749)
@@ -126,12 +126,12 @@
                                                        'sortable'      => false
                                                ),
                                                array(
-                                                       'key' => 
'control_group_id',
+                                                       'key' => 
'control_group',
                                                        'label' => 
lang('Control group'),
                                                        'sortable'      => false
                                                ),
                                                array(
-                                                       'key' => 
'control_area_id',
+                                                       'key' => 'control_area',
                                                        'label' => 
lang('Control area'),
                                                        'sortable'      => false
                                                ),

Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php       2011-09-28 
08:23:07 UTC (rev 7748)
+++ trunk/controller/inc/model/class.control_item.inc.php       2011-09-28 
08:47:30 UTC (rev 7749)
@@ -66,6 +66,13 @@
                
                public function get_control_group_id() { return 
$this->control_group_id; }
                
+               public function set_control_group_name($control_group_name)
+               {
+                       $this->control_group_name = $control_group_name;
+               }
+               
+               public function get_control_group_name() { return 
$this->control_group_name; }
+               
                public function set_control_area_id($control_area_id)
                {
                        $this->control_area_id = $control_area_id;
@@ -73,6 +80,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; }
+               
                        
                /**
                 * Get a static reference to the storage object associated with 
this model object
@@ -96,8 +110,8 @@
                        $result['required'] = $this->get_required();
                        $result['what_to_do'] = $this->get_what_to_do();
                        $result['how_to_do'] = $this->get_how_to_do();
-                       $result['control_group_id'] = 
$this->get_control_group_id();
-                       $result['control_area_id'] = 
$this->get_control_area_id();
+                       $result['control_group'] = 
$this->get_control_group_name();
+                       $result['control_area'] = 
$this->get_control_area_name();
                                                
                        return $result;
                }