Merge branch 'master' into staging

unicef · Mar 6, 2017 · 94329d0 · 94329d0
2 parents 4476c0f + a6f4828
commit 94329d0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/EquiTrack/partners/views/v2.py b/EquiTrack/partners/views/v2.py
@@ -299,30 +299,30 @@ def total_value_for_parternships(partnerships):
         result['active_value'] = total_value_for_parternships(active_partnerships)
         result['active_percentage'] = "{0:.0f}%".format(
             operator.truediv(result['active_count'], result['total_count']) * 100) \
-            if result['active_count'] else "0%"
+            if result['total_count'] and result['active_count'] else "0%"
 
         # (2a) Number and value of Approved Interventions this year
         result['total_this_year_count'] = len(total_this_year)
         result['active_this_year_count'] = len(active_this_year)
         result['active_this_year_value'] = total_value_for_parternships(active_this_year)
         result['active_this_year_percentage'] = "{0:.0f}%".format(
             operator.truediv(result['active_this_year_count'], result['total_this_year_count']) * 100) \
-            if result['active_count'] else "0%"
+            if result['total_this_year_count'] and result['active_this_year_count'] else "0%"
 
         # (2b) Number and value of Approved Interventions last year
         result['total_last_year_count'] = len(total_last_year)
         result['active_last_year_count'] = len(active_last_year)
         result['active_last_year_value'] = total_value_for_parternships(active_last_year)
         result['active_last_year_percentage'] = "{0:.0f}%".format(
-            operator.truediv(result['active_last_year_count'], result['active_last_year_count']) * 100) \
-            if result['active_last_year_count'] else "0%"
+            operator.truediv(result['active_last_year_count'], result['total_last_year_count']) * 100) \
+            if result['total_last_year_count'] and result['active_last_year_count'] else "0%"
 
         # (3) Number and Value of Expiring Interventions in next two months
         result['total_expire_in_two_months_count'] = len(total_expire_in_two_months)
         result['expire_in_two_months_count'] = len(expire_in_two_months)
         result['expire_in_two_months_value'] = total_value_for_parternships(expire_in_two_months)
         result['expire_in_two_months_percentage'] = "{0:.0f}%".format(
             operator.truediv(result['expire_in_two_months_count'], result['active_count']) * 100) \
-        if result['expire_in_two_months_count'] else "0%"
+        if result['active_count'] and result['expire_in_two_months_count'] else "0%"
 
         return Response(result, status=status.HTTP_200_OK)