[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8496]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [8496] |
|
Date: |
Thu, 05 Jan 2012 15:52:46 +0000 |
Revision: 8496
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8496
Author: vator
Date: 2012-01-05 15:52:45 +0000 (Thu, 05 Jan 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.socontrol_group_list.inc.php
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/inc/class.uicheck_list.inc.php
trunk/controller/inc/class.uicontrol.inc.php
trunk/controller/inc/class.uiprocedure.inc.php
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
+++ trunk/controller/inc/class.socontrol.inc.php 2012-01-05 15:52:45 UTC
(rev 8496)
@@ -349,7 +349,6 @@
$control->set_responsibility_name($this->unmarshal($this->db->f('responsibility_name',
true), 'string'));
$control->set_control_area_id($this->unmarshal($this->db->f('control_area_id',
true), 'int'));
$control->set_control_area_name($this->unmarshal($this->db->f('control_area_name',
true), 'string'));
- //
$control->set_control_group_id($this->unmarshal($this->db->f('control_group_id',
true), 'int'));
$control->set_component_type_id($this->unmarshal($this->db->f('component_type_id',
true), 'int'));
$control->set_component_id($this->unmarshal($this->db->f('component_id', true),
'int'));
$control->set_location_code($this->unmarshal($this->db->f('location_code',
true), 'int'));
Modified: trunk/controller/inc/class.socontrol_group_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group_list.inc.php 2012-01-05
14:17:28 UTC (rev 8495)
+++ trunk/controller/inc/class.socontrol_group_list.inc.php 2012-01-05
15:52:45 UTC (rev 8496)
@@ -166,7 +166,7 @@
return isset($result);
}
- function get_control_groups_by_control_id($control_id)
+ function get_control_groups_by_control($control_id, $returnType
= "object")
{
$this->db->query("SELECT cg.*, cgl.order_nr FROM
controller_control_group_list cgl, controller_control_group cg WHERE
cgl.control_id=$control_id AND cgl.control_group_id=cg.id ORDER BY
cgl.order_nr", __LINE__, __FILE__);
@@ -180,7 +180,10 @@
$control_group->set_control_area_id($this->unmarshal($this->db->f('control_area_id'),
'int'));
$control_group->set_building_part_id($this->unmarshal($this->db->f('building_part_id'),
'int'));
- $control_group_list[] = $control_group;
+ if($returnType == "array")
+ $control_group_list[] =
$control_group->toArray();
+ else
+ $control_group_list[] = $control_group;
}
return $control_group_list;
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-01-05 15:52:45 UTC
(rev 8496)
@@ -227,7 +227,7 @@
$control_id = phpgw::get_var('control_id');
$control = $this->so_control->get_single($control_id);
- $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control_id( $control_id );
+ $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control( $control_id );
$saved_groups_with_items_array = array();
Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
+++ trunk/controller/inc/class.uicheck_list.inc.php 2012-01-05 15:52:45 UTC
(rev 8496)
@@ -267,16 +267,28 @@
$control = $this->so_control->get_single($control_id);
- $control_items_array =
$this->so_control_item->get_control_items_by_control_id($control_id, "array");
+ $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_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->get_control_items_by_control_id_and_group($control_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
(
- 'control_items_array' => $control_items_array
+ 'saved_groups_with_items_array' =>
$saved_groups_with_items_array
);
$xslttemplate = CreateObject('phpgwapi.xslttemplates');
- $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/control_item/sort_control_items'));
+ $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/control_item/view_control_items'));
$xslttemplate->set_var('phpgw',array('view_control_items' =>
$data));
@@ -320,10 +332,10 @@
public function view_control_items_for_control()
{
$control_id = phpgw::get_var('control_id');
+
$control = $this->so_control->get_single($control_id);
+ $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control( $control_id );
- $control_groups_array =
$this->so_control_group_list->get_control_groups_by_control_id( $control_id );
-
$saved_groups_with_items_array = array();
foreach ($control_groups_array as $control_group)
Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
+++ trunk/controller/inc/class.uicontrol.inc.php 2012-01-05 15:52:45 UTC
(rev 8496)
@@ -332,7 +332,7 @@
$control = $this->so->get_single($control_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_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
$saved_control_group_ids = array();
foreach($saved_control_groups as $control_group){
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-01-05 14:17:28 UTC
(rev 8495)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-01-05 15:52:45 UTC
(rev 8496)
@@ -31,6 +31,7 @@
phpgw::import_class('controller.uicommon');
phpgw::import_class('controller.soprocedure');
phpgw::import_class('controller.socontrol_area');
+ phpgw::import_class('controller.socontrol');
include_class('controller', 'procedure', 'inc/model/');
@@ -38,15 +39,18 @@
{
private $so;
private $so_control_area;
+ private $so_control;
+ private $so_control_group_list;
public $public_functions = array
(
- 'index' => true,
- 'query' => true,
- 'edit' => true,
- 'view' => true,
- 'add' => true,
- 'get_procedures' => true
+ 'index'
=> true,
+ 'query'
=> true,
+ 'edit'
=> true,
+ 'view'
=> true,
+ 'add'
=> true,
+ 'get_procedures' =>
true,
+ 'view_procedures_for_control' => true
);
public function __construct()
@@ -55,6 +59,9 @@
$this->so = CreateObject('controller.soprocedure');
$this->so_control_area =
CreateObject('controller.socontrol_area');
+ $this->so_control =
CreateObject('controller.socontrol');
+ $this->so_control_group_list =
CreateObject('controller.socontrol_group_list');
+
$GLOBALS['phpgw_info']['flags']['menu_selection'] =
"controller::procedure";
//$this->bo = CreateObject('property.boevent',true);
}
@@ -433,6 +440,53 @@
}
}
+ public function view_procedures_for_control(){
+ $control_id = phpgw::get_var('control_id');
+
+ $control =
$this->so_control->get_single($control_id);
+
+ $control_procedure = $this->so->get_single(
$control->get_procedure_id() );
+
+ $control_groups =
$this->so_control_group_list->get_control_groups_by_control($control_id);
+
+ $group_procedures_array = array();
+
+ foreach ($control_groups as $control_group)
+ {
+ $group_procedure =
$this->so->get_single( $control_group->get_procedure_id() );
+ $group_procedures_array[] =
array("control_group" => $control_group->toArray(), "procedure" =>
$group_procedure->toArray());
+ }
+
+ $data = array
+ (
+ 'control_procedure'
=> $control_procedure->toArray(),
+ 'group_procedures_array' =>
$group_procedures_array
+ );
+
+ $xslttemplate =
CreateObject('phpgwapi.xslttemplates');
+
+ $xslttemplate->add_file(array(PHPGW_SERVER_ROOT .
'/controller/templates/base/procedure/view_procedures_for_control'));
+
+
$xslttemplate->set_var('phpgw',array('view_procedures_for_control' => $data));
+
+ $xslttemplate->xsl_parse();
+ $xslttemplate->xml_parse();
+
+ $xml = new DOMDocument;
+ $xml->loadXML($xslttemplate->xmldata);
+
+ $xsl = new DOMDocument;
+ $xsl->loadXML($xslttemplate->xsldata);
+
+ // Configure the transformer
+ $proc = new XSLTProcessor;
+ $proc->importStyleSheet($xsl); // attach the xsl rules
+
+ $html = $proc->transformToXML($xml);
+
+ echo $html;
+ }
+
public function query()
{
$params = array(
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8496],
Torstein <=