From 152252e6f97f228b55ae3a3245c6422d7f7ceee6 Mon Sep 17 00:00:00 2001
From: Jorran de Wit <jorrandewit@outlook.com>
Date: Wed, 1 Nov 2017 15:09:14 +0100
Subject: [PATCH] Fix template recommendation inconsistency
---
.../partials/submissions/remark_small.html | 2 +
.../submissions/admin/recommendation.html | 86 -------------------
submissions/templates/submissions/pool.html | 68 ++++++++++-----
.../submissions/pool/recommendation.html | 70 +++++++++++++--
submissions/views.py | 6 +-
5 files changed, 114 insertions(+), 118 deletions(-)
create mode 100644 submissions/templates/partials/submissions/remark_small.html
delete mode 100644 submissions/templates/submissions/admin/recommendation.html
diff --git a/submissions/templates/partials/submissions/remark_small.html b/submissions/templates/partials/submissions/remark_small.html
new file mode 100644
index 000000000..e900b9abd
--- /dev/null
+++ b/submissions/templates/partials/submissions/remark_small.html
@@ -0,0 +1,2 @@
+{{ remark }}<br>
+{{ remark.remark|linebreaksbr }}
diff --git a/submissions/templates/submissions/admin/recommendation.html b/submissions/templates/submissions/admin/recommendation.html
deleted file mode 100644
index 52bafd667..000000000
--- a/submissions/templates/submissions/admin/recommendation.html
+++ /dev/null
@@ -1,86 +0,0 @@
-{% extends 'submissions/admin/base.html' %}
-
-{% load bootstrap %}
-{% load scipost_extras %}
-
-{% block breadcrumb_items %}
- {{ block.super }}
- <span class="breadcrumb-item">Editorial Recommendation</span>
-{% endblock %}
-
-{% block pagetitle %}: Editorial Recommendation{% endblock pagetitle %}
-
-{% block content %}
- <h1 class="highlight">Editorial Recommendation</h1>
-
- {% include 'partials/submissions/submission_title.html' with submission=object.submission %}
- {% include 'partials/submissions/pool/submission_info_table.html' with submission=object.submission %}
-
- <br>
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=object %}
-
- <br>
- <div class="card">
- <div class="card-body">
- {% if object.remarks.exists %}
- <h3 class="card-title">Remarks by Fellows:</h3>
- <ul>
- {% for remark in object.remarks.all|sort_by:'date' %}
- {% include 'partials/submissions/remark_as_li.html' with remark=remark %}
- {% empty %}
- <li>No Remarks found.</li>
- {% endfor %}
- </ul>
- {% endif %}
-
- <h3 class="card-title">Fellows eligible to vote:</h3>
- <ul>
- {% for eligible in object.eligible_to_vote.all|sort_by:'user__last_name' %}
- <li>{{ eligible.user.first_name }} {{ eligible.user.last_name }}</li>
- {% endfor %}
- </ul>
-
- <h3 class="card-title">Voting results up to now:</h3>
- <ul>
- <li>
- Agreed ({{ object.voted_for.all.count }}):
- {% for agreed in object.voted_for.all|sort_by:'user__last_name' %}
- {{ agreed.user.last_name }}{% if not forloop.last %},{% endif %}
- {% endfor %}
- </li>
- <li>
- Disagreed ({{ object.voted_against.all.count }}):
- {% for disagreed in object.voted_against.all|sort_by:'user__last_name' %}
- {{ disagreed.user.last_name }}{% if not forloop.last %},{% endif %}
- {% endfor %}
- </li>
- <li>
- Abstained ({{ object.voted_abstain.all.count }}):
- {% for abstained in object.voted_abstain.all|sort_by:'user__last_name' %}
- {{ abstained.user.last_name }}{% if not forloop.last %},{% endif %}
- {% endfor %}
- </li>
- </ul>
-
- {% if object.remarks.exists %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in object.remarks.all %}
- <li>{{ rem }}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
- {% endif %}
- </div>
- <div class="card-footer bg-light py-3">
- <h3 class="card-title">Administrative actions on recommendations undergoing voting:</h3>
- <ul class="mb-0">
- <li>To send an email reminder to each Fellow with at least one voting duty: <a href="{% url 'submissions:remind_Fellows_to_vote' %}">click here</a></li>
- <li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=object.id %}">click here</a></li>
- <li>To request a modification of the Recommendation to request for revision: click here</li>
- </ul>
- </div>
- </div>
-
-{% endblock %}
diff --git a/submissions/templates/submissions/pool.html b/submissions/templates/submissions/pool.html
index bff975019..d52f9fa2c 100644
--- a/submissions/templates/submissions/pool.html
+++ b/submissions/templates/submissions/pool.html
@@ -54,14 +54,6 @@
<div class="card card-outline-secondary">
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
<div class="card-body">
- {% if rec.remarks.all %}
- <h3 class="card-title">Remarks by Fellows:</h3>
- <ul>
- {% for remark in rec.remarks.all|sort_by:'date' %}
- {% include 'partials/submissions/remark_as_li.html' with remark=remark %}
- {% endfor %}
- </ul>
- {% endif %}
<h3 class="card-title">Fellows eligible to vote:</h3>
<ul>
@@ -94,16 +86,14 @@
</li>
</ul>
- {% if rec.remarks %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in rec.remarks.all %}
- <li>{{ rem }}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
- {% endif %}
+ <h3 class="card-title">Remarks:</h3>
+ <ul>
+ {% for rem in rec.remarks.all %}
+ <li>{% include 'partials/submissions/remark_small.html' with remark=rem %}</li>
+ {% empty %}
+ <li><em>No remarks</em></li>
+ {% endfor %}
+ </ul>
</div>
<div class="card-footer">
<h3 class="card-title">Actions:</h3>
@@ -183,7 +173,7 @@
<h1 class="highlight mt-0">Recommendations to vote on</h1>
</div>
</div>
- {% for rec in recs_to_vote_on %}
+ {% for recommendation in recs_to_vote_on %}
{% if not forloop.first %}
<hr>
{% endif %}
@@ -192,16 +182,48 @@
<div class="col-12">
<div class="card">
<div class="card-body">
- {% include 'partials/submissions/submission_title.html' with submission=rec.submission %}
- {% include 'partials/submissions/pool/submission_info_table.html' with submission=rec.submission %}
+ {% include 'partials/submissions/submission_title.html' with submission=recommendation.submission %}
+ {% include 'partials/submissions/pool/submission_info_table.html' with submission=recommendation.submission %}
</div>
</div>
<div class="card card-outline-secondary">
- {% include 'submissions/_recommendation_fellow_content.html' with recommendation=rec %}
+ {% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
+ <div class="card-body">
+ <h3 class="card-title">Voting results up to now:</h3>
+ <ul>
+ <li>
+ Agreed ({{ recommendation.voted_for.all.count }}):
+ {% for agreed in recommendation.voted_for.all|sort_by:'user__last_name' %}
+ {{ agreed.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ <li>
+ Disagreed ({{ recommendation.voted_against.all.count }}):
+ {% for disagreed in recommendation.voted_against.all|sort_by:'user__last_name' %}
+ {{ disagreed.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ <li>
+ Abstained ({{ recommendation.voted_abstain.all.count }}):
+ {% for abstained in recommendation.voted_abstain.all|sort_by:'user__last_name' %}
+ {{ abstained.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ </ul>
+
+ <h3 class="card-title">Remarks:</h3>
+ <ul>
+ {% for rem in recommendation.remarks.all %}
+ <li>{% include 'partials/submissions/remark_small.html' with remark=rem %}</li>
+ {% empty %}
+ <li><em>No remarks</em></li>
+ {% endfor %}
+ </ul>
+ </div>
<div class="card-footer">
<h3>Your position on this recommendation</h3>
- <form action="{% url 'submissions:vote_on_rec' rec_id=rec.id %}" method="post">
+ <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
{% csrf_token %}
{{ rec_vote_form|bootstrap:'0,12' }}
<input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
diff --git a/submissions/templates/submissions/pool/recommendation.html b/submissions/templates/submissions/pool/recommendation.html
index bf8497007..e7f703eab 100644
--- a/submissions/templates/submissions/pool/recommendation.html
+++ b/submissions/templates/submissions/pool/recommendation.html
@@ -1,6 +1,7 @@
{% extends 'submissions/pool/base.html' %}
{% load bootstrap %}
+{% load scipost_extras %}
{% block breadcrumb_items %}
{{ block.super }}
@@ -18,11 +19,68 @@
<br>
{% include 'submissions/_recommendation_fellow_content.html' with recommendation=recommendation %}
- <h3 class="mt-4">Your position on this recommendation</h3>
- <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
- {% csrf_token %}
- {{ form|bootstrap:'0,12' }}
- <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
- </form>
+
+ <div class="card">
+ <div class="card-body">
+
+ <h3 class="card-title">Fellows eligible to vote:</h3>
+ <ul>
+ {% for eligible in recommendation.eligible_to_vote.all|sort_by:'user__last_name' %}
+ <li>{{ eligible.user.first_name }} {{ eligible.user.last_name }}</li>
+ {% endfor %}
+ </ul>
+
+ <h3 class="card-title">Voting results up to now:</h3>
+ <ul>
+ <li>
+ Agreed ({{ recommendation.voted_for.all.count }}):
+ {% for agreed in recommendation.voted_for.all|sort_by:'user__last_name' %}
+ {{ agreed.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ <li>
+ Disagreed ({{ recommendation.voted_against.all.count }}):
+ {% for disagreed in recommendation.voted_against.all|sort_by:'user__last_name' %}
+ {{ disagreed.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ <li>
+ Abstained ({{ recommendation.voted_abstain.all.count }}):
+ {% for abstained in recommendation.voted_abstain.all|sort_by:'user__last_name' %}
+ {{ abstained.user.last_name }}{% if not forloop.last %},{% endif %}
+ {% endfor %}
+ </li>
+ </ul>
+
+ <h3 class="card-title">Remarks:</h3>
+ <ul>
+ {% for rem in recommendation.remarks.all %}
+ <li>{% include 'partials/submissions/remark_small.html' with remark=rem %}</li>
+ {% empty %}
+ <li><em>No remarks</em></li>
+ {% endfor %}
+ </ul>
+ </div>
+
+ {% if perms.scipost.can_fix_College_decision %}
+ <div class="card-footer bg-light py-3">
+ <h3 class="card-title">Administrative actions on recommendations undergoing voting:</h3>
+ <ul class="mb-0">
+ <li>To send an email reminder to each Fellow with at least one voting duty: <a href="{% url 'submissions:remind_Fellows_to_vote' %}">click here</a></li>
+ <li>To fix the College decision and follow the Editorial Recommendation as is: <a href="{% url 'submissions:fix_College_decision' rec_id=recommendation.id %}">click here</a></li>
+ <li>To request a modification of the Recommendation to request for revision: click here</li>
+ </ul>
+ </div>
+ {% endif %}
+ </div>
+
+ {% if form %}
+ <h3 class="mt-4">Your position on this recommendation</h3>
+ <form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
+ {% csrf_token %}
+ {{ form|bootstrap:'0,12' }}
+ <input type="submit" name="submit" value="Cast your vote" class="btn btn-primary submitButton" id="submit-id-submit">
+ </form>
+ {% endif %}
{% endblock %}
diff --git a/submissions/views.py b/submissions/views.py
index 14a1ef4c7..a9824dbd6 100644
--- a/submissions/views.py
+++ b/submissions/views.py
@@ -1568,14 +1568,14 @@ def fix_College_decision(request, rec_id):
class EICRecommendationView(SubmissionAdminViewMixin, DetailView):
permission_required = 'scipost.can_fix_College_decision'
- template_name = 'submissions/admin/recommendation.html'
+ template_name = 'submissions/pool/recommendation.html'
editorial_page = True
def get_context_data(self, *args, **kwargs):
""" Get the EICRecommendation as a submission-related instance. """
ctx = super().get_context_data(*args, **kwargs)
- ctx['object'] = get_object_or_404(ctx['submission'].eicrecommendations.all(),
- id=self.kwargs['rec_id'])
+ ctx['recommendation'] = get_object_or_404(
+ ctx['submission'].eicrecommendations.all(), id=self.kwargs['rec_id'])
return ctx
--
GitLab