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

Temporarily Remove SSF/Leadership PACS options from Disbursements datatable #2979

Merged
merged 3 commits into from
Jun 21, 2019
Merged

Temporarily Remove SSF/Leadership PACS options from Disbursements datatable #2979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f94775a
make spender-committee-types macro, add ssf conditional
johnnyporkchops Jun 19, 2019
1f3a2b5
added exclusion for Leadershop PAC
johnnyporkchops Jun 21, 2019
9ba3a95
remove Leadership and Lobbyist PAC filter options
johnnyporkchops Jun 21, 2019
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
24 changes: 15 additions & 9 deletions fec/data/templates/macros/filters/committee-types.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% macro field(name='committee_type', include_ssfs = True) %}
{% macro field(name='committee_type', include_ssfs = True, include_leadership_pac = True, include_lobbyist_pac = True) %}

<div class="filter">
<fieldset class="js-dropdown js-filter" data-filter="checkbox" data-name="hsp-committee_type">
Expand Down Expand Up @@ -55,14 +55,20 @@
<button type="button" class="dropdown__button button--alt" data-name="{{ name }}">More</button>
<div id="pac-dropdown" class="dropdown__panel" aria-hidden="true">
<ul class="dropdown__list">
<li class="dropdown__item">
<input id="designation-checkbox-B" type="checkbox" name="designation" value="B">
<label class="dropdown__value" for="designation-checkbox-B">Lobbyist/Registrant PAC</label>
</li>
<li class="dropdown__item">
<input id="designation-checkbox-D" type="checkbox" name="designation" value="D">
<label class="dropdown__value" for="designation-checkbox-D">Leadership PAC</label>
</li>
{# Temporarily adding Lobbyist/Registrant PAC committee type exclusion from receipts and individual contributions until it is fixed in our data #}
{% if include_lobbyist_pac %}
<li class="dropdown__item">
<input id="designation-checkbox-B" type="checkbox" name="designation" value="B">
<label class="dropdown__value" for="designation-checkbox-B">Lobbyist/Registrant PAC</label>
</li>
{% endif %}
{# Temporarily adding Leadership PAC committee type exclusion from receipts and individual contributions until it is fixed in our data #}
{% if include_leadership_pac %}
<li class="dropdown__item">
<input id="designation-checkbox-D" type="checkbox" name="designation" value="D">
<label class="dropdown__value" for="designation-checkbox-D">Leadership PAC</label>
</li>
{% endif %}
<li class="dropdown__item">
<input id="committee-type-checkbox-N" type="checkbox" name="{{ name }}" value="N">
<label class="dropdown__value" for="committee-type-checkbox-N">PAC - nonqualified</label>
Expand Down
11 changes: 11 additions & 0 deletions ...als/filters/spender-committee-types.jinja → ...ros/filters/spender-committee-types.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% macro field(name='spender_committee_type', include_ssfs = True, include_leadership_pac = True, include_lobbyist_pac = True) %}
<div class="filter">
<fieldset class="js-dropdown js-filter" data-name="spender_committee_type" data-filter="checkbox">
<legend class="label" for="committee_type">Authorized committees</legend>
Expand Down Expand Up @@ -53,14 +54,20 @@
<button type="button" class="dropdown__button button--alt" data-name="{{ name }}">More</button>
<div id="pac-dropdown" class="dropdown__panel" aria-hidden="true">
<ul class="dropdown__list">
{# Temporarily adding Lobbyist/Registrant PAC committee type exclusion from disbursements until it is fixed in our data #}
{% if include_lobbyist_pac %}
<li class="dropdown__item">
<input id="designation-checkbox-B" type="checkbox" name="designation" value="B">
<label class="dropdown__value" for="designation-checkbox-B">Lobbyist/Registrant PAC</label>
</li>
{% endif %}
{# Temporarily adding Leadership PAC committee type exclusion from disbursements until it is fixed in our data #}
{% if include_leadership_pac %}
<li class="dropdown__item">
<input id="designation-checkbox-D" type="checkbox" name="designation" value="D">
<label class="dropdown__value" for="designation-checkbox-D">Leadership PAC</label>
</li>
{% endif %}
<li class="dropdown__item">
<input id="committee-type-checkbox-N" type="checkbox" name="spender_committee_type" value="N">
<label class="dropdown__value" for="committee-type-checkbox-N">PAC - nonqualified</label>
Expand All @@ -77,6 +84,8 @@
<input id="committee-type-checkbox-W" type="checkbox" name="spender_committee_type" value="W">
<label class="dropdown__value" for="committee-type-checkbox-W">PAC with non-contribution account - qualified</label>
</li>
{# Temporarily adding SSFs committee type exclusion from disbursements until it is fixed in our data #}
{% if include_ssfs %}
<li class="dropdown__subhead">Separate segregated funds</li>
<li class="dropdown__item">
<input id="org-type-checkbox-C" name="organization_type" type="checkbox" value="C">
Expand All @@ -102,6 +111,7 @@
<input id="org-type-checkbox-W" name="organization_type" type="checkbox" value="W">
<label class="dropdown__value" for="org-type-checkbox-W">Corporation without capital stock</label>
</li>
{% endif %}
</ul>
</div>
</fieldset>
Expand Down Expand Up @@ -149,3 +159,4 @@
</div>
</fieldset>
</div>
{% endmacro %}
3 changes: 2 additions & 1 deletion fec/data/templates/partials/disbursements-filter.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ Filter disbursements
</div>
<button type="button" class="js-accordion-trigger accordion__button">Spender committee type</button>
<div class="accordion__content">
{% include 'partials/filters/spender-committee-types.jinja' %}
{% import 'macros/filters/spender-committee-types.jinja' as spender_committee_type %}
{{ spender_committee_type.field(name='spender_committee_type', include_ssfs = False, include_leadership_pac = False, include_lobbyist_pac = False) }}
</div>
</div>
{% endblock %}
2 changes: 1 addition & 1 deletion fec/data/templates/partials/individual-contributions-filter.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Filter individual contributions
<button type="button" class="js-accordion-trigger accordion__button">Recipient committee type</button>
<div class="accordion__content">
{% import 'macros/filters/committee-types.jinja' as committee_type %}
{{ committee_type.field(name='recipient_committee_type', include_ssfs = False) }}
{{ committee_type.field(name='recipient_committee_type', include_ssfs = False, include_leadership_pac = False, include_lobbyist_pac = False) }}
</div>
<button type="button" class="js-accordion-trigger accordion__button">Contribution details</button>
<div class="accordion__content">
Expand Down
2 changes: 1 addition & 1 deletion fec/data/templates/partials/receipts-filter.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Filter receipts
<button type="button" class="js-accordion-trigger accordion__button">Recipient committee type</button>
<div class="accordion__content">
{% import 'macros/filters/committee-types.jinja' as committee_type %}
{{ committee_type.field(name='recipient_committee_type', include_ssfs = False) }}
{{ committee_type.field(name='recipient_committee_type', include_ssfs = False, include_leadership_pac = False, include_lobbyist_pac = False) }}
</div>
<button type="button" class="js-accordion-trigger accordion__button">Receipt details</button>
<div class="accordion__content">
Expand Down