[Fmsystem-commits] [16697]

[nelson . guerra]

Revision: 16697
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16697
Author:   nelson224
Date:     2017-05-05 08:07:29 -0400 (Fri, 05 May 2017)
Log Message:
-----------


Modified Paths:
--------------
    branches/dev-syncromind-2/property/js/portico/report.edit.js

Modified: branches/dev-syncromind-2/property/js/portico/report.edit.js
===================================================================
--- branches/dev-syncromind-2/property/js/portico/report.edit.js        
2017-05-05 09:12:32 UTC (rev 16696)
+++ branches/dev-syncromind-2/property/js/portico/report.edit.js        
2017-05-05 12:07:29 UTC (rev 16697)
@@ -30,7 +30,7 @@
                        
                        $('#container_columns').html(result.preview_dataset);
                        
-                       build_check_columns(result.columns);
+                       //build_check_columns(result.columns);
                        if (jsonB !== '')
                        {
                                set_values();
@@ -182,18 +182,25 @@
        });     
 }
 
-function build_check_groups(name)
+function build_check_groups(name, type)
 {
        if ($("#c_" + name).is(":checked")) 
        {
-               var el_1 = '<span style="display:block;"><input type="radio" 
name="g_'+ name +'" value="'+ name +'"/>' + name + '</span>';
-               var el_2 = '<span style="display:block;"><input type="radio" 
name="o_'+ name +'" value="'+ name +'"/>' + name + '</span>';
+               var el_1 = '<span style="display:block;"><input type="radio" 
name="group_by" id="g_'+ name +'" value="'+ name +'"/>' + name + '</span>';
+               var el_2 = '<span style="display:block;"><input type="radio" 
name="order_by" id="o_'+ name +'" value="'+ name +'"/>' + name + '</span>';
                $('#container_groups').append(el_1);
                $('#container_order').append(el_2);
+               
+               var combo = build_list_aggregates(name, type);
+               var text = build_text_aggregates(name);
+               var check = build_check_aggregates(name);
+               var el_1 = '<span style="display:table-row;">'+ check + combo + 
text + '</span>';
+               $('#container_aggregates').append(el_1);
        } 
        else {
                $("#g_" + name).parent().remove();
                $("#o_" + name).parent().remove();
+               $("#txt_" + name).parent().parent().remove();
        }
 }