diff --git a/franklincce/explorer/models.py b/franklincce/explorer/models.py index 22c41be..3b0033a 100644 --- a/franklincce/explorer/models.py +++ b/franklincce/explorer/models.py @@ -131,5 +131,3 @@ class LegislativeText(models.Model): if self.assembly in ["RGA", "BGA", "WGA", "GEN"]: return True return False - - diff --git a/franklincce/explorer/templates/explorer/conference.html b/franklincce/explorer/templates/explorer/conference.html new file mode 100644 index 0000000..2e41996 --- /dev/null +++ b/franklincce/explorer/templates/explorer/conference.html @@ -0,0 +1,19 @@ +{% extends "explorer/base.html" %} + +{% block content %} +{% if sample.is_bill %} + +{% elif sample.is_resolution %} + +{% endif %} + +
+

{{ book.name }} Conference

+ + +
+{% endblock content %} diff --git a/franklincce/explorer/templates/explorer/legislation.html b/franklincce/explorer/templates/explorer/legislation.html index 5dcdec1..e10acd7 100644 --- a/franklincce/explorer/templates/explorer/legislation.html +++ b/franklincce/explorer/templates/explorer/legislation.html @@ -1,13 +1,13 @@ {% extends "explorer/base.html" %} {% block content %} -
- {% if legislation.is_bill %} - - {% elif legislation.is_resolution %} - - {% endif %} +{% if legislation.is_bill %} + +{% elif legislation.is_resolution %} + +{% endif %} +

{{ legislation.legislation_title }}

@@ -15,7 +15,7 @@

Sponsored by {{ legislation.sponsors }} of {{ legislation.school }}

-

Presented as part of the {{ legislation.from_book.name }} conference

+

Presented as part of the {{ legislation.from_book.name }} conference

diff --git a/franklincce/explorer/urls.py b/franklincce/explorer/urls.py index 1a7d397..e7758c6 100644 --- a/franklincce/explorer/urls.py +++ b/franklincce/explorer/urls.py @@ -6,4 +6,5 @@ urlpatterns = [ path("", views.index, name="index"), path("all/", views.all, name="all"), path("legislation//", views.view_legislation, name="viewleg"), + path("conference//", views.view_conference, name="viewconf"), ] diff --git a/franklincce/explorer/views.py b/franklincce/explorer/views.py index 9af62f2..0ce1afa 100644 --- a/franklincce/explorer/views.py +++ b/franklincce/explorer/views.py @@ -27,3 +27,13 @@ def view_legislation(request, legislation_id): "lines": legislation.get_lines() } return render(request, "explorer/legislation.html", context) + +def view_conference(request, conference_id): + book = get_object_or_404(LegislationBook, pk=conference_id) + results = LegislativeText.objects.filter(from_book=book) + context = { + "book": book, + "legislation": results, + "sample": results[0] + } + return render(request, "explorer/conference.html", context)