diff --git a/opensrp-eusm/build.gradle b/opensrp-eusm/build.gradle index dadc923..065b9e5 100644 --- 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 index b9de258..7765864 100644 --- 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 index 95c8a7c..c72b270 100644 --- a/opensrp-eusm/src/main/res/values/strings.xml +++ b/opensrp-eusm/src/main/res/values/strings.xml @@ -10,7 +10,7 @@ Please check the credentials Your user group is not allowed to access this device - login failed. Try later + Incorrect username or password. Please try again No internet connection. Please ensure data connectivity Log In Show password @@ -159,5 +159,6 @@ Map Deleted: %1s Another map is currently being downloaded. Deleting map + You are not currently assigned to a mission. Please ask the EUSM administrators diff --git a/opensrp-eusm/src/main/resources/service_point_check.properties b/opensrp-eusm/src/main/resources/service_point_check.properties index bcd5595..9f0985e 100644 --- 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 \ No newline at end of file