[Fmsystem-commits] [16550]

[nelson . guerra]

Revision: 16550
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16550
Author:   nelson224
Date:     2017-04-06 23:56:38 -0400 (Thu, 06 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-07 03:56:13 UTC (rev 16549)
+++ branches/dev-syncromind-2/property/js/portico/report.edit.js        
2017-04-07 03:56:38 UTC (rev 16550)
@@ -6,8 +6,13 @@
        {
                var oArgs = {menuaction: 'property.uireport.get_columns'};
                var requestUrl = phpGWLink('index.php', oArgs, true);
-               var data = {"view": $('#view').val()};
+               var data = {"dataset_id": $('#cbo_dataset_id').val()};
 
+               if ($('#cbo_dataset_id').val() == '')
+               {
+                       return;
+               }
+               
                $('.processing').show();
                $.ajax({
                        type: 'GET',
@@ -24,11 +29,49 @@
                        $('#container_aggregates').empty();
                        
                        build_check_columns(result);
+                       if (jsonB !== '')
+                       {
+                               set_values();
+                       }
                });             
        });
        
+       $('#btn_get_columns').click();
 });
 
+function set_values()
+{
+       $.each(jsonB.group, function(key, value) 
+       {
+               $("#c_" + key).prop('checked', true);
+               $("#c_" + key).change();
+       });     
+       
+       $.each(jsonB.order, function(key, value) 
+       {
+               $("#o_" + key).prop('checked', true);
+       });
+       
+       $.each(jsonB.aggregate, function(key, value) 
+       {
+               $("#a_" + key).prop('checked', true);
+               $("#a_" + key).change();
+       });
+       
+       $.each(jsonB.cbo_aggregate, function(key, value) 
+       {
+               $("#cbo_" + key).filter(function() {
+                       //may want to use $.trim in here
+                       return $(this).val() == value; 
+               }).prop('selected', true);
+       });
+       
+       $.each(jsonB.txt_aggregate, function(key, value) 
+       {
+               $("#txt_" + key).val(value);
+       });
+}
+
 function build_check_columns(data)
 {
        $.each(data, function(key, object)