Merge pull request #128 from opensrp/update-login-responses

Update login response strings
opensrp · Apr 14, 2023 · b9686d3 · b9686d3
2 parents 9b590cf + 0b79038
commit b9686d3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 34 deletions.
diff --git a/opensrp-eusm/build.gradle b/opensrp-eusm/build.gradle
@@ -50,8 +50,8 @@ android {
         applicationId "org.smartregister.eusm"
         minSdkVersion androidMinSdkVersion
         targetSdkVersion androidTargetSdkVersion
-        versionCode 4
-        versionName "0.2.0"
+        versionCode 5
+        versionName "0.2.1"
         multiDexEnabled true
         buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
         buildConfigField "boolean", "TIME_CHECK", "false"

diff --git a/opensrp-eusm/src/main/assets/json.form/service_point_check.json b/opensrp-eusm/src/main/assets/json.form/service_point_check.json
@@ -85,6 +85,10 @@
             "type": "string",
             "ex": "equalTo(., \"yes\")"
           }
+        },
+        "v_required": {
+          "value": true,
+          "err": "{{service_point_check.step1.other_products_action_description.v_required.err}}"
         }
       },
       {
@@ -121,6 +125,10 @@
             "type": "string",
             "ex": "equalTo(., \"yes\")"
           }
+        },
+        "v_required": {
+          "value": true,
+          "err": "{{service_point_check.step1.other_needed_products_description.v_required.err}}"
         }
       },
       {
@@ -157,6 +165,10 @@
             "type": "string",
             "ex": "equalTo(., \"no\")"
           }
+        },
+        "v_required": {
+          "value": true,
+          "err": "{{service_point_check.step1.service_point_not_good_order_reason.v_required.err}}"
         }
       }
     ]

diff --git a/opensrp-eusm/src/main/res/values/strings.xml b/opensrp-eusm/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
     <!--Temp -->
     <string name="unauthorized">Please check the credentials</string>
     <string name="unauthorized_group">Your user group is not allowed to access this device</string>
-    <string name="unknown_response">login failed. Try later</string>
+    <string name="unknown_response">Incorrect username or password. Please try again</string>
     <string name="no_internet_connectivity">No internet connection. Please ensure data connectivity</string>
     <string name="login_text">Log In</string>
     <string name="show_password_text">Show password</string>
@@ -159,5 +159,6 @@
     <string name="map_deleted">Map Deleted:  %1s</string>
     <string name="another_map_in_download">Another map is currently being downloaded.</string>
     <string name="deleting_map">Deleting map</string>
+    <string name="remote_login_generic_error">You are not currently assigned to a mission. Please ask the EUSM administrators</string>
 
 </resources>
diff --git a/opensrp-eusm/src/main/resources/service_point_check.properties b/opensrp-eusm/src/main/resources/service_point_check.properties
@@ -14,34 +14,6 @@ service_point_check.step1.other_needed_products.options.yes.text = Yes
 service_point_check.step1.service_point_good_order.label = Is the service point overall in good working order?
 service_point_check.step1.other_products_action_description.hint = Please describe:
 service_point_check.step1.other_products_action.v_required.err = Field required
-
-
-
-service_point_check.step1.expired_supplies.label =
-service_point_check.step1.expired_supplies.options.yes.text = Yes
-service_point_check.step1.expired_supplies.options.no.text = No
-service_point_check.step1.expired_supplies.v_required.err =
-service_point_check.step1.expired_supplies_three_months.label =
-service_point_check.step1.expired_supplies_three_months.options.yes.text = Yes
-service_point_check.step1.expired_supplies_three_months.options.no.text = No
-service_point_check.step1.expired_supplies_three_months.v_required.err =
-service_point_check.step1.expired_supplies_three_months_list.hint = 
-service_point_check.step1.expired_supplies_three_months_list.v_required.err =
-service_point_check.step1.is_storage_space_guarded.label = 
-service_point_check.step1.is_storage_space_guarded.options.yes.text = Yes
-service_point_check.step1.is_storage_space_guarded.options.no.text = No
-service_point_check.step1.is_storage_space_guarded.v_required.err =
-service_point_check.step1.storage_conditions_satisfactory.label = 
-service_point_check.step1.storage_conditions_satisfactory.options.yes.text = Yes
-service_point_check.step1.storage_conditions_satisfactory.options.no.text = No
-service_point_check.step1.storage_conditions_satisfactory.v_required.err = Field required
-service_point_check.step1.storage_space_condition.label =
-service_point_check.step1.storage_space_condition.options.yes.text = Yes
-service_point_check.step1.storage_space_condition.options.no.text = No
-service_point_check.step1.storage_space_condition.v_required.err =
-service_point_check.step1.required_action.label = 
-service_point_check.step1.required_action.options.yes.text = Yes
-service_point_check.step1.required_action.options.no.text = No
-service_point_check.step1.required_action.v_required.err =
-service_point_check.step1.required_action_yes.hint = 
-service_point_check.step1.required_action_yes.v_required.err =
+service_point_check.step1.other_products_action_description.v_required.err = Field required
+service_point_check.step1.other_needed_products_description.v_required.err = Field required
+service_point_check.step1.service_point_not_good_order_reason.v_required.err = Field required