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.

Sign up for GitHub

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

[HOTFIX - USE GITFLOW] Update commissioner listing on homepage and leadership landing page #3131

Merged
merged 3 commits into from
Sep 3, 2019
Merged

[HOTFIX - USE GITFLOW] Update commissioner listing on homepage and leadership landing page #3131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c1b942
updated homepage to reflect commissioner's departure.
patphongs Aug 27, 2019
10250cc
only show chair and vice chair first in the list if it exists
patphongs Sep 3, 2019
6333d42
update to accommodate for number of vacant seats based on chair and v…
patphongs Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions fec/home/templates/home/home_page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,29 +104,28 @@ <h1>Commissioners</h1>
</div>
<div class="grid__item">
<div class="icon-heading">
<img class="icon-heading__image" src="{% static 'img/headshot--petersen.jpg' %}" alt="Headshot of Matthew S. Petersen">
<img class="icon-heading__image" src="{% static 'img/headshot--hunter.jpg' %}" alt="Headshot of Caroline C. Hunter">
<div class="icon-heading__content">
<div class="t-lead"><a href="/about/leadership-and-structure/mathew-s-petersen">Matthew S. Petersen</a></div>
<div class="t-note">Vice Chairman</div>
<div class="t-lead"><a href="/about/leadership-and-structure/caroline-c-hunter">Caroline C. Hunter</a></div>
<div class="t-sans">Republican</div>
</div>
</div>
</div>
<div class="grid__item">
<div class="icon-heading">
<img class="icon-heading__image" src="{% static 'img/headshot--hunter.jpg' %}" alt="Headshot of Caroline C. Hunter">
<img class="icon-heading__image" src="{% static 'img/headshot--walther.jpg' %}" alt="Headshot of Steven T. Walther">
<div class="icon-heading__content">
<div class="t-lead"><a href="/about/leadership-and-structure/caroline-c-hunter">Caroline C. Hunter</a></div>
<div class="t-sans">Republican</div>
<div class="t-lead"><a href="/about/leadership-and-structure/steven-t-walther">Steven T. Walther</a></div>
<div class="t-sans">Independent</div>
</div>
</div>
</div>
<div class="grid__item">
<div class="icon-heading">
<img class="icon-heading__image" src="{% static 'img/headshot--walther.jpg' %}" alt="Headshot of Steven T. Walther">
<img class="icon-heading__image" src="{% static 'img/headshot--no-photo.jpg' %}" alt="Vacant Position">
<div class="icon-heading__content">
<div class="t-lead"><a href="/about/leadership-and-structure/steven-t-walther">Steven T. Walther</a></div>
<div class="t-sans">Independent</div>
<div class="t-lead">Vacant seat</div>
<div class="t-sans"></div>
</div>
</div>
</div>
Expand Down
18 changes: 0 additions & 18 deletions fec/home/templates/partials/current-commissioners.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,10 @@
<div class="grid grid--2-wide">
{% if chair_commissioner %}
{% include 'partials/commissioner.html' with commissioner=chair_commissioner %}
{% else %}
<div class="grid__item commissioner-height">
<div class="icon-heading">
<img class="icon-heading__image" src="{% static "img/headshot--no-photo.jpg" %}" alt="Headshot of vacant seat">
<div class="icon-heading__content">
<div class="t-lead">Vacant Chair seat</div>
</div>
</div>
</div>
{% endif %}

{% if vice_commissioner %}
{% include 'partials/commissioner.html' with commissioner=vice_commissioner %}
{% else %}
<div class="grid__item commissioner-height">
<div class="icon-heading">
<img class="icon-heading__image" src="{% static "img/headshot--no-photo.jpg" %}" alt="Headshot of vacant seat">
<div class="icon-heading__content">
<div class="t-lead">Vacant Vice-Chair seat</div>
</div>
</div>
</div>
{% endif %}

{% for commissioner in commissioners %}
Expand Down
20 changes: 15 additions & 5 deletions fec/home/templatetags/commissioners.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,29 @@

@register.inclusion_tag('partials/current-commissioners.html')
def current_commissioners():
chair_commissioner = CommissionerPage.objects.filter(commissioner_title__startswith='Chair') \
current_commissioners = CommissionerPage.objects.filter(term_expiration__isnull=True)
chair_commissioner = current_commissioners.filter(commissioner_title__startswith='Chair') \
.exclude(commissioner_title__contains='Vice').first()
vice_commissioner = CommissionerPage.objects.filter(commissioner_title__startswith='Vice').first()
commissioners = CommissionerPage.objects.filter(term_expiration__isnull=True) \
vice_commissioner = current_commissioners.filter(commissioner_title__startswith='Vice').first()
other_commissioners = current_commissioners \
.exclude(Q(commissioner_title__startswith='Chair') \
| Q(commissioner_title__startswith='Vice')) \
.order_by('last_name')

vacant_seats = range(0, 4 - commissioners.count())
# Checks if there are any current commissioners
if current_commissioners:
try:
current_commissioners_count = len(current_commissioners)
except:
current_commissioners_count = 1
else:
current_commissioners_count = 0

vacant_seats = range(0, 6 - current_commissioners_count)

return {
'chair_commissioner': chair_commissioner,
'vice_commissioner': vice_commissioner,
'commissioners': commissioners,
'commissioners': other_commissioners,
'vacant_seats' : vacant_seats,
}