[Fmsystem-commits] [9100]

[Torstein]

Revision: 9100
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9100
Author:   vator
Date:     2012-04-04 09:20:54 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-04-04 09:20:46 UTC (rev 9099)
+++ trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-04-04 09:20:54 UTC (rev 9100)
@@ -45,31 +45,31 @@
        
                        $todays_date_ts = mktime(0,0,0,date("m"), date("d"), 
date("Y"));
        
-                       if( $this->check_list->get_status() == 0 & 
$this->check_list->get_planned_date() > 0 & $this->check_list->get_deadline() > 
$todays_date_ts)
+                       if( $this->check_list->get_status() == 
controller_check_list::STATUS_OPEN & $this->check_list->get_planned_date() > 0 
& $this->check_list->get_deadline() > $todays_date_ts)
                        {
                                $status = "control_planned";
                        }
-                       else if( $this->check_list->get_status() == 0 & 
$this->check_list->get_planned_date() > 0 & $this->check_list->get_deadline() < 
$todays_date_ts )
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_OPEN & $this->check_list->get_planned_date() > 0 
& $this->check_list->get_deadline() < $todays_date_ts )
                        {
                                $status = "control_not_accomplished_with_info";
                        }
-                       else if( $this->check_list->get_status() == 0 & 
$this->check_list->get_deadline() < $todays_date_ts )
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_OPEN & $this->check_list->get_deadline() < 
$todays_date_ts )
                        {
                                $status = "control_not_accomplished";
                        }
-                       else if( $this->check_list->get_status() == 1 & 
$this->check_list->get_completed_date() > $this->check_list->get_deadline() & 
$this->check_list->get_num_open_cases() == 0)
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_CLOSED & $this->check_list->get_completed_date() 
> $this->check_list->get_deadline() & $this->check_list->get_num_open_cases() 
== 0)
                        {
                                $status = 
"control_accomplished_over_time_without_errors";
                        }
-                       else if( $this->check_list->get_status() == 1 & 
$this->check_list->get_completed_date() < $this->check_list->get_deadline() & 
$this->check_list->get_num_open_cases() == 0)
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_CLOSED & $this->check_list->get_completed_date() 
< $this->check_list->get_deadline() & $this->check_list->get_num_open_cases() 
== 0)
                        {
                                $status = 
"control_accomplished_in_time_without_errors";
                        }
-                       else if( $this->check_list->get_status() == 1 & 
$this->check_list->get_num_open_cases() > 0){
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_CLOSED & $this->check_list->get_num_open_cases() 
> 0){
                                $status = "control_accomplished_with_errors";
                                
$check_list_status_info->set_num_open_cases($this->check_list->get_num_open_cases());
                        }
-                       else if( $this->check_list->get_status() == 3 )
+                       else if( $this->check_list->get_status() == 
controller_check_list::STATUS_CANCELED)
                        {
                                $status = "control_canceled";
                        }

Modified: trunk/controller/inc/helper/class.status_checker.inc.php
===================================================================
--- trunk/controller/inc/helper/class.status_checker.inc.php    2012-04-04 
09:20:46 UTC (rev 9099)
+++ trunk/controller/inc/helper/class.status_checker.inc.php    2012-04-04 
09:20:54 UTC (rev 9100)
@@ -6,45 +6,42 @@
        include_class('controller', 'check_item', 'inc/model/');
 
        class status_checker {
-       
-       public function __construct()
-       {
-               $this->so_check_list = CreateObject('controller.socheck_list');
-               $this->so_check_item = CreateObject('controller.socheck_item');
-       }
                
-       public function update_check_list_status( $check_list_id )
-       {
-               $check_list = $this->so_check_list->get_single( $check_list_id 
);
-       
-               $status = null;
-               $control_item_type = null;
-               $messageStatus = null;
-               $check_items = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 
$control_item_type, $status, $messageStatus, "return_object");
+               public function __construct()
+               {
+                       $this->so_check_list = 
CreateObject('controller.socheck_list');
+                       $this->so_check_item = 
CreateObject('controller.socheck_item');
+               }
+                       
+               public function update_check_list_status( $check_list_id )
+               {
+                       $check_list = $this->so_check_list->get_single( 
$check_list_id );
                
-               $num_open_cases = 0;
-               $num_pending_cases = 0;
-                               
-               foreach($check_items as $check_item){
+                       $check_items = 
$this->so_check_item->get_check_items_with_cases($check_list_id, 
$control_item_type = null, $status = null, $messageStatus = null, 
"return_object");
                        
-                       foreach($check_item->get_cases_array() as $case){
+                       $num_open_cases = 0;
+                       $num_pending_cases = 0;
+                                       
+                       foreach($check_items as $check_item){
                                
-                               if($case->get_status() == 0){
-                                       $num_open_cases++;
-                               }
-                               
-                               if($case->get_status() == 2){
-                                       $num_pending_cases++;
-                               }
-                       }       
+                               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++;
+                                       }
+                               }       
+                       }
+                       
+                       $check_list->set_num_open_cases($num_open_cases);
+                       $check_list->set_num_pending_cases($num_pending_cases);
+                       
+                       if($num_open_cases > 0)
+                               
$check_list->set_status(controller_check_list::STATUS_OPEN);
+                       
+                       $this->so_check_list->store($check_list);
                }
-               
-               $check_list->set_num_open_cases($num_open_cases);
-               $check_list->set_num_pending_cases($num_pending_cases);
-               
-               if($num_open_cases > 0)
-                       $check_list->set_status(1);
-               
-               $this->so_check_list->store($check_list);
-       }
 }
\ No newline at end of file