Skip to content
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

Jump to bottom

Rename "Diagnostic Table" to "Distribution Table" #626

Merged
merged 2 commits into from
Sep 18, 2017
Merged

Rename "Diagnostic Table" to "Distribution Table" #626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b40c1b
diagnostic to distribution
GoFroggyRun Aug 17, 2017
9a0d292
change download file name
GoFroggyRun Aug 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion static/js/taxbrain-tablebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ $(function() {
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li data-difference="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.diagnostic %>" href="#">Diagnostic Table</a></li>\
<li data-difference="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.distribution %>" href="#">Distribution Table</a></li>\
<li data-difference="true" class="active"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.difference %>" href="#">Difference Table</a></li>\
</ul>\
<br>\
Expand Down
16 changes: 8 additions & 8 deletions static/js/vendor/DataTables/datatables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27728,18 +27728,18 @@ DataTable.ext.buttons.csvHtml5 = {
}
else if (titles[0] == 'BASE'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_bins';
}
}
else if (titles[0] == 'USER'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_bins';
}
}
else if (titles[0] == 'PAYROLL'){
Expand Down Expand Up @@ -27842,18 +27842,18 @@ DataTable.ext.buttons.excelHtml5 = {
}
else if (titles[0] == 'BASE'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_bins';
}
}
else if (titles[0] == 'USER'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_bins';
}
}
else if (titles[0] == 'PAYROLL'){
Expand Down
2 changes: 1 addition & 1 deletion staticfiles/js/taxbrain-tablebuilder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ $(function() {
<br>\
<br>\
<ul class="nav nav-pills nav-justified">\
<li data-difference="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.diagnostic %>" href="#">Diagnostic Table</a></li>\
<li data-difference="false"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.distribution %>" href="#">Distribution Table</a></li>\
<li data-difference="true" class="active"><a data-toggle="tooltip" data-placement="bottom" title="<%= tooltips.difference %>" href="#">Difference Table</a></li>\
</ul>\
<br>\
Expand Down
16 changes: 8 additions & 8 deletions staticfiles/js/vendor/DataTables/datatables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27728,18 +27728,18 @@ DataTable.ext.buttons.csvHtml5 = {
}
else if (titles[0] == 'BASE'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_bins';
}
}
else if (titles[0] == 'USER'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_bins';
}
}
else if (titles[0] == 'PAYROLL'){
Expand Down Expand Up @@ -27842,18 +27842,18 @@ DataTable.ext.buttons.excelHtml5 = {
}
else if (titles[0] == 'BASE'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_currentlaw_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_currentlaw_bins';
}
}
else if (titles[0] == 'USER'){
if (titles[9] == 'DECILE'){
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_deciles';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_deciles';
}
else {
var title = '_' + regExp.exec(titles[10])[1] + '_diagnostic_reform_bins';
var title = '_' + regExp.exec(titles[10])[1] + '_distribution_reform_bins';
}
}
else if (titles[0] == 'PAYROLL'){
Expand Down
2 changes: 1 addition & 1 deletion webapp/apps/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os

DIAGNOSTIC_TOOLTIP = "Key variables in the computation of tax liabilities."
DISTRIBUTION_TOOLTIP = "Key variables in the computation of tax liabilities."
DIFFERENCE_TOOLTIP = "Key variables that highlight the differences between two tax plans."
PAYROLL_TOOLTIP = " Include employee and employer payroll taxes in output."
INCOME_TOOLTIP = "Include individual income taxes in output."
Expand Down
4 changes: 2 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 @@ -50,7 +50,7 @@

dynamic_compute = DynamicCompute()

from ..constants import (DIAGNOSTIC_TOOLTIP, DIFFERENCE_TOOLTIP,
from ..constants import (DISTRIBUTION_TOOLTIP, DIFFERENCE_TOOLTIP,
PAYROLL_TOOLTIP, INCOME_TOOLTIP, BASE_TOOLTIP,
REFORM_TOOLTIP, EXPANDED_TOOLTIP,
ADJUSTED_TOOLTIP, INCOME_BINS_TOOLTIP,
Expand Down Expand Up @@ -750,7 +750,7 @@ def behavior_results(request, pk):

tables = taxcalc_results_to_tables(output, first_year)
tables["tooltips"] = {
'diagnostic': DIAGNOSTIC_TOOLTIP,
'distribution': DISTRIBUTION_TOOLTIP,
'difference': DIFFERENCE_TOOLTIP,
'payroll': PAYROLL_TOOLTIP,
'income': INCOME_TOOLTIP,
Expand Down
4 changes: 2 additions & 2 deletions webapp/apps/taxbrain/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

dropq_compute = DropqCompute()

from ..constants import (DIAGNOSTIC_TOOLTIP, DIFFERENCE_TOOLTIP,
from ..constants import (DISTRIBUTION_TOOLTIP, DIFFERENCE_TOOLTIP,
PAYROLL_TOOLTIP, INCOME_TOOLTIP, BASE_TOOLTIP,
REFORM_TOOLTIP, EXPANDED_TOOLTIP, ADJUSTED_TOOLTIP,
FISCAL_CURRENT_LAW, FISCAL_REFORM, FISCAL_CHANGE,
Expand Down Expand Up @@ -500,7 +500,7 @@ def get_result_context(model, request, url):

tables = taxcalc_results_to_tables(output, first_year)
tables["tooltips"] = {
'diagnostic': DIAGNOSTIC_TOOLTIP,
'distribution': DISTRIBUTION_TOOLTIP,
'difference': DIFFERENCE_TOOLTIP,
'payroll': PAYROLL_TOOLTIP,
'income': INCOME_TOOLTIP,
Expand Down