[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8466]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8466] |
|
Date: |
Mon, 02 Jan 2012 07:47:17 +0000 |
Revision: 8466
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8466
Author: vator
Date: 2012-01-02 07:47:16 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uierror_report_message.inc.php
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2011-12-30 15:51:02 UTC
(rev 8465)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-01-02 07:47:16 UTC
(rev 8466)
@@ -51,7 +51,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, ci.id as ci_id, ci.status as
ci_status, control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.id = $check_list_id
AND cl.id = ci.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,
completed_date, location_code, ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id FROM
controller_check_list cl, controller_check_item ci WHERE cl.id = $check_list_id
AND cl.id = ci.check_list_id;";
$this->db->query($sql);
$counter = 0;
@@ -63,7 +63,10 @@
$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_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_deadline($this->unmarshal($this->db->f('deadline', true),
'int'));
+
$check_list->set_planned_date($this->unmarshal($this->db->f('planned_date',
true), 'int'));
+
$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), 'int'));
}
$check_item = new
controller_check_item($this->unmarshal($this->db->f('ci_id', true), 'int'));
@@ -72,14 +75,14 @@
$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();
+ $check_items_array[] = $check_item;
$counter++;
}
if($check_list != null){
$check_list->set_check_item_array($check_items_array);
- return $check_list->toArray();
+ return $check_list;
}else {
return null;
}
@@ -92,7 +95,7 @@
$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 ";
$sql .= "FROM controller_check_list cl ";
$sql .= "LEFT JOIN controller_check_item as ci ON cl.id =
ci.check_list_id ";
- $sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id=coi.id ";
+ $sql .= "LEFT JOIN controller_control_item as coi ON
ci.control_item_id = coi.id ";
$sql .= "WHERE cl.id = $check_list_id";
if($status == 'open')
@@ -480,7 +483,25 @@
return isset($result) ?
$this->db->get_last_insert_id('controller_check_list', 'id') : 0;
}
- function update($object){}
+ 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'),
+ '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'),
+ 'completed_date = ' .
$this->marshal($check_list->get_completed_date(), 'int'),
+ 'location_code = ' .
$this->marshal($check_list->get_location_code(), 'int'),
+ 'component_id = ' .
$this->marshal($check_list->get_component_id(), 'int'),
+ );
+
+ $result = $this->db->query('UPDATE controller_check_list SET '
. join(',', $values) . " WHERE id=$id", __LINE__,__FILE__);
+
+ return isset($result);
+ }
function get_id_field_name($extended_info = false)
{
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2011-12-30 15:51:02 UTC
(rev 8465)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-02 07:47:16 UTC
(rev 8466)
@@ -55,7 +55,8 @@
'save_check_item'
=> true,
'get_check_list_info' =>
true,
'control_calendar_status_overview' => true,
- 'add_check_item_to_list' =>
true
+ 'add_check_item_to_list' =>
true,
+ 'update_check_list'
=> true
);
public function __construct()
@@ -195,7 +196,7 @@
{
$check_list_id = phpgw::get_var('check_list_id');
$check_list =
$this->so_check_list->get_single_with_check_items($check_list_id, "open");
-
+
return json_encode( $check_list );
}
@@ -214,7 +215,33 @@
self::render_template_xsl('edit_check_list', $data);
}
+
+ public function update_check_list(){
+ $check_list_id = phpgw::get_var('check_list_id');
+ $status = phpgw::get_var('status');
+ $comment = phpgw::get_var('comment');
+ $deadline_date = phpgw::get_var('deadline_date');
+ $completed_date = phpgw::get_var('completed_date');
+ $planned_date = phpgw::get_var('planned_date');
+
+ $planned_date_ts = $this->get_timestamp_from_date(
$planned_date );
+ $completed_date_ts = $this->get_timestamp_from_date(
$completed_date );
+
+ // Fetches check_list from DB
+ $update_check_list =
$this->so_check_list->get_single($check_list_id);
+ $update_check_list->set_status( $status );
+ $update_check_list->set_comment( $comment );
+ $update_check_list->set_completed_date(
$completed_date_ts );
+ $update_check_list->set_planned_date( $planned_date_ts
);
+ $check_list_id = $this->so_check_list->update(
$update_check_list );
+
+ if($check_list_id > 0)
+ return json_encode( array( "saveStatus" =>
"updated" ) );
+ else
+ return json_encode( array( "saveStatus" =>
"not_updated" ) );
+ }
+
public function control_calendar_status_overview()
{
$control_id = phpgw::get_var('control_id');
@@ -338,7 +365,7 @@
if($check_item_id > 0)
return json_encode( array( "saveStatus" =>
"saved" ) );
else
- return json_encode( array( "status" =>
"not_saved" ) );
+ return json_encode( array( "saveStatus" =>
"not_saved" ) );
}
public function save_check_list(){
@@ -487,4 +514,17 @@
return $this->yui_results($results);
}
+
+ function get_timestamp_from_date( $date_string ){
+ $pos_day = strpos($date_string, "/");
+ $day = substr($date_string, 0, $pos_day);
+
+ $pos_month = strpos($date_string, "-");
+ $len_month = $pos_month - $pos_day -1;
+ $month = substr($date_string, $pos_day+1, $len_month);
+
+ $year = substr($date_string, $pos_month + $len_month-1,
strlen($date_string)-1);
+
+ return mktime(0, 0, 0, $month, $day, $year);
+ }
}
Modified: trunk/controller/inc/class.uierror_report_message.inc.php
===================================================================
--- trunk/controller/inc/class.uierror_report_message.inc.php 2011-12-30
15:51:02 UTC (rev 8465)
+++ trunk/controller/inc/class.uierror_report_message.inc.php 2012-01-02
07:47:16 UTC (rev 8466)
@@ -80,12 +80,10 @@
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$catsObj = CreateObject('phpgwapi.categories', -1,
'property', '.ticket');
-
- $this->cat_id = 89;
- $this->cats->supress_info = true;
+ $catsObj->supress_info = true;
+
$categories =
$catsObj->formatted_xslt_list(array('select_name' =>
'values[cat_id]','selected' => $this->cat_id, 'use_acl' =>
$this->_category_acl));
-
$data = array
(
'categories' => $categories,
@@ -110,6 +108,7 @@
$check_item_ids = phpgw::get_var('check_item_ids');
$location_code = phpgw::get_var('location_code');
$message_title = phpgw::get_var('message_title');
+ $message_cat_id = phpgw::get_var('message_cat_id');
$check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
@@ -130,13 +129,13 @@
$ticket = array
(
- 'origin' => $location_id,
- 'origin_id' => $location_item_id,
- 'location_code' => $location_code,
- 'cat_id' => $cat_id,
- 'priority' => $priority, //valgfri
(1-3)
- 'title' => $message_title,
- 'details' => $details,
+ 'origin' => $location_id,
+ 'origin_id' =>
$location_item_id,
+ 'location_code' => $location_code,
+ 'cat_id' =>
$message_cat_id,
+ 'priority' => $priority,
//valgfri (1-3)
+ 'title' =>
$message_title,
+ 'details' => $details,
'file_input_name' => 'file' // default,
men valgfri
);
@@ -151,9 +150,15 @@
$message_ticket =
$botts->read_single($message_ticket_id);
+ $catsObj = CreateObject('phpgwapi.categories', -1,
'property', '.ticket');
+ $catsObj->supress_info = true;
+
+ $category =
$catsObj->return_single($message_ticket["cat_id"]);
+
$data = array
(
'message_ticket' =>
$message_ticket,
+ 'category' =>
$category[0]['name'],
'location_array' =>
$location_array,
'control_array' =>
$control->toArray(),
'check_list' =>
$check_list_with_check_items,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8466],
Torstein <=