[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8753]
|
From: |
Erik Holm-Larsen |
|
Subject: |
[Fmsystem-commits] [8753] |
|
Date: |
Wed, 01 Feb 2012 09:44:07 +0000 |
Revision: 8753
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8753
Author: erikhl
Date: 2012-02-01 09:44:06 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/inc/class.uicontrol_item.inc.php
trunk/controller/inc/model/class.control_item.inc.php
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2012-02-01 09:14:39 UTC
(rev 8752)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2012-02-01 09:44:06 UTC
(rev 8753)
@@ -233,6 +233,11 @@
{
$filter_clauses[] =
"controller_control_item.control_group_id =
{$this->marshal($filters['control_groups'],'int')}";
}
+ if(isset($filters['control_areas']))
+ {
+ $filter_clauses[] =
"controller_control_item.control_area_id =
{$this->marshal($filters['control_areas'],'int')}";
+ }
+
if(count($filter_clauses))
{
@@ -251,7 +256,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_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_area_id,
controller_control_item.control_group_id, controller_control_group.group_name
AS control_group_name';
}
$dir = $ascending ? 'ASC' : 'DESC';
@@ -279,6 +284,7 @@
$control_item->set_what_to_do($this->unmarshal($this->db->f('what_to_do',
true), 'string'));
$control_item->set_how_to_do($this->unmarshal($this->db->f('how_to_do', true),
'string'));
$control_item->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
+
$control_item->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control_item->set_control_group_name($this->unmarshal($this->db->f('control_group_name',
true), 'string'));
}
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-01 09:14:39 UTC
(rev 8752)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2012-02-01 09:44:06 UTC
(rev 8753)
@@ -74,6 +74,23 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
+
+ // Sigurd: Start 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 categories
self::add_javascript('controller', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -110,8 +127,8 @@
),
array('type' =>
'filter',
'name' =>
'control_areas',
- 'text' =>
lang('Control_area').':',
- 'list' =>
$this->so_control_area->get_control_area_select_array(),
+ 'text' =>
lang('Control_area'),
+ 'list' =>
$control_areas_array2,
),
array('type' => 'text',
'text' =>
lang('searchfield'),
@@ -151,11 +168,6 @@
'sotrable' =>
false
),
array(
- 'key' => 'control_area',
- 'label' =>
lang('Control area'),
- 'sortable' => false
- ),
- array(
'key' => 'procedure',
'label' =>
lang('Procedure'),
'sortable' => false
@@ -275,8 +287,25 @@
$this->so_control_item->store($curr_control_item);
}
+
+ // Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories',
-1, 'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
+ $control_area_array = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_area_array[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
- $control_area_array =
$this->so_control_area->get_control_area_array();
+ //$control_area_array =
$this->so_control_area->get_control_area_array();
$procedure_array =
$this->so_procedure->get_procedures();
@@ -286,7 +315,7 @@
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
}
- foreach ($control_area_array as $control_area)
+/* foreach ($control_area_array as $control_area)
{
if($control_group->get_control_area_id() && $control_area->get_id() ==
$control_group->get_control_area_id())
{
@@ -305,7 +334,7 @@
'name' =>
$control_area->get_title()
);
}
- }
+ }*/
foreach ($procedure_array as $procedure)
{
@@ -357,7 +386,7 @@
'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
'editable'
=> true,
'procedure'
=> array('options' => $procedure_options),
- 'control_area'
=> array('options' => $control_area_options),
+ 'control_area'
=> array('options' => $control_area_array),
'control_group'
=> $control_group_array,
'control_items'
=> $control_items,
'selected_control_items' =>
$selected_control_items,
@@ -392,8 +421,24 @@
}
else
{
+ // Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories',
-1, 'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
+ $control_area_array = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_area_array[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
- $control_area_array =
$this->so_control_area->get_control_area_array();
+ //$control_area_array =
$this->so_control_area->get_control_area_array();
$procedure_array =
$this->so_procedure->get_procedures();
@@ -403,7 +448,7 @@
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
}
- foreach ($control_area_array as $control_area)
+/* foreach ($control_area_array as $control_area)
{
if($control_group->get_control_area_id() && $control_area->get_id() ==
$control_group->get_control_area_id())
{
@@ -422,7 +467,7 @@
'name' =>
$control_area->get_title()
);
}
- }
+ }*/
foreach ($procedure_array as $procedure)
{
@@ -474,7 +519,7 @@
'img_go_home'
=> 'rental/templates/base/images/32x32/actions/go-home.png',
'editable'
=> true,
'procedure'
=> array('options' => $procedure_options),
- 'control_area'
=> array('options' => $control_area_options),
+ 'control_area'
=> array('options' => $control_area_array),
'control_group'
=> $control_group_array,
'control_items'
=> $control_items,
'selected_control_items' =>
$selected_control_items,
Modified: trunk/controller/inc/class.uicontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_item.inc.php 2012-02-01 09:14:39 UTC
(rev 8752)
+++ trunk/controller/inc/class.uicontrol_item.inc.php 2012-02-01 09:44:06 UTC
(rev 8753)
@@ -73,6 +73,22 @@
if(phpgw::get_var('phpgw_return_as') == 'json') {
return $this->query();
}
+ // Sigurd: Start 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 categories
self::add_javascript('controller', 'yahoo',
'datatable.js');
phpgwapi_yui::load_widget('datatable');
phpgwapi_yui::load_widget('paginator');
@@ -114,8 +130,8 @@
),
array('type' =>
'filter',
'name' =>
'control_areas',
- 'text' =>
lang('Control_area').':',
- 'list' =>
$this->so_control_area->get_control_area_select_array(),
+ 'text' =>
lang('Control_area'),
+ 'list' =>
$control_areas_array2,
),
array('type' => 'text',
'text' =>
lang('searchfield'),
@@ -303,8 +319,23 @@
}
else
{
-
- $control_area_array =
$this->so_control_area->get_control_area_array();
+ //Sigurd: START as categories
+ $cats = CreateObject('phpgwapi.categories',
-1, 'controller', '.control');
+ $cats->supress_info = true;
+
+ $control_areas =
$cats->formatted_xslt_list(array('format'=>'filter','globals' => true,'use_acl'
=> $this->_category_acl));
+
+ $control_area_array = array();
+ foreach($control_areas['cat_list'] as $cat_list)
+ {
+ $control_area_array[] = array
+ (
+ 'id' => $cat_list['cat_id'],
+ 'name' => $cat_list['name'],
+ );
+ }
+ // END as categories
+ //$control_area_array =
$this->so_control_area->get_control_area_array();
$control_group_array =
$this->so_control_group->get_control_group_array();
@@ -314,7 +345,7 @@
$msgbox_data =
$GLOBALS['phpgw']->common->msgbox($msgbox_data);
}
- foreach ($control_area_array as $control_area)
+/* foreach ($control_area_array as $control_area)
{
$control_area_options[] = array
(
@@ -323,7 +354,7 @@
);
}
-
+*/
foreach ($control_group_array as $control_group)
{
$control_group_options[] = array
@@ -342,7 +373,7 @@
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
'editable'
=> true,
'control_item' =>
$control_item_array,
- 'control_area' =>
array('options' => $control_area_options),
+ 'control_area' =>
array('options' => $control_area_array),
'control_group' =>
array('options' => $control_group_options),
);
Modified: trunk/controller/inc/model/class.control_item.inc.php
===================================================================
--- trunk/controller/inc/model/class.control_item.inc.php 2012-02-01
09:14:39 UTC (rev 8752)
+++ trunk/controller/inc/model/class.control_item.inc.php 2012-02-01
09:44:06 UTC (rev 8753)
@@ -2,7 +2,7 @@
/**
* phpGroupWare - controller: a part of a Facilities Management System.
*
- * @author Erink Holm-Larsen <address@hidden>
+ * @author Erik 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.
@@ -40,6 +40,7 @@
protected $what_to_do;
protected $how_to_do;
protected $control_group_id;
+ protected $control_area_id;
protected $type;
/**
@@ -102,6 +103,13 @@
public function get_control_group_name() { return
$this->control_group_name; }
+ public function set_control_area_id($control_area_id)
+ {
+ $this->control_area_id = $control_area_id;
+ }
+
+ public function get_control_area_id() { return
$this->control_area_id; }
+
public function set_type($type)
{
$this->type = $type;
@@ -133,6 +141,7 @@
$result['what_to_do'] = $this->get_what_to_do();
$result['how_to_do'] = $this->get_how_to_do();
$result['control_group'] =
$this->get_control_group_name();
+ $result['control_area'] = $this->get_control_area_id();
return $result;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8753],
Erik Holm-Larsen <=