[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8724]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8724] |
|
Date: |
Mon, 30 Jan 2012 18:13:04 +0000 |
Revision: 8724
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8724
Author: vator
Date: 2012-01-30 18:13:03 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socheck_list.inc.php
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/component/class.calendar_builder.inc.php
trunk/controller/inc/component/class.date_generator.inc.php
trunk/controller/templates/base/check_list/cases_tab_menu.xsl
trunk/controller/templates/base/check_list/view_closed_cases.xsl
trunk/controller/templates/base/check_list/view_open_cases.xsl
Removed Paths:
-------------
trunk/controller/inc/class.uicheck_list_for_location.inc.php
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2012-01-30 18:11:39 UTC
(rev 8723)
+++ trunk/controller/inc/class.socheck_item.inc.php 2012-01-30 18:13:03 UTC
(rev 8724)
@@ -302,6 +302,8 @@
$sql .= "AND cic.status = 0 ";
else if($status == 'closed')
$sql .= "AND cic.status = 1 ";
+ else if($status == 'open_or_waiting')
+ $sql .= "AND cic.status = 0 OR cic.status = 2";
if($messageStatus != null & $messageStatus ==
'no_message_registered')
$sql .= "AND cic.location_item_id IS NULL ";
Modified: trunk/controller/inc/class.socheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_list.inc.php 2012-01-30 18:11:39 UTC
(rev 8723)
+++ trunk/controller/inc/class.socheck_list.inc.php 2012-01-30 18:13:03 UTC
(rev 8724)
@@ -267,7 +267,7 @@
$sql .= "FROM controller_check_list cl ";
$sql .= "WHERE cl.control_id = $control_id ";
$sql .= "ORDER BY cl.id;";
- //var_dump($sql);
+
$this->db->query($sql);
$check_list_id = 0;
@@ -665,7 +665,7 @@
$values = array(
'control_id = ' .
$this->marshal($check_list->get_control_id(), 'int'),
'status = ' . $check_list->get_status(),
- 'comment = ' .
$this->marshal($check_list->get_comment(), 'string'),
+ 'comment = ' . $check_list->get_comment(),
'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'),
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-30 18:11:39 UTC
(rev 8723)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-30 18:13:03 UTC
(rev 8724)
@@ -92,8 +92,6 @@
$this->calendar_builder = new
calendar_builder($from_date_ts, $to_date_ts);
- $repeat_type = 0;
-
$criteria = array
(
'user_id' =>
$GLOBALS['phpgw_info']['user']['account_id'],
@@ -111,9 +109,9 @@
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
$month, $year) ;
- $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+ $controls_for_location_array =
$this->so_control->get_controls_by_location($location_code, $from_date_ts,
$to_date_ts);
- $control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts, $repeat_type);
+ $control_id_with_check_list_array =
$this->so->get_check_lists_for_location_2($location_code, $from_date_ts,
$to_date_ts);
$controls_with_check_list =
$this->populate_controls_with_check_lists($controls_for_location_array,
$control_id_with_check_list_array);
Deleted: trunk/controller/inc/class.uicheck_list_for_location.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-30 18:11:39 UTC (rev 8723)
+++ trunk/controller/inc/class.uicheck_list_for_location.inc.php
2012-01-30 18:13:03 UTC (rev 8724)
@@ -1,616 +0,0 @@
-<?php
- /**
- * phpGroupWare - controller: a part of a Facilities Management System.
- *
- * @author Erink Holm-Larsen <address@hidden>
- * @author Torstein Vadla <address@hidden>
- * @copyright Copyright (C) 2011,2012 Free Software Foundation, Inc.
http://www.fsf.org/
- * This file is part of phpGroupWare.
- *
- * phpGroupWare is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * phpGroupWare is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with phpGroupWare; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
USA
- *
- * @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
- * @internal Development of this application was funded by
http://www.bergen.kommune.no/
- * @package property
- * @subpackage controller
- * @version $Id$
- */
-
- phpgw::import_class('phpgwapi.yui');
- phpgw::import_class('controller.uicommon');
- phpgw::import_class('controller.socontrol_area');
- phpgw::import_class('controller.socheck_list');
-
- include_class('controller', 'check_list', 'inc/model/');
- include_class('controller', 'date_generator', 'inc/component/');
- include_class('controller', 'status_checker', 'inc/helper/');
- include_class('controller', 'date_helper', 'inc/helper/');
- include_class('controller', 'check_item', 'inc/model/');
-
- class controller_uicheck_list_for_location extends controller_uicommon
- {
- private $so;
- private $so_control_area;
- private $so_control;
- private $so_control_item;
- private $so_check_item;
- private $so_procedure;
- private $so_control_group_list;
- private $so_control_item_list;
-
- var $public_functions = array(
-
'add_check_list' => true,
-
'save_check_list' => true,
-
'edit_check_list' => true,
-
'create_case_message' => true,
-
'view_control_info' => true,
-
'view_cases_for_check_list' => true,
-
'update_check_list' => true,
-
'print_check_list' => true,
-
'register_case' => true,
-
'view_open_cases' => true,
-
'view_closed_cases' => true,
-
'view_measurements' => true,
-
'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,
-
'get_cases_for_check_list' => true
- );
-
- function __construct()
- {
- parent::__construct();
-
- $this->so_control_area =
CreateObject('controller.socontrol_area');
- $this->so_control =
CreateObject('controller.socontrol');
- $this->so =
CreateObject('controller.socheck_list');
- $this->so_control_item =
CreateObject('controller.socontrol_item');
- $this->so_check_item =
CreateObject('controller.socheck_item');
- $this->so_procedure =
CreateObject('controller.soprocedure');
- $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
- $this->so_control_item_list =
CreateObject('controller.socontrol_item_list');
-
-
self::set_active_menu('controller::control::check_list');
- }
-
- function add_check_list(){
- $location_code = phpgw::get_var('location_code');
- $control_id = phpgw::get_var('control_id');
- $date = phpgw::get_var('date');
-
- $control = $this->so_control->get_single($control_id);
-
- if($date == null || $date == ''){
- $todays_date = mktime(0,0,0, date("m"),
date("d"), date("Y"));
- $period_start_date = $todays_date;
-
- if( $control->get_repeat_type() == 1 )
- {
- $period_end_date = mktime(0,0,0,
date("m")+1, date("d"), date("Y"));
- }else if( $control->get_repeat_type() == 2 )
- {
- $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + 1);
- }else if( $control->get_repeat_type() == 3 )
- {
- $period_end_date = mktime(0,0,0,
date("m"), date("d"), date("Y") + $control->get_repeat_interval());
- }
-
- $date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$period_start_date, $period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
-
- $calendar_array = $date_generator->get_dates();
- }
- else
- {
- $calendar_array[] = $date;
- }
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'location_array' => $location_array,
- 'control_array' => $control->toArray(),
- 'deadline' =>
$calendar_array[0],
- 'date_format' => $date_format
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
-
$GLOBALS['phpgw']->css->add_external_file('controller/templates/base/css/jquery-ui.custom.css');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/add_check_list'),
$data);
- }
-
- function edit_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $location_code = $check_list->get_location_code();
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'location_array' => $location_array,
- '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(array('check_list/check_list_tab_menu','check_list/edit_check_list'),
$data);
- }
-
- function view_cases_for_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $date_format =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
- $location_code = $check_list->get_location_code();
-
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'location_array' => $location_array,
- '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(array('check_list/check_list_tab_menu',
'check_list/view_cases_for_check_list'), $data);
- }
-
- function save_check_list(){
- $location_code = phpgw::get_var('location_code');
- $control_id = phpgw::get_var('control_id');
- $status = (int)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');
-
- $comment = phpgw::get_var('comment', 'string');
-
- if($planned_date != '')
- $planned_date_ts =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
-
- if($deadline_date != '')
- $deadline_date_ts =
date_helper::get_timestamp_from_date( $deadline_date, "d/m-Y" );
-
- if($completed_date != '')
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
-
- $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_comment($comment);
- $check_list->set_deadline( $deadline_date_ts );
- $check_list->set_planned_date($planned_date_ts);
- $check_list->set_completed_date($completed_date_ts);
-
- $check_list_id = $this->so->store($check_list);
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.edit_check_list',
'check_list_id'=>$check_list_id));
- }
-
- function create_case_message(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list_with_check_items =
$this->so->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_case_messsage',
$data);
- }
-
- public function view_control_info(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
- array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
- $control_areas_array2 = array();
-
- foreach($control_areas['cat_list'] as $cat_list)
- {
- $control_areas_array2[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
-
- // Fetches prosedures that are related to first control
area in list
- $control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
- $role_array = $this->so_control->get_roles();
-
- $location_code = $check_list->get_location_code();
- $location_array =
execMethod('property.bolocation.read_single', array('location_code' =>
$location_code));
-
- $data = array
- (
- 'location_array' =>
$location_array,
- 'control' =>
$control->toArray(),
- 'check_list' =>
$check_list->toArray(),
- 'date_format' => $date_format,
- 'control_areas_array2' => array('options' =>
$control_areas_array2),
- 'procedures_array' =>
$procedures_array,
- 'role_array' => $role_array
- );
-
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'jquery-ui.custom.min.js');
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu','check_list/view_control_info'),
$data);
- }
-
- public function update_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
- $status = (int)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 =
date_helper::get_timestamp_from_date( $planned_date, "d/m-Y" );
- $completed_date_ts =
date_helper::get_timestamp_from_date( $completed_date, "d/m-Y" );
-
- // Fetches check_list from DB
- $update_check_list =
$this->so->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->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 print_check_list(){
- $check_list_id = phpgw::get_var('check_list_id');
- $check_list = $this->so->get_single($check_list_id);
-
- $control =
$this->so_control->get_single($check_list->get_control_id());
- $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
-
- $saved_groups_with_items_array = array();
-
- //Populating array with saved control items for each
group
- foreach ($control_groups as $control_group)
- {
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
-
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
- }
-
- $data = array
- (
- 'saved_groups_with_items_array' =>
$saved_groups_with_items_array,
- 'check_list'
=> $check_list->toArray()
- );
-
-
self::render_template_xsl('check_list/print_check_list', $data);
- }
-
- function view_control_details(){
- $control_id = phpgw::get_var('control_id');
-
- $control = $this->so_control->get_single($control_id);
-
- // Sigurd: START as categories
- $cats = CreateObject('phpgwapi.categories', -1,
'controller', '.control');
- $cats->supress_info = true;
-
- $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','selected' =>
$control_area_id,'globals' => true,'use_acl' => $this->_category_acl));
- array_unshift($control_areas['cat_list'],array
('cat_id'=>'','name'=> lang('select value')));
- $control_areas_array2 = array();
- foreach($control_areas['cat_list'] as $cat_list)
- {
- $control_areas_array2[] = array
- (
- 'id' => $cat_list['cat_id'],
- 'name' => $cat_list['name'],
- );
- }
- // END as categories
- $control_area_id = $control_areas_array2[1]['id'];
- $procedures_array =
$this->so_procedure->get_procedures_by_control_area($control_area_id);
- $role_array = $this->so_control->get_roles();
-
- $data = array
- (
- 'control' => $control->toArray(),
- 'procedures_array' =>
$procedures_array,
- 'role_array' =>
$role_array
- );
-
-
self::render_template_xsl('check_list/view_control_details', $data);
- }
-
- function register_case(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
- $control =
$this->so_control->get_single($check_list->get_control_id());
-
- // Fetches all control items for check list
- $control_items_for_check_list = array();
-
- $control_items =
$this->so_control_item_list->get_control_items_by_control($check_list->get_control_id());
- $check_items =
$this->so_check_item->get_check_items($check_list_id, null, null,
"return_object");
-
- $remove_control_item_ids_array = array();
-
- foreach($check_items as $check_item){
- if($check_item->get_control_item()->get_type()
== "control_item_type_2" & $check_item->get_status() == 1){
- $remove_control_item_ids_array[] =
$check_item->get_control_item_id();
- }
- }
-
- foreach($control_items as $control_item){
- if( !in_array($control_item->get_id(),
$remove_control_item_ids_array) ){
- $control_items_for_check_list[] =
$control_item->toArray();
- }
- }
-
- $location_array = execMethod(
'property.bolocation.read_single', array('location_code' =>
$check_list->get_location_code()) );
-
- $data = array
- (
- 'control'
=> $control->toArray(),
- 'check_list'
=> $check_list->toArray(),
- 'location_array' => $location_array,
- 'control_items_for_check_list' =>
$control_items_for_check_list,
- );
-
-
self::render_template_xsl(array('check_list/check_list_tab_menu',
'check_list/register_case'), $data);
- self::add_javascript('controller', 'controller',
'jquery.js');
- self::add_javascript('controller', 'controller',
'custom_ui.js');
- self::add_javascript('controller', 'controller',
'ajax.js');
- }
-
- function view_open_cases(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- $open_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'open', null,
'return_array');
-
- $data = array
- (
- 'open_check_items_and_cases' =>
$open_check_items_and_cases,
- 'check_list'
=> $check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_open_cases'), $data );
- }
-
- function view_closed_cases(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- $closed_check_items_and_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, 'closed',
null, 'return_array');
-
- $data = array
- (
- 'closed_check_items_and_cases' =>
$closed_check_items_and_cases,
- 'check_list'
=> $check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_closed_cases'), $data );
- }
-
- function view_measurements(){
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_list = $this->so->get_single($check_list_id);
-
- // Fetches check items that registeres measurement
- $measurement_check_items =
$this->so_check_item->get_check_items($check_list_id, null,
'control_item_type_2', "return_array");
-
- $data = array
- (
- 'measurement_check_items' =>
$measurement_check_items,
- 'check_list' =>
$check_list->toArray()
- );
-
- self::render_template_xsl(
array('check_list/cases_tab_menu', 'check_list/view_measurements'), $data );
- }
-
- function view_control_items(){
- $check_list_id = phpgw::get_var('check_list_id');
- $check_list = $this->so->get_single($check_list_id);
-
- $control =
$this->so_control->get_single($check_list->get_control_id());
- $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control->get_id());
-
- $saved_groups_with_items_array = array();
-
- //Populating array with saved control items for each
group
- foreach ($control_groups as $control_group)
- {
- $saved_control_items =
$this->so_control_item_list->get_control_items_by_control_and_group($control->get_id(),
$control_group->get_id());
-
- $control_item =
$this->so_control_item->get_single($control_item_id);
-
- $saved_groups_with_items_array[] =
array("control_group" => $control_group->toArray(), "control_items" =>
$saved_control_items);
- }
-
- $data = array
- (
- 'saved_groups_with_items_array' =>
$saved_groups_with_items_array,
- 'check_list'
=> $check_list->toArray()
- );
-
-
self::render_template_xsl('check_list/view_control_items', $data);
- }
-
- 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);
-
- if($type == 'control_item_type_2'){
- $measurement = phpgw::get_var('measurement');
- $check_item_obj->set_measurement($measurement);
- }
-
- $check_item_id = $this->so_check_item->store(
$check_item_obj );
-
- if($check_item_id > 0)
- return json_encode( array( "saveStatus" =>
"saved" ) );
- else
- return json_encode( array( "saveStatus" =>
"not_saved" ) );
- }
-
- public function save_check_items(){
- $check_item_ids = phpgw::get_var('check_item_ids');
- $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 );
- }
-
- $this->redirect(array('menuaction' =>
'controller.uicheck_list_for_location.view_check_list',
'check_list_id'=>$check_list_id));
- }
-
- public function save_check_item(){
- $check_item_id = phpgw::get_var('check_item_id');
- $comment = phpgw::get_var('comment');
- $status = (int)phpgw::get_var('status');
-
- $check_item =
$this->so_check_item->get_single($check_item_id);
- $control_item_id = $check_item->get_control_item_id();
-
- $control_item =
$this->so_control_item->get_single($check_item->get_control_item_id());
-
- if($control_item->get_type() == 'control_item_type_2')
- {
- $measurement = phpgw::get_var('measurement');
- $check_item->set_measurement( $measurement );
- }
-
- $check_item->set_status( $status );
- $check_item->set_comment( $comment );
-
- $check_item_id = $this->so_check_item->store(
$check_item );
-
- if($check_item_id > 0){
- $status_checker = new status_checker();
- $status_checker->update_check_list_status(
$check_item->get_check_list_id() );
-
- return json_encode( array( "saveStatus" =>
"saved" ) );
- }
- else
- return json_encode( array( "status" =>
"not_saved" ) );
- }
-
- // Returns check list info as JSON
- public function get_check_list_info()
- {
- $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 );
- }
-
- public function get_cases_for_check_list()
- {
- $check_list_id = phpgw::get_var('check_list_id');
-
- $check_items_with_cases =
$this->so_check_item->get_check_items_with_cases($check_list_id, "open", null,
"return_array");
-
- return json_encode( $check_items_with_cases );
- }
-
- public function query(){}
- }
Modified: trunk/controller/inc/component/class.calendar_builder.inc.php
===================================================================
--- trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-30 18:11:39 UTC (rev 8723)
+++ trunk/controller/inc/component/class.calendar_builder.inc.php
2012-01-30 18:13:03 UTC (rev 8724)
@@ -19,24 +19,27 @@
$calendar_array = $this->init_calendar( $control,
$calendar_array, $num, $period_type );
+ echo " Kontroll: " . $control->get_title();
+
// Inserts check_list object on deadline month in
twelve_months_array
foreach($control->get_check_lists_array() as
$check_list){
$check_list_status_info = new
check_list_status_info();
$check_list_status_info->set_check_list_id(
$check_list->get_id() );
- $todays_date = mktime(0,0,0,date("m"),
date("d"), date("Y"));
-
- if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date)
+ $todays_date_ts = mktime(0,0,0,date("m"),
date("d"), date("Y"));
+
+ echo " Dato: " . $check_list->get_id() . "
deadline: " . date("d/m-Y", $check_list->get_deadline());
+
+ if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() >
$todays_date_ts)
{
$status = "control_planned";
-
$check_list_status_info->set_info_text("Planlagt utført: " .
$check_list->get_planned_date());
}
- else if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() <
$todays_date)
+ else if( $check_list->get_status() == 0 &
$check_list->get_planned_date() > 0 & $check_list->get_deadline() <
$todays_date_ts )
{
$status =
"control_not_accomplished_with_info";
}
- else if( $check_list->get_status() == 0 &
$check_list->get_deadline() > $todays_date )
+ else if( $check_list->get_status() == 0 &
$check_list->get_deadline() < $todays_date_ts )
{
$status = "control_not_accomplished";
}
@@ -136,14 +139,13 @@
function init_calendar( $control, $calendar_array, $num, $period_type ){
- // Initialises twelve_months_array
for($i=1;$i<=$num;$i++){
$calendar_array[$i] = null;
}
$date_generator = new
date_generator($control->get_start_date(), $control->get_end_date(),
$this->period_start_date, $this->period_end_date, $control->get_repeat_type(),
$control->get_repeat_interval());
$dates_array = $date_generator->get_dates();
-
+
// Inserts dates on behalf of repeat type and repeat interval
foreach($dates_array as $date){
Modified: trunk/controller/inc/component/class.date_generator.inc.php
===================================================================
--- trunk/controller/inc/component/class.date_generator.inc.php 2012-01-30
18:11:39 UTC (rev 8723)
+++ trunk/controller/inc/component/class.date_generator.inc.php 2012-01-30
18:13:03 UTC (rev 8724)
@@ -39,10 +39,14 @@
$this->calendar_array[] = $interval_date;
- if($this->repeat_type == 1 || $this->repeat_type == 0)
+ if($this->repeat_type == 0)
{
$interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date)+$this->repeat_interval, date("Y",
$interval_date));
}
+ else if($this->repeat_type == 1)
+ {
+ $interval_date = mktime(0,0,0, date("m",
$interval_date), date("d", $interval_date) + ($this->repeat_interval * 7),
date("Y", $interval_date));
+ }
else if($this->repeat_type == 2)
{
$month = date("m",
$interval_date)+$this->repeat_interval;
@@ -89,6 +93,10 @@
$num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
date("m", $this->start_date), date("y", $this->start_date));
$search_date = mktime(0,0,0, date("m",
$this->start_date), $num_days_in_month, date("y", $this->start_date));
}
+ else if( $this->repeat_type == 3 ){
+ $num_days_in_month = cal_days_in_month(CAL_GREGORIAN,
12, date("y", $this->start_date));
+ $search_date = mktime(0,0,0, 12, $num_days_in_month,
date("y", $this->start_date));
+ }
return $search_date;
}
Modified: trunk/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/cases_tab_menu.xsl
2012-01-30 18:11:39 UTC (rev 8723)
+++ trunk/controller/templates/base/check_list/cases_tab_menu.xsl
2012-01-30 18:13:03 UTC (rev 8724)
@@ -27,6 +27,7 @@
</xsl:attribute>
Lukkede saker
</a>
+ <!--
<a id="view_measurements">
<xsl:if test="$active_tab = 'view_measurements'">
<xsl:attribute
name="class">active</xsl:attribute>
@@ -39,5 +40,6 @@
</xsl:attribute>
Målinger
</a>
+ -->
</div>
</xsl:template>
Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-30 18:11:39 UTC (rev 8723)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-01-30 18:13:03 UTC (rev 8724)
@@ -21,7 +21,7 @@
<ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
-
<li><xsl:value-of select="descr"/>
+
<li><xsl:number />. <xsl:value-of select="descr"/>
<xsl:choose>
<xsl:when test="location_item_id > 0">
<div style="float:right;">
Modified: trunk/controller/templates/base/check_list/view_open_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-30 18:11:39 UTC (rev 8723)
+++ trunk/controller/templates/base/check_list/view_open_cases.xsl
2012-01-30 18:13:03 UTC (rev 8724)
@@ -18,7 +18,7 @@
<xsl:when
test="cases_array/child::node()">
<li
class="check_item_case">
<h4><span><xsl:value-of select="control_item/title"/></span></h4>
- <ul>
+ <ul>
<xsl:for-each select="cases_array">
<xsl:variable name="cases_id"><xsl:value-of select="id"/></xsl:variable>
<li><span class="order_nr"><xsl:number /></span>. <xsl:value-of select="descr"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8724],
Torstein <=