[Fmsystem-commits] [9577]

[Torstein]

Revision: 9577
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9577
Author:   vator
Date:     2012-06-13 12:09:13 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/class.uicontrol.inc.php

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-06-13 12:07:31 UTC 
(rev 9576)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-06-13 12:09:13 UTC 
(rev 9577)
@@ -51,8 +51,8 @@
                                
                public $public_functions = array
                (
-                       'view_calendar_for_month'                       =>      
true,
-                       'view_calendar_for_year'                        =>      
true,
+                       'view_calendar_for_month'                             
=>        true,
+                       'view_calendar_for_year'                              
=>        true,
                        'view_calendar_year_for_locations'      =>  true,
                        'view_calendar_month_for_locations'     =>  true
                );
@@ -165,10 +165,10 @@
                        // Validates year. If year is not set, current year is 
chosen
                        $year = $this->validate_year($year);
                        
-                       // Gets timestamp value of first day in year
+                       // Gets timestamp of first day in year
                        $from_date_ts = $this->get_start_date_year_ts($year);
 
-                       // Gets timestamp value of first day in next year
+                       // Gets timestamp of first day in next year
                        $to_date_ts = $this->get_end_date_year_ts($year);
 
                        // Array that will be populated with controls and 
calendar objects that will be sent to view
@@ -187,6 +187,9 @@
                        // Fetches all controls for the location within time 
period
                        $controls_for_location_array = 
$this->so_control->get_controls_by_location($location_code, $from_date_ts, 
$to_date_ts, $repeat_type = null);
                        
+                       // Fetches all controls for the components on location 
within time period
+                       $controls_for_component_array = 
$this->so_control->get_controls_by_component($location_code, $from_date_ts, 
$to_date_ts, $repeat_type = null);
+                       
                        $controls_calendar_array = array();
                        
                        // Loops through controls with repeat type day or week 
in controls_for_location_array
@@ -272,10 +275,10 @@
                        // Validates year. If year is not set, current year is 
chosen
                        $year = $this->validate_year($year);
                        
-                       // Gets timestamp value of first day in year
+                       // Gets timestamp of first day in year
                        $from_date_ts = $this->get_start_date_year_ts($year);
 
-                       // Gets timestamp value of first day in next year
+                       // Gets timestamp of first day in next year
                        $to_date_ts = $this->get_end_date_year_ts($year);
                        
                        $locations_with_calendar_array = array();
@@ -328,7 +331,7 @@
                                        $locations_with_calendar_array[] = 
array("location" => $location, "calendar_array" => $calendar_array);
                                }
                                
-                           foreach($components_for_control_array as 
$component){
+                         foreach($components_for_control_array as $component){
                                        $curr_component_id = 
$component['component_id'];
                                        
                                        $repeat_type = 
$control->get_repeat_type();

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2012-06-13 12:07:31 UTC 
(rev 9576)
+++ trunk/controller/inc/class.uicontrol.inc.php        2012-06-13 12:09:13 UTC 
(rev 9577)
@@ -60,29 +60,29 @@
 
     public $public_functions = array
     (
-                       'index'                                                 
                                                                =>      true,
-                       'control_list'                                          
                                        =>      true,
-                       'view'                                                  
                                                                =>      true,
-                       'view_control_details'                                  
                =>      true,
-                       'save_control_details'                                  
                =>      true,
-                       'view_control_groups'                                   
                        =>      true,
-                       'save_control_groups'                                   
                        =>      true,
-                       'view_control_items'                                    
                        =>      true,
-                       'save_control_items'                                    
                        =>      true,
-                       'view_check_list'                                       
                                        =>      true,
-                       'get_controls_by_control_area'          =>      true,
+                       'index'                                                 
                                                =>      true,
+                       'control_list'                                          
                        =>      true,
+                       'view'                                                  
                                                =>      true,
+                       'view_control_details'                                  
=>      true,
+                       'save_control_details'                                  
=>      true,
+                       'view_control_groups'                                   
        =>      true,
+                       'save_control_groups'                                   
        =>      true,
+                       'view_control_items'                                    
        =>      true,
+                       'save_control_items'                                    
        =>      true,
+                       'view_check_list'                                       
                        =>      true,
+                       'get_controls_by_control_area'  =>      true,
                );
 
                public function __construct()
                {
                        parent::__construct();
 
-                       $read        = 
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_READ, 'controller');//1 
-                       $add         = 
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_ADD, 'controller');//2 
-                       $edit         = 
$GLOBALS['phpgw']->acl->check('.control', PHPGW_ACL_EDIT, 'controller');//4 
-                       $delete     = $GLOBALS['phpgw']->acl->check('.control', 
PHPGW_ACL_DELETE, 'controller');//8 
+                       $read    = $GLOBALS['phpgw']->acl->check('.control', 
PHPGW_ACL_READ, 'controller');//1 
+                       $add     = $GLOBALS['phpgw']->acl->check('.control', 
PHPGW_ACL_ADD, 'controller');//2 
+                       $edit    = $GLOBALS['phpgw']->acl->check('.control', 
PHPGW_ACL_EDIT, 'controller');//4 
+                       $delete  = $GLOBALS['phpgw']->acl->check('.control', 
PHPGW_ACL_DELETE, 'controller');//8 
                        
-                       $manage     = $GLOBALS['phpgw']->acl->check('.control', 
16, 'controller');//16
+                       $manage  = $GLOBALS['phpgw']->acl->check('.control', 
16, 'controller');//16
 
                        //if(!$manage)