[Fmsystem-commits] [8324]

[Torstein]

Revision: 8324
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8324
Author:   vator
Date:     2011-12-15 12:43:22 +0000 (Thu, 15 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-15 12:40:11 UTC (rev 8323)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php       
2011-12-15 12:43:22 UTC (rev 8324)
@@ -32,7 +32,8 @@
                                }
                                else if( $period_type == "view_days" )
                                {
-                                       $calendar_array[ date("j", $date) ]  = 
array( "date" => $date );        
+                                       $calendar_array[ date("j", $date) 
]["status"]  = 0;
+                                       $calendar_array[ date("j", $date) 
]["info"]  = array("date" => $date);  
                                }
                        }
                        
@@ -69,14 +70,19 @@
                                {
                                        $calendar_array[ date("n", 
$check_list->get_deadline()) ] = $check_list_status_info->serialize();       
                                }
-                               else{
-                                       $calendar_array[ date("j", 
$check_list->get_deadline()) ] = $check_list_status_info->serialize();       
+                               else if( $period_type == "view_days" )
+                               {
+                                       $calendar_array[ date("j", 
$check_list->get_deadline()) ]["status"] = 1;
+                                       $calendar_array[ date("j", 
$check_list->get_deadline()) ]["info"] = $check_list_status_info->serialize();
                                }
                        }
                        
                        $controls_calendar_array[] = array("control" => 
$control->toArray(), "calendar_array" => $calendar_array);
                }
                
+               
+               print_r( $controls_calendar_array );
+               
                return $controls_calendar_array;
        }