Skip to content

Pre production #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dodosi wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pre production #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9ebfe0
field made not required and min date removed
neric1 Sep 4, 2023
7d1aef6
field made not required and min date removed
neric1 Sep 4, 2023
38cda6e
Nw changes made Profile
dodosi Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,12 @@ subprojects {

ext.androidToolsBuildGradle = '30.0.3'
ext.androidBuildToolsVersion = '30.0.3'
// ext.androidMinSdkVersion = 21
// ext.androidCompileSdkVersion = 31
// ext.androidTargetSdkVersion = 31
ext.androidMinSdkVersion = 21
ext.androidCompileSdkVersion = 31
ext.androidTargetSdkVersion = 31
ext.androidCompileSdkVersion = 33
ext.androidTargetSdkVersion = 33
ext.androidAnnotationsVersion = '3.0.1'
ext.androidAnnotationsAPIVersion = '3.0.1'
ext.jacocoVersion = "0.7.9"
Expand Down
9 changes: 5 additions & 4 deletions opensrp-anc/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
// classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
// classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:7.0.0'
//classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.8.3'
classpath 'gradle.plugin.org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.10.2'
classpath 'com.google.gms:google-services:4.3.10'
}
Expand Down Expand Up @@ -179,7 +180,7 @@ tasks.withType(Test) {

dependencies {
implementation 'androidx.appcompat:appcompat:1.3.1'
implementation('org.smartregister:opensrp-client-native-form:3.1.1-PREVIEW-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-native-form:3.1.2-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.android.support', module: 'recyclerview-v7'
exclude group: 'com.android.support', module: 'appcompat-v7'
Expand All @@ -190,7 +191,7 @@ dependencies {
exclude group: 'org.yaml', module: 'snakeyaml'
exclude group: 'io.ona.rdt-capture', module: 'lib'
}
implementation('org.smartregister:opensrp-client-core:6.0.0-SNAPSHOT@aar') {
implementation('org.smartregister:opensrp-client-core:6.1.2-SNAPSHOT@aar') {
transitive = true
exclude group: 'com.github.bmelnychuk', module: 'atv'
exclude group: 'com.google.guava', module: 'guava'
Expand Down
35 changes: 34 additions & 1 deletion opensrp-anc/src/main/assets/json.form/anc_counselling_treatment.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6484,6 +6484,26 @@
"err": "{{anc_counselling_treatment.step12.prevention_measures.v_required.err}}"
}
},
{
"key": "total_treatment_received",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "edit_text",
"hint": "{{anc_counselling_treatment.step12.total_treatment_received.hint}}",
"edit_type": "name",
"relevance": {
"step12:prevention_measures": {
"ex-checkbox": [
{
"or": [
"iron_and_foric_acid"
]
}
]
}
}
},
{
"key": "prevention_measures_other",
"openmrs_entity_parent": "",
Expand Down Expand Up @@ -6655,11 +6675,24 @@
"hint": "{{anc_counselling_treatment.step12.next_visit_date.hint}}",
"expanded": "false",
"max_date": "today+280d",
"min_date": "today",

"v_required": {
"value": true,
"err": "{{anc_counselling_treatment.step12.next_visit_date.v_required.err}}"
}
},{
"key": "lst_visit_date",
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "",
"type": "date_picker",
"hint": "Date of Contact",
"expanded": "false",
"max_date": "today",
"v_required": {
"value": true,
"err": "Date of contact required"
}
},
{
"key": "prep_toaster",
Expand Down
6 changes: 3 additions & 3 deletions opensrp-anc/src/main/assets/json.form/anc_profile.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@
"specify_info": "{{anc_profile.step2.lmp_known.options.yes.specify_info}}",
"specify_widget": "date_picker",
"max_date": "today-14d",
"min_date": "today-280d",

"default": "today"
},
{
Expand Down Expand Up @@ -642,7 +642,7 @@
"specify_info": "{{anc_profile.step2.ultrasound_done.options.yes.specify_info}}",
"specify_widget": "date_picker",
"max_date": "today",
"min_date": "today-9m",

"default": "today"
},
{
Expand Down Expand Up @@ -780,7 +780,7 @@
"openmrs_entity_id": "",
"type": "date_picker",
"expanded": "false",
"min_date": "today",

"max_date": "today+10m",
"hint": "{{anc_profile.step2.edd_from_ultrasound.hint}}",
"relevance": {
Expand Down
6 changes: 3 additions & 3 deletions opensrp-anc/src/main/assets/json.form/anc_register.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@
"duration": {
"label": "{{anc_register.step1.dob_entered.duration.label}}"
},
"min_date": "today-49y",
"min_date": "today-60y",
"max_date": "today-10y",
"v_required": {
"value": "true",
Expand Down Expand Up @@ -393,7 +393,7 @@
"openmrs_entity": "",
"openmrs_entity_id": "",
"openmrs_data_type": "select one",
"type": "spinner",
"type": "hidden",
"hint": "{{anc_register.step1.ubudehe_category.hint}}",
"values": [
"1",
Expand Down Expand Up @@ -588,7 +588,7 @@
"openmrs_entity_parent": "",
"openmrs_entity": "concept",
"openmrs_entity_id": "163164AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"type": "native_radio",
"type": "hidden",
"label": "{{anc_register.step1.reminders.label}}",
"label_info_text": "{{anc_register.step1.reminders.label_info_text}}",
"label_text_style": "normal",
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_blood_glucose_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@
"hint": "{{tests_blood_glucose_sub_form.step1.glucose_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
103 changes: 6 additions & 97 deletions opensrp-anc/src/main/assets/json.form/sub_form/tests_blood_haemoglobin_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
"hint": "{{tests_blood_haemoglobin_sub_form.step1.hb_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down Expand Up @@ -247,14 +247,7 @@
"type": "edit_text",
"hint": "{{tests_blood_haemoglobin_sub_form.step1.cbc.hint}}",
"edit_type": "number",
"v_min": {
"value": "0",
"err": "{{tests_blood_haemoglobin_sub_form.step1.cbc.v_min.err}}"
},
"v_max": {
"value": "25",
"err": "{{tests_blood_haemoglobin_sub_form.step1.cbc.v_max.err}}"
},

"v_numeric": {
"value": "true",
"err": "{{tests_blood_haemoglobin_sub_form.step1.cbc.v_numeric.err}}"
Expand Down Expand Up @@ -283,14 +276,7 @@
"value": "0",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_gmeter.v_min.err}}"
},
"v_max": {
"value": "25",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_gmeter.v_max.err}}"
},
"v_numeric": {
"value": "true",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_gmeter.v_numeric.err}}"
},

"v_required": {
"value": true,
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_gmeter.v_required.err}}"
Expand All @@ -311,14 +297,7 @@
"type": "edit_text",
"hint": "{{tests_blood_haemoglobin_sub_form.step1.hb_colour.hint}}",
"edit_type": "number",
"v_min": {
"value": "0",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_colour.v_min.err}}"
},
"v_max": {
"value": "25",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_colour.v_max.err}}"
},

"v_numeric": {
"value": "true",
"err": "{{tests_blood_haemoglobin_sub_form.step1.hb_colour.v_numeric.err}}"
Expand Down Expand Up @@ -364,24 +343,7 @@
}
}
},
{
"key": "anaemia_diagnosis_danger_toaster",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "toaster_notes",
"text": "{{tests_blood_haemoglobin_sub_form.step1.anaemia_diagnosis_danger_toaster.text}}",
"toaster_info_text": "{{tests_blood_haemoglobin_sub_form.step1.anaemia_diagnosis_danger_toaster.toaster_info_text}}",
"toaster_info_title": "{{tests_blood_haemoglobin_sub_form.step1.anaemia_diagnosis_danger_toaster.toaster_info_title}}",
"toaster_type": "problem",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_relevance_rules.yml"
}
}
}
},

{
"key": "ht",
"openmrs_entity_parent": "",
Expand All @@ -406,24 +368,7 @@
}
}
},
{
"key": "hematocrit_danger_toaster",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "toaster_notes",
"text": "{{tests_blood_haemoglobin_sub_form.step1.hematocrit_danger_toaster.text}}",
"toaster_info_text": "{{tests_blood_haemoglobin_sub_form.step1.hematocrit_danger_toaster.toaster_info_text}}",
"toaster_info_title": "{{tests_blood_haemoglobin_sub_form.step1.hematocrit_danger_toaster.toaster_info_title}}",
"toaster_type": "problem",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_relevance_rules.yml"
}
}
}
},

{
"key": "wbc",
"openmrs_entity_parent": "",
Expand All @@ -449,24 +394,6 @@
}
}
},
{
"key": "wbc_danger_toaster",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "toaster_notes",
"text": "{{tests_blood_haemoglobin_sub_form.step1.wbc_danger_toaster.text}}",
"toaster_info_text": "{{tests_blood_haemoglobin_sub_form.step1.wbc_danger_toaster.toaster_info_text}}",
"toaster_info_title": "{{tests_blood_haemoglobin_sub_form.step1.wbc_danger_toaster.toaster_info_title}}",
"toaster_type": "problem",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_relevance_rules.yml"
}
}
}
},
{
"key": "platelets",
"openmrs_entity_parent": "",
Expand All @@ -491,24 +418,6 @@
}
}
}
},
{
"key": "paltelets_danger_toaster",
"openmrs_entity_parent": "",
"openmrs_entity": "",
"openmrs_entity_id": "",
"type": "toaster_notes",
"text": "{{tests_blood_haemoglobin_sub_form.step1.paltelets_danger_toaster.text}}",
"toaster_info_text": "{{tests_blood_haemoglobin_sub_form.step1.paltelets_danger_toaster.toaster_info_text}}",
"toaster_info_title": "{{tests_blood_haemoglobin_sub_form.step1.paltelets_danger_toaster.toaster_info_title}}",
"toaster_type": "problem",
"relevance": {
"rules-engine": {
"ex-rules": {
"rules-file": "tests_relevance_rules.yml"
}
}
}
}
],
"count": 1,
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_blood_type_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
"hint": "{{tests_blood_type_sub_form.step1.blood_type_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_hepatitis_b_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@
"hint": "{{tests_hepatitis_b_sub_form.step1.hepb_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_hepatitis_c_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
"hint": "{{tests_hepatitis_c_sub_form.step1.hepc_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_hiv_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
"hint": "{{tests_hiv_sub_form.step1.hiv_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_partner_hiv_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"hint": "{{tests_partner_hiv_sub_form.step1.hiv_test_partner_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_partner_rpr_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
"hint": "{{tests_partner_rpr_sub_form.step1.partner_rpr_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_syphilis_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
"hint": "{{tests_syphilis_sub_form.step1.syph_test_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
2 changes: 1 addition & 1 deletion opensrp-anc/src/main/assets/json.form/sub_form/tests_tb_screening_sub_form.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@
"hint": "{{tests_tb_screening_sub_form.step1.tb_screening_scheduled_date.hint}}",
"expanded": "false",
"max_date": "today+10m",
"min_date": "today",

"relevance": {
"rules-engine": {
"ex-rules": {
Expand Down
Loading