[Fmsystem-commits] [9641]

[Torstein]

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


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/inc/component/class.year_calendar.inc.php
    trunk/controller/inc/helper/class.check_list_status_manager.inc.php
    trunk/controller/templates/base/calendar/check_list_status_checker.xsl

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-06-21 08:28:16 UTC 
(rev 9640)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-06-21 09:13:57 UTC 
(rev 9641)
@@ -286,7 +286,7 @@
                          
                          $components_calendar_array[] = array("component" => 
$component->toArray(), "controls_calendar" => 
$controls_components_calendar_array);
                        }
-                       
+               
                        $location_array = 
execMethod('property.bolocation.read_single', array('location_code' => 
$location_code));
 
                        // Gets array of locations assigned to current user

Modified: trunk/controller/inc/component/class.year_calendar.inc.php
===================================================================
--- trunk/controller/inc/component/class.year_calendar.inc.php  2012-06-21 
08:28:16 UTC (rev 9640)
+++ trunk/controller/inc/component/class.year_calendar.inc.php  2012-06-21 
09:13:57 UTC (rev 9641)
@@ -79,6 +79,7 @@
                        $this->calendar_array[ $month_nr ]["status"] = 
$check_list_status_info->get_status();
                        $this->calendar_array[ $month_nr ]["info"]   = 
$check_list_status_info->serialize();
                }
+               print_r( $this->calendar_array );
                
                return $this->calendar_array;
        }

Modified: trunk/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-06-21 08:28:16 UTC (rev 9640)
+++ trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-06-21 09:13:57 UTC (rev 9641)
@@ -57,14 +57,14 @@
                                {
                                        $status = "CONTROL_PLANNED";
                                }
+                               else if( $this->check_list->get_status() == 
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() < 
$todays_date_ts )
+                               {
+                                       $status = 
"CONTROL_NOT_DONE_WITH_CHECKLIST";
+                               }
                                else if( $this->check_list->get_status() == 
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_planned_date() 
> 0 & $this->check_list->get_deadline() < $todays_date_ts )
                                {
                                        $status = 
"CONTROL_NOT_DONE_WITH_PLANNED_DATE";
                                }
-                               else if( $this->check_list->get_status() == 
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() < 
$todays_date_ts )
-                               {
-                                       $status = "CONTROL_NOT_DONE";
-                               }
                                else if( $this->check_list->get_status() == 
controller_check_list::STATUS_DONE & $this->check_list->get_completed_date() > 
$this->check_list->get_deadline() & $this->check_list->get_num_open_cases() == 
0)
                                {
                                        $status = 
"CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS";

Modified: trunk/controller/templates/base/calendar/check_list_status_checker.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_checker.xsl      
2012-06-21 08:28:16 UTC (rev 9640)
+++ trunk/controller/templates/base/calendar/check_list_status_checker.xsl      
2012-06-21 09:13:57 UTC (rev 9641)
@@ -24,7 +24,7 @@
                                          </xsl:when>
                                          <xsl:otherwise>
                                                        
<xsl:text>&amp;location_code=</xsl:text>
-                                                       <xsl:value-of 
select="$location_code"/>  
+                                                       <xsl:value-of 
select="info/location_code"/>  
                                          </xsl:otherwise>
                                        </xsl:choose>
                                </xsl:attribute>
@@ -64,7 +64,7 @@
                                                  </xsl:when>
                                                  <xsl:otherwise>
                                                                
<xsl:text>&amp;location_code=</xsl:text>
-                                                               <xsl:value-of 
select="$location_code"/>  
+                                                               <xsl:value-of 
select="info/location_code"/>  
                                                  </xsl:otherwise>
                                          </xsl:choose>
                                        </xsl:attribute>
@@ -72,6 +72,18 @@
                                </a>
                        </td>
                </xsl:when>
+               <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+                       <td>
+                               <a>
+                                       <xsl:attribute name="href">
+                                               
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
+                                               
<xsl:text>&amp;check_list_id=</xsl:text>
+                                               <xsl:value-of 
select="info/check_list_id"/>
+                                       </xsl:attribute>
+                                       <img height="15" 
src="controller/images/status_icon_red_cross.png" />
+                               </a>
+                       </td>
+               </xsl:when>
                <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
                        <td>
                        <a>
@@ -140,9 +152,9 @@
                                                <xsl:attribute name="href">
                                                        
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
                                                        
<xsl:text>&amp;control_id=</xsl:text>
-                                                       <xsl:value-of 
select="//control/id"/>
+                                                       <xsl:value-of 
select="info/control_id"/>
                                                        
<xsl:text>&amp;location_code=</xsl:text>
-                                                       <xsl:value-of 
select="//current_location/location_code"/>
+                                                       <xsl:value-of 
select="info/location_code"/>
                                                        
<xsl:text>&amp;year=</xsl:text>
                                                        <xsl:value-of 
select="//current_year"/>
                                                        
<xsl:text>&amp;month=</xsl:text>