[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9640]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9640] |
|
Date: |
Thu, 21 Jun 2012 08:28:16 +0000 |
Revision: 9640
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9640
Author: vator
Date: 2012-06-21 08:28:16 +0000 (Thu, 21 Jun 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicontrol_location.inc.php
Added Paths:
-----------
trunk/controller/inc/helper/class.check_list_status_updater.inc.php
Removed Paths:
-------------
trunk/controller/inc/helper/class.status_checker.inc.php
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-06-21 07:23:05 UTC
(rev 9639)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-06-21 08:28:16 UTC
(rev 9640)
@@ -53,7 +53,7 @@
public function get_single($check_list_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date, ";
- $sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, ci.id as ci_id, control_item_id, ";
+ $sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, location_id, ci.id as ci_id,
control_item_id, ";
$sql .= "check_list_id ";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
@@ -75,6 +75,7 @@
$check_list->set_completed_date($this->unmarshal($this->db->f('completed_date',
true), 'int'));
$check_list->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
$check_list->set_component_id($this->unmarshal($this->db->f('component_id',
true), 'int'));
+
$check_list->set_location_id($this->unmarshal($this->db->f('location_id',
true), 'int'));
$check_list->set_num_open_cases($this->unmarshal($this->db->f('num_open_cases',
true), 'int'));
$check_list->set_num_pending_cases($this->unmarshal($this->db->f('num_pending_cases',
true), 'int'));
}
@@ -810,6 +811,7 @@
$control->set_equipment_type_id($this->unmarshal($this->db->f('equipment_type_id',
true), 'int'));
$control->set_equipment_id($this->unmarshal($this->db->f('equipment_id', true),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'string'));
+
$control->set_location_id($this->unmarshal($this->db->f('location_id', true),
'string'));
$control->set_repeat_type($this->unmarshal($this->db->f('repeat_type', true),
'int'));
$control->set_repeat_interval($this->unmarshal($this->db->f('repeat_interval',
true), 'int'));
}
@@ -833,24 +835,22 @@
'status'
);
- $check_list->set_status(1);
$values = array(
$this->marshal($check_list->get_control_id(), 'int'),
$this->marshal($check_list->get_comment(), 'string'),
$this->marshal($check_list->get_deadline(), 'int'),
$this->marshal($check_list->get_planned_date(), 'int'),
$this->marshal($check_list->get_completed_date(),
'int'),
- 444,
- $this->marshal(sds, 'string'),
- intval(77),
- $this->marshal(88, 'int'),
+ $this->marshal($check_list->get_component_id(), 'int'),
+ $this->marshal($check_list->get_location_code(),
'string'),
+ $this->marshal($check_list->get_num_open_cases(),
'int'),
+ $this->marshal($check_list->get_num_pending_cases(),
'int'),
+ $this->marshal($check_list->get_location_id(), 'int'),
$check_list->get_status()
);
-
- //$result = $this->db->query('INSERT INTO controller_check_list
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
- $result = $this->db->query('INSERT INTO controller_check_list
(control_id,comment,deadline,planned_date,completed_date,component_id,location_code,num_open_cases,num_pending_cases,location_id,status)
values(4,' . 4 . ',4,4,4,4,' . 4 . ',4,4,2,4)');
- //$result = $this->db->query('INSERT INTO controller_check_list
values(' . 84 . ',4,' . 4 . ',4,4,4,4,' . 4 . ',4,4,2,4)');
+ $result = $this->db->query('INSERT INTO controller_check_list
(' . join(',', $cols) . ') VALUES (' . join(',', $values) . ')',
__LINE__,__FILE__);
+
return isset($result) ?
$this->db->get_last_insert_id('controller_check_list', 'id') : 0;
}
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-06-21 07:23:05 UTC (rev
9639)
+++ trunk/controller/inc/class.uicase.inc.php 2012-06-21 08:28:16 UTC (rev
9640)
@@ -36,7 +36,7 @@
phpgw::import_class('controller.socontrol');
include_class('controller', 'check_item_case', 'inc/model/');
- include_class('controller', 'status_checker', 'inc/helper/');
+ include_class('controller', 'check_list_status_updater', 'inc/helper/');
class controller_uicase extends phpgwapi_uicommon
{
@@ -133,8 +133,8 @@
$case_id = $this->so->store($case);
if($case_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
return json_encode( array( "status" => "saved"
) );
}
@@ -162,8 +162,8 @@
$case = $this->so->get_single($case_id);
if($case_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
$check_item =
$this->so_check_item->get_single($case->get_check_item_id());
$control_item =
$this->so_control_item->get_single($check_item->get_control_item_id());
@@ -376,8 +376,8 @@
$check_list_id =
$check_item->get_check_list_id();
// Updates number of open cases for check list
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
}
}
@@ -389,8 +389,8 @@
$status = $this->so->delete($case_id);
if($status){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
return json_encode( array( "status" =>
"deleted" ) );
}
@@ -410,8 +410,8 @@
$case_id = $this->so->store($case);
if($case_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
return json_encode( array( "status" => "true" )
);
}
@@ -431,8 +431,8 @@
$case_id = $this->so->store($case);
if($case_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
+ $cl_status_updater = new
check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
return json_encode( array( "status" => "true" )
);
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-06-21 07:23:05 UTC
(rev 9639)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-06-21 08:28:16 UTC
(rev 9640)
@@ -36,7 +36,7 @@
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'check_item', 'inc/model/');
include_class('controller', 'date_generator', 'inc/component/');
- include_class('controller', 'status_checker', 'inc/helper/');
+ include_class('controller', 'check_list_status_updater', 'inc/helper/');
include_class('controller', 'date_helper', 'inc/helper/');
class controller_uicheck_list extends phpgwapi_uicommon
@@ -295,9 +295,9 @@
function edit_check_list(){
$check_list_id = phpgw::get_var('check_list_id');
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_list_id );
-
+ $cl_status_updater = new check_list_status_updater();
+ $cl_status_updater->update_check_list_status(
$check_list_id );
+
$check_list = $this->so->get_single($check_list_id);
$control =
$this->so_control->get_single($check_list->get_control_id());
@@ -313,8 +313,6 @@
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
}
-
-
$data = array
(
'control' =>
$control->toArray(),
Modified: trunk/controller/inc/class.uicontrol_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-21
07:23:05 UTC (rev 9639)
+++ trunk/controller/inc/class.uicontrol_location.inc.php 2012-06-21
08:28:16 UTC (rev 9640)
@@ -41,7 +41,7 @@
include_class('controller', 'check_list', 'inc/model/');
include_class('controller', 'date_generator', 'inc/component/');
- include_class('controller', 'status_checker', 'inc/helper/');
+ include_class('controller', 'check_list_status_updater', 'inc/helper/');
include_class('controller', 'date_helper', 'inc/helper/');
class controller_uicontrol_location extends phpgwapi_uicommon
Copied: trunk/controller/inc/helper/class.check_list_status_updater.inc.php
(from rev 9520, trunk/controller/inc/helper/class.status_checker.inc.php)
===================================================================
--- trunk/controller/inc/helper/class.check_list_status_updater.inc.php
(rev 0)
+++ trunk/controller/inc/helper/class.check_list_status_updater.inc.php
2012-06-21 08:28:16 UTC (rev 9640)
@@ -0,0 +1,47 @@
+<?php
+ phpgw::import_class('controller.socheck_list');
+ phpgw::import_class('controller.socheck_item');
+
+ include_class('controller', 'check_list', 'inc/model/');
+ include_class('controller', 'check_item', 'inc/model/');
+
+ class check_list_status_updater {
+
+ 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 );
+
+ $check_items =
$this->so_check_item->get_check_items_with_cases($check_list_id,
$control_item_type = null, $status = null, $messageStatus = null,
"return_object");
+
+ $num_open_cases = 0;
+ $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);
+
+ $this->so_check_list->store($check_list);
+ }
+}
\ No newline at end of file
Deleted: trunk/controller/inc/helper/class.status_checker.inc.php
===================================================================
--- trunk/controller/inc/helper/class.status_checker.inc.php 2012-06-21
07:23:05 UTC (rev 9639)
+++ trunk/controller/inc/helper/class.status_checker.inc.php 2012-06-21
08:28:16 UTC (rev 9640)
@@ -1,47 +0,0 @@
-<?php
- phpgw::import_class('controller.socheck_list');
- phpgw::import_class('controller.socheck_item');
-
- include_class('controller', 'check_list', 'inc/model/');
- 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 );
-
- $check_items =
$this->so_check_item->get_check_items_with_cases($check_list_id,
$control_item_type = null, $status = null, $messageStatus = null,
"return_object");
-
- $num_open_cases = 0;
- $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);
-
- $this->so_check_list->store($check_list);
- }
-}
\ No newline at end of file
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9640],
Torstein <=