[Fmsystem-commits] [8877]

[Torstein]

Revision: 8877
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8877
Author:   vator
Date:     2012-02-15 09:18:33 +0000 (Wed, 15 Feb 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/model/class.control.inc.php
    trunk/controller/templates/base/calendar/view_calendar_year.xsl

Modified: trunk/controller/inc/model/class.control.inc.php
===================================================================
--- trunk/controller/inc/model/class.control.inc.php    2012-02-15 07:28:02 UTC 
(rev 8876)
+++ trunk/controller/inc/model/class.control.inc.php    2012-02-15 09:18:33 UTC 
(rev 8877)
@@ -57,8 +57,9 @@
 
                // Objects
                protected $check_lists_array = array();
+               // Array that contains open cases for a month   
+               protected $agg_check_lists_array = array();
                
-               
                /**
                 * Constructor.  Takes an optional ID.  If a contract is 
created from outside
                 * the database the ID should be empty so the database can add 
one according to its logic.

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-02-15 07:28:02 UTC (rev 8876)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-02-15 09:18:33 UTC (rev 8877)
@@ -138,17 +138,12 @@
                                                                                
                <xsl:text>&amp;control_id=</xsl:text>
                                                                                
                <xsl:value-of select="info/control_id"/>
                                                                                
                <xsl:text>&amp;location_code=</xsl:text>
-                                                                               
                <xsl:value-of select="$location_code"/>
+                                                                               
                <xsl:value-of select="$view_location_code"/>
                                                                                
        </xsl:attribute>
                                                                                
        <img height="15" src="controller/images/status_icon_yellow_ring.png" />
                                                                                
</a>
                                                                                
</div>
                                                                        
</xsl:when>
-                                                                       
<xsl:when test="status = 'controls_registered'">
-                                                                               
<div>
-                                                                               
        <img height="15" src="controller/images/status_icon_yellow_ring.png" />
-                                                                               
</div>
-                                                                       
</xsl:when>
                                                                        
<xsl:when test="status = 'control_planned'">
                                                                                
<div>
                                                                                
<a>
@@ -188,11 +183,6 @@
                                                                                
        </a>
                                                                                
</div>
                                                                        
</xsl:when>
-                                                                       
<xsl:when test="status = 'controls_accomplished_without_errors'">
-                                                                               
<div>
-                                                                               
        <img height="15" src="controller/images/status_icon_dark_green.png" />
-                                                                               
</div>
-                                                                       
</xsl:when>
                                                                        
<xsl:when test="status = 'control_accomplished_with_errors'">
                                                                                
<div style="position:relative;">
                                                                                
<div id="info_box" style="position:absolute;display:none;"></div>
@@ -216,14 +206,13 @@
                                                                                
                <xsl:value-of select="info"/>
                                                                                
        </a>
                                                                                
</div>
-                                                                       
                                                                        
</xsl:when>
                                                                        
<xsl:when test="status = 'control_canceled'">
                                                                                
<div>
                                                                                
        <img height="12" src="controller/images/status_icon_red_cross.png" />
                                                                                
</div>
                                                                        
</xsl:when>
-                                                                       
<xsl:when test="status = 'control_not_accomplished' or status = 
'controls_not_accomplished'">
+                                                                       
<xsl:when test="status = 'control_not_accomplished'">
                                                                                
<div>
                                                                                
        <img height="12" src="controller/images/status_icon_red_cross.png" />
                                                                                
</div>