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

Merge branch 'master' into edge

Browse source
This commit is contained in:
Anand Doshi 2013-04-23 12:31:51 +05:30
commit 516c6fc919
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
public/js/wn/views/listview.js
View file

@ -348,11 +348,10 @@ wn.views.ListView = Class.extend({
fully_delivered: (data[field] > 99 ? 'bar-complete' : ''),
label: label
}
$(parent).append(repl('<span class="bar-outer" style="width: 30px; float: right" \
<span class="bar-inner %(fully_delivered)s" \
$(parent).append(repl('<span class="bar-outer" style="width: 30px; float: right"> \
<span class="bar-inner %(fully_delivered)s" title="%(percent)s% %(label)s" \
style="width: %(percent)s%;"></span>\
</span>', args));
$(parent).attr("title", repl("%(percent)s% %(label)s", args));
},
render_icon: function(parent, icon_class, label) {
var icon_html = "<i class='%(icon_class)s' title='%(label)s'></i>";

15
public/js/wn/views/query_report.js
View file

@ -75,7 +75,7 @@ wn.views.QueryReport = Class.extend({
var export_btn = this.appframe.add_button("<i class='icon-download' title='"+
wn._('Export') + "'></i>", function() {
me.export();
me.export_report();
});
wn.utils.disable_export_btn(export_btn);
},
@ -141,12 +141,23 @@ wn.views.QueryReport = Class.extend({
$(f.wrapper).find("input, button").css({"margin-top":"-4px"});
else if(f.df.fieldtype == "Date")
$(f.wrapper).css({"margin-right":"-15px"});
if(df.get_query) f.get_query = df.get_query;
});
this.set_filters_by_name();
},
clear_filters: function() {
this.filters = [];
this.appframe.toolbar.find(".filters").remove();
},
set_filters_by_name: function() {
this.filters_by_name = {};
for(var i in this.filters) {
this.filters_by_name[this.filters[i].df.fieldname] = this.filters[i];
}
},
refresh: function() {
// Run
var me =this;
@ -387,7 +398,7 @@ wn.views.QueryReport = Class.extend({
me.dataView.refresh();
});
},
export: function() {
export_report: function() {
var result = $.map(wn.slickgrid_tools.get_view_data(this.columns, this.dataView),
function(row) {
return [row.splice(1)];