From c08aa5052880e1d1ffa7a78a0281bdffff70130d Mon Sep 17 00:00:00 2001
From: Fredrik Jonsson <frjo@xdeb.org>
Date: Tue, 17 May 2022 13:56:05 +0200
Subject: [PATCH] Exclude draft submissions from submissions results.
---
.../funds/management/commands/export_submissions_csv.py | 2 +-
hypha/apply/funds/views.py | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hypha/apply/funds/management/commands/export_submissions_csv.py b/hypha/apply/funds/management/commands/export_submissions_csv.py
index e3ce85eba..999f380d3 100644
--- a/hypha/apply/funds/management/commands/export_submissions_csv.py
+++ b/hypha/apply/funds/management/commands/export_submissions_csv.py
@@ -12,7 +12,7 @@ class Command(BaseCommand):
with open('export_submissions.csv', 'w', newline='') as csvfile:
writer = csv.writer(csvfile, quoting=csv.QUOTE_ALL)
writer.writerow(['Submission ID', 'Submission title', 'Submission author', 'Submission e-mail', 'Submission value', 'Submission duration', 'Submission reapplied', 'Submission stage', 'Submission phase', 'Submission screening', 'Submission date', 'Submission region', 'Submission country', 'Submission focus', 'Round/Lab/Fellowship'])
- for submission in ApplicationSubmission.objects.all():
+ for submission in ApplicationSubmission.objects.exclude_draft():
submission_region = ''
submission_country = ''
submission_focus = ''
diff --git a/hypha/apply/funds/views.py b/hypha/apply/funds/views.py
index 84f033ac1..3f6b24696 100644
--- a/hypha/apply/funds/views.py
+++ b/hypha/apply/funds/views.py
@@ -115,7 +115,7 @@ User = get_user_model()
class SubmissionStatsMixin:
def get_context_data(self, **kwargs):
- submissions = ApplicationSubmission.objects.all()
+ submissions = ApplicationSubmission.objects.exclude_draft()
submission_undetermined_count = submissions.undetermined().count()
review_my_count = submissions.reviewed_by(self.request.user).count()
@@ -128,7 +128,7 @@ class SubmissionStatsMixin:
submission_accepted_sum = intcomma(submission_accepted_value.get('value__sum'))
submission_accepted_count = submission_accepted.count()
- reviews = Review.objects.all()
+ reviews = Review.objects.submitted()
review_count = reviews.count()
review_my_score = reviews.by_user(self.request.user).score()
@@ -1282,7 +1282,7 @@ class SubmissionResultView(SubmissionStatsMixin, FilterView):
return new_kwargs
def get_queryset(self):
- return self.filterset_class._meta.model.objects.current()
+ return self.filterset_class._meta.model.objects.current().exclude_draft()
def get_context_data(self, **kwargs):
search_term = self.request.GET.get('query')
--
GitLab