Skip to content

[WIP] Add age button to "build table" widget #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

[WIP] Add age button to "build table" widget #853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95e0593
add age button
GoFroggyRun Mar 20, 2018
6105aaa
add click event
GoFroggyRun Mar 20, 2018
890a0f7
add tooltips
GoFroggyRun Mar 20, 2018
b0cd3b0
add tooltips for dynamic
GoFroggyRun Mar 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions static/js/taxbrain-tablebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,13 @@ $(function() {
<li class="active" data-grouping="bin"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.bins %>" href="#">Income Bins</a></li>\
<li data-grouping="dec"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.deciles %>" href="#">Income Deciles</a></li>\
</ul>\
<br>\
<br>\
<ul id="age" class="nav nav-pills nav-justified">\
<li class="active" data-under65="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.under_65 %>" href="#">Under Age 65</a></li>\
<li><h1 class="text-center" style="margin:0">+</h1></li>\
<li class="active" data-above65="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.above_65 %>" href="#">Age 65 & Above</a></li>\
</ul>\
</div>\
</div>'),

Expand Down Expand Up @@ -387,6 +394,20 @@ $(function() {
$el.data('incometax', !incometax);
$el.toggleClass('active');
},
'click [data-under65]': function(e) {
var $el = $(e.currentTarget);
var under65 = $el.data('under65');
this.model.set('under65', under65);
$el.data('under65', !under65);
$el.toggleClass('active');
},
'click [data-above65]': function(e) {
var $el = $(e.currentTarget);
var above65 = $el.data('above65')
this.model.set('above65', above65);
$el.data('above65', !above65);
$el.toggleClass('active');
},
'click [data-difference]': function(e) {
var $el = $(e.currentTarget);
this.model.set('difference', $el.data('difference'));
Expand Down
2 changes: 2 additions & 0 deletions webapp/apps/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
METTR_TOOLTIP = "Marginal effective total tax rate on new investments. The METTR includes the impact of all levels of taxation (both on business entities and savers) on the incentives to invest."
COC_TOOLTIP = "The cost of capital is calculated as the net-of-depreciation, before-tax rate of return."
DPRC_TOOLTIP = "Net present value of depreciation deductions."
UBI_UNDER_TOOLTIP = "Include tax units under age 65."
UBI_ABOVE_TOOLTIP = " Include tax units aged 65 and above."

START_YEARS = ('2013', '2014', '2015', '2016', '2017', '2018')
START_YEAR = os.environ.get('START_YEAR', '2017')
Expand Down
7 changes: 5 additions & 2 deletions webapp/apps/dynamic/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@
from ..constants import (DISTRIBUTION_TOOLTIP, DIFFERENCE_TOOLTIP,
PAYROLL_TOOLTIP, INCOME_TOOLTIP, BASE_TOOLTIP,
REFORM_TOOLTIP, INCOME_BINS_TOOLTIP,
INCOME_DECILES_TOOLTIP, START_YEAR, START_YEARS)
INCOME_DECILES_TOOLTIP, START_YEAR, START_YEARS,
UBI_UNDER_TOOLTIP, UBI_ABOVE_TOOLTIP)

from ..formatters import format_dynamic_params, get_version

Expand Down Expand Up @@ -786,7 +787,9 @@ def behavior_results(request, pk):
'base': BASE_TOOLTIP,
'reform': REFORM_TOOLTIP,
'bins': INCOME_BINS_TOOLTIP,
'deciles': INCOME_DECILES_TOOLTIP
'deciles': INCOME_DECILES_TOOLTIP,
'under_65': UBI_UNDER_TOOLTIP,
'above_65': UBI_ABOVE_TOOLTIP
}
is_registered = True if request.user.is_authenticated() else False
hostname = os.environ.get('BASE_IRI', 'http://www.ospc.org')
Expand Down
5 changes: 4 additions & 1 deletion webapp/apps/taxbrain/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
REFORM_TOOLTIP, FISCAL_CURRENT_LAW, FISCAL_REFORM,
FISCAL_CHANGE, INCOME_BINS_TOOLTIP,
INCOME_DECILES_TOOLTIP, START_YEAR, START_YEARS,
DATA_SOURCES, DEFAULT_SOURCE)
DATA_SOURCES, DEFAULT_SOURCE, UBI_UNDER_TOOLTIP,
UBI_ABOVE_TOOLTIP)

from ..formatters import get_version
from .param_formatters import (get_reform_from_file, get_reform_from_gui,
Expand Down Expand Up @@ -681,6 +682,8 @@ def get_result_context(model, request, url):
'fiscal_current_law': FISCAL_CURRENT_LAW,
'fiscal_reform': FISCAL_REFORM,
'fiscal_change': FISCAL_CHANGE,
'under_65': UBI_UNDER_TOOLTIP,
'above_65': UBI_ABOVE_TOOLTIP
}

if (model.json_text is not None and (model.json_text.raw_reform_text or
Expand Down