[Fmsystem-commits] [10926] Added status for check list not done, but with an existing check list

[Torstein]

Revision: 10926
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10926
Author:   vator
Date:     2013-02-19 12:00:57 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
Added status for check list not done, but with an existing check list

Modified Paths:
--------------
    trunk/controller/inc/helper/class.check_list_status_updater.inc.php
    trunk/controller/templates/base/calendar/check_list_status_manager.xsl

Modified: trunk/controller/inc/helper/class.check_list_status_updater.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_updater.inc.php 
2013-02-19 11:59:40 UTC (rev 10925)
+++ trunk/controller/inc/helper/class.check_list_status_updater.inc.php 
2013-02-19 12:00:57 UTC (rev 10926)
@@ -15,7 +15,7 @@
                        
                public function update_check_list_status( $check_list_id )
                {
-      //$db_check_list = $this->so_check_list->get_db();
+            //$db_check_list = $this->so_check_list->get_db();
                        //$db_check_list->transaction_begin();
     
                        $check_list = $this->so_check_list->get_single( 
$check_list_id );
@@ -26,26 +26,26 @@
                        $num_pending_cases = 0;
                                        
                        foreach($check_items as $check_item)
-      {
+            {
                                foreach($check_item->get_cases_array() as $case)
-        {
+                {
                                        
                                        if($case->get_status() == 
controller_check_item_case::STATUS_OPEN)
-          {
+                    {
                                                $num_open_cases++;
                                        }
                                        
                                        if($case->get_status() == 
controller_check_item_case::STATUS_PENDING)
-          {
+                    {
                                                $num_pending_cases++;
                                        }
                                }       
                        }
                        
                        if($num_open_cases > 0)
-      {
+            {
                                
$check_list->set_status(controller_check_list::STATUS_DONE);
-      }
+            }
       
                        $check_list->set_num_open_cases($num_open_cases);
                        $check_list->set_num_pending_cases($num_pending_cases);

Modified: trunk/controller/templates/base/calendar/check_list_status_manager.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_manager.xsl      
2013-02-19 11:59:40 UTC (rev 10925)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl      
2013-02-19 12:00:57 UTC (rev 10926)
@@ -70,7 +70,7 @@
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
-    <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+    <xsl:when test="status = 'CONTROL_REGISTERED_WITH_CHECKLIST'">
       <a>
         <xsl:attribute name="href">
           
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
@@ -78,7 +78,7 @@
           <xsl:value-of select="info/check_list_id"/>
                 <xsl:value-of select="$session_url"/>
         </xsl:attribute>
-        <img height="15" src="controller/images/status_icon_red_cross.png" />
+        <img height="15" src="controller/images/status_icon_yellow_ring.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
@@ -92,6 +92,17 @@
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
+    <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+      <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:value-of select="$session_url"/>
+        </xsl:attribute>
+        <img height="15" src="controller/images/status_icon_red_cross.png" />
+      </a>
+    </xsl:when>
     <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
       <a>
         <xsl:attribute name="href">