From 56b61c17fb9cb9eb912ab29d6aa30db5515b3325 Mon Sep 17 00:00:00 2001
From: sks444 <krishnasingh.ss30@gmail.com>
Date: Wed, 28 Oct 2020 11:32:53 +0530
Subject: [PATCH] Use joined screening statuses for export submissions
---
.../apply/funds/management/commands/export_submissions_csv.py | 2 +-
hypha/apply/funds/models/submissions.py | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/hypha/apply/funds/management/commands/export_submissions_csv.py b/hypha/apply/funds/management/commands/export_submissions_csv.py
index 61bbe8a11..e3ce85eba 100644
--- a/hypha/apply/funds/management/commands/export_submissions_csv.py
+++ b/hypha/apply/funds/management/commands/export_submissions_csv.py
@@ -44,4 +44,4 @@ class Command(BaseCommand):
submission_value = submission.value
except KeyError:
submission_value = 0
- writer.writerow([submission.id, submission.title, submission.full_name, submission.email, submission_value, submission.duration, submission_reapplied, submission.stage, submission.phase, submission.screening_status, submission.submit_time.strftime('%Y-%m-%d'), submission_region, submission_country, submission_focus, submission_type])
+ writer.writerow([submission.id, submission.title, submission.full_name, submission.email, submission_value, submission.duration, submission_reapplied, submission.stage, submission.phase, submission.joined_screening_statuses, submission.submit_time.strftime('%Y-%m-%d'), submission_region, submission_country, submission_focus, submission_type])
diff --git a/hypha/apply/funds/models/submissions.py b/hypha/apply/funds/models/submissions.py
index 5f4c90539..197a90a00 100644
--- a/hypha/apply/funds/models/submissions.py
+++ b/hypha/apply/funds/models/submissions.py
@@ -820,6 +820,10 @@ class ApplicationSubmission(
def can_not_edit_default(self):
return self.screening_statuses.all().count() > 1
+ @property
+ def joined_screening_statuses(self):
+ return ', '.join([s.title for s in self.screening_statuses.all()])
+
@receiver(post_transition, sender=ApplicationSubmission)
def log_status_update(sender, **kwargs):
--
GitLab