[Fmsystem-commits] [8892] added repeat_type_label to contract

[Erik Holm-Larsen]

Revision: 8892
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8892
Author:   erikhl
Date:     2012-02-16 10:06:15 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
added repeat_type_label to contract

Modified Paths:
--------------
    trunk/controller/inc/class.socontrol.inc.php
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/setup/phpgw_no.lang
    trunk/controller/templates/base/calendar/view_calendar_year.xsl

Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php        2012-02-16 09:43:11 UTC 
(rev 8891)
+++ trunk/controller/inc/class.socontrol.inc.php        2012-02-16 10:06:15 UTC 
(rev 8892)
@@ -147,6 +147,7 @@
                                
$control->set_component_id($this->unmarshal($this->db->f('component_id', true), 
'int'));
                                
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
+                               
$control->set_repeat_type_label($this->unmarshal($this->db->f('repeat_type', 
true), 'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
                                
                                if($return_type == "return_object")
@@ -189,7 +190,7 @@
                                
$control->set_location_code($this->unmarshal($this->db->f('location_code', 
true), 'string'));
                                
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true), 
'int'));
                                
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval', 
true), 'int'));
-
+                               
                                $controls_array[] = $control->toArray();
                        }
 

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-02-16 09:43:11 UTC 
(rev 8891)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-02-16 10:06:15 UTC 
(rev 8892)
@@ -223,20 +223,6 @@
        
                        $controls_calendar_array = 
$this->calendar_builder->build_calendar_array( $controls_for_location_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");

Modified: trunk/controller/setup/phpgw_no.lang
===================================================================
--- trunk/controller/setup/phpgw_no.lang        2012-02-16 09:43:11 UTC (rev 
8891)
+++ trunk/controller/setup/phpgw_no.lang        2012-02-16 10:06:15 UTC (rev 
8892)
@@ -319,4 +319,9 @@
 Property name  controller      no      Lokasjonsnavn
 Address        controller      no      Adresse
 Zip code       controller      no      Postnummer
-no category selected   controller      no      Kategori ikke valgt
\ No newline at end of file
+no category selected   controller      no      Kategori ikke valgt
+repeat_type_none       controller      no      Ingen
+repeat_type_day        controller      no      Dag
+repeat_type_week       controller      no      Uke
+repeat_type_month      controller      no      Måned
+repeat_type_year       controller      no      År
\ No newline at end of file

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-02-16 09:43:11 UTC (rev 8891)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-02-16 10:06:15 UTC (rev 8892)
@@ -123,7 +123,7 @@
                                                </xsl:choose>
                                                </div>
                                                <div class="frequency">
-                                               <xsl:value-of 
select="control/repeat_type"/>
+                                               <xsl:value-of 
select="control/repeat_type_label"/>
                                                </div>                          
                        
                                                <div class="months">
                                                <xsl:for-each 
select="calendar_array">