From 7c6f7d3125564cc8d357ae5d07b167d5887e763b Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Tue, 12 Sep 2023 13:38:21 +0200
Subject: [PATCH] add new voting round button to nominations
---
scipost_django/colleges/models/nomination.py | 10 ++++++-
.../colleges/_hx_nomination_li_contents.html | 2 +-
.../_hx_nomination_voting_rounds_tab.html | 22 ++++++++++++---
.../colleges/_hx_voting_round_results.html | 28 ++++++++-----------
scipost_django/colleges/views.py | 8 +++++-
5 files changed, 47 insertions(+), 23 deletions(-)
diff --git a/scipost_django/colleges/models/nomination.py b/scipost_django/colleges/models/nomination.py
index 72e546b3b..4adfaf87f 100644
--- a/scipost_django/colleges/models/nomination.py
+++ b/scipost_django/colleges/models/nomination.py
@@ -219,6 +219,14 @@ class FellowshipNominationVotingRound(models.Model):
def is_open(self):
return self.voting_opens <= timezone.now() <= self.voting_deadline
+ @property
+ def is_scheduled(self):
+ return self.voting_deadline is not None and self.voting_opens > timezone.now()
+
+ @property
+ def is_unscheduled(self):
+ return self.voting_opens is None or self.voting_deadline is None
+
@property
def vote_outcome(self):
"""The outcome as determined by the votes."""
@@ -244,7 +252,7 @@ class FellowshipNominationVotingRound(models.Model):
def can_view(self, user) -> bool:
"""Return whether the user can view this voting round.
They must be authenticated and have voting eligibility or be edadmin."""
-
+
eligibility_per_fellowship = [
fellowship in self.eligible_to_vote.all()
for fellowship in user.contributor.fellowships.all()
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html
index 4c0684f32..20d95ccdc 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_li_contents.html
@@ -127,7 +127,7 @@
<div class="card">
<div class="card-header">Voting Rounds</div>
<div class="card-body p-0">
- <div hx-get="{% url 'colleges:_hx_nomination_voting_rounds_tab' nomination_id=nomination.id round_id=nomination.latest_voting_round.id %}"
+ <div hx-get="{% url 'colleges:_hx_nomination_voting_rounds_tab' nomination_id=nomination.id round_id=nomination.latest_voting_round.id|default:0 %}"
hx-trigger="intersect once"></div>
</div>
</div>
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_voting_rounds_tab.html b/scipost_django/colleges/templates/colleges/_hx_nomination_voting_rounds_tab.html
index 5f9239748..cb09c04f0 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_voting_rounds_tab.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_voting_rounds_tab.html
@@ -1,16 +1,26 @@
<div id="nomination-{{ nomination_id }}-round-tab-holder">
<nav class="nav nav-pills m-2 overflow-scroll">
+ <div type="button" class="me-2 px-2 nav-link {% if new_round %}bg-success{% else %}border border-success{% endif %}"
+ hx-get="{% url 'colleges:_hx_nomination_voting_rounds_tab' nomination_id=nomination_id round_id=0 %}"
+ hx-target="#nomination-{{ nomination_id }}-round-tab-holder"
+ hx-swap="outerHTML">
+ <span class="fs-1 align-items-center text-{% if new_round %}white{% else %}success{% endif %}">+</span>
+ </div>
{% for voting_round in voting_rounds %}
- <div type="button" class="nav-link {% if selected_round.id == voting_round.id %}active{% endif %} {% if voting_round.id in inaccessible_round_ids %}disabled opacity-50{% endif %}"
+ <div type="button" class="me-2 nav-link {% if selected_round and selected_round.id == voting_round.id %}active{% endif %} {% if voting_round.id in inaccessible_round_ids %}disabled opacity-50{% endif %}"
hx-get="{% url 'colleges:_hx_nomination_voting_rounds_tab' nomination_id=nomination_id round_id=voting_round.id %}"
hx-target="#nomination-{{ nomination_id }}-round-tab-holder"
hx-swap="outerHTML">
<span class="d-block text-nowrap">
<span class="d-flex justify-content-between">
<span>Round #{{ forloop.counter0|add:1 }}</span>
- {% if voting_round.is_open %}
+ {% if voting_round.is_unscheduled %}
+ <span class="text-danger">Uncheduled</span>
+ {% elif voting_round.is_scheduled %}
+ <span class="text-warning">Scheduled</span>
+ {% elif voting_round.is_open %}
<span class="text-success">Open</span>
{% endif %}
</span>
@@ -21,8 +31,12 @@
</nav>
- <div id="nomination-{{ nomination_id }}-round-{{ selected_round.id }}-tab-content-holder">
- {% include "colleges/_hx_voting_round_results.html" with voting_round=selected_round %}
+ <div id="nomination-{{ nomination_id }}-round-{{ selected_round.id }}-tab-content-holder" class="mt-3 px-3">
+ {% if new_round %}
+ Newrounds!
+ {% else %}
+ {% include "colleges/_hx_voting_round_results.html" with voting_round=selected_round %}
+ {% endif %}
</div>
</div>
diff --git a/scipost_django/colleges/templates/colleges/_hx_voting_round_results.html b/scipost_django/colleges/templates/colleges/_hx_voting_round_results.html
index e82d9f903..80c0cda1e 100644
--- a/scipost_django/colleges/templates/colleges/_hx_voting_round_results.html
+++ b/scipost_django/colleges/templates/colleges/_hx_voting_round_results.html
@@ -1,21 +1,17 @@
-<div class="px-3">
-
+{% if "edadmin" in user_roles %}
+ <h3>Votes</h3>
+ <div id="nomination-{{ nomination.id }}-round-{{ voting_round.id }}-votes"
+ hx-get="{% url 'colleges:_hx_nomination_voter_table' round_id=voting_round.id %}"
+ hx-trigger="intersect once"></div>
+{% endif %}
- {% if "edadmin" in user_roles %}
- <h3>Votes</h3>
- <div id="nomination-{{ nomination.id }}-round-{{ voting_round.id }}-votes"
- hx-get="{% url 'colleges:_hx_nomination_voter_table' round_id=voting_round.id %}"
- hx-trigger="intersect once"></div>
- {% endif %}
-
- <div class="row mb-0">
- <div class="col-12 col-md mt-3">
- <h3>Decision</h3>
+<div class="row mb-0">
+ <div class="col-12 col-md mt-3">
+ <h3>Decision</h3>
- <div hx-get="{% url 'colleges:_hx_nomination_decision_form' round_id=voting_round.id %}"
- hx-trigger="intersect once"></div>
+ <div hx-get="{% url 'colleges:_hx_nomination_decision_form' round_id=voting_round.id %}"
+ hx-trigger="intersect once"></div>
- </div>
- <div class="col-12 col-md mt-3">{% include "colleges/_voting_results_box.html" with voting_round=voting_round %}</div>
</div>
+ <div class="col-12 col-md mt-3">{% include "colleges/_voting_results_box.html" with voting_round=voting_round %}</div>
</div>
diff --git a/scipost_django/colleges/views.py b/scipost_django/colleges/views.py
index e18745b55..02d765985 100644
--- a/scipost_django/colleges/views.py
+++ b/scipost_django/colleges/views.py
@@ -912,9 +912,15 @@ def _hx_nomination_voting_rounds_tab(request, nomination_id, round_id):
context = {
"nomination_id": nomination_id,
"voting_rounds": voting_rounds,
- "selected_round": voting_rounds.get(id=round_id),
"inaccessible_round_ids": inaccessible_round_ids,
+ "new_round": False,
}
+
+ if round_id == 0:
+ context["new_round"] = True
+ else:
+ context["selected_round"] = voting_rounds.get(id=round_id)
+
return render(request, "colleges/_hx_nomination_voting_rounds_tab.html", context)
--
GitLab