{% if agenda_item.description|lower != 'page break' %}
- {{ forloop.counter }} |
- {{agenda_item.description}} |
+
+
+ {{ forloop.counter }}
+ |
+
+
+ {{agenda_item.description}}
+ |
{% if agenda_item.bills %}
+
{{ agenda_item.bills.0.bill.councilmatic_bill.friendly_name }}
|
+
{% for s in agenda_item.bills.0.bill.sponsors %}
{{ s.person.councilmatic_person.link_html | safe }}{% if not forloop.last %},{% endif %}
{% endfor %}
@@ -70,7 +84,7 @@ Agenda: {{event.agenda.all|length}} items
{% endif %}
- {% if event.status == 'passed' or event.status == 'confirmed' %}
+ {% if event.status == 'passed' %}
{% if attendance_taken %}
Alder Attendance: {{attendance_present}} Present, {{attendance_absent}} Absent
diff --git a/chicago/templates/legislation.html b/chicago/templates/legislation.html
index b3ee32e..01d0a25 100644
--- a/chicago/templates/legislation.html
+++ b/chicago/templates/legislation.html
@@ -110,7 +110,7 @@ Sponsors
{% if legislation.actions %}
History
-
+
Date |
@@ -122,19 +122,22 @@ History
{% for action in legislation.actions.all %}
+
{{action.date}}
|
+
{{action.organization.name}}
|
+
{{action.description | remove_action_subj}}
{% if action.vote.counts.all|length > 0 %}
{% if action.vote.motion_text %}
{{action.vote.motion_text}}
{% endif %}
-
+
Votes for |
@@ -145,6 +148,7 @@ History
+
{% for vote in action.vote.counts.all %}
{% if vote.option == 'yes' %}
{{vote.option|capfirst}}: {{vote.value}}
@@ -165,6 +169,7 @@ History
|
+
{% for vote in action.vote.counts.all %}
{% if vote.option == 'no' %}
{{vote.option|capfirst}}: {{vote.value}}
@@ -185,6 +190,7 @@ History
|
+
{% for vote in action.vote.counts.all %}
{% if vote.option != 'yes' and vote.option != 'no' %}
{{vote.option|capfirst}}: {{vote.value}}
diff --git a/chicago/templatetags/chicago_extras.py b/chicago/templatetags/chicago_extras.py
index 6da16f8..e9ff7ff 100644
--- a/chicago/templatetags/chicago_extras.py
+++ b/chicago/templatetags/chicago_extras.py
@@ -1,4 +1,5 @@
from django import template
+from django.core.exceptions import ObjectDoesNotExist
from councilmatic.settings import ALDER_EXTRAS, CITY_VOCAB
register = template.Library()
@@ -16,10 +17,12 @@ def get_person_headshot(person):
@register.filter
def get_legistar_link(object):
- for source in object.sources.all():
+ try:
+ source = object.sources.get(note="web")
return f" View on the {CITY_VOCAB['SOURCE']} website" # noqa
- return ""
+ except ObjectDoesNotExist:
+ return ""
@register.filter
| | |