Skip to content

Commit

Permalink
fix facility lookup failure (thanks @miltontony)
Browse files Browse the repository at this point in the history
  • Loading branch information
smn committed Jan 27, 2016
1 parent 3c16e22 commit adf77cb
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
1 change: 1 addition & 0 deletions .coverage.smn.local.9734.886482
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
!coverage.py: This is a private format, don't read it directly!{"runs": [{"brief_sys": "CPython 2.7.6 Darwin"}], "lines": {"/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tasks.py": [1, 2, 4, 5, 6, 71, 8, 9, 13, 15, 18, 82, 114, 127, 102, 30, 37], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tests/test_tasks.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/celery.py": [1, 3, 5, 8, 9, 11, 13, 17, 18], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/__init__.py": [1, 3], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tests/base.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/admin.py": [1, 2, 3, 4, 5, 6, 129, 8, 9, 138, 132, 12, 13, 143, 144, 154, 151, 137, 25, 26, 27, 156, 29, 214, 164, 37, 40, 41, 43, 48, 49, 50, 51, 52, 55, 56, 57, 58, 59, 188, 61, 194, 139, 196, 69, 198, 72, 73, 75, 205, 80, 81, 210, 211, 212, 213, 86, 87, 153, 90, 91, 208, 136, 209, 107, 109, 189, 112, 140, 116, 117, 118, 119, 120, 122, 125, 127], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tests/test_views.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/urls.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/urls.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tests/test_models.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/views.py": [], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/models.py": [1, 2, 3, 4, 5, 6, 7, 8, 9, 522, 12, 15, 16, 17, 19, 536, 34, 515, 51, 54, 55, 56, 58, 68, 594, 529, 112, 634, 129, 132, 133, 134, 136, 146, 659, 660, 661, 195, 214, 217, 218, 219, 221, 231, 260, 279, 280, 281, 282, 283, 284, 285, 286, 288, 292, 296, 297, 298, 299, 300, 301, 302, 303, 304, 305, 306, 307, 308, 309, 310, 311, 312, 313, 314, 315, 316, 317, 318, 319, 320, 321, 323, 326, 329, 335, 339, 343, 347, 351, 365, 368, 375, 379, 383, 388, 389, 390, 391, 392, 393, 396, 397, 398, 399, 400, 401, 402, 403, 404, 408, 410, 413, 417, 421, 424, 428, 432, 437, 440, 441, 442, 443, 444, 445, 446, 447, 448, 449, 450, 451, 452, 453, 454, 455, 456, 458, 460, 464, 467, 468, 469, 470, 471, 472, 475, 478, 479, 480, 481, 482, 483, 486, 487, 488, 489, 490, 491, 492, 493, 494, 495, 497, 498, 499, 501, 504], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/__init__.py": [1], "/Users/sdehaan/Documents/Repositories/malaria24-django/malaria24/ona/tests/__init__.py": []}}
10 changes: 8 additions & 2 deletions malaria24/ona/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,15 @@ def get_digest_email_data(self, facility_code):
males = facility_cases.exclude(gender__icontains='f').count()
over5 = len([x for x in facility_cases if x.age >= 5])
under5 = facility_cases.count() - over5

facilities = Facility.objects.filter(facility_code=facility_code)
if facilities.exists():
facility_name = facilities.first().facility_name
else:
facility_name = 'Unknown (facility code: %s)' % (facility_code,)

fac_list = [{
'facility': Facility.objects.get(
facility_code=facility_code).facility_name,
'facility': facility_name,
'cases': facility_cases.count(),
'females': females, 'males': males,
'under5': under5,
Expand Down

0 comments on commit adf77cb

Please sign in to comment.