[Fmsystem-commits] [10792] Made it possible to show status for controll with status NOT DONE and no planned date set

[Torstein]

Revision: 10792
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10792
Author:   vator
Date:     2013-02-11 13:59:35 +0000 (Mon, 11 Feb 2013)
Log Message:
-----------
Made it possible to show status for controll with status NOT DONE and no 
planned date set 

Modified Paths:
--------------
    trunk/controller/inc/component/class.check_list_status_manager.inc.php
    trunk/controller/inc/helper/class.check_list_status_updater.inc.php

Modified: trunk/controller/inc/component/class.check_list_status_manager.inc.php
===================================================================
--- trunk/controller/inc/component/class.check_list_status_manager.inc.php      
2013-02-11 13:54:43 UTC (rev 10791)
+++ trunk/controller/inc/component/class.check_list_status_manager.inc.php      
2013-02-11 13:59:35 UTC (rev 10792)
@@ -57,9 +57,9 @@
                                {
                                        $status = "CONTROL_PLANNED";
                                }
-                               else if( $this->check_list->get_status() == 
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() < 
$todays_date_ts )
+        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";
+                                       $status = "CONTROL_REGISTERED";
                                }
                                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 )
                                {
@@ -82,16 +82,16 @@
                                {
                                        $status = "CONTROL_CANCELED";
                                }
-                               
+        
                                $check_list_status_info->set_check_list_id( 
$this->check_list->get_id() );
                        }
-                       
+      
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        $check_list_status_info->set_control_id( 
$this->check_list->get_control_id() );
                        $check_list_status_info->set_deadline_date_txt( 
date($dateformat, $this->check_list->get_deadline()) );
                        $check_list_status_info->set_deadline_date_ts( 
$this->check_list->get_deadline() );
                        $check_list_status_info->set_type( $this->type );
-                       
+                     
                        if($this->type == "component"){
                                $check_list_status_info->set_component_id( 
$this->check_list->get_component_id() );
                                $check_list_status_info->set_location_id( 
$this->check_list->get_location_id() );

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-11 13:54:43 UTC (rev 10791)
+++ trunk/controller/inc/helper/class.check_list_status_updater.inc.php 
2013-02-11 13:59:35 UTC (rev 10792)
@@ -20,7 +20,7 @@
     
                        $check_list = $this->so_check_list->get_single( 
$check_list_id );
                
-                       $check_items = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 
$control_item_type = null, $status = null, $messageStatus = null, 
"return_object");
+                       $check_items = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 
$control_item_type = null, $status = null, $messageStatus = null);
                
                        $num_open_cases = 0;
                        $num_pending_cases = 0;