Merge pull request #948 from hdoupe/fix-zeros

No longer need to scale numbers
ospc-org · Nov 9, 2018 · 798df85 · 798df85
2 parents 1c52554 + 2f6f87a
commit 798df85
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/RELEASES.md b/RELEASES.md
@@ -4,6 +4,18 @@ Go
 [here](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pulls?q=is%3Apr+is%3Aclosed)
 for a complete commit history.
 
+Release 1.7.6 on 2018-11-09
+----------------------------
+**Major Changes**
+- None
+
+**Minor Changes**
+- None
+
+**Bug Fixes**
+- [#948](https://github.com/ospc-org/ospc.org/pull/948) -  No longer need to scale numbers - Hank Doupe
+
+
 Release 1.7.5 on 2018-11-07
 ----------------------------
 **Major Changes**

diff --git a/static/js/taxbrain-tablebuilder.js b/static/js/taxbrain-tablebuilder.js
@@ -46,10 +46,10 @@ $(function() {
                 var j = 0;
                 _.each(row.cells, function(cell) {
                     if (_.isEmpty(cell.year_values)) {
-                        that.get('rows')[i]['cells'][j]['tot_value'] = that.numberWithCommas((parseFloat(cell.value / cell.format.divisor)).toFixed(cell.format.decimals));
+                        that.get('rows')[i]['cells'][j]['tot_value'] = that.numberWithCommas((parseFloat(cell.value)).toFixed(cell.format.decimals));
                     } else {
                         _.each(_.keys(cell.year_values), function(year) {
-                            that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas((parseFloat(cell.year_values[year] / cell.format.divisor)).toFixed(cell.format.decimals));
+                            that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas((parseFloat(cell.year_values[year])).toFixed(cell.format.decimals));
                         });
                     }
                     j++;

diff --git a/staticfiles/js/taxbrain-tablebuilder.js b/staticfiles/js/taxbrain-tablebuilder.js
@@ -46,10 +46,10 @@ $(function() {
                 var j = 0;
                 _.each(row.cells, function(cell) {
                     if (_.isEmpty(cell.year_values)) {
-                        that.get('rows')[i]['cells'][j]['tot_value'] = that.numberWithCommas((parseFloat(cell.value / cell.format.divisor)).toFixed(cell.format.decimals));
+                        that.get('rows')[i]['cells'][j]['tot_value'] = that.numberWithCommas((parseFloat(cell.value)).toFixed(cell.format.decimals));
                     } else {
                         _.each(_.keys(cell.year_values), function(year) {
-                            that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas((parseFloat(cell.year_values[year] / cell.format.divisor)).toFixed(cell.format.decimals));
+                            that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas((parseFloat(cell.year_values[year])).toFixed(cell.format.decimals));
                         });
                     }
                     j++;

diff --git a/webapp/settings.py b/webapp/settings.py
@@ -58,7 +58,7 @@
 ]
 
 
-WEBAPP_VERSION = "1.7.5"
+WEBAPP_VERSION = "1.7.6"
 
 # Application definition