Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 11440 [merge]
committer: Jan Henrik Overland <janhenrik.overl...@gmail.com>
branch nick: dhis2
timestamp: Thu 2013-07-18 13:44:07 +0200
message:
(PT) Trailing zero decimals chopped.
modified:
dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js'
--- dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-07-17 13:41:17 +0000
+++ dhis-2/dhis-web/dhis-web-pivot/src/main/webapp/dhis-web-pivot/app/scripts/core.js 2013-07-18 11:40:02 +0000
@@ -481,17 +481,16 @@
util.number = {
getNumberOfDecimals: function(x) {
var tmp = new String(x);
- return (tmp.indexOf(".") > -1) ? (tmp.length - tmp.indexOf(".") - 1) : 0;
+ return (tmp.indexOf('.') > -1) ? (tmp.length - tmp.indexOf('.') - 1) : 0;
},
roundIf: function(x, prec) {
- if (Ext.isString(x)) {
- x = parseFloat(x);
- }
+ x = parseFloat(x);
+ prec = parseFloat(prec);
if (Ext.isNumber(x) && Ext.isNumber(prec)) {
var dec = pt.util.number.getNumberOfDecimals(x);
- return parseFloat(dec > prec ? Ext.Number.toFixed(x, prec) : x);
+ return dec > prec ? Ext.Number.toFixed(x, prec) : x;
}
return x;
},
@@ -1559,7 +1558,7 @@
if (idValueMap[id]) {
value = parseFloat(idValueMap[id]);
- htmlValue = pt.util.number.roundIf(idValueMap[id], 1).toString();
+ htmlValue = value.toString();
}
else {
value = 0;
@@ -1600,7 +1599,7 @@
type: 'valueTotal',
cls: 'pivot-value-total',
value: total,
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(total, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(total).toString() : ' ',
empty: !Ext.Array.contains(empty, false)
});
@@ -1661,13 +1660,11 @@
row.push(item);
if (colCount === colUniqueFactor) {
- rowSubTotal = pt.util.number.roundIf(rowSubTotal, 1);
-
row.push({
type: 'valueSubtotal',
cls: 'pivot-value-subtotal',
value: rowSubTotal,
- htmlValue: Ext.Array.contains(empty, false) ? rowSubTotal.toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(rowSubTotal).toString() : ' ',
empty: !Ext.Array.contains(empty, false),
collapsed: !Ext.Array.contains(collapsed, false)
});
@@ -1749,7 +1746,7 @@
tmpValueObjects[tmpCount++].push({
type: item.type === 'value' ? 'valueSubtotal' : 'valueSubtotalTotal',
value: subTotal,
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(subTotal, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(subTotal).toString() : ' ',
collapsed: collapsed,
cls: item.type === 'value' ? 'pivot-value-subtotal' : 'pivot-value-subtotal-total'
});
@@ -1775,7 +1772,7 @@
type: 'valueTotalSubgrandtotal',
cls: 'pivot-value-total-subgrandtotal',
value: subTotal,
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(subTotal, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(subTotal).toString() : ' ',
empty: !Ext.Array.contains(empty, false),
collapsed: !Ext.Array.contains(collapsed, false)
});
@@ -1841,7 +1838,7 @@
totalColObjects.push({
type: 'valueTotal',
value: total,
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(total, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(total).toString() : ' ',
empty: !Ext.Array.contains(empty, false),
cls: 'pivot-value-total'
});
@@ -1866,7 +1863,7 @@
tmp.push({
type: 'valueTotalSubgrandtotal',
value: subTotal,
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(subTotal, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(subTotal).toString() : ' ',
empty: !Ext.Array.contains(empty, false),
cls: 'pivot-value-total-subgrandtotal'
});
@@ -1899,14 +1896,13 @@
total += obj.value;
empty.push(obj.empty);
- //values.push(totalColObjects[i].value);
}
if (xColAxis && xRowAxis) {
a.push(getTdHtml({
type: 'valueGrandTotal',
cls: 'pivot-value-grandtotal',
- htmlValue: Ext.Array.contains(empty, false) ? pt.util.number.roundIf(total, 1).toString() : ' ',
+ htmlValue: Ext.Array.contains(empty, false) ? parseFloat(total).toString() : ' ',
empty: !Ext.Array.contains(empty, false)
}));
}
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
