Skip to content

Commit

Permalink
Merge pull request #61 from akrosinc/kenya-updates
Browse files Browse the repository at this point in the history
Kenya updates
  • Loading branch information
lindagcaba authored Oct 14, 2022
2 parents 1c81c5b + be17c40 commit a95564c
Show file tree
Hide file tree
Showing 33 changed files with 2,988 additions and 153 deletions.
8 changes: 4 additions & 4 deletions opensrp-reveal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@ android {
applicationId "org.smartregister.reveal"
minSdkVersion 26
targetSdkVersion 28
versionCode 34
versionName "10.0.1"
versionCode 37
versionName "10.1.2"
multiDexEnabled true
buildConfigField "long", "MAX_SERVER_TIME_DIFFERENCE", "1800000l"
buildConfigField "boolean", "TIME_CHECK", "false"
Expand Down Expand Up @@ -173,13 +173,13 @@ android {
}

debug {
resValue "string", 'opensrp_base_url', '"https://api-mcp-zm-uat.akros.online/"'
resValue "string", 'opensrp_base_url', '"https://api-ef-ke-uat.akros.online/"'
buildConfigField "Integer", "DATABASE_VERSION", '14'
buildConfigField "int", "OPENMRS_UNIQUE_ID_INITIAL_BATCH_SIZE", '250'
buildConfigField "int", "OPENMRS_UNIQUE_ID_BATCH_SIZE", '100'
buildConfigField "int", "OPENMRS_UNIQUE_ID_SOURCE", '2'
buildConfigField "long", "SYNC_INTERVAL_IN_MINUTES", '480'
buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.ZAMBIA"
buildConfigField "org.smartregister.reveal.util.Country", "BUILD_COUNTRY", "org.smartregister.reveal.util.Country.KENYA"
buildConfigField "long", "PULL_UNIQUE_IDS_MINUTES", '15'
buildConfigField "String", "ADMIN_PASSWORD_NOT_NEAR_STRUCTURES", '"AdminPass1"'
buildConfigField "float", "MY_LOCATION_BUFFER", '25'
Expand Down
21 changes: 21 additions & 0 deletions opensrp-reveal/src/main/assets/ec_client_classification.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,33 @@
"ec_events"
]
},
{
"field": "eventType",
"field_value": "cdd_drug_withdrawal",
"creates_case": [
"ec_events"
]
},
{
"field": "eventType",
"field_value": "cdd_drug_received",
"creates_case": [
"ec_events"
]
},
{
"field": "eventType",
"field_value": "general_supervision",
"creates_case": [
"ec_events"
]
},
{
"field": "eventType",
"field_value": "county_cdd_supervisory",
"creates_case": [
"ec_events"
]
}
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
"label": "Please select drug",
"options": [
{
"key": "Praziquantel (PZQ)",
"key": "pzq",
"text": "Praziquantel (PZQ)"
},
{
Expand Down Expand Up @@ -199,6 +199,13 @@
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_allocation_relevance_rules.yml"
}
}
}
},
{
Expand Down Expand Up @@ -229,6 +236,13 @@
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_allocation_relevance_rules.yml"
}
}
}
},
{
Expand Down Expand Up @@ -274,7 +288,7 @@
"label": "Please select drug reallocated",
"options": [
{
"key": "Praziquantel (PZQ)",
"key": "pzq",
"text": "Praziquantel (PZQ)"
},
{
Expand Down Expand Up @@ -319,6 +333,13 @@
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_allocation_relevance_rules.yml"
}
}
}
},
{
Expand Down Expand Up @@ -349,6 +370,13 @@
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_allocation_relevance_rules.yml"
}
}
}
}
]
Expand Down
262 changes: 262 additions & 0 deletions opensrp-reveal/src/main/assets/json.form/cdd_drug_received_form.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,262 @@
{
"count": "1",
"encounter_type": "cdd_drug_received",
"form_version": "0.0.2",
"entity_id": "",
"metadata": {
"start": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "start",
"openmrs_entity_id": ""
},
"end": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "end",
"openmrs_entity_id": ""
},
"today": {
"openmrs_entity_parent": "",
"openmrs_entity": "encounter",
"openmrs_entity_id": "encounter_date"
},
"deviceid": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "deviceid",
"openmrs_entity_id": "163149AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"subscriberid": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "subscriberid",
"openmrs_entity_id": "163150AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"simserial": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "simserial",
"openmrs_entity_id": "163151AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"phonenumber": {
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_data_type": "phonenumber",
"openmrs_entity_id": "163152AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
},
"encounter_location": ""
},
"step1": {
"title": "Drug Received Form",
"display_back_button": "true",
"fields": [
{
"key": "date",
"type": "date_picker",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"hint": "Date of drug issuing",
"max_date": "today",
"v_required": {
"value": true,
"err": "Please specify the date of drug issuing"
}
},
{
"key": "location",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "spinner",
"hint": "Select the Location ( ward or health facility)",
"text_size": "8sp",
"v_required": {
"value": "true",
"err": "Required field"
}
},
{
"key": "health_worker_supervisor",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "spinner",
"hint": "Name of Health worker Supervisor",
"v_required": {
"value": "true",
"err": "This field is required."
}
},
{
"key": "cdd_name",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "spinner",
"hint": "Name of CDD issued drugs",
"v_required": {
"value": "true",
"err": "This field is required."
}
},
{
"key": "drug_issued",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "Which drug did CDD receive?",
"options": [
{
"key": "PZQ",
"text": "Praziquantel (PZQ)"
},
{
"key": "MBZ",
"text": "Mebendazole"
},
{
"key": "Both",
"text": "Both"
}
],
"v_required": {
"value": true,
"err": "Please select drug"
}
},
{
"key": "pzq_received",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"edit_type": "number",
"hint": "Number of PZQ tablets Received",
"is_mandatory": true,
"v_required": {
"value": true,
"err": "This field is mandatory"
},
"v_numeric": {
"value": "true",
"err": "This field must be a number"
},
"v_numeric_integer": {
"value": "true",
"err": "This field must be a whole number"
},
"v_min": {
"value": "0",
"err": "This field must be greater than or equal to 0"
},
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_received_relevance_rules.yml"
}
}
}
},
{
"key": "mbz_received",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "edit_text",
"edit_type": "number",
"hint": "Number of Mebendazole tablets Received",
"is_mandatory": true,
"v_required": {
"value": true,
"err": "This field is mandatory"
},
"v_numeric": {
"value": "true",
"err": "This field must be a number"
},
"v_numeric_integer": {
"value": "true",
"err": "This field must be a whole number"
},
"v_min": {
"value": "0",
"err": "This field must be greater than or equal to 0"
},
"v_max": {
"value": "999999999",
"err": "This field must be less that or equal to 999999999"
},
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "cdd_drug_received_relevance_rules.yml"
}
}
}
},
{
"key": "drug_allocation",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "Select the drug allocation type (Initial balance or top up)",
"options": [
{
"key": "Initial balance",
"text": "Initial balance"
},
{
"key": "Top Up",
"text": "Top Up"
}
],
"v_required": {
"value": true,
"err": "This field is mandatory"
}
},
{
"key": "drug_received_from",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "native_radio",
"label": "Drugs received from Sub County Pharmacist or CDD Supervisor?",
"options": [
{
"key": "Sub County Pharmacists",
"text": "Sub County Pharmacists"
},
{
"key": "CDD Supervisor",
"text": "CDD Supervisor"
}
],
"v_required": {
"value": true,
"err": "This field is mandatory"
}
},
{
"key": "cdd_borrowed_from",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "spinner",
"hint": "Name of CDD who you borrowed drugs from",
"v_required": {
"value": "true",
"err": "This field is required."
}
}
]
}
}
Loading

0 comments on commit a95564c

Please sign in to comment.