[Fmsystem-commits] [16840]

[nelson . guerra]

Revision: 16840
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16840
Author:   nelson224
Date:     2017-06-06 11:41:46 -0400 (Tue, 06 Jun 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/templates/base/report.xsl

Modified: branches/dev-syncromind-2/property/templates/base/report.xsl
===================================================================
--- branches/dev-syncromind-2/property/templates/base/report.xsl        
2017-06-06 09:44:52 UTC (rev 16839)
+++ branches/dev-syncromind-2/property/templates/base/report.xsl        
2017-06-06 15:41:46 UTC (rev 16840)
@@ -290,18 +290,29 @@
                        var order = "";
                        var field = "";
                        var operator = "";
-                       
+                       var text = "";
+                       var conector = "";
+
+                       var values = {};
+                       values['cbo_restricted_value'] = {};
+                       values['cbo_operator'] = {};
+                       values['txt_value1'] = {};
+                       values['cbo_conector'] = {};
+
+                       var length = 0;
                        $('.criteria').each(function() 
                        {
                                order = $(this).val();
                                field = $("#cbo_restricted_value_" + 
order).val();
                                operator = $("#cbo_operator_" + order).val();
-                               
+                               text = $("#txt_value1_" + order).val();
+                               conector = $("#cbo_conector_" + order).val();
+
                                if (field == "")
                                {
                                        return true;
                                }
-                               
+
                                if (field && operator == "")
                                {
                                        result = {
@@ -311,7 +322,7 @@
                                          
                                        return false;
                                }
-                               
+
                                switch (true)
                                {
                                        case (in_array_object(operator, 
operators_null)):
@@ -324,10 +335,40 @@
                                                                message : 
lang['enter_value'] + ' ' + field
                                                          }
                                                }
-                               }       
+                               }
 
+                               if (jQuery.isEmptyObject(result))
+                               {
+                                       values['cbo_restricted_value'][order] = 
field;
+                                       values['cbo_operator'][order] = 
operator;
+                                       values['txt_value1'][order] = text;
+                                       values['cbo_conector'][order] = 
conector;               
+                                       length++;
+                               }
                        });
 
+                       if (!jQuery.isEmptyObject(result))
+                       {
+                               return result;                          
+                       }
+
+                       var n = 0;
+                       $.each(values.cbo_restricted_value, function(key, 
value) 
+                       {
+                               if (n < (length - 1))
+                               {
+                                       if ($("#cbo_conector_" + key).val() == 
'')
+                                       {
+                                               result = {
+                                                       element : 
$("#cbo_conector_" + key),
+                                                       message : 
lang['select_conector'] + ' ' + values.cbo_restricted_value[key]
+                                                 }
+                                               return false;                   
        
+                                       }
+                               }
+                               n++;
+                       });
+
                        return result;
                }
 
@@ -350,13 +391,6 @@
                                                return result;
                                        }
                                        
-                                       /*result = validate_group();
-                                       if (!jQuery.isEmptyObject(result))
-                                       {
-                                               
$('#responsiveTabsGroups').responsiveTabs('activate', 1);
-                                               return result;
-                                       }*/
-                                       
                                        result = validate_aggregate();
                                        if (!jQuery.isEmptyObject(result))
                                        {