From 92a3dc616735a3a04b296f5eed971be12e70d0c2 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Tue, 9 Apr 2024 12:38:40 +0200
Subject: [PATCH] split eic rec and status to new line
fixes #216
---
scipost_django/submissions/models/recommendation.py | 12 ++++++++++--
.../pool/_submission_details_summary_contents.html | 5 ++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/scipost_django/submissions/models/recommendation.py b/scipost_django/submissions/models/recommendation.py
index e3bec94a0..e94b4e71a 100644
--- a/scipost_django/submissions/models/recommendation.py
+++ b/scipost_django/submissions/models/recommendation.py
@@ -155,11 +155,19 @@ class EICRecommendation(SubmissionRelatedObjectMixin, models.Model):
def get_full_status_short_display(self):
"""Return `recommendation` and `status` field display in short form."""
- eicrec_short = dict(EIC_REC_CHOICES_SHORT).get(self.recommendation)
+ eicrec_short = self.get_recommendation_short_display()
journal_name = self.for_journal.name_abbrev or ""
- status_short = dict(EIC_REC_STATUSES_SHORT).get(self.status)
+ status_short = self.get_status_short_display()
return f"{eicrec_short} - {journal_name} ({status_short})"
+ def get_status_short_display(self):
+ """Return `status` field display in short form."""
+ return dict(EIC_REC_STATUSES_SHORT).get(self.status)
+
+ def get_recommendation_short_display(self):
+ """Return `recommendation` field display in short form."""
+ return dict(EIC_REC_CHOICES_SHORT).get(self.recommendation)
+
class AlternativeRecommendation(models.Model):
"""Alternative recommendation from voting Fellow who disagrees with EICRec."""
diff --git a/scipost_django/submissions/templates/submissions/pool/_submission_details_summary_contents.html b/scipost_django/submissions/templates/submissions/pool/_submission_details_summary_contents.html
index 8d9acb81b..fd169b783 100644
--- a/scipost_django/submissions/templates/submissions/pool/_submission_details_summary_contents.html
+++ b/scipost_django/submissions/templates/submissions/pool/_submission_details_summary_contents.html
@@ -60,7 +60,10 @@
<br>
<small class="text-muted">EIC Recommendation & Status</small>
<br>
- {{ recommendation.get_full_status_short_display }}
+ {{ recommendation.get_recommendation_short_display }}
+ - {{ recommendation.for_journal.name_abbrev }}
+ <br>
+ {{ recommendation.get_status_short_display }}
<br>
<small class="text-muted">{{ recommendation.eligible_to_vote.count }} voting: {{ recommendation.voted_for.count }} agreed, {{ recommendation.voted_against.count }} disagreed, {{ recommendation.voted_abstain.count }} abstained</small>
{% endif %}
--
GitLab