From 9c866dfb85ff150dbc6ae11fe0d57fae82f22521 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Mon, 2 Oct 2023 17:36:27 +0200
Subject: [PATCH] move nomination vote bootstrap classes to model
---
scipost_django/colleges/models/nomination.py | 10 ++++++++++
.../templates/colleges/_hx_nomination_vote.html | 2 +-
.../colleges/_hx_nomination_voter_table.html | 12 ++----------
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/scipost_django/colleges/models/nomination.py b/scipost_django/colleges/models/nomination.py
index 7468a9381..f76b17bce 100644
--- a/scipost_django/colleges/models/nomination.py
+++ b/scipost_django/colleges/models/nomination.py
@@ -312,6 +312,12 @@ class FellowshipNominationVote(models.Model):
(VOTE_DISAGREE, "Disagree"),
(VOTE_VETO, "Veto"),
)
+ VOTE_BS_CLASSES = {
+ VOTE_AGREE: "success",
+ VOTE_ABSTAIN: "warning",
+ VOTE_DISAGREE: "danger",
+ VOTE_VETO: "black",
+ }
voting_round = models.ForeignKey(
"colleges.FellowshipNominationVotingRound",
@@ -331,6 +337,10 @@ class FellowshipNominationVote(models.Model):
objects = FellowshipNominationVoteQuerySet.as_manager()
+ @property
+ def get_vote_bs_class(self):
+ return self.VOTE_BS_CLASSES[self.vote]
+
class Meta:
constraints = [
models.UniqueConstraint(
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html b/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
index 456572351..a4425b79c 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_vote.html
@@ -1,6 +1,6 @@
<h3>Cast your vote:</h3>
-{% for vote_option, color in vote_options %}
+{% for vote_option, color in VOTE_BS_CLASSES.items %}
<form hx-post="{% url 'colleges:_hx_nomination_vote' round_id=voting_round.id %}"
hx-target="#nomination-{{ voting_round.nomination.id }}-vote">
diff --git a/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html b/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
index f14bba5b3..edb03507b 100644
--- a/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
+++ b/scipost_django/colleges/templates/colleges/_hx_nomination_voter_table.html
@@ -41,16 +41,8 @@
{% if not round.is_unscheduled %}
- {% if voter.vote.vote == "agree" %}
- <td class="text-success">{{ voter.vote.get_vote_display }}</td>
- {% elif voter.vote.vote == "abstain" %}
- <td class="text-warning">{{ voter.vote.get_vote_display }}</td>
- {% elif voter.vote.vote == "disagree" %}
- <td class="text-danger">{{ voter.vote.get_vote_display }}</td>
- {% elif voter.vote.vote == "veto" %}
- <td>
- <span class="badge bg-dark">{{ voter.vote.get_vote_display }}</span>
- </td>
+ {% if voter.vote %}
+ <td class="text-{{ voter.vote.get_vote_bs_class }}">{{ voter.vote.get_vote_display }}</td>
{% else %}
<td class="text-muted">No vote</td>
{% endif %}
--
GitLab