making changes to admin

praekeltfoundation · Feb 3, 2016 · 70bb166 · 70bb166
1 parent a39495a
commit 70bb166
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/malaria24/ona/admin.py b/malaria24/ona/admin.py
@@ -82,7 +82,7 @@ class ActorAdminForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         super(ActorAdminForm, self).__init__(*args, **kwargs)
-        self.fields['district'].choices = [('---------', '---------')] + [(
+        self.fields['district'].choices = [('', '---------')] + [(
             d, d) for d in Facility.objects.all().values_list(
                 'district', flat=True).distinct().order_by("district")]
 

diff --git a/malaria24/ona/models.py b/malaria24/ona/models.py
@@ -151,7 +151,7 @@ def get_digest_email_data(self, province, facility_code):
             try:
                 province = Facility.objects.get(
                     facility_code=facility_code).province
-            except:
+            except Facility.DoesNotExist:
                 return {}
         districts = Facility.objects.filter(province=province).values_list(
             'district', flat=True).distinct().order_by("district")
@@ -200,6 +200,10 @@ def send_digest_email(self):
         for manager in Actor.objects.provincial():
             context = self.get_digest_email_data(
                 manager.province, manager.facility_code)
+            if not context:
+                logging.warning(
+                    'No province or facility_code for %s.' % manager.name)
+                continue
             text_content = render_to_string(
                 'ona/text_provincial_digest.txt', context)
             html_content = render_to_string(
@@ -241,7 +245,7 @@ def get_digest_email_data(self, district, facility_code):
             try:
                 district = Facility.objects.get(
                     facility_code=facility_code).district
-            except:
+            except Facility.DoesNotExist:
                 return {}
 
         district_fac_codes = Facility.objects.filter(
@@ -281,6 +285,10 @@ def send_digest_email(self):
         for manager in Actor.objects.district():
             context = self.get_digest_email_data(
                 manager.district, manager.facility_code)
+            if not context:
+                logging.warning(
+                    'No district or facility_code for %s.' % manager.name)
+                continue
             text_content = render_to_string(
                 'ona/text_district_digest.txt', context)
             html_content = render_to_string(