[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8599]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8599] |
|
Date: |
Tue, 17 Jan 2012 17:43:10 +0000 |
Revision: 8599
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8599
Author: vator
Date: 2012-01-17 17:43:10 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
trunk/controller/inc/helper/class.status_checker.inc.php
trunk/controller/templates/base/check_list/add_check_list.xsl
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-01-17 16:50:22 UTC
(rev 8598)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-01-17 17:43:10 UTC
(rev 8599)
@@ -68,7 +68,7 @@
if($counter == 0){
$check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
$check_list->set_control_id($this->unmarshal($this->db->f('control_id', true),
'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
@@ -80,7 +80,7 @@
$check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'int'));
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
@@ -227,7 +227,7 @@
}
$check_list = new
controller_check_list($this->unmarshal($this->db->f('cl_id', true), 'int'));
-
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'bool'));
+
$check_list->set_status($this->unmarshal($this->db->f('cl_status', true),
'int'));
$check_list->set_comment($this->unmarshal($this->db->f('cl_comment', true),
'string'));
$check_list->set_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
@@ -241,7 +241,7 @@
$check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
-
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'bool'));
+
$check_item->set_status($this->unmarshal($this->db->f('ci_status', true),
'int'));
$check_item->set_comment($this->unmarshal($this->db->f('ci_comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
@@ -538,7 +538,6 @@
$control->set_responsibility_id($this->unmarshal($this->db->f('responsibility_id',
true), 'int'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
-//
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
$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), 'int'));
@@ -583,10 +582,10 @@
function update($check_list)
{
$id = intval($check_list->get_id());
-
+
$values = array(
'control_id = ' .
$this->marshal($check_list->get_control_id(), 'int'),
- 'status = ' . $this->marshal($check_list->get_status(),
'int'),
+ 'status = ' . $check_list->get_status(),
'comment = ' .
$this->marshal($check_list->get_comment(), 'string'),
'deadline = ' .
$this->marshal($check_list->get_deadline(), 'int'),
'planned_date = ' .
$this->marshal($check_list->get_planned_date(), 'int'),
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-17 16:50:22 UTC (rev 8598)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-17 17:43:10 UTC (rev 8599)
@@ -424,23 +424,29 @@
$location_code = phpgw::get_var('location_code');
$control_id = phpgw::get_var('control_id');
$status = phpgw::get_var('status');
-
+
+ $deadline_date = phpgw::get_var('deadline_date',
'string');
$planned_date = phpgw::get_var('planned_date',
'string');
$completed_date = phpgw::get_var('completed_date',
'string');
- $deadline_date = phpgw::get_var('deadline_date',
'string');
-
- $planned_date_ts = $this->get_timestamp_from_date(
$planned_date );
- $deadline_date_ts = $this->get_timestamp_from_date(
$deadline_date );
+
+ if($planned_date != '')
+ $planned_date_ts =
$this->get_timestamp_from_date( $planned_date );
+
+ if($deadline_date != '')
+ $deadline_date_ts =
$this->get_timestamp_from_date( $deadline_date );
+ if($completed_date != '')
+ $completed_date_ts =
$this->get_timestamp_from_date( $completed_date );
+
$check_list = new controller_check_list();
$check_list->set_location_code($location_code);
$check_list->set_control_id($control_id);
$check_list->set_status($status);
$check_list->set_deadline( $deadline_date_ts );
$check_list->set_planned_date($planned_date_ts);
- $check_list->set_completed_date($completed_date);
+ $check_list->set_completed_date($completed_date_ts);
- $check_list_id = $this->so_check_list->add($check_list);
+ $check_list_id =
$this->so_check_list->store($check_list);
$this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list',
'check_list_id'=>$check_list_id));
}
Modified: trunk/controller/inc/helper/class.status_checker.inc.php
===================================================================
--- trunk/controller/inc/helper/class.status_checker.inc.php 2012-01-17
16:50:22 UTC (rev 8598)
+++ trunk/controller/inc/helper/class.status_checker.inc.php 2012-01-17
17:43:10 UTC (rev 8599)
@@ -16,7 +16,7 @@
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;
$check_items =
$this->so_check_item->get_check_items_with_cases($check_list_id, $status,
$control_item_type, "return_object");
@@ -37,6 +37,7 @@
}
$check_list->set_num_open_cases($num_open_cases);
+
$this->so_check_list->store($check_list);
}
}
\ No newline at end of file
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2012-01-17 16:50:22 UTC (rev 8598)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-01-17 17:43:10 UTC (rev 8599)
@@ -29,7 +29,7 @@
<h3 class="box_header">Sjekklistedetaljer</h3>
<fieldset class="check_list_details">
- <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list_for_location"
method="post">
+ <form id="frm_add_check_list"
action="index.php?menuaction=controller.uicheck_list_for_location.save_check_list"
method="post">
<div id="calendar_dates">
<xsl:for-each select="calendar_array">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8599],
Torstein <=