From f9831cce8af574c0cb4d436a05b2977c8e471f17 Mon Sep 17 00:00:00 2001
From: George Katsikas <giorgakis.katsikas@gmail.com>
Date: Mon, 14 Aug 2023 14:23:18 +0300
Subject: [PATCH] find readiness & qualification from resubmissions
---
.../templatetags/submissions_pool.py | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/scipost_django/submissions/templatetags/submissions_pool.py b/scipost_django/submissions/templatetags/submissions_pool.py
index d8cd828d2..5ce197ea4 100644
--- a/scipost_django/submissions/templatetags/submissions_pool.py
+++ b/scipost_django/submissions/templatetags/submissions_pool.py
@@ -39,7 +39,14 @@ def get_fellow_qualification_expertise_level_display(submission, fellow):
q = submission.qualification_set.get(fellow=fellow)
return q.get_expertise_level_display()
except Qualification.DoesNotExist:
- return ""
+ # Try to get the Qualification from the previous Submissions
+ try:
+ q = Qualification.objects.filter(
+ submission__in=submission.thread_full, fellow=fellow
+ ).latest("submission__created")
+ return q.get_expertise_level_display() + " (previous submission)"
+ except Qualification.DoesNotExist:
+ return ""
@register.simple_tag
@@ -62,4 +69,11 @@ def get_fellow_readiness_status_display(submission, fellow):
r = submission.readiness_set.get(fellow=fellow)
return r.get_status_display()
except Readiness.DoesNotExist:
- return ""
+ # Try to get the Readiness from the previous Submissions
+ try:
+ q = Readiness.objects.filter(
+ submission__in=submission.thread_full, fellow=fellow
+ ).latest("submission__created")
+ return q.get_status_display() + " (previous submission)"
+ except Readiness.DoesNotExist:
+ return ""
--
GitLab