Enable overriding the event type out of catchment event and entity va…

…lues in VaccineIntentService
opensrp · Apr 27, 2018 · ed7198a · ed7198a
1 parent 87546ca
commit ed7198a
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.2.5
+VERSION_NAME=1.2.10-SNAPSHOT
 VERSION_CODE=2
 GROUP=org.smartregister
 POM_SETTING_DESCRIPTION=OpenSRP Client Immunization

diff --git a/...ion/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java b/...ion/src/main/java/org/smartregister/immunization/service/intent/VaccineIntentService.java
@@ -78,10 +78,10 @@ protected void onHandleIntent(Intent intent) {
                     jsonObject.put(JsonFormUtils.VALUE, vaccine.getCalculation());
                     jsonArray.put(jsonObject);
 
-                    JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, EVENT_TYPE, ENTITY_TYPE, jsonArray);
+                    JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, getEventType(), getEntityType(), jsonArray);
                     //log out of catchment service since this is required in some of the hia2 report indicators
                     if (vaccine.getBaseEntityId() == null || vaccine.getBaseEntityId().isEmpty()) {
-                        JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, EVENT_TYPE_OUT_OF_CATCHMENT, ENTITY_TYPE, jsonArray);
+                        JsonFormUtils.createVaccineEvent(getApplicationContext(), vaccine, getEventTypeOutOfCatchment(), getEntityType(), jsonArray);
 
                     }
                     vaccineRepository.close(vaccine.getId());
@@ -118,4 +118,20 @@ public int onStartCommand(Intent intent, int flags, int startId) {
         vaccineRepository = ImmunizationLibrary.getInstance().vaccineRepository();
         return super.onStartCommand(intent, flags, startId);
     }
+
+    protected String getEventType() {
+
+        return EVENT_TYPE;
+
+    }
+
+    protected String getEventTypeOutOfCatchment() {
+        return EVENT_TYPE_OUT_OF_CATCHMENT;
+    }
+
+    protected String getEntityType() {
+
+        return ENTITY_TYPE;
+
+    }
 }