vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] [minor] print filtered items in query report

Browse source
This commit is contained in:
Rushabh Mehta 2016-02-11 10:52:30 +05:30
parent d6f43ff1c3
commit 17e82b537f
3 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/public/js/frappe/misc/tools.js
View file

@ -68,6 +68,13 @@ frappe.tools.to_csv = function(data) {
};
frappe.slickgrid_tools = {
get_filtered_items: function(dataView) {
var data = [];
for (var i=0, len=dataView.getLength(); i<len; i++) {
data.push(dataView.getItem(i));
}
return data;
},
get_view_data: function(columns, dataView, filter) {
var col_row = $.map(columns, function(v) { return v.name; });
var res = [];

4
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -132,7 +132,7 @@ frappe.views.QueryReport = Class.extend({
frappe.render_grid({content:content, title:__(this.report_name)});
} else {
frappe.render_grid({grid:this.grid, title:__(this.report_name)});
frappe.render_grid({grid:this.grid, report: this, title:__(this.report_name)});
}
},
setup_filters: function() {
@ -320,7 +320,7 @@ frappe.views.QueryReport = Class.extend({
if (!df.fieldtype) df.fieldtype = "Data";
if (!cint(df.width)) df.width = 80;
if (df.hidden) {
return null;
}

6
frappe/public/js/lib/microtemplate.js
View file

@ -58,7 +58,11 @@ frappe.render_grid = function(opts) {
// build context
if(opts.grid) {
opts.columns = opts.grid.getColumns();
opts.data = opts.grid.getData().getItems();
if(opts.report) {
opts.data = frappe.slickgrid_tools.get_filtered_items(opts.report.dataView);
} else if(opts.grid) {
opts.data = opts.grid.getData().getItems();
}
}
// render content