[Fmsystem-commits] [8860]

[Erik Holm-Larsen]

Revision: 8860
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8860
Author:   erikhl
Date:     2012-02-14 12:23:45 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-02-14 12:23:27 UTC 
(rev 8859)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-02-14 12:23:45 UTC 
(rev 8860)
@@ -121,7 +121,21 @@
                        
                        $controls_calendar_array = array();
                        $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_calendar_array, 
$controls_with_check_list, $num_days_in_month, "view_days" );
+                       
+                       foreach($controls_calendar_array as &$inst)
+                       {       
+                               $curr_control = &$inst['control'];
 
+                               if($curr_control['repeat_type'] == 0)
+                                       $curr_control['repeat_type'] = "Dag";
+                               else if($curr_control['repeat_type'] == 1)
+                                       $curr_control['repeat_type'] = "Uke";
+                               else if($curr_control['repeat_type'] == 2)
+                                       $curr_control['repeat_type'] = "Måned";
+                               else if($curr_control['repeat_type'] == 3)
+                                       $curr_control['repeat_type'] = "År";
+                       }
+
                        $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");
@@ -219,6 +233,20 @@
                        
                        $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_calendar_array, 
$control_check_list_array, 12, "view_months" );
                        
+                       foreach($controls_calendar_array as &$inst)
+                       {       
+                               $curr_control = &$inst['control'];
+
+                               if($curr_control['repeat_type'] == 0)
+                                       $curr_control['repeat_type'] = "Dag";
+                               else if($curr_control['repeat_type'] == 1)
+                                       $curr_control['repeat_type'] = "Uke";
+                               else if($curr_control['repeat_type'] == 2)
+                                       $curr_control['repeat_type'] = "Måned";
+                               else if($curr_control['repeat_type'] == 3)
+                                       $curr_control['repeat_type'] = "År";
+                       }
+                       
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
                        
                        $heading_array = array("Jan", "Feb", "Mar", "Apr", 
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
@@ -240,7 +268,7 @@
                        self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                }
-               /*
+
                public function view_calendar_for_locations()
                {
                        $control_id = phpgw::get_var('control_id');
@@ -283,6 +311,15 @@
                                        if($curr_control["location_code"] == 
$loc1["location_code"])
                                                $curr_control["location_name"] 
= $loc1["loc1_name"];
                                }
+
+                               if($curr_control['repeat_type'] == 0)
+                                       $curr_control['repeat_type'] = "Dag";
+                               else if($curr_control['repeat_type'] == 1)
+                                       $curr_control['repeat_type'] = "Uke";
+                               else if($curr_control['repeat_type'] == 2)
+                                       $curr_control['repeat_type'] = "Måned";
+                               else if($curr_control['repeat_type'] == 3)
+                                       $curr_control['repeat_type'] = "År";
                        }
                        
                        //_debug_array($controls_calendar_array);
@@ -308,6 +345,6 @@
                        self::add_javascript('controller', 'controller', 
'jquery.js');
                        self::add_javascript('controller', 'controller', 
'ajax.js');
                }
-               */
+
                public function query(){}
        }
\ No newline at end of file