[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8116]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8116] |
|
Date: |
Wed, 16 Nov 2011 13:09:48 +0000 |
Revision: 8116
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8116
Author: vator
Date: 2011-11-16 13:09:48 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uilocation_check_list.inc.php
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2011-11-16 07:05:06 UTC
(rev 8115)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2011-11-16 13:09:48 UTC
(rev 8116)
@@ -195,12 +195,12 @@
return $results;
}
- function get_control_groups_as_array($control_area_id = null, $limit)
+ function get_control_groups_as_array($control_area_id)
{
$results = array();
$sql = "SELECT * FROM controller_control_group WHERE
control_area_id=$control_area_id";
- $this->db->limit_query($sql, $start, __LINE__, __FILE__,
$limit);
+ $this->db->query($sql);
while ($this->db->next_record()) {
$control_group = new
controller_control_group($this->unmarshal($this->db->f('id', true), 'int'));
@@ -253,97 +253,9 @@
}
$filter_clauses = array();
- /*switch($filters['is_active']){
- case "active":
- $filter_clauses[] = "rental_composite.is_active
= TRUE";
- break;
- case "non_active":
- $filter_clauses[] = "rental_composite.is_active
= FALSE";
- break;
- case "both":
- break;
- }*/
- /*
- $special_query = false; //specify if the query should use
distinct on rental_composite.id (used for selecting composites that has an
active or inactive contract)
- $ts_query = strtotime(date('Y-m-d')); // timestamp for query
(today)
- $availability_date_from = $ts_query;
- $availability_date_to = $ts_query;
-
- if(isset($filters['availability_date_from']) &&
$filters['availability_date_from'] != ''){
- $availability_date_from =
strtotime($filters['availability_date_from']);
- }
-
- if(isset($filters['availability_date_to']) &&
$filters['availability_date_to'] != ''){
- $availability_date_to =
strtotime($filters['availability_date_to']);
- }
- */
- /*switch($filters['has_contract']){
- case "has_contract":
- $filter_clauses[] = "NOT
rental_contract_composite.contract_id IS NULL"; // Composite must have a
contract
- $filter_clauses[] = "NOT
rental_contract.date_start IS NULL"; // The contract must have start date
- */
- /* The contract's start date not after the end
of the period if there is no end date */
-/* $filter_clauses[] = "
- ((NOT rental_contract.date_start >
$availability_date_to AND rental_contract.date_end IS NULL)
- OR
- (NOT rental_contract.date_start >
$availability_date_to AND NOT rental_contract.date_end IS NULL AND NOT
rental_contract.date_end < $availability_date_from))";
- $special_query=true;
- break;
- case "has_no_contract":
- $filter_clauses[] = "
- (
- rental_contract_composite.contract_id
IS NULL OR
- NOT rental_composite.id IN
- (
- SELECT rental_composite.id FROM
rental_composite
- LEFT JOIN
rental_contract_composite ON (rental_contract_composite.composite_id =
rental_composite.id)
- LEFT JOIN rental_contract ON
(rental_contract.id = rental_contract_composite.contract_id)
- WHERE
- (
- NOT
rental_contract_composite.contract_id IS NULL AND
- NOT
rental_contract.date_start IS NULL AND
- ((NOT
rental_contract.date_start > $availability_date_to AND rental_contract.date_end
IS NULL)
- OR
- (NOT
rental_contract.date_start > $availability_date_to AND NOT
rental_contract.date_end IS NULL AND NOT rental_contract.date_end <
$availability_date_from))
- )
- )
- )
- ";
- $special_query=true;
- break;
- case "both":
- break;
- }
-
- // Furnished, partly furnished, not furnished, not specified
- if(isset($filters['furnished_status']) &
$filters['furnished_status'] < 4){
- // Not specified
- if($filters['furnished_status'] == 0)
- $filter_clauses[] =
"rental_composite.furnish_type_id IS NULL";
- else
- $filter_clauses[] =
"rental_composite.furnish_type_id=".$filters['furnished_status'];
- }
-
- if(isset($filters['not_in_contract'])){
- $filter_clauses[] =
"(rental_contract_composite.contract_id != ".$filters['not_in_contract']." OR
rental_contract_composite.contract_id IS NULL)";
- }
-
- if(isset($filters['location_code'])){
- $filter_clauses[] = "rental_unit.location_code = '".
$filters['location_code'] . "'";
- }
-
- if(isset($filters['contract_id']))
- {
- $filter_clauses[] = "contract_id =
{$this->marshal($filters['contract_id'],'int')}";
- }
-
+
if(isset($filters[$this->get_id_field_name()]))
{
- $filter_clauses[] = "rental_composite.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
- }*/
-
- if(isset($filters[$this->get_id_field_name()]))
- {
$filter_clauses[] = "controller_control_group.id =
{$this->marshal($filters[$this->get_id_field_name()],'int')}";
}
if(isset($filters['control_areas']))
@@ -371,7 +283,9 @@
}
else
{
- $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id,
controller_control_group.control_area_id, building_part_id,
fm_building_part.descr AS building_part_descr, controller_procedure.title as
procedure_title, controller_control_area.title as control_area_name ";
+ $cols .= "controller_control_group.id, group_name,
controller_control_group.procedure_id, controller_control_group.control_area_id
as control_area_id, ";
+ $cols .= "building_part_id, fm_building_part.descr AS
building_part_descr, controller_procedure.title as procedure_title, ";
+ $cols .= "controller_control_area.title as
control_area_name ";
}
$dir = $ascending ? 'ASC' : 'DESC';
$order = $sort_field ? "ORDER BY {$this->marshal($sort_field,
'field')} $dir ": '';
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2011-11-16 07:05:06 UTC
(rev 8115)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2011-11-16 13:09:48 UTC
(rev 8116)
@@ -221,7 +221,7 @@
}
else
{
- $cols = 'controller_control_item.id,
controller_control_item.title, required, what_to_do, how_to_do,
controller_control_item.control_group_id,
controller_control_item.control_area_id, controller_control_group.group_name AS
control_group_name';
+ $cols = 'controller_control_item.id,
controller_control_item.title, required, what_to_do, how_to_do,
controller_control_item.control_group_id, controller_control_group.group_name
AS control_group_name';
}
$dir = $ascending ? 'ASC' : 'DESC';
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2011-11-16 07:05:06 UTC
(rev 8115)
+++ trunk/controller/inc/class.uicontrol.inc.php 2011-11-16 13:09:48 UTC
(rev 8116)
@@ -236,23 +236,26 @@
// Displays control groups based on previously chosen control
area
public function view_control_groups(){
-
$control_id = phpgw::get_var('control_id');
$control = $this->so->get_single($control_id);
- $control_area_id = phpgw::get_var('control_area_id');
+
+ // Fetches saved control groups from db
+ $saved_control_groups =
$this->so_control_group_list->get_control_groups_by_control_id($control_id);
+ $saved_control_group_ids = array();
- // Contains earlier selected control_groups
- $selected_control_group_ids =
phpgw::get_var('control_group_ids');
-
- $control_area = $this->so_control_area->get_single(
$control_area_id );
- $control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control_area->get_id(),
25);
+ foreach($saved_control_groups as $control_group){
+ $saved_control_group_ids[] =
$control_group->get_id();
+ }
+ // Fetches control groups based on selected control
area
+ $control_area = $this->so_control_area->get_single(
$control->get_control_area_id );
+ $control_groups_as_array =
$this->so_control_group->get_control_groups_as_array($control->get_control_area_id());
+
$control_groups = array();
-
foreach($control_groups_as_array as $control_group){
$control_group_id = $control_group['id'];
- if( in_array($control_group_id,
$selected_control_group_ids )){
+ if( in_array($control_group_id,
$saved_control_group_ids )){
$control_groups[] = array("checked" =>
1, "control_group" => $control_group);
}
else
@@ -264,8 +267,8 @@
$tabs = array(
array(
'label' => "1: " .
lang('Details'),
- 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details', 'view' => "view_control_details",
-
'id' => $control_id))
+ 'link' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'controller.uicontrol.view_control_details',
+
'view' => "view_control_details", 'id' => $control_id))
),
array(
'label' => "2: " .
lang('Choose_control_groups')
@@ -293,9 +296,11 @@
public function save_control_groups(){
$control_id = phpgw::get_var('control_id');
- $control_area_id = phpgw::get_var('control_area_id');
$control_group_ids =
phpgw::get_var('control_group_ids');
+ // Deleting earlier saved control groups
+
$this->so_control_group_list->delete_control_groups($control_id);
+
$group_order_nr = 1;
// Saving control groups
@@ -309,10 +314,10 @@
$this->so_control_group_list->add($control_group_list);
$group_order_nr++;
}
-
+
+ // Redirect: view_control_items
$this->redirect(array('menuaction' =>
'controller.uicontrol.view_control_items',
-
'control_id'=>$control_id, 'control_area_id'=>$control_area_id,
-
'control_title'=>$control_title, 'control_group_ids'=>$control_group_ids));
+
'control_id'=>$control_id, 'control_group_ids'=>$control_group_ids));
}
// Gets a comma separated list of control groups, and displays
control items for these groups
@@ -323,11 +328,11 @@
$control_group_ids =
phpgw::get_var('control_group_ids');
// Fetches saved control items from db
- $selected_control_items =
$this->so_control_item->get_control_items_by_control_id($control_id);
- $selected_control_item_ids = array();
+ $saved_control_items =
$this->so_control_item->get_control_items_by_control_id($control_id);
+ $saved_control_item_ids = array();
- foreach($selected_control_items as $control_item){
- $selected_control_item_ids[] =
$control_item->get_id();
+ foreach($saved_control_items as $control_item){
+ $saved_control_item_ids[] =
$control_item->get_id();
}
// Array with selected control groups and items
@@ -343,7 +348,7 @@
foreach($group_control_items_array as
$control_item){
$control_item_id = $control_item['id'];
- if( in_array($control_item_id,
$selected_control_item_ids )){
+ if( in_array($control_item_id,
$saved_control_item_ids )){
$control_items_for_group_array[] = array("checked" => 1, "control_item" =>
$control_item);
}
else
@@ -371,7 +376,10 @@
'control_id' => $control_id, 'control_group_ids' => $control_group_ids,
'control_area_id' => $control->get_control_area_id()))
),
- array('label' => "3: " .
lang('Choose_control_items')));
+ array('label' => "3: " .
lang('Choose_control_items')),
+ array(
+ 'label' => "4: " .
lang('Sort_check_list')
+ ));
$data = array
(
Modified: trunk/controller/inc/class.uilocation_check_list.inc.php
===================================================================
--- trunk/controller/inc/class.uilocation_check_list.inc.php 2011-11-16
07:05:06 UTC (rev 8115)
+++ trunk/controller/inc/class.uilocation_check_list.inc.php 2011-11-16
13:09:48 UTC (rev 8116)
@@ -39,7 +39,7 @@
$this->so_check_list =
CreateObject('controller.socheck_list');
$this->so_check_item =
CreateObject('controller.socheck_item');
- $GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::check_list";
+
self::set_active_menu('controller::location_check_list');
}
public function view_check_lists_for_location()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8116],
Torstein <=