SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit a4d011fb authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Partial work

parent 0dabd969
No related branches found
No related tags found
No related merge requests found
......@@ -53,9 +53,7 @@ class FellowQuerySet(models.QuerySet):
class PotentialFellowshipQuerySet(models.QuerySet):
def vote_needed(self, contributor):
return self.filter(profile__discipline=contributor.profile.discipline,
status=POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING
).exclude(Q(in_agreement__in=[contributor]) |
Q(in_abstain__in=[contributor]) |
Q(in_disagreement__in=[contributor])
).order_by('profile__last_name')
return self.filter(
profile__discipline=contributor.profile.discipline,
status=POTENTIAL_FELLOWSHIP_ELECTION_VOTE_ONGOING
).order_by('profile__last_name')
......@@ -22,13 +22,13 @@ $(document).ready(function($) {
{% if perms.scipost.can_add_potentialfellowship %}
<div class="row">
<div class="col-12">
<h3 class="highlight">Nomination of/voting on potential Fellowships</h3>
<h3 class="highlight">Nominations for/voting on potential Fellowships</h3>
<p>
Do you know somebody qualified who could serve as a Fellow?<br/>
Nominate them by <a href="{% url 'colleges:potential_fellowship_create' %}">adding a Potential Fellowship</a>.
</p>
{% if potfels_to_vote_on %}
<h4>To vote on:</h4>
<h4>Nominations to vote on:</h4>
<ul>
{% for potfel in potfels_to_vote_on %}
<li>{{ potfel }}</li>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment