From 6f2a4803042c175054cdcf6f857c6b68d9523b49 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Tue, 2 Apr 2024 16:06:02 +0200
Subject: [PATCH] add remarks count as submissions edadmin note
fixes #184
---
scipost_django/submissions/models/submission.py | 14 ++++++++++++++
.../submissions/pool/_hx_submission_details.html | 2 +-
.../pool/_submission_details_summary_contents.html | 9 ++++++++-
3 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/scipost_django/submissions/models/submission.py b/scipost_django/submissions/models/submission.py
index 8c9dec408..0ada8a726 100644
--- a/scipost_django/submissions/models/submission.py
+++ b/scipost_django/submissions/models/submission.py
@@ -939,6 +939,20 @@ class Submission(models.Model):
return self.editorialdecision_set.nondeprecated().latest_version()
return None
+ def edadmin_notes(self):
+ """Notes to be displayed to edadmin."""
+ notes: list[tuple[str, str]] = []
+
+ if nr_remarks := self.remarks.count():
+ notes.append(
+ (
+ "info",
+ f"There are {nr_remarks} remarks for this submission.",
+ )
+ )
+
+ return notes
+
# The next two models are for optimization of django guardian object-level permissions
# using direct foreign keys instead of generic ones
diff --git a/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html b/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
index 9f0e6e69a..745c12550 100644
--- a/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
+++ b/scipost_django/submissions/templates/submissions/pool/_hx_submission_details.html
@@ -1,5 +1,5 @@
<details id="submission-{{ submission.pk }}-details"
- class="border border-2 mx-3 p-2 bg-primary bg-opacity-10"
+ class="border border-2 mx-3 p-2 bg-primary bg-opacity-10 position-relative"
>
<summary style="list-style: none;"
class="p-2"
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 2e6020bb0..8d9acb81b 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
@@ -1,8 +1,15 @@
{% load submissions_pool %}
{% load ethics_extras %}
-
+{% load user_groups %}
+{% is_ed_admin request.user as is_ed_admin %}
{% get_profile_clearance submission.clearances request.user.contributor.profile as clearance %}
+{% if is_ed_admin %}
+ <div class="fs-5 float-start position-absolute top-0 start-0 translate-middle">
+ {% include "error_hover_explainer.html" with notes=submission.edadmin_notes %}
+ </div>
+{% endif %}
+
<div class="row mb-0">
<div class="col col-md-9">
<table>
--
GitLab