district name added

praekeltfoundation · Jul 12, 2016 · e2cccc6 · e2cccc6
1 parent 7756724
commit e2cccc6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/malaria24/ona/models.py b/malaria24/ona/models.py
@@ -32,15 +32,20 @@ def compile_digest(cls):
         return digest
 
     def send_digest_email(self):
-        start_date = self.reportedcase_set.all() \
-            .first().create_date_time.strftime(
-                "%d %B %Y"
-        )
-        end_date = self.reportedcase_set.all() \
-            .last().create_date_time.strftime(
-                "%d %B %Y"
-        )
-        week = "{0} to {1}".format(start_date, end_date)
+        if self.reportedcase_set.all():
+            start_date = self.reportedcase_set.all() \
+                .first().create_date_time.strftime(
+                    "%d %B %Y"
+            )
+            end_date = self.reportedcase_set.all() \
+                .last().create_date_time.strftime(
+                    "%d %B %Y"
+            )
+            week = "{0} to {1}".format(start_date, end_date)
+        else:
+            date = datetime.today()
+            week = 'Week ' + str(
+                date.strftime("%U")) + ' ' + str(date.year)
         context = {
             'digest': self,
             'week': week,
@@ -272,13 +277,18 @@ def get_digest_email_data(self, district, facility_code):
 
         district_cases = ReportedCase.objects.filter(
             facility_code__in=district_fac_codes, digest__isnull=True)
-        start_date = district_cases.first().create_date_time.strftime(
-            "%d %B %Y"
-        )
-        end_date = district_cases.last().create_date_time.strftime(
-            "%d %B %Y"
-        )
-        week = "{0} to {1}".format(start_date, end_date)
+        if district_cases:
+            start_date = district_cases.first().create_date_time.strftime(
+                "%d %B %Y"
+            )
+            end_date = district_cases.last().create_date_time.strftime(
+                "%d %B %Y"
+            )
+            week = "{0} to {1}".format(start_date, end_date)
+        else:
+            date = datetime.today()
+            week = 'Week ' + str(
+                date.strftime("%U")) + ' ' + str(date.year)
         facilities = Facility.objects.filter(district=district)
         fac_list = []
         total_cases = total_females = total_males = 0

diff --git a/malaria24/ona/templates/ona/html_digest.html b/malaria24/ona/templates/ona/html_digest.html
@@ -15,16 +15,17 @@
 <body>
   <table border="1" style="width: 100%; border: 1px #DEDFDE solid;" cellspacing="0" cellpadding="2">
     <tr>
-      <td colspan="5" style="text-align: center;"><strong>National Department of Health: Malaria Elimination Programme</strong></td>
+      <td colspan="8" style="text-align: center;"><strong>National Department of Health: Malaria Elimination Programme</strong></td>
     </tr>
     <tr>
-      <td colspan="5" style="text-align: center;"><strong>MalariaConnect Case Summary</strong></td>
+      <td colspan="8" style="text-align: center;"><strong>MalariaConnect Case Summary</strong></td>
     </tr>
     <tr>
-      <td colspan="5" style="text-align: center;"><strong>{{week}}</strong></td>
+      <td colspan="8" style="text-align: center;"><strong>{{week}}</strong></td>
     </tr>
     <tr>
       <th>Case Number</th>
+      <th>District</th>
       <th>Facility Code</th>
       <th>Facility Name</th>
       <th>Date &amp; Time</th>
@@ -33,6 +34,7 @@
     {% for case in digest.reportedcase_set.all %}
         <tr>
           <td>{{case.case_number}}</td>
+          <td>{{case.districts}}</td>
           <td>{{case.facility_code}}</td>
           <td>{{case.facility_names}}</td>
           <td>{{ case.create_date_time|date:"D d M Y" }} {{ case.create_date_time|time:"H:i" }}</td>