Browse Source

fixes in print format - call modifier after formatter

version-14
Anand Doshi 12 years ago
parent
commit
ecdf03b836
2 changed files with 11 additions and 7 deletions
  1. +1
    -1
      public/js/wn/form/formatters.js
  2. +10
    -6
      public/js/wn/print/print_table.js

+ 1
- 1
public/js/wn/form/formatters.js View File

@@ -6,7 +6,7 @@ wn.form.formatters = {
return value==null ? "" : value return value==null ? "" : value
}, },
Float: function(value) { Float: function(value) {
return flt(value, 6);
return "<div style='text-align: right'>" + flt(value, 6) + "</div>";
}, },
Int: function(value) { Int: function(value) {
return cint(value); return cint(value);


+ 10
- 6
public/js/wn/print/print_table.js View File

@@ -103,10 +103,10 @@ wn.print.Table = Class.extend({


var headrow = $("<tr>").appendTo(table); var headrow = $("<tr>").appendTo(table);
$.each(me.columns, function(ci, fieldname) { $.each(me.columns, function(ci, fieldname) {
var df = wn.meta.docfield_map[me.tabletype][fieldname];
if(me.head_labels) { if(me.head_labels) {
var label = me.head_labels[ci]; var label = me.head_labels[ci];
} else { } else {
var df = wn.meta.docfield_map[me.tabletype][fieldname];
var label = df ? df.label : fieldname; var label = df ? df.label : fieldname;
} }
var td = $("<td>").html(label) var td = $("<td>").html(label)
@@ -117,6 +117,10 @@ wn.print.Table = Class.extend({
if(ci==0) { if(ci==0) {
td.css({"min-width": "30px"}); td.css({"min-width": "30px"});
} }
if(df && in_list(['Float', 'Currency'], df.fieldtype)) {
td.css({"text-align": "right"});
}
}); });
$.each(data, function(ri, row) { $.each(data, function(ri, row) {
@@ -132,14 +136,14 @@ wn.print.Table = Class.extend({
var value = row.idx; var value = row.idx;
else else
var value = row[fieldname]; var value = row[fieldname];

if(me.modifier && me.modifier[fieldname])
value = me.modifier[fieldname](row);
var df = wn.meta.docfield_map[me.tabletype][fieldname]; var df = wn.meta.docfield_map[me.tabletype][fieldname];
value = wn.form.get_formatter( value = wn.form.get_formatter(
df && df.fieldtype || "Data")(value); df && df.fieldtype || "Data")(value);


if(me.modifier && me.modifier[fieldname])
value = me.modifier[fieldname](row);
var td = $("<td>").html(value) var td = $("<td>").html(value)
.css(me.cell_style) .css(me.cell_style)
.css({width: me.widths[ci]}) .css({width: me.widths[ci]})
@@ -210,7 +214,7 @@ wn.print.Table = Class.extend({
}, },
}) })


function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier, hide_empty) {
function print_table(dt, dn, fieldname, tabletype, cols, head_labels, widths, condition, cssClass, modifier) {
return new wn.print.Table({ return new wn.print.Table({
doctype: dt, doctype: dt,
docname: dn, docname: dn,


Loading…
Cancel
Save