Skip to content

Commit

Permalink
Merge pull request #49 from OpenSRP/mls
Browse files Browse the repository at this point in the history 
Add MLS
  • Loading branch information
@bennsimon
bennsimon authored Jan 29, 2021
2 parents 27a541a + ca86838 commit 6ed2912
Show file tree
Hide file tree
Showing 52 changed files with 743 additions and 192 deletions.
32 changes: 31 additions & 1 deletion .tx/config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,34 @@ file_filter = opensrp-eusm/src/main/res/values-<lang>/strings.xml
minimum_perc = 0
source_file = opensrp-eusm/src/main/res/values/strings.xml
source_lang = en
type = ANDROID
type = ANDROID

[opensrp-eusm.fix_problem-properties]
file_filter = opensrp-eusm/src/main/resources/fix_problem_<lang>.properties
source_file = opensrp-eusm/src/main/resources/fix_problem.properties
source_lang = en
type = PROPERTIES

[opensrp-eusm.flag_problem-properties]
file_filter = opensrp-eusm/src/main/resources/flag_problem_<lang>.properties
source_file = opensrp-eusm/src/main/resources/flag_problem.properties
source_lang = en
type = PROPERTIES

[opensrp-eusm.looks_good-properties]
file_filter = opensrp-eusm/src/main/resources/looks_good_<lang>.properties
source_file = opensrp-eusm/src/main/resources/looks_good.properties
source_lang = en
type = PROPERTIES

[opensrp-eusm.record_gps-properties]
file_filter = opensrp-eusm/src/main/resources/record_gps_<lang>.properties
source_file = opensrp-eusm/src/main/resources/record_gps.properties
source_lang = en
type = PROPERTIES

[opensrp-eusm.service_point_check-properties]
file_filter = opensrp-eusm/src/main/resources/service_point_check_<lang>.properties
source_file = opensrp-eusm/src/main/resources/service_point_check.properties
source_lang = en
type = PROPERTIES
2 changes: 1 addition & 1 deletion opensrp-eusm/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ dependencies {
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
}

api('org.smartregister:opensrp-client-stock:1.2.2-SNAPSHOT') {
api('org.smartregister:opensrp-client-stock:1.2.3-SNAPSHOT') {
transitive = true
exclude group: 'org.smartregister', module: 'opensrp-client-core'
exclude group: 'org.smartregister', module: 'opensrp-client-native-form'
Expand Down
17 changes: 9 additions & 8 deletions opensrp-eusm/src/main/assets/json.form/fix_problem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"encounter_location": ""
},
"step1": {
"title": "Fix problem",
"title": "{{fix_problem.step1.title}}",
"display_back_button": true,
"fields": [
{
Expand All @@ -57,20 +57,20 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "Was the problem fixed?",
"label": "{{fix_problem.step1.problem_fixed.label}}",
"options": [
{
"key": "yes",
"text": "Yes"
"text": "{{fix_problem.step1.problem_fixed.options.yes.text}}"
},
{
"key": "no",
"text": "No"
"text": "{{fix_problem.step1.problem_fixed.options.no.text}}"
}
],
"v_required": {
"value": true,
"err": "Field requred"
"err": "{{fix_problem.step1.problem_fixed.v_required.err}}"
}
},
{
Expand All @@ -79,7 +79,7 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "Why was the problem not able to be fixed?",
"hint": "{{fix_problem.step1.not_fixed_reason.hint}}",
"relevance": {
"step1:problem_fixed": {
"type": "string",
Expand All @@ -93,7 +93,7 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "What actions were taken to fix this problem?",
"hint": "{{fix_problem.step1.fix_problem_actions.hint}}",
"relevance": {
"step1:problem_fixed": {
"type": "string",
Expand All @@ -102,5 +102,6 @@
}
}
]
}
},
"properties_file_name": "fix_problem"
}
59 changes: 30 additions & 29 deletions opensrp-eusm/src/main/assets/json.form/flag_problem.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"encounter_location": ""
},
"step1": {
"title": "Flag Problem",
"title": "{{flag_problem.step1.title}}",
"next": "step2",
"fields": [
{
Expand All @@ -57,51 +57,51 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "check_box",
"label": "Flag problem(s)",
"label": "{{flag_problem.step1.flag_problem.label}}",
"label_text_style": "bold",
"exclusive": [
"not_there"
],
"options": [
{
"key": "not_there",
"text": "Product is not there",
"text": "{{flag_problem.step1.flag_problem.options.not_there.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "not_good",
"text": "Product is not in good condition",
"text": "{{flag_problem.step1.flag_problem.options.not_good.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "misuse",
"text": "Product is not being used appropriately",
"text": "{{flag_problem.step1.flag_problem.options.misuse.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
}
],
"v_required": {
"value": true,
"err": "Field required"
"err": "{{flag_problem.step1.flag_problem.v_required.err}}"
}
}
]
},
"step2": {
"title": "Reason",
"title": "{{flag_problem.step2.title}}",
"fields": [
{
"key": "product_picture",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "choose_image",
"uploadButtonText": "Take a photo of the product",
"uploadButtonText": "{{flag_problem.step2.product_picture.uploadButtonText}}",
"relevance": {
"step1:flag_problem": {
"ex-checkbox": [
Expand All @@ -121,41 +121,41 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "What is wrong with the product?",
"label": "{{flag_problem.step2.not_good.label}}",
"label_text_style": "bold",
"options": [
{
"key": "worn_broken",
"text": "Worn, damaged, or broken",
"text": "{{flag_problem.step2.not_good.options.worn_broken.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "expired",
"text": "Expired",
"text": "{{flag_problem.step2.not_good.options.expired.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "parts_missing",
"text": "Parts missing",
"text": "{{flag_problem.step2.not_good.options.parts_missing.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "other",
"text": "Other (specify)",
"text": "{{flag_problem.step2.not_good.options.other.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
}
],
"v_required": {
"value": true,
"err": "Field required"
"err": "{{flag_problem.step2.not_good.v_required.err}}"
},
"relevance": {
"step1:flag_problem": {
Expand All @@ -175,7 +175,7 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "Specify other:",
"hint": "{{flag_problem.step2.not_good_specify_other.hint}}",
"relevance": {
"step2:not_good": {
"type": "string",
Expand All @@ -189,48 +189,48 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "What happened to the product?",
"label": "{{flag_problem.step2.not_there.label}}",
"label_text_style": "bold",
"options": [
{
"key": "lost_stolen",
"text": "Lost / Stolen",
"text": "{{flag_problem.step2.not_there.options.lost_stolen.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "never_received",
"text": "Never received",
"text": "{{flag_problem.step2.not_there.options.never_received.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "discarded",
"text": "Discarded (e.g. damaged on delivery, expired)",
"text": "{{flag_problem.step2.not_there.options.discarded.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "stock_out",
"text": "Stock out",
"text": "{{flag_problem.step2.not_there.options.stock_out.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "other",
"text": "Other (specify)",
"text": "{{flag_problem.step2.not_there.options.other.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
}
],
"v_required": {
"value": true,
"err": "Field required"
"err": "{{flag_problem.step2.not_there.v_required.err}}"
},
"relevance": {
"step1:flag_problem": {
Expand All @@ -250,7 +250,7 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "Specify other:",
"hint": "{{flag_problem.step2.not_there_specify_other.hint}}",
"relevance": {
"step2:not_there": {
"type": "string",
Expand All @@ -264,27 +264,27 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "How is the product not being used appropriately?",
"label": "{{flag_problem.step2.misuse.label}}",
"label_text_style": "bold",
"options": [
{
"key": "lacks_skills",
"text": "End user lacks necessary skills or knowledge",
"text": "{{flag_problem.step2.misuse.options.lacks_skills.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
},
{
"key": "fraud_use",
"text": "End user is using the product for unauthorised / fraudulent purposes",
"text": "{{flag_problem.step2.misuse.options.fraud_use.text}}",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": ""
}
],
"v_required": {
"value": true,
"err": "Field required"
"err": "{{flag_problem.step2.misuse.v_required.err}}"
},
"relevance": {
"step1:flag_problem": {
Expand All @@ -304,8 +304,9 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "Provide some details on the specific issue, including any advice you were able to give."
"hint": "{{flag_problem.step2.issue_details.hint}}"
}
]
}
},
"properties_file_name": "flag_problem"
}
5 changes: 3 additions & 2 deletions opensrp-eusm/src/main/assets/json.form/looks_good.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"encounter_location": ""
},
"step1": {
"title": "Looks Good",
"title": "{{looks_good.step1.title}}",
"display_back_button": true,
"fields": [
{
Expand All @@ -59,5 +59,6 @@
"openmrs_entity_id": ""
}
]
}
},
"properties_file_name": "looks_good"
}
5 changes: 3 additions & 2 deletions opensrp-eusm/src/main/assets/json.form/record_gps.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"encounter_location": ""
},
"step1": {
"title": "Record GPS",
"title": "{{record_gps.step1.title}}",
"display_back_button": true,
"fields": [
{
Expand All @@ -59,5 +59,6 @@
"openmrs_entity_id": ""
}
]
}
},
"properties_file_name": "record_gps"
}
Loading

0 comments on commit 6ed2912

Please sign in to comment.