diff --git a/RELEASES.md b/RELEASES.md index d8861017..a5ff5899 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -4,7 +4,7 @@ Go [here](https://github.com/OpenSourcePolicyCenter/PolicyBrain/pulls?q=is%3Apr+is%3Aclosed) for a complete commit history. -Release 1.7.7 on 2019-01-14 +Release 1.7.7 on 2019-01-15 ---------------------------- **Major Changes** - None @@ -16,6 +16,7 @@ Release 1.7.7 on 2019-01-14 **Bug Fixes** - [#952](https://github.com/ospc-org/ospc.org/pull/952) - Update links - Hank Doupe - [#953](https://github.com/ospc-org/ospc.org/pull/953) - Update more links - Hank Doupe +- [#955](https://github.com/ospc-org/ospc.org/pull/955) - Output page fixes - Hank Doupe Release 1.7.6 on 2018-11-09 ---------------------------- diff --git a/static/js/taxbrain-tablebuilder.js b/static/js/taxbrain-tablebuilder.js index 49f59ac0..1056332f 100644 --- 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)).toFixed(cell.format.decimals)); + that.get('rows')[i]['cells'][j]['tot_value'] = that.numberWithCommas(parseFloat(cell.value)); } else { _.each(_.keys(cell.year_values), function(year) { - that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas((parseFloat(cell.year_values[year])).toFixed(cell.format.decimals)); + that.get('rows')[i]['cells'][j]['year_values'][year] = that.numberWithCommas(parseFloat(cell.year_values[year])); }); } j++; diff --git a/webapp/apps/taxbrain/helpers.py b/webapp/apps/taxbrain/helpers.py index 566cad5b..7764fbe8 100644 --- a/webapp/apps/taxbrain/helpers.py +++ b/webapp/apps/taxbrain/helpers.py @@ -221,17 +221,17 @@ def default_taxcalc_data(cls, start_year, metadata=True): TAXCALC_RESULTS_DFTABLE_COL_LABELS = taxcalc.DIFF_TABLE_LABELS[:] TAXCALC_RESULTS_MTABLE_COL_FORMATS = [ # divisor, unit, decimals - [ 1000, None, 0], # 'Returns', + [ 1000000, None, 0], # 'Returns', [1000000000, 'Dollars', 1], # 'AGI', - [ 1000, None, 0], # 'Standard Deduction Filers', + [ 1000000, None, 0], # 'Standard Deduction Filers', [1000000000, 'Dollars', 1], # 'Standard Deduction', - [ 1000, None, 0], # 'Itemizers', + [ 1000000, None, 0], # 'Itemizers', [1000000000, 'Dollars', 1], # 'Itemized Deduction', [1000000000, 'Dollars', 1], # 'Personal Exemption', [1000000000, 'Dollars', 1], # 'Taxable Income', [1000000000, 'Dollars', 1], # 'Regular Tax', [1000000000, 'Dollars', 1], # 'AMTI', - [ 1000, None, 0], # 'AMT Filers', + [ 1000000, None, 0], # 'AMT Filers', [1000000000, 'Dollars', 1], # 'AMT', [1000000000, 'Dollars', 1], # 'Tax before Credits', [1000000000, 'Dollars', 1], # 'Non-refundable Credits', @@ -247,10 +247,10 @@ def default_taxcalc_data(cls, start_year, metadata=True): [1000000000, 'Dollars', 1], # 'After-Tax Expanded Income' ] TAXCALC_RESULTS_DFTABLE_COL_FORMATS = [ - [ 1000, None, 0], # "Count", --> All Tax Units - [ 1000, None, 0], # "Tax Units with Tax Cut", + [ 1000000, None, 0], # "Count", --> All Tax Units + [ 1000000, None, 0], # "Tax Units with Tax Cut", [ 1, '%',1], # "Percent Tax Decrease" --> "Percent with Tax Cut" - [ 1000, None, 0], # "Tax Units with Tax Cut", + [ 1000000, None, 0], # "Tax Units with Tax Cut", [ 1, '%', 1], # "Percent Tax Increase" --> "Percent with Tax Increase", [ 1, 'Dollars', 0], # "Average Tax Change", [1000000000, 'Dollars', 1], # "Total Tax Difference",