Added cumulative annual values for cso and zeir

Signed-off-by: Ephraim Muhia <emuhia@ona.io>
opensrp · Feb 1, 2018 · 550dc0f · 550dc0f
1 parent a4b891b
commit 550dc0f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/...p-path/src/main/java/org/smartregister/path/activity/AnnualCoverageReportCsoActivity.java b/...p-path/src/main/java/org/smartregister/path/activity/AnnualCoverageReportCsoActivity.java
@@ -159,13 +159,9 @@ public void onServiceFinish(String actionType) {
 
     @Override
     protected <T> View generateView(final View view, final VaccineRepo.Vaccine vaccine, final List<T> indicators) {
-        long value = 0;
 
-        CumulativeIndicator cumulativeIndicator = retrieveCumulativeIndicator(indicators, vaccine);
 
-        if (cumulativeIndicator != null) {
-            value = cumulativeIndicator.getValue();
-        }
+        long value = retrieveCumulativeIndicatorValue(indicators, vaccine);
 
         String display = vaccine.display();
         if (vaccine.equals(VaccineRepo.Vaccine.measles1)) {

diff --git a/...-path/src/main/java/org/smartregister/path/activity/AnnualCoverageReportZeirActivity.java b/...-path/src/main/java/org/smartregister/path/activity/AnnualCoverageReportZeirActivity.java
@@ -135,13 +135,7 @@ public void onServiceFinish(String actionType) {
 
     @Override
     protected <T> View generateView(final View view, final VaccineRepo.Vaccine vaccine, final List<T> indicators) {
-        long value = 0;
-
-        CumulativeIndicator cumulativeIndicator = retrieveCumulativeIndicator(indicators, vaccine);
-
-        if (cumulativeIndicator != null) {
-            value = cumulativeIndicator.getValue();
-        }
+        long value = retrieveCumulativeIndicatorValue(indicators, vaccine);
 
         String display = vaccine.display();
         if (vaccine.equals(VaccineRepo.Vaccine.measles1)) {

diff --git a/opensrp-path/src/main/java/org/smartregister/path/activity/BaseReportActivity.java b/opensrp-path/src/main/java/org/smartregister/path/activity/BaseReportActivity.java
@@ -192,17 +192,18 @@ protected <T> View generateView(final View view, final VaccineRepo.Vaccine vacci
         return view;
     }
 
-    protected <T> CumulativeIndicator retrieveCumulativeIndicator(List<T> indicators, VaccineRepo.Vaccine vaccine) {
+    protected <T> Long retrieveCumulativeIndicatorValue(List<T> indicators, VaccineRepo.Vaccine vaccine) {
+        long value = 0L;
         final String vaccineString = VaccineRepository.addHyphen(vaccine.display().toLowerCase());
         for (T t : indicators) {
             if (t instanceof CumulativeIndicator) {
                 CumulativeIndicator cumulativeIndicator = (CumulativeIndicator) t;
                 if (cumulativeIndicator.getVaccine().equals(vaccineString)) {
-                    return cumulativeIndicator;
+                    value += cumulativeIndicator.getValue();
                 }
             }
         }
-        return null;
+        return value;
     }
 
     protected <T> CohortIndicator retrieveCohortIndicator(List<T> indicators, VaccineRepo.Vaccine vaccine) {