[Fmsystem-commits] [8660]

[Torstein]

Revision: 8660
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8660
Author:   vator
Date:     2012-01-24 09:55:59 +0000 (Tue, 24 Jan 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/inc/component/class.calendar_builder.inc.php
    trunk/controller/templates/base/check_list/edit_check_list.xsl

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 09:45:25 UTC 
(rev 8659)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-01-24 09:55:59 UTC 
(rev 8660)
@@ -115,6 +115,8 @@
                                $location_code = 
$my_locations[0]["location_code"];     
                        }
                        
+                       $num_days_in_month = cal_days_in_month(CAL_GREGORIAN, 
$month, $year) ; 
+                       
                        $controls_for_location_array = 
$this->so_control->get_controls_by_location($location_code, $from_date_ts, 
$to_date_ts, $repeat_type);
                
                        $control_id_with_check_list_array = 
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts, 
$to_date_ts, $repeat_type);
@@ -122,16 +124,16 @@
                        $controls_with_check_list = 
$this->populate_controls_with_check_lists($controls_for_location_array, 
$control_id_with_check_list_array);
                        
                        $controls_calendar_array = array();
-                       $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_calendar_array, 
$controls_with_check_list, 31, "view_days" );
+                       $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_calendar_array, 
$controls_with_check_list, $num_days_in_month, "view_days" );
 
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
                        
                        $month_array = array("Januar", "Februar", "Mars", 
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November", 
"Desember");
                        
-                       for($i=1;$i<=31;$i++){
+                       for($i=1;$i<=$num_days_in_month;$i++){
                                $heading_array[$i] = "$i";      
                        }
-                                                       
+                                               
                        $data = array
                        (               
                                'my_locations'                    => 
$my_locations,
@@ -142,7 +144,7 @@
                                'date_format'                     => 
$date_format,
                                'period'                                  => 
$month_array[ $month - 1],
                                'month_nr'                                => 
$month,
-                               'year'                                    => 
$year
+                               'year'                                    => 
$year,
                        );
                        
                        self::add_javascript('controller', 'controller', 
'jquery.js');

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-01-24 09:45:25 UTC 
(rev 8659)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-01-24 09:55:59 UTC 
(rev 8660)
@@ -240,7 +240,7 @@
                
                        if(isset($control_id) && $control_id > 0)
                        {
-                               $control = $this->so->get_single($control_id);
+                               $control = $this->so->get_single($control_id);  
                        }
 
                        // Sigurd: START as categories
@@ -571,9 +571,8 @@
                        {       
                                $saved_control_items = 
$this->so_control_item_list->get_control_items_by_control_and_group($control_id,
 $control_group->get_id());
                                
-                               $control_item = 
$this->so_control_item->get_single($control_item_id);
-                               
-                               $saved_groups_with_items_array[] = 
array("control_group" => $control_group->toArray(), "control_items" => 
$saved_control_items);
+                               if(count($saved_control_items) > 0)             
                
+                                       $saved_groups_with_items_array[] = 
array("control_group" => $control_group->toArray(), "control_items" => 
$saved_control_items);
                        }
                        
                        $tabs = array(

Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php       
2012-01-24 09:45:25 UTC (rev 8659)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php       
2012-01-24 09:55:59 UTC (rev 8660)
@@ -17,7 +17,7 @@
                
                foreach($control_array as $control){
 
-                       $calendar_array = $this->init_calendar( $control, 
$calendar_array, $num, $period_type );
+                       $calendar_array = $this->init_calendar( $control, 
$calendar_array, $num_days_in_month, $period_type );
 
                        // Inserts check_list object on deadline month in 
twelve_months_array
                        foreach($control->get_check_lists_array() as 
$check_list){
@@ -106,8 +106,6 @@
 
                        $twelve_month_array[$i-1]["status"] = $status;
                }
-               
-               print_r($twelve_month_array);
                                
                for($from_month;$from_month<=$to_month;$from_month++){
        
@@ -136,10 +134,10 @@
                return $controls_calendar_array;
        }
                
-       function init_calendar( $control, $calendar_array, $num, $period_type ){
+       function init_calendar( $control, $calendar_array, $num_days_in_month, 
$period_type ){
                
                // Initialises twelve_months_array
-               for($i=1;$i<=$num;$i++){
+               for($i=1;$i<=$num_days_in_month;$i++){
                        $calendar_array[$i] = null;
                }
                

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-24 09:45:25 UTC (rev 8659)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-01-24 09:55:59 UTC (rev 8660)
@@ -25,8 +25,8 @@
                });
        </script>
        
-               <h1>Utførelse av kontroll: <xsl:value-of 
select="control/title"/></h1>
-               <h2>Sjekkliste for: <xsl:value-of 
select="location_array/loc1_name"/></h2>
+               <h1>Kontroll: <xsl:value-of select="control/title"/></h1>
+               <h2>Bygg: <xsl:value-of select="location_array/loc1_name"/></h2>
                
                <xsl:call-template name="check_list_tab_menu">
                        <xsl:with-param 
name="active_tab">view_details</xsl:with-param>