WD|Fix modules fragments #4

opensrp · Nov 8, 2017 · a87ad9d · a87ad9d
1 parent 127d62d
commit a87ad9d
Show file tree

Hide file tree

Showing 37 changed files with 3,736 additions and 441 deletions.
diff --git a/opensrp-bidan/src/main/AndroidManifest.xml b/opensrp-bidan/src/main/AndroidManifest.xml
@@ -120,27 +120,8 @@
             android:screenOrientation="landscape"
             android:theme="@style/BidanAppTheme"
             />
-        <activity android:name=".activity.KISmartRegisterActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape"
-            android:theme="@style/AppThemeNoActionBarAndTitle"
-            android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.KIAnakSmartRegisterActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape"
-            android:theme="@style/AppThemeNoActionBarAndTitle"
-            android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.KIANCSmartRegisterActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape"
-            android:theme="@style/AppThemeNoActionBarAndTitle"
-            android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.KIPNCSmartRegisterActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="landscape"
-            android:theme="@style/AppThemeNoActionBarAndTitle"
-            android:windowSoftInputMode="adjustResize" />
-        <activity android:name=".activity.KBSmartRegisterActivity"
+
+        <activity android:name=".activity.KIbuSmartRegisterActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="landscape"
             android:theme="@style/AppThemeNoActionBarAndTitle"

diff --git a/opensrp-bidan/src/main/assets/json.form/child_enrollment.json b/opensrp-bidan/src/main/assets/json.form/child_enrollment.json
@@ -86,7 +86,7 @@
         "openmrs_entity_id": "ZEIR_ID",
         "type": "barcode",
         "barcode_type": "qrcode",
-        "hint": "Child's ZEIR ID *",
+        "hint": "Child's BIDAN ID *",
         "scanButtonText": "Scan QR Code",
         "value": "0",
         "v_numeric": {
@@ -95,7 +95,7 @@
         },
         "v_required": {
           "value": "true",
-          "err": "Please enter the Child's ZEIR ID"
+          "err": "Please enter the Child's BIDAN ID"
         }
       },
       {

diff --git a/opensrp-bidan/src/main/assets/json.form/out_of_catchment_service.json b/opensrp-bidan/src/main/assets/json.form/out_of_catchment_service.json
@@ -56,13 +56,13 @@
         "openmrs_entity_id": "",
         "type": "barcode",
         "barcode_type": "qrcode",
-        "hint": "ZEIR ID *",
+        "hint": "BIDAN ID *",
         "scanButtonText": "Scan QR Code",
         "read_only": true,
         "value": "",
         "v_required": {
           "value": "true",
-          "err": "Enter the child's ZEIR ID"
+          "err": "Enter the child's BIDAN ID"
         }
       },
       {

diff --git a/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/ChildDetailTabbedActivity.java b/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/ChildDetailTabbedActivity.java
@@ -765,7 +765,7 @@ private void profileWidget() {
         }
 
         profileage.setText(String.format("%s: %s", getString(R.string.age), formattedAge));
-        profileZeirID.setText(String.format("%s: %s", getString(R.string.label_zeir), childId));
+        profileZeirID.setText(String.format("%s: %s", getString(R.string.label_opensrp), childId));
         profilename.setText(name);
         updateGenderViews();
         Gender gender = Gender.UNKNOWN;

diff --git a/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/ChildImmunizationActivity.java b/opensrp-bidan/src/main/java/org/smartregister/bidan/activity/ChildImmunizationActivity.java
@@ -278,7 +278,7 @@ private void updateChildIdViews() {
         TextView nameTV = (TextView) findViewById(R.id.name_tv);
         nameTV.setText(name);
         TextView childIdTV = (TextView) findViewById(R.id.child_id_tv);
-        childIdTV.setText(String.format("%s: %s", getString(R.string.label_zeir), childId));
+        childIdTV.setText(String.format("%s: %s", getString(R.string.label_opensrp), childId));
 
         Utils.startAsyncTask(new GetSiblingsTask(), null);
     }