From 63b7a4e9fea1d1f51bff47efe53892261963e865 Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Fri, 12 May 2017 12:19:44 +0100 Subject: [PATCH] New status grouping - success --- app/models.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/app/models.py b/app/models.py index 7eeba1e6f..ecc2670e0 100644 --- a/app/models.py +++ b/app/models.py @@ -602,6 +602,11 @@ NOTIFICATION_STATUS_TYPES_COMPLETED = [ NOTIFICATION_PERMANENT_FAILURE, ] +NOTIFICATION_STATUS_SUCCESS = [ + NOTIFICATION_SENT, + NOTIFICATION_DELIVERED +] + NOTIFICATION_STATUS_TYPES_BILLABLE = [ NOTIFICATION_SENDING, NOTIFICATION_SENT, @@ -623,6 +628,7 @@ NOTIFICATION_STATUS_TYPES = [ NOTIFICATION_TEMPORARY_FAILURE, NOTIFICATION_PERMANENT_FAILURE, ] + NOTIFICATION_STATUS_TYPES_ENUM = db.Enum(*NOTIFICATION_STATUS_TYPES, name='notify_status_type') @@ -1060,5 +1066,11 @@ class JobStatistics(db.Model): the_string += "sms sent {} sms delivered {} sms failed {} ".format( self.sms_sent, self.sms_delivered, self.sms_failed ) - the_string += "letter sent {} letter failed {} ".format(self.letters_sent, self.letters_failed) + the_string += "letter sent {} letter failed {} ".format( + self.letters_sent, self.letters_failed + ) + the_string += "job_id {} ".format( + self.job_id + ) + the_string += "created at {}".format(self.created_at) return the_string