[Fmsystem-commits] [8706]

[Erik Holm-Larsen]

Revision: 8706
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8706
Author:   erikhl
Date:     2012-01-30 11:23:34 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.socheck_list.inc.php

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2012-01-30 10:30:40 UTC 
(rev 8705)
+++ trunk/controller/inc/class.socheck_list.inc.php     2012-01-30 11:23:34 UTC 
(rev 8706)
@@ -207,12 +207,13 @@
        
        function get_check_lists_for_control($control_id){
                $sql = "SELECT cl.id as cl_id, cl.status as cl_status, 
cl.comment as cl_comment, deadline, planned_date, "; 
-               $sql .= "completed_date, component_id, location_code, 
num_open_cases ";
+               $sql .= "completed_date, component_id, location_code, 
num_open_cases, ";
                $sql .= "ci.id as ci_id, ci.status as ci_status, 
control_item_id, ci.comment as ci_comment, check_list_id ";
                $sql .= "FROM controller_check_list cl, controller_check_item 
ci ";
                $sql .= "WHERE cl.control_id = $control_id ";
                $sql .= "AND cl.id = ci.check_list_id "; 
                $sql .= "ORDER BY cl.id;";
+               //var_dump($sql);
                $this->db->query($sql);
                
                $check_list_id = 0;
@@ -260,6 +261,47 @@
                }
        }
        
+               function get_planned_check_lists_for_control($control_id){
+               $sql = "SELECT cl.id as cl_id, cl.status as cl_status, 
cl.comment as cl_comment, deadline, planned_date, "; 
+               $sql .= "completed_date, component_id, location_code, 
num_open_cases ";
+               $sql .= "FROM controller_check_list cl ";
+               $sql .= "WHERE cl.control_id = $control_id "; 
+               $sql .= "ORDER BY cl.id;";
+               //var_dump($sql);
+               $this->db->query($sql);
+               
+               $check_list_id = 0;
+               $check_list = null;
+               while ($this->db->next_record()) {
+               
+                       if( $this->db->f('cl_id', true) != $check_list_id ){
+                               
+                               if($check_list_id != 0){
+                                       
$check_list->set_check_item_array($check_items_array);
+                                       $check_list_array[] = 
$check_list->toArray();
+                               }
+                               
+                               $check_list = new 
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+                               
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true), 
'int'));
+                               
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true), 
'string'));
+                               
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true), 
'int'));
+                               
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
+                               
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
+                               
$check_list->set_component_id($this->unmarshal($this->db->f('component_id', 
true), 'int'));
+                               
$check_list->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
+                       }
+                       $check_list_id =  $check_list->get_id();
+               }
+               
+               if($check_list != null){
+                       $check_list_array[] = $check_list;
+               
+                       return $check_list_array;
+               }else {
+                       return null;
+               }
+       }
+       
        function get_agg_check_lists_for_location( $location_code, 
$from_date_ts, $to_date_ts ){
                
                $sql =  "SELECT c.id as c_id, title, start_date, end_date, 
cl.id as cl_id, c.repeat_type, c.repeat_interval, cl.deadline, count(ci.id) ";
@@ -453,6 +495,39 @@
                return $controls_array;
        }
        
+       function get_check_list_for_date($control_id, $current_date){
+               $sql =  "SELECT c.id as c_id, title, description, start_date, 
end_date, control_area_id, c.location_code as c_location_code, repeat_type, 
repeat_interval, ";
+               $sql .= "cl.id as cl_id, cl.status as cl_status, cl.comment as 
cl_comment, deadline, planned_date, completed_date, ";
+               $sql .= "cl.component_id as cl_component_id, cl.location_code 
as cl_location_code, num_open_cases "; 
+               $sql .= "FROM controller_control c ";
+               $sql .= "LEFT JOIN controller_check_list cl on cl.control_id = 
c.id ";
+               $sql .= "WHERE c.id = {$control_id} "; 
+               $sql .= "AND NOT planned_date IS NULL ";
+//             $sql .= "AND planned_date = {$current_date}";
+               
+//             var_dump($sql);
+
+               $this->db->query($sql);
+               $check_lists_array = array();
+
+               while ($this->db->next_record()) {
+                       $check_list = new 
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
+                       $check_list->set_control_id($control_id);
+                       
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true), 
'int'));
+                       
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true), 
'string'));
+                       
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true), 
'int'));
+                       
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date', 
true), 'int'));
+                       
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date', 
true), 'int')); 
+                       
$check_list->set_component_id($this->unmarshal($this->db->f('cl_component_id', 
true), 'int'));
+                       
$check_list->set_location_code($this->unmarshal($this->db->f('cl_location_code',
 true), 'string'));
+                       
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases', 
true), 'int'));
+                       
+                       $check_lists_array[] = $check_list;
+               }
+//             if()
+               return $check_lists_array;
+       }
+       
        function get_query(string $sort_field, boolean $ascending, string 
$search_for, string $search_type, array $filters, boolean $return_count)
        {
                $current_time = time();