Skip to content

Commit b752877

Browse files
LZRSLZRS
committed
Update to new sdk artifacts released 23-04
1 parent a86a90f commit b752877

File tree

7 files changed

+87
-68
lines changed

7 files changed

+87
-68
lines changed

‎android/build.gradle.kts

+10-12
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,18 @@ allprojects {
3535
mavenCentral()
3636
maven(url = "https://oss.sonatype.org/content/repositories/snapshots")
3737
maven(url = "https://jcenter.bintray.com/")
38-
val properties = ProjectProperties.readProperties("local.properties")
39-
40-
if (properties.getProperty("dtreeRepositoryUsername") != null && properties.getProperty("dtreeRepositoryPassword") != null) {
41-
maven {
42-
url = uri("https://maven.pkg.github.com/d-tree-org/android-fhir")
43-
name = "dtreeRepository"
44-
credentials {
45-
username = properties["dtreeRepositoryUsername"]?.toString()
46-
password = properties["dtreeRepositoryPassword"]?.toString()
38+
ProjectProperties.readProperties("local.properties")
39+
.takeIf { it.getProperty("dtreeRepositoryUsername") != null && it.getProperty("dtreeRepositoryPassword") != null }
40+
?.let {
41+
maven {
42+
url = uri("https://maven.pkg.github.com/d-tree-org/android-fhir")
43+
name = "dtreeRepository"
44+
credentials {
45+
username = it["dtreeRepositoryUsername"]?.toString()
46+
password = it["dtreeRepositoryPassword"]?.toString()
47+
}
4748
}
4849
}
49-
}
50-
51-
mavenLocal()
5250
maven {
5351
name = "fhirsdk"
5452
url = uri("/Users/ndegwamartin/.m2.dev/fhirsdk")

‎android/dataclerk/src/main/java/org/dtree/fhircore/dataclerk/DataClerkConfigService.kt

+9-9
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ class DataClerkConfigService @Inject constructor(@ApplicationContext val context
4848
Coding().apply {
4949
system =
5050
context.getString(
51-
org.smartregister.fhircore.engine.R.string.sync_strategy_careteam_system
51+
org.smartregister.fhircore.engine.R.string.sync_strategy_careteam_system,
5252
)
5353
display =
5454
context.getString(
55-
org.smartregister.fhircore.engine.R.string.sync_strategy_careteam_display
55+
org.smartregister.fhircore.engine.R.string.sync_strategy_careteam_display,
5656
)
5757
},
5858
),
@@ -62,11 +62,11 @@ class DataClerkConfigService @Inject constructor(@ApplicationContext val context
6262
Coding().apply {
6363
system =
6464
context.getString(
65-
org.smartregister.fhircore.engine.R.string.sync_strategy_location_system
65+
org.smartregister.fhircore.engine.R.string.sync_strategy_location_system,
6666
)
6767
display =
6868
context.getString(
69-
org.smartregister.fhircore.engine.R.string.sync_strategy_location_display
69+
org.smartregister.fhircore.engine.R.string.sync_strategy_location_display,
7070
)
7171
},
7272
),
@@ -76,11 +76,11 @@ class DataClerkConfigService @Inject constructor(@ApplicationContext val context
7676
Coding().apply {
7777
system =
7878
context.getString(
79-
org.smartregister.fhircore.engine.R.string.sync_strategy_organization_system
79+
org.smartregister.fhircore.engine.R.string.sync_strategy_organization_system,
8080
)
8181
display =
8282
context.getString(
83-
org.smartregister.fhircore.engine.R.string.sync_strategy_organization_display
83+
org.smartregister.fhircore.engine.R.string.sync_strategy_organization_display,
8484
)
8585
},
8686
),
@@ -90,11 +90,11 @@ class DataClerkConfigService @Inject constructor(@ApplicationContext val context
9090
Coding().apply {
9191
system =
9292
context.getString(
93-
org.smartregister.fhircore.engine.R.string.sync_strategy_practitioner_system
93+
org.smartregister.fhircore.engine.R.string.sync_strategy_practitioner_system,
9494
)
9595
display =
9696
context.getString(
97-
org.smartregister.fhircore.engine.R.string.sync_strategy_practitioner_display
97+
org.smartregister.fhircore.engine.R.string.sync_strategy_practitioner_display,
9898
)
9999
},
100100
isResource = false,
@@ -105,7 +105,7 @@ class DataClerkConfigService @Inject constructor(@ApplicationContext val context
105105
Coding().apply {
106106
system =
107107
context.getString(
108-
org.smartregister.fhircore.engine.R.string.sync_strategy_appid_system
108+
org.smartregister.fhircore.engine.R.string.sync_strategy_appid_system,
109109
)
110110
display = context.getString(org.smartregister.fhircore.engine.R.string.application_id)
111111
},

‎android/engine/build.gradle.kts

+3-3
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ dependencies {
125125
exclude(group = "org.slf4j", module = "jcl-over-slf4j")
126126
}
127127

128-
api("org.dtree.android.fhir:knowledge:0.1.0-alpha0394") {
128+
api("org.smartregister:knowledge:0.1.0-alpha03-preview4-SNAPSHOT") {
129129
exclude(group = "org.slf4j", module = "jcl-over-slf4j")
130130
}
131131

@@ -185,7 +185,7 @@ dependencies {
185185
exclude(group = "com.google.android.fhir", module = "common")
186186
exclude(group = "com.google.android.fhir", module = "engine")
187187
}
188-
api("org.dtree.android.fhir:data-capture:1.1.0-alpha04") {
188+
api("org.smartregister:data-capture:1.1.0-preview8-SNAPSHOT") {
189189
isTransitive = true
190190
exclude(group = "ca.uhn.hapi.fhir")
191191
exclude(group = "com.google.android.fhir", module = "engine")
@@ -195,7 +195,7 @@ dependencies {
195195

196196
api("org.smartregister:common:0.1.0-alpha05-preview3-SNAPSHOT") { isTransitive = true }
197197

198-
api("org.smartregister:engine:1.0.0-preview5-SNAPSHOT") {
198+
api("org.smartregister:engine:1.0.0-preview7.1-SNAPSHOT") {
199199
isTransitive = true
200200
exclude(group = "com.google.android.fhir", module = "common")
201201
exclude(group = "com.github.ben-manes.caffeine")

‎android/quest/src/main/java/org/smartregister/fhircore/quest/ui/appointment/register/AppointmentRegisterScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ fun FilterAppointmentsModal(
124124
),
125125
reason = AppointmentFilter(Reason.ALL_REASONS, Reason.values().asList()),
126126
)
127-
},
128-
)
127+
},
128+
)
129129

130130
AppointmentExposedDropdown(
131131
filter = filtersState.patientCategory,

‎android/quest/src/main/java/org/smartregister/fhircore/quest/ui/tracing/register/TracingRegisterScreen.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -100,8 +100,8 @@ fun FilterTracingRegisterModal(
100100
),
101101
age = TracingRegisterUiFilter(AgeFilter.ALL_AGES, AgeFilter.values().asList()),
102102
)
103-
},
104-
)
103+
},
104+
)
105105

106106
TracingRegisterExposedDropdown(
107107
filter = filtersState.patientCategory,

‎android/quest/src/main/java/org/smartregister/fhircore/quest/util/mappers/AppointmentFilterMappers.kt

+60-39
Original file line numberDiff line numberDiff line change
@@ -37,44 +37,65 @@ fun transformPatientCategoryToHealthStatus(patientCategory: PatientCategory) =
3737

3838
fun transformAppointmentUiReasonToCode(uiReason: Reason): CodeableConcept? =
3939
when (uiReason) {
40-
Reason.CERVICAL_CANCER_SCREENING -> CodeableConcept(
41-
Coding(SystemConstants.REASON_CODE_SYSTEM, "via", "Cervical Cancer Screening")
42-
)
43-
Reason.DBS_POSITIVE -> CodeableConcept(
44-
Coding(SystemConstants.REASON_CODE_SYSTEM, "DBS Pos", "DBS Positive")
45-
)
46-
Reason.HIV_TEST -> CodeableConcept(
47-
Coding(SystemConstants.REASON_CODE_SYSTEM, "hiv-test", "HIV Test")
48-
)
49-
Reason.INDEX_CASE_TESTING -> CodeableConcept(
50-
Coding(SystemConstants.REASON_CODE_SYSTEM, "ICT", "Index Case Testing")
51-
)
52-
Reason.MILESTONE_HIV_TEST -> CodeableConcept(
53-
Coding(SystemConstants.REASON_CODE_SYSTEM, "Milestone", "Milestone HIV Test")
54-
)
55-
Reason.LINKAGE -> CodeableConcept(
56-
Coding(SystemConstants.REASON_CODE_SYSTEM, "linkage", "Linkage")
57-
)
58-
Reason.REFILL -> CodeableConcept(
59-
Coding(SystemConstants.REASON_CODE_SYSTEM, "Refill", "Refill")
60-
)
61-
Reason.ROUTINE_VISIT -> CodeableConcept(
62-
Coding(SystemConstants.REASON_CODE_SYSTEM, "Routine", "Routine Visit")
63-
)
64-
Reason.VIRAL_LOAD_COLLECTION -> CodeableConcept(
65-
Coding(SystemConstants.REASON_CODE_SYSTEM, "vl", "Viral Load Collection")
66-
)
67-
Reason.WELCOME_SERVICE -> CodeableConcept(
68-
Coding(SystemConstants.REASON_CODE_SYSTEM, "ICT", "Index Case Testing")
69-
)
70-
Reason.WELCOME_SERVICE_HVL -> CodeableConcept(
71-
Coding(SystemConstants.REASON_CODE_SYSTEM, "welcome-service-hvl", "Welcome Service HVL")
72-
)
73-
Reason.WELCOME_SERVICE_FOLLOW_UP -> CodeableConcept(
74-
Coding(SystemConstants.REASON_CODE_SYSTEM, "welcome-service-follow-up", "Index Case Testing")
75-
)
76-
Reason.TB_HISTORY_REGIMEN -> CodeableConcept(
77-
Coding(SystemConstants.REASON_CODE_SYSTEM, "tb_history_and_regimen", "Welcome Service Follow Up")
78-
)
40+
Reason.CERVICAL_CANCER_SCREENING ->
41+
CodeableConcept(
42+
Coding(SystemConstants.REASON_CODE_SYSTEM, "via", "Cervical Cancer Screening"),
43+
)
44+
Reason.DBS_POSITIVE ->
45+
CodeableConcept(
46+
Coding(SystemConstants.REASON_CODE_SYSTEM, "DBS Pos", "DBS Positive"),
47+
)
48+
Reason.HIV_TEST ->
49+
CodeableConcept(
50+
Coding(SystemConstants.REASON_CODE_SYSTEM, "hiv-test", "HIV Test"),
51+
)
52+
Reason.INDEX_CASE_TESTING ->
53+
CodeableConcept(
54+
Coding(SystemConstants.REASON_CODE_SYSTEM, "ICT", "Index Case Testing"),
55+
)
56+
Reason.MILESTONE_HIV_TEST ->
57+
CodeableConcept(
58+
Coding(SystemConstants.REASON_CODE_SYSTEM, "Milestone", "Milestone HIV Test"),
59+
)
60+
Reason.LINKAGE ->
61+
CodeableConcept(
62+
Coding(SystemConstants.REASON_CODE_SYSTEM, "linkage", "Linkage"),
63+
)
64+
Reason.REFILL ->
65+
CodeableConcept(
66+
Coding(SystemConstants.REASON_CODE_SYSTEM, "Refill", "Refill"),
67+
)
68+
Reason.ROUTINE_VISIT ->
69+
CodeableConcept(
70+
Coding(SystemConstants.REASON_CODE_SYSTEM, "Routine", "Routine Visit"),
71+
)
72+
Reason.VIRAL_LOAD_COLLECTION ->
73+
CodeableConcept(
74+
Coding(SystemConstants.REASON_CODE_SYSTEM, "vl", "Viral Load Collection"),
75+
)
76+
Reason.WELCOME_SERVICE ->
77+
CodeableConcept(
78+
Coding(SystemConstants.REASON_CODE_SYSTEM, "ICT", "Index Case Testing"),
79+
)
80+
Reason.WELCOME_SERVICE_HVL ->
81+
CodeableConcept(
82+
Coding(SystemConstants.REASON_CODE_SYSTEM, "welcome-service-hvl", "Welcome Service HVL"),
83+
)
84+
Reason.WELCOME_SERVICE_FOLLOW_UP ->
85+
CodeableConcept(
86+
Coding(
87+
SystemConstants.REASON_CODE_SYSTEM,
88+
"welcome-service-follow-up",
89+
"Index Case Testing"
90+
),
91+
)
92+
Reason.TB_HISTORY_REGIMEN ->
93+
CodeableConcept(
94+
Coding(
95+
SystemConstants.REASON_CODE_SYSTEM,
96+
"tb_history_and_regimen",
97+
"Welcome Service Follow Up"
98+
),
99+
)
79100
else -> null
80101
}

‎android/quest/src/main/java/org/smartregister/fhircore/quest/util/mappers/ProfileViewDataMapper.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ class ProfileViewDataMapper @Inject constructor(@ApplicationContext val context:
9696
inputModel.tasks.map {
9797
PatientProfileRowItem(
9898
id = it.outcomeReference.first().extractId(),
99-
actionFormId = if (it.canBeCompleted()) it.getQuestionnaire() else null,
99+
actionFormId = if (it.canBeCompleted()) it.getQuestionnaire() else null,
100100
title = "", // it.description,
101101
subtitle = "", // context.getString(R.string.due_on,
102102
// it.executionPeriod.start.makeItReadable()),

0 commit comments

Comments
 (0)