Skip to content

Commit b9fecad

Browse files
committed
Add notifications for DELETE_REPORT.
1 parent 60eb6ee commit b9fecad

5 files changed

Lines changed: 14 additions & 0 deletions

File tree

hypha/apply/activity/adapters/activity_feed.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ class ActivityAdapter(AdapterBase):
6565
MESSAGES.UPDATE_INVOICE_STATUS: "handle_update_invoice_status",
6666
MESSAGES.CREATE_INVOICE: _("Invoice added"),
6767
MESSAGES.SUBMIT_REPORT: _("Submitted a report"),
68+
MESSAGES.DELETE_REPORT: _("deleted a report"),
6869
MESSAGES.SKIPPED_REPORT: "handle_skipped_report",
6970
MESSAGES.REPORT_FREQUENCY_CHANGED: "handle_report_frequency",
7071
MESSAGES.DISABLED_REPORTING: _("disabled reporting"),
@@ -112,6 +113,7 @@ def extra_kwargs(self, message_type, source, sources, **kwargs):
112113
MESSAGES.SUBMIT_CONTRACT_DOCUMENTS,
113114
MESSAGES.DELETE_INVOICE,
114115
MESSAGES.CREATE_INVOICE,
116+
MESSAGES.DELETE_REPORT,
115117
]:
116118
return {"visibility": APPLICANT}
117119

hypha/apply/activity/adapters/base.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
MESSAGES.DELETE_INVOICE: "invoice",
3434
MESSAGES.UPDATE_INVOICE: "invoice",
3535
MESSAGES.SUBMIT_REPORT: "report",
36+
MESSAGES.DELETE_REPORT: "report",
3637
MESSAGES.SKIPPED_REPORT: "report",
3738
MESSAGES.REPORT_FREQUENCY_CHANGED: "config",
3839
MESSAGES.REPORT_NOTIFY: "report",

hypha/apply/activity/adapters/slack.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ class SlackAdapter(AdapterBase):
123123
MESSAGES.SUBMIT_REPORT: _(
124124
"{user} has submitted a report for <{link}|{source.title}>"
125125
),
126+
MESSAGES.DELETE_REPORT: _(
127+
"{user} has deleted a report for <{link}|{source.title}>"
128+
),
126129
MESSAGES.BATCH_DELETE_SUBMISSION: "handle_batch_delete_submission",
127130
MESSAGES.BATCH_ANONYMIZE_SUBMISSION: "handle_batch_anonymize_submission",
128131
MESSAGES.STAFF_ACCOUNT_CREATED: _(

hypha/apply/activity/options.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ class MESSAGES(TextChoices):
5959
SENT_TO_COMPLIANCE = "SENT_TO_COMPLIANCE", _("sent project to compliance")
6060
UPDATE_INVOICE = "UPDATE_INVOICE", _("updated invoice")
6161
SUBMIT_REPORT = "SUBMIT_REPORT", _("submitted report")
62+
DELETE_REPORT = "DELETE_REPORT", _("deleted report")
6263
SKIPPED_REPORT = "SKIPPED_REPORT", _("skipped report")
6364
REPORT_FREQUENCY_CHANGED = "REPORT_FREQUENCY_CHANGED", _("changed report frequency")
6465
DISABLED_REPORTING = "DISABLED_REPORTING", _("disabled reporting")

hypha/apply/projects/reports/views.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,13 @@ def post(self, request, *args, **kwargs):
640640
"funds:submissions:project",
641641
kwargs={"pk": self.report.project.submission.id},
642642
)
643+
messenger(
644+
MESSAGES.DELETE_REPORT,
645+
request=request,
646+
user=request.user,
647+
source=self.report.project,
648+
related=self.report,
649+
)
643650
self.report.delete()
644651
return HttpResponseRedirect(project_url)
645652

0 commit comments

Comments
 (0)