[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16720]
From: |
nelson . guerra |
Subject: |
[Fmsystem-commits] [16720] |
Date: |
Wed, 10 May 2017 14:42:18 -0400 (EDT) |
Revision: 16720
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16720
Author: nelson224
Date: 2017-05-10 14:42:18 -0400 (Wed, 10 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-10 14:17:42 UTC (rev 16719)
+++ branches/dev-syncromind-2/property/js/portico/report.edit.js
2017-05-10 18:42:18 UTC (rev 16720)
@@ -4,7 +4,7 @@
$('#btn_get_columns').click( function()
{
- var oArgs = {menuaction: 'property.uireport.get_columns_data'};
+ var oArgs = {menuaction:
'property.uireport.get_column_preview'};
var requestUrl = phpGWLink('index.php', oArgs, true);
var data = {"dataset_id": $('#cbo_dataset_id').val()};
@@ -28,7 +28,7 @@
$('#container_order').empty();
$('#container_aggregates').empty();
- $('#container_columns').html(result.preview_dataset);
+ $('#container_columns').html(result.columns_preview);
//build_check_columns(result.columns);
if (jsonB !== '')
@@ -53,6 +53,7 @@
var values = {};
+ values['columns'] = {};
values['group'] = {};
values['order'] = {};
values['aggregate'] = {};
@@ -59,6 +60,14 @@
values['cbo_aggregate'] = {};
//values['txt_aggregate'] = {};
+ $('input[name^="columns"]').each(function() {
+
+ if ($(this).is(":checked"))
+ {
+ values['columns'][$(this).val()] =
$(this).val();
+ }
+ });
+
var invalid_groups = true;
$('input[name^="group"]').each(function() {
@@ -71,7 +80,7 @@
if (invalid_groups)
{
- alert('Choose columns');
+ alert('Choose group');
$('#responsiveTabsGroups').responsiveTabs('activate',
0);
return;
}
@@ -140,10 +149,15 @@
function set_values()
{
- $.each(jsonB.group, function(key, value)
+ $.each(jsonB.columns, function(key, value)
{
$("#c_" + key).prop('checked', true);
$("#c_" + key).change();
+ });
+
+ $.each(jsonB.group, function(key, value)
+ {
+ $("#g_" + key).prop('checked', true);
});
$.each(jsonB.order, function(key, value)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16720],
nelson . guerra <=