Merge pull request #312 from OpenSRP/immunization_refactor

Immunization refactor
opensrp · May 13, 2019 · 1e632fc · 1e632fc
2 parents c555867 + 3d54245
commit 1e632fc
Show file tree

Hide file tree

Showing 54 changed files with 1,714 additions and 4,956 deletions.
diff --git a/opensrp-chw/build.gradle b/opensrp-chw/build.gradle
@@ -30,7 +30,7 @@ android {
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
         versionCode 1
-        versionName "0.1.3"
+        versionName "0.1.4"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"
@@ -149,11 +149,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
 
+    /*
     implementation('org.smartregister:opensrp-client-reporting:1.0.6-SNAPSHOT@aar') {
         transitive = true
         exclude group: 'org.smartregister', module: 'opensrp-client-core'
         exclude group: 'com.android.support', module: 'appcompat-v7'
     }
+    */
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:support-v4:28.0.0'

diff --git a/opensrp-chw/release/opensrp-chw-release-v0.1.4.apk b/opensrp-chw/release/opensrp-chw-release-v0.1.4.apk
diff --git a/opensrp-chw/release/output.json b/opensrp-chw/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.4","enabled":true,"outputFile":"opensrp-chw-release.apk","fullName":"release","baseName":"release"},"path":"opensrp-chw-release.apk","properties":{}}]
diff --git a/opensrp-chw/src/main/assets/ec_client_fields.json b/opensrp-chw/src/main/assets/ec_client_fields.json
@@ -363,7 +363,7 @@
           "type": "Event",
           "json_mapping": {
             "field": "obs.fieldCode",
-            "formSubmissionField": "birth_cert"
+            "concept": "165406AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           }
         },
         {
@@ -387,7 +387,7 @@
           "type": "Event",
           "json_mapping": {
             "field": "obs.fieldCode",
-            "formSubmissionField": "birth_notification"
+            "concept": "165405AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
           }
         },
         {

diff --git a/opensrp-chw/src/main/assets/recurring_service_types.json b/opensrp-chw/src/main/assets/recurring_service_types.json
@@ -23,7 +23,7 @@
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+1m"
+            "offset": "+30d"
           }
         }
       },
@@ -33,11 +33,11 @@
         "schedule": {
           "due": {
             "reference": "dob",
-            "offset": "+1m"
+            "offset": "+31d"
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+2m"
+            "offset": "+60d"
           }
         }
       },
@@ -47,11 +47,11 @@
         "schedule": {
           "due": {
             "reference": "dob",
-            "offset": "+2m"
+            "offset": "+61d"
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+3m"
+            "offset": "+90d"
           }
         }
       },
@@ -61,11 +61,11 @@
         "schedule": {
           "due": {
             "reference": "dob",
-            "offset": "+3m"
+            "offset": "+91d"
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+4m"
+            "offset": "+120d"
           }
         }
       },
@@ -75,11 +75,11 @@
         "schedule": {
           "due": {
             "reference": "dob",
-            "offset": "+4m"
+            "offset": "+121d"
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+5m"
+            "offset": "+150d"
           }
         }
       },
@@ -89,11 +89,11 @@
         "schedule": {
           "due": {
             "reference": "dob",
-            "offset": "+5m"
+            "offset": "+151d"
           },
           "expiry": {
             "reference": "dob",
-            "offset": "+6m"
+            "offset": "+180d"
           }
         }
       }

diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/activity/UpcomingServicesActivity.java b/opensrp-chw/src/main/java/org/smartregister/chw/activity/UpcomingServicesActivity.java
@@ -23,7 +23,6 @@
 public class UpcomingServicesActivity extends SecuredActivity {
 
 
-    private UpcomingServicesFragmentView upcomingServicesView;
     private ProgressBar progressBar;
     private String name;
 
@@ -41,22 +40,20 @@ protected void onCreation() {
         CommonPersonObjectClient childClient = (CommonPersonObjectClient) getIntent().getSerializableExtra(Constants.INTENT_KEY.CHILD_COMMON_PERSON);
         name = getValue(childClient.getColumnmaps(), "first_name", true) + " " +
                 getValue(childClient.getColumnmaps(), "last_name", true);
-        upcomingServicesView = (UpcomingServicesFragmentView) findViewById(R.id.upcomingServicesHolder);
-        upcomingServicesView.setActivity(this);
-        upcomingServicesView.setChildClient(childClient);
+        UpcomingServicesFragmentView upcomingServicesView = findViewById(R.id.upcomingServicesHolder);
+        upcomingServicesView.setChildClient(this, childClient);
 
         setUpActionBar();
-
-
     }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-       return false;
+        return false;
     }
 
     @Override
     protected void onResumption() {
-        upcomingServicesView.updateImmunizationState();
+        // upcomingServicesView.updateImmunizationState();
     }
 
     private void setUpActionBar() {
@@ -84,8 +81,9 @@ public void onClick(View v) {
         }
 
     }
-    public void progressBarVisibility(boolean flag){
-        if(flag) progressBar.setVisibility(View.VISIBLE);
+
+    public void progressBarVisibility(boolean flag) {
+        if (flag) progressBar.setVisibility(View.VISIBLE);
         else progressBar.setVisibility(View.GONE);
     }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.1.4","enabled":true,"outputFile":"opensrp-chw-release.apk","fullName":"release","baseName":"release"},"path":"opensrp-chw-release.apk","properties":{}}]