fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [8166] added responsibility-filter on control list


From: Erik Holm-Larsen
Subject: [Fmsystem-commits] [8166] added responsibility-filter on control list
Date: Tue, 22 Nov 2011 13:15:04 +0000

Revision: 8166
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8166
Author:   erikhl
Date:     2011-11-22 13:15:03 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
added responsibility-filter on control list

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/inc/model/class.control.inc.php

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2011-11-22 13:02:00 UTC 
(rev 8165)
+++ trunk/controller/inc/class.socontrol.inc.php        2011-11-22 13:15:03 UTC 
(rev 8166)
@@ -139,6 +139,10 @@
                {
                        $filter_clauses[] = "controller_control.control_area_id 
= {$this->marshal($filters['control_areas'],'int')}";
                }
+               if(isset($filters['responsibilities']))
+               {
+                       $filter_clauses[] = 
"controller_control.responsibility_id = 
{$this->marshal($filters['responsibilities'],'int')}";
+               }
                
                if(count($filter_clauses))
                {
@@ -152,6 +156,7 @@
                //$joins = " {$this->left_join} rental_document_types ON 
(rental_document.type_id = rental_document_types.id)";
                $joins = " {$this->left_join} controller_control_area ON 
(controller_control.control_area_id = controller_control_area.id)";
                $joins .= " {$this->left_join} controller_procedure ON 
(controller_control.procedure_id = controller_procedure.id)";
+               $joins .= " {$this->left_join} fm_responsibility_role ON 
(controller_control.responsibility_id = fm_responsibility_role.id)";
                
                if($return_count)
                {
@@ -159,7 +164,7 @@
                }
                else
                {
-                       $cols = 'controller_control.id, 
controller_control.title, controller_control.description, 
controller_control.start_date, controller_control.end_date, 
controller_control.procedure_id, controller_control.control_area_id, 
controller_control.requirement_id, controller_control.costresponsibility_id, 
controller_control.responsibility_id, controller_control.equipment_type_id, 
controller_control.equipment_id, controller_control.location_code, 
controller_control.repeat_type, controller_control.repeat_interval, 
controller_control.enabled, controller_control_area.title AS control_area_name, 
controller_procedure.title AS procedure_name ';
+                       $cols = 'controller_control.id, 
controller_control.title, controller_control.description, 
controller_control.start_date, controller_control.end_date, 
controller_control.procedure_id, controller_control.control_area_id, 
controller_control.requirement_id, controller_control.costresponsibility_id, 
controller_control.responsibility_id, controller_control.equipment_type_id, 
controller_control.equipment_id, controller_control.location_code, 
controller_control.repeat_type, controller_control.repeat_interval, 
controller_control.enabled, controller_control_area.title AS control_area_name, 
controller_procedure.title AS procedure_name, fm_responsibility_role.name AS 
responsibility_name ';
                }
                
                $dir = $ascending ? 'ASC' : 'DESC';
@@ -191,6 +196,7 @@
                        
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id', 
true), 'int'));
                        
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
 true), 'int'));
                        
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
 true), 'int'));
+                       
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
 true), 'string'));
                        
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id', 
true), 'int'));
                        
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
 //                     
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
@@ -216,8 +222,9 @@
                
                $joins = " {$this->left_join} controller_control_area ON 
(c.control_area_id = controller_control_area.id)";
                $joins .= " {$this->left_join} controller_procedure ON 
(c.procedure_id = controller_procedure.id)";
+               $joins .= " {$this->left_join} fm_responsibility_role ON 
(c.responsibility_id = fm_responsibility_role.id)";
                
-               $sql = "SELECT c.*, controller_control_area.title AS 
control_area_name, controller_procedure.title AS procedure_name FROM 
controller_control c {$joins} WHERE c.id = " . $id;
+               $sql = "SELECT c.*, controller_control_area.title AS 
control_area_name, controller_procedure.title AS procedure_name, 
fm_responsibility_role.name AS responsibility_name FROM controller_control c 
{$joins} WHERE c.id = " . $id;
                $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
                $this->db->next_record();
                
@@ -232,6 +239,7 @@
                
$control->set_requirement_id($this->unmarshal($this->db->f('requirement_id', 
true), 'int'));
                
$control->set_costresponsibility_id($this->unmarshal($this->db->f('costresponsibility_id',
 true), 'int'));
                
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
 true), 'int'));
+               
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
 true), 'string'));
                
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id', 
true), 'int'));
                
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
 true), 'string'));
 //                     
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
 true), 'int'));
@@ -247,9 +255,10 @@
        function get_roles()
        {
                $ret_array = array();
+               $ret_array[0] = array('id' =>  0,'name' => lang('Not 
selected'));
                $sql = "select * from fm_responsibility_role ORDER BY name";
                $this->db->query($sql, __LINE__, __FILE__);
-               $i = 0;
+               $i = 1;
                while($this->db->next_record())
                {
                        $ret_array[$i]['id'] = $this->db->f('id');

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2011-11-22 13:02:00 UTC 
(rev 8165)
+++ trunk/controller/inc/class.uicontrol.inc.php        2011-11-22 13:15:03 UTC 
(rev 8166)
@@ -105,6 +105,11 @@
                                 'text' => lang('Control_area'),
                                 'list' => 
$this->so_control_area->get_control_area_select_array(),
                                                        ),
+                                                       array('type' => 
'filter',
+                                                               'name' => 
'responsibilities',
+                                'text' => lang('Responsibility'),
+                                'list' => $this->so->get_roles(),
+                                                       ),
                                                        array('type' => 'text', 
                                 'text' => lang('searchfield'),
                                                                'name' => 
'query'
@@ -153,6 +158,11 @@
                                                        'sortable'      => false
                                                ),
                                                array(
+                                                       'key' => 
'responsibility_name',
+                                                       'label' => 
lang('Responsibility'),
+                                                       'sortable'      => false
+                                               ),
+                                               array(
                                                        'key' => 'link',
                                                        'hidden' => true
                                                )
@@ -618,6 +628,11 @@
                        {
                                $filters['control_areas'] = $ctrl_area; 
                        }
+                       $responsibility = phpgw::get_var('responsibilities');
+                       if(isset($responsibility) && $responsibility > 0)
+                       {
+                               $filters['responsibilities'] = $responsibility; 
+                       }
                        
                        $search_for = phpgw::get_var('query');
 

Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php    2011-11-22 13:02:00 UTC 
(rev 8165)
+++ trunk/controller/inc/model/class.control.inc.php    2011-11-22 13:15:03 UTC 
(rev 8166)
@@ -18,6 +18,7 @@
                protected $requirement_id;
                protected $costresponsibility_id;
                protected $responsibility_id;
+               protected $responsibility_name;
                protected $equipment_id;
                protected $equipment_type_id;
                protected $location_code;
@@ -129,6 +130,13 @@
                
                public function get_responsibility_id() { return 
$this->responsibility_id; }
                
+               public function set_responsibility_name($responsibility_name)
+               {
+                       $this->responsibility_name = $responsibility_name;
+               }
+               
+               public function get_responsibility_name() { return 
$this->responsibility_name; }
+               
                public function set_equipment_id($equipment_id)
                {
                        $this->equipment_id = $equipment_id;
@@ -212,7 +220,7 @@
                                'control_area_name' => 
$this->get_control_area_name(),
                                'repeat_type' => $this->get_repeat_type(),
                                'repeat_interval' => 
$this->get_repeat_interval(),
-                               'responsibility' => 
$this->get_responsibility_id(),
+                               'responsibility_name' => 
$this->get_responsibility_name(),
                        
                                );
                }




reply via email to

[Prev in Thread] Current Thread [Next in Thread]