[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8419]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8419] |
|
Date: |
Fri, 23 Dec 2011 09:54:15 +0000 |
Revision: 8419
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8419
Author: vator
Date: 2011-12-23 09:54:15 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicheck_list_for_location.inc.php
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2011-12-23 09:53:58 UTC
(rev 8418)
+++ trunk/controller/inc/class.socheck_list.inc.php 2011-12-23 09:54:15 UTC
(rev 8419)
@@ -86,7 +86,7 @@
}
public function get_single_with_check_items($check_list_id, $status){
- $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, ";
+ $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, ";
$sql .= "ci.id as ci_id, ci.status as ci_status,
control_item_id, ci.comment as ci_comment, check_list_id, ";
$sql .= "coi.title as coi_id, coi.title as coi_title,
coi.required as coi_required, 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 ";
@@ -113,6 +113,7 @@
$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'));
}
if($this->db->f('ci_id', true) != ''){
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2011-12-23 09:53:58 UTC
(rev 8418)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2011-12-23 09:54:15 UTC
(rev 8419)
@@ -312,8 +312,8 @@
{
$results = array();
- $sql = "SELECT ci.* FROM controller_control_item ci,
controller_control_item_list cl, controller_control c ";
- $sql .= "WHERE c.id=$control_id AND c.id=cl.control_id
AND cl.control_item_id=ci.id";
+ $sql = "SELECT ci.* FROM controller_control_item ci,
controller_control_item_list cl ";
+ $sql .= "WHERE cl.control_id=$control_id AND
cl.control_item_id=ci.id";
$this->db->query($sql);
while ($this->db->next_record()) {
@@ -326,7 +326,6 @@
$results[] = $control_item;
}
-
return $results;
}
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2011-12-23
09:53:58 UTC (rev 8418)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2011-12-23
09:54:15 UTC (rev 8419)
@@ -82,20 +82,6 @@
}
}
- /**
- * Update the database values for an existing activity object.
- *
- * @param $activity the activity to be updated
- * @return boolean true if successful, false otherwise
- */
-
- /**
- * Update the database values for an existing activity object.
- *
- * @param $activity the activity to be updated
- * @return boolean true if successful, false otherwise
- */
-
function update($control_item_list)
{
$id = intval($control_item_list->get_id());
@@ -161,21 +147,8 @@
return isset($result);
}
- /**
- * Get a list of procedure objects matching the specific filters
- *
- * @param $start search result offset
- * @param $results number of results to return
- * @param $sort field to sort by
- * @param $query LIKE-based query string
- * @param $filters array of custom filters
- * @return list of rental_composite objects
- */
- function get_control_item_array($start = 0, $results = 1000,
$sort = null, $dir = '', $query = null, $search_option = null, $filters =
array())
- {
+ function get_control_item_array($start = 0, $results = 1000,
$sort = null, $dir = '', $query = null, $search_option = null, $filters =
array()){}
- }
-
function get_id_field_name($extended_info = false)
{
}
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2011-12-23 09:53:58 UTC
(rev 8418)
+++ trunk/controller/inc/class.uicalendar.inc.php 2011-12-23 09:54:15 UTC
(rev 8419)
@@ -96,12 +96,13 @@
$repeat_type = 0;
$check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date, $to_date,
$repeat_type);
+
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $check_list_array, null, 31,
"view_days" );
-
- print_r( $controls_calendar_array );
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+ $month_array = array("Januar", "Februar", "Mars",
"April", "Mai", "Juni", "Juli", "August", "September", "Oktober", "November",
"Desember");
+
for($i=1;$i<=31;$i++){
$heading_array[$i] = "$i";
}
@@ -112,7 +113,7 @@
'heading_array' =>
$heading_array,
'controls_calendar_array' =>
$controls_calendar_array,
'date_format' =>
$date_format,
- 'period' =>
$month,
+ 'period' =>
$month_array[ $month - 1],
'year' =>
$year
);
@@ -146,11 +147,11 @@
$repeat_type = 2;
$control_check_list_array =
$this->so->get_check_lists_for_location( $location_code, $from_date, $to_date,
$repeat_type );
$controls_calendar_array =
$this->calendar_builder->build_calendar_array( $control_check_list_array,
$controls_calendar_array, 12, "view_months" );
-
+
$location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$heading_array = array("Jan", "Feb", "Mar", "Apr",
"Mai", "Jun", "Jul", "Aug", "Sep", "Okt", "Nov", "Des");
-
+
$data = array
(
'location_array' =>
$location_array,
Modified: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2011-12-23 09:53:58 UTC (rev 8418)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2011-12-23 09:54:15 UTC (rev 8419)
@@ -58,7 +58,8 @@
'add_location_to_control' => true,
'add_check_list_for_location' => true,
'save_check_list_for_location' => true,
-
'edit_check_list_for_location' => true
+
'edit_check_list_for_location' => true,
+
'create_error_report_message' => true
);
function __construct()
@@ -312,7 +313,6 @@
$control_id = phpgw::get_var('control_id');
$date = phpgw::get_var('date');
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$control = $this->so_control->get_single($control_id);
if($date == null || $date == ''){
@@ -338,7 +338,9 @@
{
$calendar_array[] = $date;
}
-
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
$data = array
(
'location_array' => $location_array,
@@ -359,8 +361,10 @@
function edit_check_list_for_location(){
$check_list_id = phpgw::get_var('check_list_id');
-
+
$check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
+
+ $location_code =
$check_list_with_check_items["location_code"];
$control_item_list_all =
$this->so_control_item->get_control_items_by_control_id($check_list_with_check_items["control_id"]);
@@ -380,10 +384,11 @@
$date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- print_r($control_item_list_stripped);
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
$data = array
(
+ 'location_array' => $location_array,
'check_list' =>
$check_list_with_check_items,
'control_items_list' =>
$control_item_list_stripped,
'date_format' => $date_format
@@ -405,34 +410,70 @@
$status = phpgw::get_var('status');
$planned_date = phpgw::get_var('planned_date',
'string');
- $completed_date = strtotime(
phpgw::get_var('completed_date', 'string') );
- $deadline_date = strtotime(
phpgw::get_var('deadline_date', 'string') );
+ $completed_date = phpgw::get_var('completed_date',
'string');
+ $deadline_date = phpgw::get_var('deadline_date',
'string');
- $pos_day = strpos($planned_date, "/");
- $day = substr($planned_date, 0, $pos_day);
+ $planned_date_ts = $this->get_timestamp_from_date(
$planned_date );
+ $deadline_date_ts = $this->get_timestamp_from_date(
$deadline_date );
- $pos_month = strpos($planned_date, "-");
- $len_month = $pos_month - $pos_day -1;
- $month = substr($planned_date, $pos_day+1, $len_month);
-
- $year = substr($planned_date, $pos_month +
$len_month-1, strlen($planned_date)-1);
-
- $planned_date = mktime(0, 0, 0, $month, $day, $year);
-
$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 );
- $check_list->set_planned_date($planned_date);
+ $check_list->set_deadline( $deadline_date_ts );
+ $check_list->set_planned_date($planned_date_ts);
$check_list->set_completed_date($completed_date);
-
- $check_list_id =
$this->so_check_list->add($check_list);
-
+ $check_list_id = $this->so_check_list->add($check_list);
+
$this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list_for_location',
'check_list_id'=>$check_list_id));
}
+ function create_error_report_message(){
+ $check_list_id = phpgw::get_var('check_list_id');
+
+ $check_list_with_check_items =
$this->so_check_list->get_single_with_check_items($check_list_id);
+
+ $control_id =
$check_list_with_check_items["control_id"];
+ $control = $this->so_control->get_single( $control_id );
+
+ $location_code =
$check_list_with_check_items["location_code"];
+
+ $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
+
+ $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
+
+ $data = array
+ (
+ 'location_array' =>
$location_array,
+ 'control_array' =>
$control->toArray(),
+ 'check_list' =>
$check_list_with_check_items,
+ 'date_format' => $date_format
+ );
+
+ self::add_javascript('controller', 'controller',
'jquery.js');
+ self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
+ self::add_javascript('controller', 'controller',
'custom_ui.js');
+ self::add_javascript('controller', 'controller',
'ajax.js');
+
+
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
+
+
self::render_template_xsl('create_error_report_message', $data);
+ }
+
+ 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);
+ }
+
public function query(){
$type_id = phpgw::get_var('type_id');
$return_results = phpgw::get_var('results', 'int',
'REQUEST', 0);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8419],
Torstein <=