[Fmsystem-commits] [9169]

[Torstein]

Revision: 9169
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9169
Author:   vator
Date:     2012-04-17 12:13:57 +0000 (Tue, 17 Apr 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicase.inc.php
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    trunk/controller/templates/base/case/create_case_message.xsl
    trunk/controller/templates/base/case/view_case_message.xsl

Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php   2012-04-17 10:44:27 UTC (rev 
9168)
+++ trunk/controller/inc/class.uicase.inc.php   2012-04-17 12:13:57 UTC (rev 
9169)
@@ -346,7 +346,8 @@
                public function updateStatusForCases($location_id, 
$location_item_id, $updateStatus = 0){
                        
                        $cases_array = $this->so->get_cases_by_message( 
$location_id, $location_item_id );
-                       
+
+                       // Updates status for cases related to message  
                        foreach($cases_array as $case){
                                $case->set_status( $updateStatus );
                                $this->so->update( $case );

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-04-17 10:44:27 UTC (rev 9168)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-04-17 12:13:57 UTC (rev 9169)
@@ -8,7 +8,7 @@
        <div id="control_plan">
                <div class="col_1">
                        <h1><xsl:value-of 
select="location_array/loc1_name"/></h1>
-                       <h3 style="margin:0;font-size:19px;">Kalenderoversikt 
for <xsl:value-of select="period"/></h3>
+                       <h3 style="margin:0;font-size:19px;">Kalenderoversikt 
for <xsl:value-of select="period"/><span style="margin-left:5px;"><xsl:value-of 
select="year"/></span></h3>
                </div>
                
                <div class="col_2">
@@ -86,6 +86,18 @@
                        });
                </script>
                
+                       <a style="font-weight: bold;font-size: 
14px;float:left;">
+                               <xsl:attribute name="href">
+                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+                                       <xsl:text>&amp;year=</xsl:text>
+                                       <xsl:value-of select="year"/>
+                                       <xsl:text>&amp;location_code=</xsl:text>
+                                       <xsl:value-of select="$location_code"/>
+                               </xsl:attribute>
+                               Årsoversikt
+                       </a>
+
+                       <!-- =========================  NAVIGATION BETWEEN 
FIRST AND LAST 14 DAYS IN DAYS CALENDAR  
============================================================= -->           
                        <div class="nav">
                                <a class="move_left" href="#"><img 
src="controller/images/arrow_right.png" width="16"/></a>
                                <a class="move_right" href="#"><img 
src="controller/images/arrow_left.png" width="16"/></a>

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2012-04-17 10:44:27 UTC (rev 9168)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2012-04-17 12:13:57 UTC (rev 9169)
@@ -97,7 +97,7 @@
                                </form>                 
                                </xsl:when>
                                <xsl:otherwise>
-                                       Ingen registrerte saker
+                                       Ingen registrerte saker eller det er 
blitt registrert en melding for alle registrerte saker
                                </xsl:otherwise>
                        </xsl:choose>
                </div>

Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl  2012-04-17 
10:44:27 UTC (rev 9168)
+++ trunk/controller/templates/base/case/view_case_message.xsl  2012-04-17 
12:13:57 UTC (rev 9169)
@@ -31,7 +31,9 @@
                <!-- === UPLOAD FILE === -->
                <div class="row">
                        <label>Filvedlegg:</label>
-                       
+                               <xsl:for-each select="message_ticket/files">
+                                       <li><xsl:value-of select="."/></li>
+                               </xsl:for-each>
                </div>
 
                <h3>Saker for meldingen</h3>