|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [11194] more on controller |
| Date: | Mon, 24 Jun 2013 04:38:10 +0000 |
Revision: 11194
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11194
Author: sigurdne
Date: 2013-06-24 04:38:09 +0000 (Mon, 24 Jun 2013)
Log Message:
-----------
more on controller
Modified Paths:
--------------
trunk/controller/inc/class.socase.inc.php
trunk/controller/inc/class.socheck_item.inc.php
trunk/controller/inc/class.socontrol.inc.php
trunk/controller/inc/class.socontrol_group.inc.php
trunk/controller/inc/class.socontrol_group_list.inc.php
trunk/controller/inc/class.socontrol_item.inc.php
trunk/controller/inc/class.socontrol_item_list.inc.php
trunk/controller/inc/class.socontrol_item_option.inc.php
trunk/controller/inc/class.soprocedure.inc.php
trunk/controller/inc/class.uicase.inc.php
trunk/controller/inc/class.uicontrol_group.inc.php
trunk/controller/templates/base/case/add_case.xsl
trunk/controller/templates/base/control_group/control_group.xsl
Modified: trunk/controller/inc/class.socase.inc.php
===================================================================
--- trunk/controller/inc/class.socase.inc.php 2013-06-23 19:56:30 UTC (rev
11193)
+++ trunk/controller/inc/class.socase.inc.php 2013-06-24 04:38:09 UTC (rev
11194)
@@ -68,7 +68,7 @@
$sql .= "WHERE id = {$case_id}";
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
if($this->db->next_record())
{
Modified: trunk/controller/inc/class.socheck_item.inc.php
===================================================================
--- trunk/controller/inc/class.socheck_item.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.socheck_item.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -116,7 +116,7 @@
$sql .= "WHERE ci.id = {$check_item_id} ";
$sql .= "AND ci.control_item_id=coi.id";
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
if($this->db->next_record())
{
@@ -234,9 +234,9 @@
$sql .= "WHERE ci.check_list_id = {$check_list_id} ";
$sql .= "AND ci.control_item_id = coi.id ";
$sql .= "AND ci.control_item_id = {$control_item_id}";
-
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
+
if($this->db->next_record())
{
$check_item = new
controller_check_item($this->unmarshal($this->db->f('c_id'), 'int'));
Modified: trunk/controller/inc/class.socontrol.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.socontrol.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -744,8 +744,8 @@
$sql .= "WHERE control_id = $control_id ";
$sql .= "AND location_code = '$location_code'";
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
-
+ $this->db->query($sql, __LINE__, __FILE__);
+
if($this->db->next_record())
{
$control_location = new
controller_control_location($this->unmarshal($this->db->f('id'), 'int'));
@@ -1072,7 +1072,7 @@
$sql .= "FROM controller_control c {$joins} ";
$sql .= "WHERE c.id = " . $id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$this->db->next_record();
$control = new controller_control((int) $id);
Modified: trunk/controller/inc/class.socontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.socontrol_group.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -128,7 +128,7 @@
$joins .= " {$this->left_join} controller_procedure
ON (p.procedure_id = controller_procedure.id)";
$sql = "SELECT p.*, fm_building_part.descr AS
building_part_descr, controller_procedure.title as procedure_title FROM
controller_control_group p {$joins} WHERE p.id = " . $id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$this->db->next_record();
$control_group = new
controller_control_group($this->unmarshal($this->db->f('id'), 'int'));
Modified: trunk/controller/inc/class.socontrol_group_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_group_list.inc.php 2013-06-23
19:56:30 UTC (rev 11193)
+++ trunk/controller/inc/class.socontrol_group_list.inc.php 2013-06-24
04:38:09 UTC (rev 11194)
@@ -118,7 +118,7 @@
$id = (int)$id;
$sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.id = " . $id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
if($this->db->next_record())
{
@@ -148,7 +148,7 @@
$control_group_id = (int) $control_group_id;
$sql = "SELECT p.* FROM controller_control_group_list p
WHERE p.control_id={$control_id} AND p.control_group_id={$control_group_id}";
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
if($this->db->next_record())
{
Modified: trunk/controller/inc/class.socontrol_item.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.socontrol_item.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -136,7 +136,7 @@
$id = (int)$id;
$joins = " {$this->left_join} controller_control_group
ON (p.control_group_id = controller_control_group.id)";
$sql = "SELECT p.*, controller_control_group.group_name
AS control_group_name FROM controller_control_item p {$joins} WHERE p.id = " .
$id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$this->db->next_record();
$control_item = new
controller_control_item($this->unmarshal($this->db->f('id'), 'int'));
@@ -219,7 +219,7 @@
$control_item_id = (int)$control_item_id;
$sql = "delete from controller_control_item_option
where control_item_id={$control_item_id}";
- return $this->db->query($sql);
+ return $this->db->query($sql);
}
function get_control_item_array($start = 0, $results = 1000,
$sort = null, $dir = '', $query = null, $search_option = null, $filters =
array())
Modified: trunk/controller/inc/class.socontrol_item_list.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_list.inc.php 2013-06-23
19:56:30 UTC (rev 11193)
+++ trunk/controller/inc/class.socontrol_item_list.inc.php 2013-06-24
04:38:09 UTC (rev 11194)
@@ -114,7 +114,7 @@
$id = (int)$id;
$sql = "SELECT p.* FROM controller_control_item_list p
WHERE p.id = " . $id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$this->db->next_record();
$control_item_list = new
controller_control_item_list($this->unmarshal($this->db->f('id'), 'int'));
@@ -138,7 +138,7 @@
$control_item_id = (int) $control_item_id;
$sql = "SELECT cil.* FROM controller_control_item_list
cil WHERE cil.control_id = " . $control_id . " AND cil.control_item_id = " .
$control_item_id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$result = $this->db->next_record();
if( $result )
Modified: trunk/controller/inc/class.socontrol_item_option.inc.php
===================================================================
--- trunk/controller/inc/class.socontrol_item_option.inc.php 2013-06-23
19:56:30 UTC (rev 11193)
+++ trunk/controller/inc/class.socontrol_item_option.inc.php 2013-06-24
04:38:09 UTC (rev 11194)
@@ -106,7 +106,7 @@
{
$id = (int)$id;
$sql = "SELECT p.* FROM controller_control_item_option
p {$joins} WHERE p.id = " . $id;
- $this->db->limit_query($sql, 0, __LINE__, __FILE__, 1);
+ $this->db->query($sql, __LINE__, __FILE__);
$this->db->next_record();
$control_item_option = new
controller_control_item_option($this->unmarshal($this->db->f('id'), 'int'));
Modified: trunk/controller/inc/class.soprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.soprocedure.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.soprocedure.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -312,7 +312,7 @@
$condition = "WHERE end_date IS NULL";
$sql = "SELECT * FROM controller_procedure $condition
$order";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
+ $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $results);
while ($this->db->next_record())
{
@@ -346,7 +346,7 @@
//$condition = "WHERE end_date IS NULL";
$sql = "SELECT * FROM controller_procedure $condition
$order";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
+ $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $results);
while ($this->db->next_record())
{
@@ -375,7 +375,7 @@
$results = array();
$sql = "SELECT p.* FROM controller_procedure p WHERE
procedure_id = {$id} ORDER BY end_date DESC";
- $this->db->limit_query($sql, $start, __LINE__,
__FILE__, $limit);
+ $this->db->query($sql, __LINE__, __FILE__);
while ($this->db->next_record())
{
Modified: trunk/controller/inc/class.uicase.inc.php
===================================================================
--- trunk/controller/inc/class.uicase.inc.php 2013-06-23 19:56:30 UTC (rev
11193)
+++ trunk/controller/inc/class.uicase.inc.php 2013-06-24 04:38:09 UTC (rev
11194)
@@ -162,18 +162,20 @@
$component_criteria =
$control_group->get_component_criteria();
$conditions = array();
- foreach ($component_criteria as
$attribute_id => $condition_value)
+ foreach ($component_criteria as
$attribute_id => $condition)
{
- if($condition_value)
+ if($condition['value'])
{
+
eval('$condition_value = ' . "{$condition['value']};");
$conditions[] =
array
(
'attribute_id' => $attribute_id,
-
'operator' => 'equal',
- 'value'
=> $condition_value,
+
'operator' => $condition['operator'],
+ 'value'
=> $condition_value
);
}
}
+
$criterias_array['conditions']
= $conditions;
if(
!isset($components_at_location[$component_location_id][$location_code_search_components])
|| !$_components_at_location =
$components_at_location[$component_location_id][$location_code_search_components])
@@ -669,6 +671,8 @@
if($status)
{
+
+
return json_encode( array( "status" =>
"deleted" ) );
}
else
Modified: trunk/controller/inc/class.uicontrol_group.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol_group.inc.php 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/inc/class.uicontrol_group.inc.php 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -232,8 +232,26 @@
$control_group->set_control_area_id(
phpgw::get_var('control_area') );
$control_group->set_building_part_id(
phpgw::get_var('building_part') );
$control_group->set_component_location_id($component_location_id);
- $control_group->set_component_criteria(
phpgw::get_var('attributes') );
+
+ $attributes =
phpgw::get_var('attributes');
+ $attributes_operator =
phpgw::get_var('attributes_operator');
+
+ $criteria = array();
+ if(is_array($attributes))
+ {
+ foreach ($attributes as $_key
=> $_value)
+ {
+ if($_value)
+ {
+
$criteria[$_key]['value'] = $_value;
+
$criteria[$_key]['operator'] = $attributes_operator[$_key];
+ }
+
+ }
+ }
+ $control_group->set_component_criteria(
$criteria );
+
if(isset($control_group_id) &&
$control_group_id > 0)
{
$ctrl_group_id =
$control_group_id;
@@ -509,7 +527,7 @@
$entity_so =
CreateObject('property.soadmin_entity');
$custom =
createObject('phpgwapi.custom_fields');
$entity_list = $entity_so->read(array('allrows'
=> true));
-
+ $attributes = array();
array_unshift($entity_list,array
('id'=>'','name'=> lang('select value')));
$component_location_id =
$control_group->get_component_location_id();
@@ -539,20 +557,70 @@
$attributes =
$custom->find('property',".entity.{$entity_arr[2]}.{$entity_arr[3]}", 0,
'','','',true, true);
+ $operator1 = array
+ (
+ array
+ (
+ 'id' => 'eq',
+ 'name' => '='
+ ),
+ );
+
+ $operator2 = array
+ (
+ array
+ (
+ 'id' => 'eq',
+ 'name' => '='
+ ),
+ array
+ (
+ 'id' => 'lt',
+ 'name' => '<'
+ ),
+ array
+ (
+ 'id' => 'gt',
+ 'name' => '>'
+ ),
+ );
+
$component_criteria =
$control_group->get_component_criteria();
+
foreach ($attributes as $key => &$a)
{
-
if(isset($component_criteria[$key]) && $component_criteria[$key])
+ switch ($a['datatype'])
{
- $a['value'] =
$component_criteria[$key];
+ case 'LB':
+ case 'R':
+ case 'CH':
+ $a['operator']
= array('options' => $operator1);
+ break;
+ default:
+ $a['operator']
= array('options' => $operator2);
+ }
+
+
if(isset($component_criteria[$key]['value']) &&
$component_criteria[$key]['value'])
+ {
+ $a['value'] =
$component_criteria[$key]['value'];
if(isset($a['choice'])
&& $a['choice'])
{
foreach($a['choice'] as &$choise)
{
-
$choise['selected'] = $choise['id'] == $component_criteria[$key] ? 1 : 0;
+
$choise['selected'] = $choise['id'] == $component_criteria[$key]['value'] ? 1 :
0;
}
}
}
+
if(isset($component_criteria[$key]['operator']) &&
$component_criteria[$key]['operator'])
+ {
+
if(isset($a['operator']) && $a['operator'])
+ {
+
foreach($a['operator']['options'] as &$_operator)
+ {
+
$_operator['selected'] = $_operator['id'] ==
$component_criteria[$key]['operator'] ? 1 : 0;
+ }
+ }
+ }
}
}
@@ -810,20 +878,70 @@
$custom =
createObject('phpgwapi.custom_fields');
$attributes =
$custom->find('property',".entity.{$entity_arr[2]}.{$entity_arr[3]}", 0,
'','','',true, true);
+ $operator1 = array
+ (
+ array
+ (
+ 'id' => 'eq',
+ 'name' => '='
+ ),
+ );
+
+ $operator2 = array
+ (
+ array
+ (
+ 'id' => 'eq',
+ 'name' => '='
+ ),
+ array
+ (
+ 'id' => 'lt',
+ 'name' => '<'
+ ),
+ array
+ (
+ 'id' => 'gt',
+ 'name' => '>'
+ ),
+ );
+
$component_criteria =
$control_group->get_component_criteria();
+
foreach ($attributes as $key => &$a)
{
- if(isset($component_criteria[$key]) &&
$component_criteria[$key])
+ switch ($a['datatype'])
{
- $a['value'] =
$component_criteria[$key];
+ case 'LB':
+ case 'R':
+ case 'CH':
+ $a['operator'] =
array('options' => $operator1);
+ break;
+ default:
+ $a['operator'] =
array('options' => $operator2);
+ }
+
+
if(isset($component_criteria[$key]['value']) &&
$component_criteria[$key]['value'])
+ {
+ $a['value'] =
$component_criteria[$key]['value'];
if(isset($a['choice']) &&
$a['choice'])
{
foreach($a['choice'] as
&$choise)
{
-
$choise['selected'] = $choise['id'] == $component_criteria[$key] ? 1 : 0;
+
$choise['selected'] = $choise['id'] == $component_criteria[$key]['value'] ? 1 :
0;
}
}
}
+
if(isset($component_criteria[$key]['operator']) &&
$component_criteria[$key]['operator'])
+ {
+ if(isset($a['operator']) &&
$a['operator'])
+ {
+
foreach($a['operator']['options'] as &$_operator)
+ {
+
$_operator['selected'] = $_operator['id'] ==
$component_criteria[$key]['operator'] ? 1 : 0;
+ }
+ }
+ }
}
$control_items_array =
$this->so_control_item_list->get_control_items($control_group_id);
Modified: trunk/controller/templates/base/case/add_case.xsl
===================================================================
--- trunk/controller/templates/base/case/add_case.xsl 2013-06-23 19:56:30 UTC
(rev 11193)
+++ trunk/controller/templates/base/case/add_case.xsl 2013-06-24 04:38:09 UTC
(rev 11194)
@@ -74,7 +74,13 @@
<div>
<label class="comment">Beskrivelse av sak</label>
-
<textarea name="case_descr" class="required">
+
<textarea name="case_descr" >
+
<xsl:if test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:value-of select="comment"/>
</textarea>
</div>
@@ -99,6 +105,12 @@
<div class="row">
<label class="comment">Registrer målingsverdi</label>
<input>
+
<xsl:if test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
+
<xsl:attribute
name="name">measurement</xsl:attribute>
<xsl:attribute name="type">text</xsl:attribute>
<xsl:attribute name="value">
@@ -134,6 +146,11 @@
<div class="row">
<label class="comment">Velg verdi fra liste</label>
<select name="option_value">
+
<xsl:if test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
<option value="" >Velg</option>
<xsl:for-each select="options_array">
<option>
@@ -169,8 +186,13 @@
</select>
</div>
<div class="row">
-
<label class="comment">Velg verdi fra liste</label>
+
<label class="comment">Velg verdi fra lister</label>
<select name="option_value">
+
<xsl:if test="required = 1">
+
<xsl:attribute name="class" >
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</xsl:if>
<option value="" >Velg</option>
<xsl:for-each select="options_array">
<option>
Modified: trunk/controller/templates/base/control_group/control_group.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_group.xsl
2013-06-23 19:56:30 UTC (rev 11193)
+++ trunk/controller/templates/base/control_group/control_group.xsl
2013-06-24 04:38:09 UTC (rev 11194)
@@ -97,6 +97,11 @@
<xsl:value-of select="input_text" /> (
<xsl:value-of select="trans_datatype" /> )
</td>
<td>
+
<select name='attributes_operator[{id}]'
id='attribute_{id}'>;
+
<xsl:apply-templates select="operator/options"/>
+
</select>
+
</td>
+
<td>
<xsl:choose>
<xsl:when test="choice!=''">
<select name='attributes[{id}]'
id='attribute_{id}'>;
@@ -149,7 +154,17 @@
<xsl:value-of select="input_text" /> (
<xsl:value-of select="trans_datatype" /> )
</td>
<td>
-
<xsl:text> => </xsl:text>
+
+
<xsl:choose>
+
<xsl:when test="operator/options!=''">
+
<xsl:for-each
select="operator/options">
+
<xsl:if test="selected
!= 0">
+
<xsl:value-of
disable-output-escaping="yes" select="name"/>
+
</xsl:if>
+
</xsl:for-each>
+
</xsl:when>
+
</xsl:choose>
+
</td>
<td>
<xsl:choose>
| [Prev in Thread] | Current Thread | [Next in Thread] |