diff --git a/server_py/flatgov/bills/templatetags/bill_filters.py b/server_py/flatgov/bills/templatetags/bill_filters.py index 7118eed..711878a 100644 --- a/server_py/flatgov/bills/templatetags/bill_filters.py +++ b/server_py/flatgov/bills/templatetags/bill_filters.py @@ -39,8 +39,8 @@ def billnumber_display(billnumber: str): return billnumber @register.filter -def billnumbers_by_congress(billnumbers: list, current_bill: str): - return [billnumber for billnumber in list(billnumbers) if str(current_bill) in billnumber.split('(')[-1]] +def billnumbers_by_congress(billnumbers: list, congress: str): + return [billnumber for billnumber in list(billnumbers) if str(congress) in billnumber.split('(')[-1]] @register.filter def billnumbers_display(billnumbers: list): diff --git a/server_py/flatgov/bills/templatetags/bill_tags.py b/server_py/flatgov/bills/templatetags/bill_tags.py index 9336e8a..78cee9a 100644 --- a/server_py/flatgov/bills/templatetags/bill_tags.py +++ b/server_py/flatgov/bills/templatetags/bill_tags.py @@ -4,7 +4,11 @@ @register.simple_tag -def check_bill(bill_number, congress): +def check_bill(bill_number: str, congress: int): if bill_number[:len(str(congress))] == str(congress): return True return False + +@register.simple_tag +def check_billnumbers_congress(bill_numbers: list, congress: int): + return any( check_bill(bill_number, congress) for bill_number in bill_numbers) \ No newline at end of file diff --git a/server_py/flatgov/templates/bills/_bill.html b/server_py/flatgov/templates/bills/_bill.html deleted file mode 100644 index 2b7e7cd..0000000 --- a/server_py/flatgov/templates/bills/_bill.html +++ /dev/null @@ -1,740 +0,0 @@ - - - - - - - - - - - - - - - - - - BillMap template - - -
- -
- - -
-
-
- Home > Bills > {{bill.bill_congress_type_number |billnumber_display}} -

- {{ type_abbrev }} {{ bill.meta.number }}: {{ bill.meta.short_title }} -

- {{ bill.meta.congress }}th Congress (2019-2020) -
-
-
-
-

Bill Summary

-

{{bill.meta.summary_short}}

- -
Bill Stage
-

Passed House (Senate next) on Jul 17, 2019

- {% if bill.related_table %} -
Related Bills
- {{bill.related_bill_numbers}} - {% endif %} -
Committee(s) of Jurisdiction
-

Information provided by the clerk of the house (senate.gov)

-
Committee Documents
-

NA

- -
-
-

Committee(s) of Jurisdiction

- House Administration -
- House Oversight -

Most Relevant Sponsors

-
-
- -
-
-
-
-

Analyze Related Bills

- - Discover related bills to {{ type_abbrev }} {{ bill.meta.number }}: Access to Congressionally - Mandated Reports Act. A related bill may be a companion measure, an - identical bill, a procedurally-related measure, or one with text - similarities. - -
-
- -
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
-
-
-
-

Sponsors

- Identify the sponsor and cosponsors of this bill and which related - bills they cosponsored. Also shown are the committees to which each cosponsor belongs and their rank in that - committee. - -
-
-
View all current sponsors of {{ type_abbrev }} {{ bill.meta.number }} in the {{ bill.meta.congress }}th Congress
-
- -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
-
-
-

Understand the Context

- Identify the Sponsor and Cosponsors of this bill and which related - -
-
-
View all current sponsors of {{ type_abbrev }} {{ bill.meta.number }} in the {{ bill.meta.congress }}th Congress
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Co-SponsorCommittee JurisdictionPartyRank
Raúl GrijalvaNoDNo
Rodney DavisHouse AdministrationRRanking Member
Jim CooperHouse OversightDNo
Virginia FoxxHouse OversightRNo
-
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
- Lorem ipsum dolor sit amet consectetur adipisicing elit. Laudantium - magnam nisi reprehenderit animi iste rem ut corrupti, vel libero - fuga dicta asperiores, consectetur error nam hic quasi vitae - temporibus eaque? -
-
-
-
-

Timeline

- Here goes the body copy explaining what this is about -
-
- -
-
-
Reverse Timeline - -
-
-
-
- - JUN 22, 2011 - -
-
-
-
-
- -
-
-
-
- EARLIER VERSION -
- - Ordered Reported - - - This activity took place on a related bill, H.R. 4631 (115th). - -
-
-
- - MAY 22, 2013 - -
-
-
-
-
- -
-
-
-
- INTRODUCED -
- - Ordered Reported - - - This activity took place on a related bill, H.R. 4631 (115th). - -
-
-
- - JUL 14, 2016 - -
-
-
-
-
- -
-
-
-
- PASSED HOUSE (SENATE NEXT) -
- - The bill was passed in a vote in the House. It goes to the Senate next. The vote was by voice vote so no record of individual votes was made. - - - This activity took place on a related bill, H.R. 4631 (115th). - -
-
-
- - FEB 6, 2018 - -
-
-
-
-
- -
-
-
-
- EARLIER VERSION -
- - Ordered Reported - - - This activity took place on a related bill, H.R. 4631 (115th). - -
-
-
- - -
-
-
-
-
- -
-
-
-
- Passed Senate -
-
-
-
- - -
-
-
-
-
- Passed By President -
-
-
-
-
-
-
- - - - - - - - - - - diff --git a/server_py/flatgov/templates/bills/detail.html b/server_py/flatgov/templates/bills/detail.html index ce618c1..78b7a72 100644 --- a/server_py/flatgov/templates/bills/detail.html +++ b/server_py/flatgov/templates/bills/detail.html @@ -190,6 +190,9 @@

Bills Related to {{ bill.type_abbrev }} {{ bill.number }}

+
+ View bills related to {{ bill.type_abbrev }} {{ bill.number }} in the same Congress +
@@ -241,6 +244,9 @@

Bills Related to {{ bill.type_abbrev }} {{ bill.number }}

+
+ View bills related to {{ bill.type_abbrev }} {{ bill.number }} in recent Congresses +
@@ -289,6 +295,9 @@

Bills Related to {{ bill.type_abbrev }} {{ bill.number }}

+
+ View bills with related sections +
@@ -322,18 +331,18 @@

Sponsors of Related Measures

-
+
- View all current sponsors of {{ bill.type_abbrev }} {{ bill.number }} and identical bills in any recent Congress + View all current sponsors of {{ bill.type_abbrev }} {{ bill.number }} and identical bills in the same Congress
-
+
@@ -345,9 +354,11 @@
{% for cosponsor in cosponsors_for_bills %} + {% check_billnumbers_congress cosponsor.bill_congress_type_numbers object.congress as cosponsor_checker %} + {% if cosponsor_checker %} - + @@ -355,17 +366,17 @@
- + {% endif %} {% endfor %}
Co-sponsor
{{ cosponsor.name_full_official }}{{ cosponsor.bill_congress_type_numbers|billnumbers_display|join:", "}}{{ cosponsor.bill_congress_type_numbers|billnumbers_by_congress:bill.congress|billnumbers_display|join:", "}} {{ cosponsor.committees_named|join:", " }} {{cosponsor.ranks|join:", "}}
-
+
View this current sponsors of {{ bill.type_abbrev }} {{ bill.number }} and identical bills in any recent Congress
- +
Co-sponsor