RA|made vaccine cards for women work

opensrp · Jul 27, 2017 · 0fcdd53 · 0fcdd53
1 parent 1784b05
commit 0fcdd53
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/opensrp-path/src/main/assets/mother_vaccines.json b/opensrp-path/src/main/assets/mother_vaccines.json
@@ -28,7 +28,7 @@
           "expiry": [
             {
               "reference": "dob",
-              "offset": "+130000000000000000000000000000000000000000000000000000000000000000000000000000000000000000d"
+              "offset": "+10000d"
             }
           ]
         }

diff --git a/opensrp-path/src/main/java/org/ei/opensrp/path/activity/WomanImmunizationActivity.java b/opensrp-path/src/main/java/org/ei/opensrp/path/activity/WomanImmunizationActivity.java
@@ -1172,7 +1172,7 @@ protected Map<String, NamedObject<?>> doInBackground(Void... voids) {
             String dobString = Utils.getValue(childDetails.getColumnmaps(), "dob", false);
             if (!TextUtils.isEmpty(dobString)) {
                 DateTime dateTime = new DateTime(dobString);
-                VaccineSchedule.updateOfflineAlerts(childDetails.entityId(), dateTime, "child");
+                VaccineSchedule.updateOfflineAlerts(childDetails.entityId(), dateTime, "mother");
             }
 
             List<Vaccine> vaccineList = new ArrayList<>();
@@ -1259,7 +1259,7 @@ protected Void doInBackground(Void... params) {
                     String dobString = Utils.getValue(childDetails.getColumnmaps(), "dob", false);
                     if (!TextUtils.isEmpty(dobString)) {
                         DateTime dateTime = new DateTime(dobString);
-                        affectedVaccines = VaccineSchedule.updateOfflineAlerts(childDetails.entityId(), dateTime, "child");
+                        affectedVaccines = VaccineSchedule.updateOfflineAlerts(childDetails.entityId(), dateTime, "mother");
                         vaccineList = vaccineRepository.findByEntityId(childDetails.entityId());
                         alertList = alertService.findByEntityIdAndAlertNames(childDetails.entityId(),
                                 VaccinateActionUtils.allAlertNames("child"));

diff --git a/opensrp-path/src/main/java/org/ei/opensrp/path/sync/PathClientProcessor.java b/opensrp-path/src/main/java/org/ei/opensrp/path/sync/PathClientProcessor.java
@@ -464,18 +464,19 @@ public ContentValues processCaseModel(JSONObject entity, JSONObject clientClassi
     @Override
     public void updateFTSsearch(String tableName, String entityId, ContentValues contentValues) {
         super.updateFTSsearch(tableName, entityId, contentValues);
-
-        if (contentValues != null && StringUtils.containsIgnoreCase(tableName, "child")) {
-            String dob = contentValues.getAsString("dob");
-
-            if (StringUtils.isBlank(dob)) {
-                return;
-            }
-
-            DateTime birthDateTime = new DateTime(dob);
-            VaccineSchedule.updateOfflineAlerts(entityId, birthDateTime, "child");
-            ServiceSchedule.updateOfflineAlerts(entityId, birthDateTime);
-        }
+        Log.v("tablename",tableName);
+        Log.v("contentValues",contentValues.toString());
+//        if (contentValues != null && StringUtils.containsIgnoreCase(tableName, "child")) {
+//            String dob = contentValues.getAsString("dob");
+//
+//            if (StringUtils.isBlank(dob)) {
+//                return;
+//            }
+//
+//            DateTime birthDateTime = new DateTime(dob);
+//            VaccineSchedule.updateOfflineAlerts(entityId, birthDateTime, "child");
+//            ServiceSchedule.updateOfflineAlerts(entityId, birthDateTime);
+//        }
         if (contentValues != null && StringUtils.containsIgnoreCase(tableName, "mother")) {
             String dob = contentValues.getAsString("dob");
 

diff --git a/opensrp-path/src/main/java/org/ei/opensrp/path/view/VaccineGroup.java b/opensrp-path/src/main/java/org/ei/opensrp/path/view/VaccineGroup.java
@@ -310,7 +310,7 @@ public void updateWrapperStatus(VaccineWrapper tag) {
         Map<String, Date> recievedVaccines = receivedVaccines(vaccineList);
 
         String dobString = Utils.getValue(getChildDetails().getColumnmaps(), "dob", false);
-        List<Map<String, Object>> sch = generateScheduleList("woman", new DateTime(dobString), recievedVaccines, alertList);
+        List<Map<String, Object>> sch = generateScheduleList("mother", new DateTime(dobString), recievedVaccines, alertList);
 
         for (Map<String, Object> m : sch) {
             VaccineRepo.Vaccine vaccine = (VaccineRepo.Vaccine) m.get("vaccine");