add a conference view
This commit is contained in:
parent
cc8e1026ac
commit
62b13cd684
|
@ -131,5 +131,3 @@ class LegislativeText(models.Model):
|
||||||
if self.assembly in ["RGA", "BGA", "WGA", "GEN"]:
|
if self.assembly in ["RGA", "BGA", "WGA", "GEN"]:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
{% extends "explorer/base.html" %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
{% if sample.is_bill %}
|
||||||
|
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
|
||||||
|
{% elif sample.is_resolution %}
|
||||||
|
<link rel="stylesheet" type="text/css" href="/static/un.css" />
|
||||||
|
{% endif %}
|
||||||
|
|
||||||
|
<div class="boxed">
|
||||||
|
<h1>{{ book.name }} Conference</h1>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
{% for text in legislation %}
|
||||||
|
<li><a href="/explorer/legislation/{{ text.id }}">{{ text.legislation_title }}</a></li>
|
||||||
|
{% endfor %}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
{% endblock content %}
|
|
@ -1,13 +1,13 @@
|
||||||
{% extends "explorer/base.html" %}
|
{% extends "explorer/base.html" %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div id="legcontainer">
|
{% if legislation.is_bill %}
|
||||||
{% if legislation.is_bill %}
|
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="/static/tn.css" />
|
{% elif legislation.is_resolution %}
|
||||||
{% elif legislation.is_resolution %}
|
<link rel="stylesheet" type="text/css" href="/static/un.css" />
|
||||||
<link rel="stylesheet" type="text/css" href="/static/un.css" />
|
{% endif %}
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
|
<div id="legcontainer">
|
||||||
<div id="leginfo" class="boxed">
|
<div id="leginfo" class="boxed">
|
||||||
<h1 class="no-margin-top">{{ legislation.legislation_title }}</h1>
|
<h1 class="no-margin-top">{{ legislation.legislation_title }}</h1>
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
|
|
||||||
<p>Sponsored by {{ legislation.sponsors }} of {{ legislation.school }}</p>
|
<p>Sponsored by {{ legislation.sponsors }} of {{ legislation.school }}</p>
|
||||||
|
|
||||||
<p>Presented as part of the {{ legislation.from_book.name }} conference</p>
|
<p>Presented as part of the <a href="/explorer/conference/{{ legislation.from_book.id }}">{{ legislation.from_book.name }}</a> conference</p>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="legislation" class="boxed">
|
<div id="legislation" class="boxed">
|
||||||
|
|
|
@ -6,4 +6,5 @@ urlpatterns = [
|
||||||
path("", views.index, name="index"),
|
path("", views.index, name="index"),
|
||||||
path("all/", views.all, name="all"),
|
path("all/", views.all, name="all"),
|
||||||
path("legislation/<int:legislation_id>/", views.view_legislation, name="viewleg"),
|
path("legislation/<int:legislation_id>/", views.view_legislation, name="viewleg"),
|
||||||
|
path("conference/<int:conference_id>/", views.view_conference, name="viewconf"),
|
||||||
]
|
]
|
||||||
|
|
|
@ -27,3 +27,13 @@ def view_legislation(request, legislation_id):
|
||||||
"lines": legislation.get_lines()
|
"lines": legislation.get_lines()
|
||||||
}
|
}
|
||||||
return render(request, "explorer/legislation.html", context)
|
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)
|
||||||
|
|
Loading…
Reference in New Issue