[Fmsystem-commits] [16633]

[nelson . guerra]

Revision: 16633
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16633
Author:   nelson224
Date:     2017-04-26 23:50:00 -0400 (Wed, 26 Apr 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-04-27 03:49:45 UTC (rev 16632)
+++ branches/dev-syncromind-2/property/js/portico/report.edit.js        
2017-04-27 03:50:00 UTC (rev 16633)
@@ -4,7 +4,7 @@
        
        $('#btn_get_columns').click( function()
        {
-               var oArgs = {menuaction: 'property.uireport.get_columns'};
+               var oArgs = {menuaction: 'property.uireport.get_columns_data'};
                var requestUrl = phpGWLink('index.php', oArgs, true);
                var data = {"dataset_id": $('#cbo_dataset_id').val()};
 
@@ -28,7 +28,9 @@
                        $('#container_order').empty();
                        $('#container_aggregates').empty();
                        
-                       build_check_columns(result);
+                       $('#container_columns').html(result.preview_dataset);
+                       
+                       build_check_columns(result.columns);
                        if (jsonB !== '')
                        {
                                set_values();
@@ -37,6 +39,9 @@
        });
        
        $('#btn_get_columns').click();
+       
+
+       
 });
 
 function set_values()
@@ -73,7 +78,7 @@
 {
        $.each(data, function(key, object) 
        {
-               $('#container_columns').append('<span 
style="margin-right:12px;"><input type="checkbox" id="c_'+ object.name +'" 
value="'+ object.name +'" onchange="build_check_groups(\''+ object.name 
+'\')"/> ' + object.name + '</span>');
+               //$('#container_columns').append('<span 
style="margin-right:12px;"><input type="checkbox" id="c_'+ object.name +'" 
value="'+ object.name +'" onchange="build_check_groups(\''+ object.name 
+'\')"/> ' + object.name + '</span>');
 
                var combo = build_list_aggregates(object.name, object.type);
                var text = build_text_aggregates(object.name);