Merge pull request #2090 from opensrp/lmh1-211

LMH1-211: Display "Child vaccine card recieved" for children less than 5years

Author: LZRS

opensrp-chw/build.gradle

@@ -351,8 +351,8 @@ android {
         lmh {
             dimension = 'baseDimension'
             applicationIdSuffix ".lmh"
-            versionCode 6
-            versionName "2.0.1"
+            versionCode 7
+            versionName "2.0.3"
             buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '10000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '10000'
             buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '1'

opensrp-chw/src/lmh/java/org/smartregister/chw/interactor/ChildHomeVisitInteractorFlv.java

@@ -1,6 +1,7 @@
 package org.smartregister.chw.interactor;
 
 
+import org.joda.time.LocalDate;
 import org.smartregister.chw.anc.model.BaseAncHomeVisitAction;
 import org.smartregister.chw.dao.ChwChildDao;
 import org.smartregister.immunization.domain.ServiceWrapper;
@@ -42,4 +43,11 @@ protected int vaccineCardCeiling() {
         return 60;
     }
 
+    @Override
+    protected void evaluateChildVaccineCard() throws Exception {
+        // expires on 5 years. verify that vaccine card is not received
+        if (new LocalDate().isBefore(new LocalDate(dob).plusYears(5)) && !vaccineCardReceived) {
+            addChildVaccineCardCardAction();
+        }
+    }
 }

opensrp-chw/src/main/java/org/smartregister/chw/interactor/DefaultChildHomeVisitInteractorFlv.java

@@ -204,21 +204,25 @@ protected int immunizationCeiling() {
         return 24;
     }
 
+    protected void addChildVaccineCardCardAction() throws BaseAncHomeVisitAction.ValidationException {
+        Map<String, List<VisitDetail>> details = getDetails(Constants.EventType.CHILD_VACCINE_CARD_RECEIVED);
+
+        BaseAncHomeVisitAction vaccine_card = getBuilder(context.getString(R.string.vaccine_card_title))
+                .withOptional(false)
+                .withDetails(details)
+                .withBaseEntityID(memberObject.getBaseEntityId())
+                .withProcessingMode(BaseAncHomeVisitAction.ProcessingMode.SEPARATE)
+                .withHelper(new ChildVaccineCardHelper(dob))
+                .withDestinationFragment(BaseAncHomeVisitFragment.getInstance(view, Constants.JSON_FORM.CHILD_HOME_VISIT.getVaccineCard(), null, details, null))
+                .build();
+
+        actionList.put(context.getString(R.string.vaccine_card_title), vaccine_card);
+    }
+
     protected void evaluateChildVaccineCard() throws Exception {
         // expires after 24 months. verify that vaccine card is not received
         if (!new LocalDate().isAfter(new LocalDate(dob).plusMonths(24)) && !vaccineCardReceived) {
-            Map<String, List<VisitDetail>> details = getDetails(Constants.EventType.CHILD_VACCINE_CARD_RECEIVED);
-
-            BaseAncHomeVisitAction vaccine_card = getBuilder(context.getString(R.string.vaccine_card_title))
-                    .withOptional(false)
-                    .withDetails(details)
-                    .withBaseEntityID(memberObject.getBaseEntityId())
-                    .withProcessingMode(BaseAncHomeVisitAction.ProcessingMode.SEPARATE)
-                    .withHelper(new ChildVaccineCardHelper(dob))
-                    .withDestinationFragment(BaseAncHomeVisitFragment.getInstance(view, Constants.JSON_FORM.CHILD_HOME_VISIT.getVaccineCard(), null, details, null))
-                    .build();
-
-            actionList.put(context.getString(R.string.vaccine_card_title), vaccine_card);
+            addChildVaccineCardCardAction();
         }
     }
 

opensrp-chw/src/test/java/org/smartregister/chw/BaseActivityTestSetUp.java

@@ -10,6 +10,10 @@
 import org.mockito.junit.MockitoRule;
 import org.robolectric.Robolectric;
 import org.robolectric.android.controller.ActivityController;
+import org.smartregister.Context;
+import org.smartregister.CoreLibrary;
+
+import java.util.ArrayList;
 
 /**
  * @param <T>
@@ -26,6 +30,16 @@ public abstract class BaseActivityTestSetUp<T extends Activity> extends BaseUnit
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        Context context = Context.getInstance();
+        Context.bindtypes = new ArrayList<>();
+        CoreLibrary.init(context);
+
+        //Auto login by default
+        String password = "pwd";
+        context.session().start(context.session().lengthInMilliseconds());
+        context.configuration().getDrishtiApplication().setPassword(password.getBytes());
+        context.session().setPassword(password.getBytes());
+
         if (getControllerIntent() == null) {
             controller = Robolectric.buildActivity(getActivityClass()).create().start();
         } else {