[Fmsystem-commits] [9303]

[Torstein]

Revision: 9303
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9303
Author:   vator
Date:     2012-05-08 06:42:36 +0000 (Tue, 08 May 2012)
Log Message:
-----------


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

Modified: trunk/controller/inc/helper/class.check_list_status_info.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_info.inc.php    
2012-05-08 06:42:13 UTC (rev 9302)
+++ trunk/controller/inc/helper/class.check_list_status_info.inc.php    
2012-05-08 06:42:36 UTC (rev 9303)
@@ -36,6 +36,7 @@
                private $deadline_date_ts;
                private $deadline_date_txt;
                private $info_text;
+               private $location_code;
                private $num_open_cases;
                        
                public function __construct(){}
@@ -82,6 +83,13 @@
                
                public function get_info_text() { return $this->info_text; }
                
+               public function set_location_code($location_code)
+               {
+                       $this->location_code = $location_code;
+               }
+               
+               public function get_location_code() { return 
$this->location_code; }
+               
                public function set_num_open_cases($num_open_cases)
                {
                        $this->num_open_cases = $num_open_cases;
@@ -99,6 +107,7 @@
                                'deadline_date_ts' => 
$this->get_deadline_date_ts(),
                                'deadline_date_txt' => 
$this->get_deadline_date_txt(),
                                'info_text' => $this->get_info_text(),
+                               'location_code' => $this->get_location_code(),
                                'num_open_cases' => $this->get_num_open_cases()
                        );
                }

Modified: trunk/controller/inc/helper/class.check_list_status_manager.inc.php
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-05-08 06:42:13 UTC (rev 9302)
+++ trunk/controller/inc/helper/class.check_list_status_manager.inc.php 
2012-05-08 06:42:36 UTC (rev 9303)
@@ -56,7 +56,7 @@
                        }
                        else if( $this->check_list->get_status() == 
controller_check_list::STATUS_NOT_DONE & $this->check_list->get_deadline() < 
$todays_date_ts )
                        {
-                               $status = "control_not_accomplished";
+                               $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)
                        {
@@ -67,17 +67,18 @@
                                $status = "CONTROL_DONE_IN_TIME_WITHOUT_ERRORS";
                        }
                        else if( $this->check_list->get_status() == 
controller_check_list::STATUS_DONE & $this->check_list->get_num_open_cases() > 
0){
-                               $status = "control_accomplished_with_errors";
+                               $status = "CONTROL_DONE_WITH_ERRORS";
                                
$check_list_status_info->set_num_open_cases($this->check_list->get_num_open_cases());
                        }
                        else if( $this->check_list->get_status() == 
controller_check_list::STATUS_CANCELED)
                        {
-                               $status = "control_canceled";
+                               $status = "CONTROL_CANCELED";
                        }
                        
                        
                        $check_list_status_info->set_deadline_date_txt( 
date("d/m-Y", $this->check_list->get_deadline()) );
                        $check_list_status_info->set_deadline_date_ts( 
$this->check_list->get_deadline() );
+                       $check_list_status_info->set_location_code( 
$this->check_list->get_location_code() );
                        $check_list_status_info->set_status($status);
                
                        return $check_list_status_info;