Skip to content

fix: Add "simple" list of nomcom volunteers (#4732) #5412

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

Closed
richsalz wants to merge 5 commits into from
Closed

fix: Add "simple" list of nomcom volunteers (#4732) #5412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07e0ae3
fix: Add "simple" list of nomcom volunteers (#4732)
richsalz Mar 25, 2023
75b6818
Re-order columns to "simple" ones are first
richsalz Mar 26, 2023
8321342
Fix parameter declaration to have default value
richsalz Mar 26, 2023
7e1818e
Fix parameter declaration to have default value
richsalz Mar 26, 2023
cf53e11
move dropdown item
richsalz Apr 13, 2023
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
12 changes: 7 additions & 5 deletions ietf/nomcom/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,14 +1313,16 @@ def eligible(request, year, public=False):
def public_volunteers(request, year):
return volunteers(request=request, year=year, public=True)

def private_volunteers(request, year):
return volunteers(request=request, year=year, public=False)

def private_volunteers(request, year, mode="full"):
return volunteers(request=request, year=year, public=False, mode=mode)

@role_required("Nomcom Chair", "Nomcom Advisor", "Secretariat")
def volunteers(request, year, public=False):
def volunteers(request, year, public=False, mode="full"):
nomcom, volunteers = extract_volunteers(year)
return render(request, 'nomcom/volunteers.html', dict(year=year, nomcom=nomcom, volunteers=volunteers, public=public))
fullmode = 1
if mode != "full":
fullmode=0
return render(request, 'nomcom/volunteers.html', dict(year=year, nomcom=nomcom, volunteers=volunteers, public=public, fullmode=fullmode))

@role_required("Nomcom Chair", "Nomcom Advisor", "Secretariat")
def private_volunteers_csv(request, year, public=False):
Expand Down
15 changes: 10 additions & 5 deletions ietf/templates/nomcom/nomcom_private_base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,13 +126,18 @@ <h1>
</a>
<ul class="dropdown-menu mt-n1" role="menu">
<li class="dropdown-item">
<a href="{% url 'ietf.nomcom.views.private_eligible' year %}">
View eligible
<a href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
View volunteers (full)
</a>
</li>
<li class="dropdown-item">
<a href="{% url 'ietf.nomcom.views.private_volunteers' year %}">
View volunteers
<a href="{% url 'ietf.nomcom.views.private_volunteers' year "simple" %}">
Copy link
Copy Markdown
Member

@rjsparks rjsparks Mar 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not doing what you intend, I think. There's nothing in the urls to reverse this to. If possible, lets talk about this in yokohama (I'm at the hackathon today).

View volunteers (simple)
</a>
</li>
<li class="dropdown-item">
<a href="{% url 'ietf.nomcom.views.private_eligible' year %}">
View eligible
</a>
</li>
</ul>
Expand All @@ -153,4 +158,4 @@ <h1>
window.location.hash=e.target.hash;
})
</script>
{% endblock %}
{% endblock %}
28 changes: 16 additions & 12 deletions ietf/templates/nomcom/volunteers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,30 @@ <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}<
<thead>
<tr>
<th scope="col"></th>
<th scope="col" data-sort="last">Last name</th>
<th scope="col" data-sort="first">First name</th>
<th scope="col" data-sort="plain">Plain name</th>
<th scope="col" data-sort="page">Profile page</th>
<th scope="col" data-sort="affiliation">Affiliation</th>
<th scope="col" data-sort="primary">Primary email</th>
<th scope="col" data-sort="qualifications">Qualifications</th>
<th scope="col" data-sort="affiliation">Affiliation</th>
{% if fullmode %}
<th scope="col" data-sort="last">Last name</th>
<th scope="col" data-sort="first">First name</th>
<th scope="col" data-sort="page">Profile page</th>
<th scope="col" data-sort="primary">Primary email</th>
<th scope="col" data-sort="qualifications">Qualifications</th>
{% endif %}
</tr>
</thead>
<tbody>
{% for v in eligibility_group.list %}
<tr>
<td>{{ forloop.counter }}</td>
<td>{{ v.person.last_name }}</td>
<td>{{ v.person.first_name }}</td>
<td>{{ v.person.ascii_name }}</td>
<td>{% person_link v.person %}</td>
<td>{{ v.affiliation }}</td>
<td>{{ v.person.email|linkify }}</td>
<td>{{ v.qualifications }}</td>
{% if fullmode %}
<td>{{ v.person.last_name }}</td>
<td>{{ v.person.first_name }}</td>
<td>{% person_link v.person %}</td>
<td>{{ v.person.email|linkify }}</td>
<td>{{ v.qualifications }}</td>
{% endif %}
</tr>
{% endfor %}
</tbody>
Expand All @@ -46,4 +50,4 @@ <h3 class="mt-3">{{ eligibility_group.grouper|yesno:"Eligible, Not Eligible" }}<
{% endblock %}
{% block js %}
<script src="{% static "ietf/js/list.js" %}"></script>
{% endblock %}
{% endblock %}