[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9232] Slettet en del kode relatert til sletting av f
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9232] Slettet en del kode relatert til sletting av feltene comment, status og measurement i check item. |
|
Date: |
Sun, 29 Apr 2012 16:42:21 +0000 |
Revision: 9232
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9232
Author: vator
Date: 2012-04-29 16:42:21 +0000 (Sun, 29 Apr 2012)
Log Message:
-----------
Slettet en del kode relatert til sletting av feltene comment, status og
measurement i check item.
Modified Paths:
--------------
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-04-29 15:50:16 UTC
(rev 9231)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-04-29 16:42:21 UTC
(rev 9232)
@@ -58,18 +58,12 @@
{
$cols = array(
'control_item_id',
- //'status',
- //'comment',
- 'check_list_id',
- //'measurement'
+ 'check_list_id'
);
$values = array(
$this->marshal($check_item->get_control_item_id(), 'int'),
- //$check_item->get_status(),
- //$this->marshal($check_item->get_comment(),
'string'),
-
$this->marshal($check_item->get_check_list_id(), 'int'),
-
//$this->marshal($check_item->get_measurement(), 'int')
+
$this->marshal($check_item->get_check_list_id(), 'int')
);
$result = $this->db->query('INSERT INTO
controller_check_item (' . join(',', $cols) . ') VALUES (' . join(',', $values)
. ')', __LINE__,__FILE__);
@@ -83,10 +77,7 @@
$values = array(
'control_item_id = ' .
$this->marshal($check_item->get_control_item_id(), 'int'),
- //'status = ' . $check_item->get_status(),
- //'comment = ' .
$this->marshal($check_item->get_comment(), 'string'),
- 'check_list_id = ' .
$this->marshal($check_item->get_check_list_id(), 'int'),
- //'measurement = ' .
$this->marshal($check_item->get_measurement(), 'string')
+ 'check_list_id = ' .
$this->marshal($check_item->get_check_list_id(), 'int')
);
$result = $this->db->query('UPDATE
controller_check_item SET ' . join(',', $values) . " WHERE id=$id",
__LINE__,__FILE__);
@@ -112,8 +103,6 @@
if($this->db->next_record()) {
$check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id', true), 'int'));
-
//$check_item->set_status($this->unmarshal($this->db->f('status', true),
'bool'));
-
//$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
@@ -135,7 +124,7 @@
}
public function get_single_with_cases($check_item_id,
$return_type = "return_object"){
- $sql = "SELECT ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment, ci.measurement, check_list_id, ";
+ $sql = "SELECT ci.id as ci_id, control_item_id,
check_list_id, ";
$sql .= "cic.id as cic_id, cic.status as cic_status,
cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
@@ -153,10 +142,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_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
//$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
@@ -221,8 +207,6 @@
if($this->db->next_record()) {
$check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id', true), 'int'));
-
//$check_item->set_status($this->unmarshal($this->db->f('status', true),
'bool'));
-
//$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
$check_item->set_control_item_id($this->unmarshal($this->db->f('control_item_id',
true), 'int'));
@@ -244,7 +228,7 @@
}
public function get_check_items($check_list_id, $status, $type,
$return_type = "return_object"){
- $sql = "SELECT ci.id as ci_id, ci.status,
control_item_id, ci.comment, ci.measurement, check_list_id, ";
+ $sql = "SELECT ci.id as ci_id, control_item_id,
check_list_id, ";
$sql .= "coi.id as coi_id, coi.title, coi.required,
coi.what_to_do, coi.how_to_do, coi.control_group_id, coi.type ";
$sql .= "FROM controller_check_item ci ";
$sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
@@ -263,10 +247,7 @@
while ($this->db->next_record()) {
$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('status', true),
'bool'));
-
//$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
//$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('title',
true), 'string');
@@ -290,7 +271,7 @@
}
public function get_check_items_with_cases($check_list_id,
$type = "control_item_type_1", $status = "open", $messageStatus = null,
$return_type = "return_object"){
- $sql = "SELECT ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment, check_list_id, ";
+ $sql = "SELECT ci.id as ci_id, control_item_id,
check_list_id, ";
$sql .= "cic.id as cic_id, cic.status as cic_status,
cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
@@ -338,10 +319,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->db->f('ci_status', true), 'int');
-
//$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
//$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
@@ -396,7 +374,7 @@
}
public function
get_check_items_with_cases_by_message($message_ticket_id, $return_type =
"return_object"){
- $sql = "SELECT ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment, ci.measurement, ";
+ $sql = "SELECT ci.id as ci_id, control_item_id, ";
$sql .= "check_list_id, cic.id as cic_id, cic.status as
cic_status, cic.*, ";
$sql .= "coi.id as coi_id, coi.* ";
$sql .= "FROM controller_check_item ci ";
@@ -423,10 +401,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_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
//$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('title', true), 'string');
@@ -494,10 +469,7 @@
while ($this->db->next_record()) {
$check_item = new
controller_check_item($this->unmarshal($this->db->f('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('status', true),
'bool'));
-
//$check_item->set_comment($this->unmarshal($this->db->f('comment', true),
'string'));
$check_item->set_check_list_id($this->unmarshal($this->db->f('check_list_id',
true), 'int'));
-
//$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
if($return_type == "return_array")
$check_items_array[] =
$check_item->toArray();
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-04-29 15:50:16 UTC
(rev 9231)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-04-29 16:42:21 UTC
(rev 9232)
@@ -53,8 +53,8 @@
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, ci.status as ci_status,
control_item_id, ";
- $sql .= "ci.comment as ci_comment, check_list_id ";
+ $sql .= "completed_date, location_code, component_id,
num_open_cases, num_pending_cases, 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 ";
$sql .= "WHERE cl.id = $check_list_id";
@@ -81,8 +81,6 @@
$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),
'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'));
$check_items_array[] = $check_item;
@@ -100,7 +98,7 @@
public function get_single_with_check_items($check_list_id, $status,
$type){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.control_id, cl.comment as cl_comment, deadline, planned_date,
completed_date, num_open_cases, location_code, num_pending_cases, ";
- $sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id, ";
+ $sql .= "ci.id as ci_id, control_item_id, check_list_id, ";
$sql .= "coi.title as coi_title, coi.required as coi_required,
";
$sql .= "coi.what_to_do as coi_what_to_do, coi.how_to_do as
coi_how_to_do, coi.control_group_id as coi_control_group_id, coi.type ";
$sql .= "FROM controller_check_list cl ";
@@ -139,10 +137,7 @@
if($this->db->f('ci_id', true) != ''){
$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_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'));
-
$check_item->set_measurement($this->unmarshal($this->db->f('measurement',
true), 'int'));
$control_item = new
controller_control_item($this->unmarshal($this->db->f('coi_id', true), 'int'));
$control_item->set_title($this->db->f('coi_title', true), 'string');
@@ -167,7 +162,7 @@
return null;
}
}
-
+ /*
public function get_check_list(){
$current_time = time();
@@ -208,11 +203,11 @@
return $results;
}
-
+ */
function get_check_lists_for_control($control_id){
$sql = "SELECT cl.id as cl_id, cl.status as cl_status,
cl.comment as cl_comment, deadline, planned_date, ";
$sql .= "completed_date, component_id, location_code,
num_open_cases, num_pending_cases ";
- $sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id ";
+ $sql .= "ci.id as ci_id, control_item_id, check_list_id ";
$sql .= "FROM controller_check_list cl, controller_check_item
ci ";
$sql .= "WHERE cl.control_id = $control_id ";
$sql .= "AND cl.id = ci.check_list_id ";
@@ -247,8 +242,6 @@
$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),
'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'));
$check_items_array[] = $check_item->toArray();
@@ -311,17 +304,17 @@
function get_agg_check_lists_for_location( $location_code,
$from_date_ts, $to_date_ts, $control_id = 0 ){
- $sql = "SELECT c.id as c_id, title, start_date, end_date,
cl.id as cl_id, c.repeat_type, c.repeat_interval, cl.deadline, count(ci.id) ";
+ $sql = "SELECT c.id as c_id, title, start_date, end_date,
cl.id as cl_id, c.repeat_type, c.repeat_interval, cl.deadline,
count(cl.num_open_cases) ";
$sql .= "FROM controller_check_list cl, controller_control c,
controller_check_item ci ";
$sql .= "WHERE cl.location_code = '{$location_code}' ";
+
if($control_id > 0)
{
$sql .= "AND c.id = {$control_id} ";
}
+
$sql .= "AND c.repeat_type < 2 ";
$sql .= "AND cl.control_id = c.id ";
- $sql .= "AND cl.id = ci.check_list_id ";
- $sql .= "AND ci.status = 0 ";
$sql .= "AND deadline BETWEEN $from_date_ts AND $to_date_ts ";
$sql .= "GROUP BY c.id, title, start_date, end_date, cl.id,
cl.deadline, c.repeat_type, c.repeat_interval ";
$sql .= "ORDER BY c.id";
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2012-04-29 15:50:16 UTC (rev
9231)
+++ trunk/controller/inc/class.uicase.inc.php 2012-04-29 16:42:21 UTC (rev
9232)
@@ -99,13 +99,7 @@
$new_check_item = new controller_check_item();
$new_check_item->set_check_list_id(
$check_list_id );
$new_check_item->set_control_item_id(
$control_item_id );
- if($status == 0)
- $new_check_item->set_status(
controller_check_item_case::STATUS_OPEN );
- else
- $new_check_item->set_status(
controller_check_item_case::STATUS_CLOSED );
-
- $new_check_item->set_comment( null );
-
+
$saved_check_item_id =
$this->so_check_item->store( $new_check_item );
$check_item =
$this->so_check_item->get_single($saved_check_item_id);
}
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-04-29 15:50:16 UTC
(rev 9231)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-04-29 16:42:21 UTC
(rev 9232)
@@ -64,13 +64,12 @@
'register_case' => true,
'view_open_cases' => true,
'view_closed_cases' => true,
-
'view_measurements' => true,
+
//'view_measurements' => true, SLETT HVIS DET IKKE
OPPSTÅR FEILMELDINGER
'view_control_details' => true,
'view_control_items' => true,
-
'add_check_item_to_list' => true,
-
'save_check_items' => true,
-
'save_check_item' => true,
-
'get_check_list_info' => true,
+
//'save_check_items' => true, SLETT HVIS DET IKKE
OPPSTÅR FEILMELDINGER
+
//'save_check_item' => true, SLETT HVIS DET IKKE
OPPSTÅR FEILMELDINGER
+
'get_check_list_info' => true,
'get_cases_for_check_list' => true
);
@@ -694,17 +693,15 @@
self::render_template_xsl('check_list/view_control_items', $data);
}
-
+ /*
+ *
+ * HVIS DETTE IKKE RESULTERER I FEILMELDINGER KAN VI BARE
SLETTE DISS FUNKSJONENE
function add_check_item_to_list(){
$control_item_id = phpgw::get_var('control_item_id');
$check_list_id = phpgw::get_var('check_list_id');
- $comment = phpgw::get_var('comment');
- $status = (int)phpgw::get_var('status');
$type = phpgw::get_var('type');
$check_item_obj = new controller_check_item();
- $check_item_obj->set_status($status);
- $check_item_obj->set_comment($comment);
$check_item_obj->set_check_list_id($check_list_id);
$check_item_obj->set_control_item_id($control_item_id);
@@ -726,14 +723,8 @@
$check_list_id = phpgw::get_var('check_list_id');
foreach($check_item_ids as $check_item_id){
- $status = phpgw::get_var('status_' .
$check_item_id);
- $comment = phpgw::get_var('comment_' .
$check_item_id);
-
$check_item =
$this->so_check_item->get_single($check_item_id);
- $check_item->set_status( $status );
- $check_item->set_comment( $comment );
-
$this->so_check_item->store( $check_item );
}
@@ -770,7 +761,7 @@
else
return json_encode( array( "status" =>
"not_saved" ) );
}
-
+ */
// Returns check list info as JSON
public function get_check_list_info()
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9232] Slettet en del kode relatert til sletting av feltene comment, status og measurement i check item.,
Torstein <=