[Fmsystem-commits] [11226] more on controller

[Sigurd Nes]

Revision: 11226
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11226
Author:   sigurdne
Date:     2013-07-02 18:14:16 +0000 (Tue, 02 Jul 2013)
Log Message:
-----------
more on controller

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

Modified: trunk/controller/inc/class.hook_helper.inc.php
===================================================================
--- trunk/controller/inc/class.hook_helper.inc.php      2013-07-02 13:00:20 UTC 
(rev 11225)
+++ trunk/controller/inc/class.hook_helper.inc.php      2013-07-02 18:14:16 UTC 
(rev 11226)
@@ -234,15 +234,15 @@
                                        else if($control_type == "component")
                                        {
                                                $component = $container_arr[3];
-                                               $check_list_array = 
$so_check_list->get_check_lists_for_control_and_component( $my_control['id'], 
$component['location_id'], $component['id'], $from_date_ts, $to_date_ts, 
$repeat_type = null );
+                                               
$check_lists_for_control_and_component = 
$so_check_list->get_check_lists_for_control_and_component( $my_control['id'], 
$component['location_id'], $component['id'], $from_date_ts, $to_date_ts, 
$repeat_type = null );
 
-                                               foreach($check_list_array as 
$check_list)
+                                               
foreach($check_lists_for_control_and_component['check_lists_array'] as 
$check_list)
                                                {
                                                        
$planned_date_for_check_list = $check_list->get_planned_date();
 
                                                        
if($planned_date_for_check_list > 0)
                                                        {
-                                                               
$my_planned_controls[$planned_date_for_check_list][] = 
array($check_list->get_deadline(), $my_control, "component", 
$component['location_id'], $component['id'] );
+                                                               
$my_planned_controls[$planned_date_for_check_list][] = 
array($check_list->get_deadline(), $my_control, $check_list->get_id(), 
"component", $component['location_id'], $component['id'] );
                                                        }
                                                }
                                        }

Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php     2013-07-02 13:00:20 UTC 
(rev 11225)
+++ trunk/controller/inc/class.socheck_list.inc.php     2013-07-02 18:14:16 UTC 
(rev 11226)
@@ -644,6 +644,7 @@
                
                $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'), 'int'));