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.

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

Conversation

johnnyporkchops
Copy link
Contributor

@johnnyporkchops johnnyporkchops commented Jun 19, 2019

Summary

Remove Separate segregated funds (SSF) and Leadership PAC options from Disbursements datatable > Filters > Spender Committee Type > PACS dropdown

Changed spender-committee-types.jinja partial to macro, added ssf conditional option.

It may have been possible to reuse the commitee-types.jinja macro here since currently the options are the same for both rasing and spending datatables-- But, this macro should remain separate in case we ever need to have different filter options for Disbursements VS. raising datatables( Receipts , Individual Contributions) .

Impacted areas of the application

renamed: data/templates/partials/filters/spender-committee-types.jinja -> data/templates/macros/filters/spender-committee-types.jinja
modified: data/templates/partials/disbursements-filter.jinja

How to test

  • checkout and run branch
  • go to http://127.0.0.1:8000/data/disbursements/
  • Look at Filters > Spender Committee Type > PACS dropdown
  • Make sure Leadership PAC option has been removed
  • Make sure the Separate segregated funds (SSF) section has been removed. The last item in the dropdown should be : PAC with non-contribution account - qualified

Copy link
Contributor

@JonellaCulmer JonellaCulmer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we're also removing Leadership PACs from the dropdown too.

@johnnyporkchops johnnyporkchops changed the title make spender-committee-types macro, add ssf conditional Remove Separate segregated funds (SSF) options from Disbursements datatable Jun 20, 2019
@johnnyporkchops johnnyporkchops changed the title Remove Separate segregated funds (SSF) options from Disbursements datatable Remove Separate segregated funds (SSF)/Leadership PACS options from Disbursements datatable Jun 21, 2019
@johnnyporkchops johnnyporkchops changed the title Remove Separate segregated funds (SSF)/Leadership PACS options from Disbursements datatable Temporarily Remove SSF/Leadership PACS options from Disbursements datatable Jun 21, 2019
@codecov-io
Copy link

codecov-io commented Jun 21, 2019

Codecov Report

Merging #2979 into release/public-20190625 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                   Coverage Diff                    @@
##           release/public-20190625    #2979   +/-   ##
========================================================
  Coverage                    74.83%   74.83%           
========================================================
  Files                          119      119           
  Lines                         7126     7126           
  Branches                       615      615           
========================================================
  Hits                          5333     5333           
  Misses                        1793     1793

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update fe82b7f...9ba3a95. Read the comment docs.

@johnnyporkchops
Copy link
Contributor Author

@JonellaCulmer , I added exclusion for Leadership PACs as requested in your review.

@lbeaufort
Copy link
Member

Thanks @johnnyporkchops! Per our discussion, can you:

  1. Target the release branch since the receipts change is already in the release
  2. Remove "Lobbyist/Registrant PAC" from disbursements
  3. Put in a PR to the release branch to remove "Lobbyist/Registrant PAC" and "Leadership PAC" from receipts? These filters don't work either.

@johnnyporkchops johnnyporkchops changed the base branch from develop to release/public-20190625 June 21, 2019 18:42
@johnnyporkchops
Copy link
Contributor Author

With this PR:

  1. SSF, Leadership PAC and Lobbyist/Reg PAC have been removed from /Disbursements datatable

  2. SSF, Leadership PAC and Lobbyist/Reg PAC have been removed from /Receipts and /Individual Contributions datatables (the work was started in PR Remove SSFs from receipts and individual contributions datatable #2941 and continued in this PR)

Copy link
Member

@lbeaufort lbeaufort left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great, thanks @johnnyporkchops!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants