[Fmsystem-commits] [8418]

[Torstein]

Revision: 8418
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8418
Author:   vator
Date:     2011-12-23 09:53:58 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/component/class.calendar_builder.inc.php

Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php       
2011-12-23 09:53:49 UTC (rev 8417)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php       
2011-12-23 09:53:58 UTC (rev 8418)
@@ -45,13 +45,14 @@
                        foreach($control->get_check_lists_array() as 
$check_list){
                                
                                $check_list_status_info = new 
check_list_status_info();
-                               $check_list_status_info->set_id( 
$check_list->get_id() );
+                               $check_list_status_info->set_check_list_id( 
$check_list->get_id() );
                
                                $todays_date = mktime(0,0,0,date("m"), 
date("d"), date("Y"));
                                
                                if( $check_list->get_status() == 0 & 
$check_list->get_planned_date() > 0 )
                                {
                                        $status = "control_planned";
+                                       
$check_list_status_info->set_info_text("Planlagt utført: " . 
$check_list->get_planned_date());
                                }
                                else if( $check_list->get_status() == 0 & 
$check_list->get_deadline() > $todays_date )
                                {
@@ -73,7 +74,7 @@
                                        $status = "control_canceled";
                                }
                                
-                               $check_list_status_info->set_deadline( 
date("d/m-Y", $check_list->get_deadline()) );
+                               $check_list_status_info->set_deadline_date( 
date("d/m-Y", $check_list->get_deadline()) );
                                
                                if($period_type == "view_months")
                                {
@@ -110,11 +111,12 @@
                                $calendar_array[$i] = null;
                        }
                        
+                       $status = "control_agg_accomplished_with_errors";
+                       
                        // Inserts check_list object on deadline month in 
twelve_months_array
                        foreach($check_list_array as $check_list){
-                               $calendar_array[ date("m", 
$check_list['deadline']) - 1 ] ["status"] = 2;
+                               $calendar_array[ date("m", 
$check_list['deadline']) - 1 ] ["status"] = $status;
                                $calendar_array[ date("m", 
$check_list['deadline']) - 1 ] ["info"] = $check_list['count']; 
-                               
                        }
                        
                        $control_calendar_array[] = array("control" => 
$control_info, "calendar_array" => $calendar_array);