|
| From: | Erik Holm-Larsen |
| Subject: | [Fmsystem-commits] [10316] |
| Date: | Wed, 24 Oct 2012 06:17:37 +0000 |
Revision: 10316
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10316
Author: erikhl
Date: 2012-10-24 06:17:37 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
Modified: trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
===================================================================
--- trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-10-23 13:31:06 UTC (rev 10315)
+++ trunk/logistic/inc/class.uirequirement_resource_allocation.inc.php
2012-10-24 06:17:37 UTC (rev 10316)
@@ -358,7 +358,8 @@
{
$curr_attr =
$attributes[$index];
$column_name =
$curr_attr['column_name'];
- if($curr_attr['choice'] &&
count($curr_attr['choice'])>0)
+
//var_dump($curr_attr['choice']);
+ if($curr_attr['choice'] != null)
{
$curr_choice =
$curr_attr['choice'];
$curr_attr_req_value =
$curr_attr['req_value'];
@@ -379,52 +380,40 @@
}
else
{
+ $operator =
$curr_attr['op'];
+ $curr_attr_req_value =
$curr_attr['req_value'];
foreach ($items as $it)
{
-
//var_dump($it[$column_name]);
-
//var_dump($curr_attr['op']);
-
//var_dump($it[$column_name]);
- $operator =
$curr_attr['op'];
if($operator)
{
-
var_dump($operator);
-
var_dump($it[$column_name]);
-
var_dump($col_val);
if($operator == "eq")
{
-
if($it[$column_name] == $col_val)
+
if($it[$column_name] == $curr_attr_req_value)
{
+
var_dump("eq1");
$list_items[] = $it;
}
}
else
if($operator == 'gt')
{
-
if(is_numeric($it[$column_name]) && $it[$column_name] > $col_val)
+
if(is_numeric($it[$column_name]) && $it[$column_name] > $curr_attr_req_value)
{
$list_items[] = $it;
}
}
else
if($operator == 'lt')
{
-
if(is_numeric($it[$column_name]) && $it[$column_name] < $col_val)
+
if(is_numeric($it[$column_name]) && $it[$column_name] < $curr_attr_req_value)
{
$list_items[] = $it;
}
}
}
-/*
if($it[$column_name] == $col_val)
- {
-
$list_items[] = $it;
- } */
}
-
-
//var_dump($curr_attr[$column_name]);
}
}
}
- //_debug_array($list_items);
-
$data = array
(
'editable' => true,
| [Prev in Thread] | Current Thread | [Next in Thread] |