diff --git a/scipost_django/submissions/forms/__init__.py b/scipost_django/submissions/forms/__init__.py
index 23385caa1f74627e2a990da65517408868258e1a..3c01b9ad20138fa71398794402febd3bee0de343 100644
--- a/scipost_django/submissions/forms/__init__.py
+++ b/scipost_django/submissions/forms/__init__.py
@@ -2,6 +2,7 @@ __copyright__ = "Copyright © Stichting SciPost (SciPost Foundation)"
__license__ = "AGPL v3"
+from django.urls import reverse
from .appraisal import QualificationForm, ReadinessForm
@@ -1744,11 +1745,13 @@ class SubmissionForm(forms.ModelForm):
).return_active_for_submission(submission)
elif len(submission.collections.all()) > 0:
# Add the Fellowships of the collections
- fellows = set([
- fellow
- for collection in submission.collections.all()
- for fellow in collection.expected_editors.all()
- ])
+ fellows = set(
+ [
+ fellow
+ for collection in submission.collections.all()
+ for fellow in collection.expected_editors.all()
+ ]
+ )
# Check if neither a Proceedings nor a Collection is set
# or whether the above queries returned no results
@@ -2867,17 +2870,6 @@ class RecommendationVoteForm(forms.Form):
choices=ALT_REC_CHOICES,
required=False,
)
- remark = forms.CharField(
- widget=forms.Textarea(
- attrs={
- "rows": 3,
- "cols": 30,
- "placeholder": "Any further remark you want to add? (optional)",
- }
- ),
- label="",
- required=False,
- )
def clean(self):
cleaned_data = super().clean()
@@ -2891,6 +2883,51 @@ class RecommendationVoteForm(forms.Form):
)
+class RecommendationRemarkForm(forms.Form):
+ """Add a remark to an EICRecommendation."""
+
+ remark = forms.CharField(
+ widget=forms.Textarea(
+ attrs={"rows": 5, "placeholder": "Write your remark in this box."}
+ ),
+ label="",
+ )
+
+ def __init__(self, *args, **kwargs):
+ identifier_w_vn_nr = kwargs.pop("identifier_w_vn_nr")
+ self.rec_id = kwargs.pop("rec_id")
+ self.contributor = kwargs.pop("contributor")
+ super().__init__(*args, **kwargs)
+
+ self.helper = FormHelper()
+ self.helper.attrs = {
+ "hx-target": "#recommendation-remarks",
+ "hx-post": reverse(
+ "submissions:pool:decisionmaking:_hx_recommendation_remarks",
+ kwargs={
+ "identifier_w_vn_nr": identifier_w_vn_nr,
+ "rec_id": self.rec_id,
+ },
+ ),
+ }
+ self.helper.layout = Layout(
+ Field("remark"),
+ ButtonHolder(
+ Submit("submit", "Add remark", css_class="mt-2 btn btn-primary")
+ ),
+ )
+
+ def save(self):
+ """Save the remark."""
+ remark = Remark(
+ recommendation=get_object_or_404(EICRecommendation, id=self.rec_id),
+ contributor=self.contributor,
+ remark=self.cleaned_data["remark"],
+ )
+ remark.save()
+ return remark
+
+
class EditorialDecisionForm(forms.ModelForm):
"""For EdAdmin to fix the outcome on a Submission, after voting is completed."""
diff --git a/scipost_django/submissions/templates/submissions/_recommendation_fellow_content.html b/scipost_django/submissions/templates/submissions/_recommendation_fellow_content.html
index 113dc9b3a13d7cc366170bd50d3e9d5c053b76c3..3d05200dafd0cd6d22912ff365686c8a916c241b 100644
--- a/scipost_django/submissions/templates/submissions/_recommendation_fellow_content.html
+++ b/scipost_django/submissions/templates/submissions/_recommendation_fellow_content.html
@@ -102,14 +102,10 @@
</table>
{% endif %}
- <h3 class="card-title">Remarks:</h3>
- <ul>
- {% for rem in recommendation.remarks.all %}
- <li>{% include 'submissions/_remark_small.html' with remark=rem %}</li>
- {% empty %}
- <li><em>No remarks</em></li>
- {% endfor %}
- </ul>
+ <div id="recommendation-remarks"
+ hx-get="{% url "submissions:pool:decisionmaking:_hx_recommendation_remarks" identifier_w_vn_nr=recommendation.submission.preprint.identifier_w_vn_nr rec_id=recommendation.id%}"
+ hx-trigger="load">
+ </div>
</div>
diff --git a/scipost_django/submissions/templates/submissions/pool/decisionmaking/_hx_recommendation_remarks.html b/scipost_django/submissions/templates/submissions/pool/decisionmaking/_hx_recommendation_remarks.html
new file mode 100644
index 0000000000000000000000000000000000000000..0222c4c7bc3fc10c3f79a2333ec25ff3c3d8b784
--- /dev/null
+++ b/scipost_django/submissions/templates/submissions/pool/decisionmaking/_hx_recommendation_remarks.html
@@ -0,0 +1,21 @@
+{% load crispy_forms_tags %}
+
+<h3 class="card-title">Remarks:</h3>
+<ul>
+
+ {% for remark in recommendation.remarks.all %}
+ <li class='mb-1'>
+ {{ remark }}
+ <br />
+ {{ remark.remark|linebreaksbr }}
+ </li>
+ {% empty %}
+ <li>
+ <em>No remarks</em>
+ </li>
+ {% endfor %}
+
+ <h5 class="mt-4">Add a new Remark to this recommendation</h5>
+ {% crispy form %}
+
+</ul>
diff --git a/scipost_django/submissions/templates/submissions/pool/recommendation.html b/scipost_django/submissions/templates/submissions/pool/recommendation.html
index f3bb02727b33c711c2e0cf1a680038a361f8a238..37a45c8d1664d3471d88b5385a32922e129cf7af 100644
--- a/scipost_django/submissions/templates/submissions/pool/recommendation.html
+++ b/scipost_django/submissions/templates/submissions/pool/recommendation.html
@@ -50,7 +50,7 @@
{% if voting_form %}
<h3 class="mt-4" id="votingForm">Your position on this recommendation</h3>
{% if previous_vote %}
- <p>You had previously voted <span class="text-danger">{{ previous_vote }}</span>; you can use the form below to change your vote and/or add a remark:</p>
+ <p>You had previously voted <span class="text-danger">{{ previous_vote }}</span>; you can use the form below to change your vote:</p>
{% endif %}
<form action="{% url 'submissions:vote_on_rec' rec_id=recommendation.id %}" method="post">
<p id="agree_instructions">
diff --git a/scipost_django/submissions/urls/pool/decisionmaking.py b/scipost_django/submissions/urls/pool/decisionmaking.py
index 179949dde270a87ab659dac282bc46d22c97e2ee..8852e04bc11250d8c9dbff86d7fb418ba0416ea2 100644
--- a/scipost_django/submissions/urls/pool/decisionmaking.py
+++ b/scipost_django/submissions/urls/pool/decisionmaking.py
@@ -11,7 +11,7 @@ app_name = "decisionmaking"
urlpatterns = [ # building on /submissions/pool/decisionmaking
path(
- "<identifier:identifier_w_vn_nr>/",
+ "/<identifier:identifier_w_vn_nr>/",
include(
[
path(
@@ -23,6 +23,11 @@ urlpatterns = [ # building on /submissions/pool/decisionmaking
views._hx_recommendation_voting_details_contents,
name="_hx_recommendation_voting_details_contents",
),
+ path(
+ "_hx_recommendation_remarks",
+ views._hx_recommendation_remarks,
+ name="_hx_recommendation_remarks",
+ ),
path(
"voting_rights/grant/",
include(
diff --git a/scipost_django/submissions/views/__init__.py b/scipost_django/submissions/views/__init__.py
index 8e1233c838a3c4d1d7306c54d1cba7f6ccee692b..2bac3b901012969aa41e8be13c15e48a6f2081c0 100644
--- a/scipost_django/submissions/views/__init__.py
+++ b/scipost_django/submissions/views/__init__.py
@@ -2212,26 +2212,16 @@ def vote_on_rec(request, rec_id):
)
pass
votechanged = previous_vote and form.cleaned_data["vote"] != previous_vote
- if form.cleaned_data["remark"] or votechanged:
- # If the vote is changed, we automatically put a remark
- extra_remark = ""
- if votechanged:
- if form.cleaned_data["remark"]:
- extra_remark += "\n"
- extra_remark += (
- "Note from EdAdmin: %s %s changed vote from %s to %s"
- % (
- request.user.first_name,
- request.user.last_name,
- previous_vote,
- form.cleaned_data["vote"],
- )
- )
+ if votechanged:
remark = Remark(
contributor=request.user.contributor,
recommendation=recommendation,
date=timezone.now(),
- remark=form.cleaned_data["remark"] + extra_remark,
+ remark="Note from EdAdmin: {full_name} changed vote from {previous} to {current}".format(
+ full_name=request.user.get_full_name(),
+ previous=previous_vote,
+ current=form.cleaned_data["vote"],
+ ),
)
remark.save()
recommendation.save()
diff --git a/scipost_django/submissions/views/pool/decisionmaking.py b/scipost_django/submissions/views/pool/decisionmaking.py
index 8ad82a44213e28a7c083e8d4aea1af1db1d4e37b..93b5a3c5e71f8d392b554c5449d9444f080e88d7 100644
--- a/scipost_django/submissions/views/pool/decisionmaking.py
+++ b/scipost_django/submissions/views/pool/decisionmaking.py
@@ -11,6 +11,7 @@ from colleges.permissions import (
is_edadmin,
is_edadmin_or_senior_fellow,
)
+from submissions.forms import RecommendationRemarkForm
from submissions.models import Submission, EICRecommendation
from submissions.constants import PUT_TO_VOTING
@@ -167,3 +168,23 @@ def _hx_recommendation_open_voting(
"submission": submission,
},
)
+
+
+def _hx_recommendation_remarks(request, identifier_w_vn_nr, rec_id):
+ recommendation = get_object_or_404(EICRecommendation, pk=rec_id)
+
+ new_remark_form = RecommendationRemarkForm(
+ request.POST or None,
+ rec_id=rec_id,
+ identifier_w_vn_nr=identifier_w_vn_nr,
+ contributor=request.user.contributor,
+ )
+
+ if request.method == "POST" and new_remark_form.is_valid():
+ new_remark_form.save()
+
+ return render(
+ request,
+ "submissions/pool/decisionmaking/_hx_recommendation_remarks.html",
+ context={"recommendation": recommendation, "form": new_remark_form},
+ )