Skip to content
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

Jump to bottom

Add the new eCBIS flavor | main #2610

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Add the new eCBIS flavor | main #2610

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
23a9cee
Add the new eCBIS flavor
dubdabasoduba Jul 20, 2023
20c76a7
Merge branch 'main' into feature/add_new_ecbis_flavor
pld Jul 20, 2023
74bd8ee
Update the flavor naming
dubdabasoduba Jul 21, 2023
ddc90a3
Merge branch 'feature/add_new_ecbis_flavor' of github.com:opensrp/fhi…
dubdabasoduba Jul 21, 2023
289b2ff
Update changelog
dubdabasoduba Jul 21, 2023
73412dc
Merge branch 'main' into feature/add_new_ecbis_flavor
dubdabasoduba Jul 21, 2023
2d50993
Merge branch 'main' into feature/add_new_ecbis_flavor
dubdabasoduba Jul 25, 2023
2119f59
Update the flavor naming
dubdabasoduba Jul 25, 2023
b5fc566
Move assets to the correct folder
dubdabasoduba Jul 25, 2023
2e18c66
Updating the ecbis flavor and updating the practitioner details pract…
dubdabasoduba Jul 25, 2023
2dad6bf
Fix broken tasks
dubdabasoduba Jul 25, 2023
1e061aa
Merge branch 'main' into feature/add_new_ecbis_flavor
dubdabasoduba Aug 1, 2023
71dc93c
Merge branch 'main' of github.com:opensrp/fhircore into feature/add_n…
dubdabasoduba Aug 16, 2023
70f372e
Fix changelog
dubdabasoduba Aug 16, 2023
6d218e1
Merge branch 'main' of github.com:opensrp/fhircore into feature/add_n…
dubdabasoduba Aug 16, 2023
b089366
Update android/quest/src/main/java/org/smartregister/fhircore/quest/u…
pld Aug 16, 2023
c316f55
Merge branch 'main' into feature/add_new_ecbis_flavor
pld Aug 16, 2023
a3deafd
Merge branch 'main' into feature/add_new_ecbis_flavor
dubdabasoduba Apr 30, 2024
2007e0e
Merge branch 'main' into feature/add_new_ecbis_flavor
dubdabasoduba Jun 14, 2024
52cb3b6
Merge branch 'main' into feature/add_new_ecbis_flavor
pld Jun 14, 2024
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Implement configurable image/icon widget
- Added functionality to filter related resources for list view
- Added the sick child workflow automated closure
- Added a new eCBIS flavour to be used for the production app.

### Fixed
- Logout while offline causes flicker(multiple render) of Login Page
Expand Down
4 changes: 0 additions & 4 deletions ...ne/src/main/java/org/smartregister/fhircore/engine/util/extension/FhirContextExtension.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@ import ca.uhn.fhir.context.FhirContext
import ca.uhn.fhir.parser.IParser
import org.smartregister.model.location.LocationHierarchy
import org.smartregister.model.practitioner.FhirPractitionerDetails
import org.smartregister.model.practitioner.KeycloakUserDetails
import org.smartregister.model.practitioner.PractitionerDetails
import org.smartregister.model.practitioner.UserBioData

fun FhirContext.getCustomJsonParser(): IParser {
return this.apply {
Expand All @@ -31,8 +29,6 @@ fun FhirContext.getCustomJsonParser(): IParser {
PractitionerDetails::class.java,
FhirPractitionerDetails::class.java,
LocationHierarchy::class.java,
KeycloakUserDetails::class.java,
UserBioData::class.java,
),
)
}
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ data-capture = "1.0.0-preview11-SNAPSHOT"
desugar-jdk-libs = "1.1.5"
easy-rules-jexl = "4.1.0"
espresso-core = "3.5.0"
fhir-common-utils = "0.0.2-SNAPSHOT"
fhir-common-utils = "0.0.7-SNAPSHOT"
fhir-engine = "0.1.0-beta03-preview9.5-SNAPSHOT"
foundation = "1.3.1"
fragment-ktx = "1.5.5"
Expand Down
7 changes: 7 additions & 0 deletions android/quest/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ android {
manifestPlaceholders["appLabel"] = "MOH eCBIS"
}

create("ecbis_preview") {
dimension = "apps"
applicationIdSuffix = ".ecbis_preview"
versionNameSuffix = "-ecbis_preview"
manifestPlaceholders["appLabel"] = "MOH eCBIS Preview"
}

create("g6pd") {
dimension = "apps"
applicationIdSuffix = ".g6pd"
Expand Down
Binary file added android/quest/src/ecbis_preview/res/drawable/ic_app_logo.png
View file
Open in desktop
pld marked this conversation as resolved.
Show resolved Hide resolved
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we use the ecbis logo w/a banner over it or something

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We wanted the distinction on the installation hence the need to use different icons.

I will be updating the configs on preview to change the app name on the UI to read preview too

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/quest/src/ecbis_preview/res/drawable/ic_launcher.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt
View file
Open in desktop
pld marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ constructor(

sharedPreferences.write(
key = SharedPreferenceKey.PRACTITIONER_ID.name,
value = practitionerDetails.fhirPractitionerDetails?.practitionerId.valueToString(),
value = practitionerDetails.fhirPractitionerDetails?.id,
)
sharedPreferences.write(SharedPreferenceKey.PRACTITIONER_DETAILS.name, practitionerDetails)
sharedPreferences.write(ResourceType.CareTeam.name, careTeamIds)
Expand Down
7 changes: 3 additions & 4 deletions ...test/java/org/smartregister/fhircore/quest/ui/questionnaire/QuestionnaireViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import org.hl7.fhir.r4.model.Extension
import org.hl7.fhir.r4.model.Group
import org.hl7.fhir.r4.model.HumanName
import org.hl7.fhir.r4.model.Patient
import org.hl7.fhir.r4.model.Practitioner
import org.hl7.fhir.r4.model.Questionnaire
import org.hl7.fhir.r4.model.QuestionnaireResponse
import org.hl7.fhir.r4.model.QuestionnaireResponse.QuestionnaireResponseItemAnswerComponent
Expand Down Expand Up @@ -116,7 +117,6 @@ import org.smartregister.fhircore.quest.R
import org.smartregister.fhircore.quest.app.fakes.Faker
import org.smartregister.fhircore.quest.robolectric.RobolectricTest
import org.smartregister.model.practitioner.FhirPractitionerDetails
import org.smartregister.model.practitioner.KeycloakUserDetails
import org.smartregister.model.practitioner.PractitionerDetails

@HiltAndroidTest
Expand Down Expand Up @@ -148,7 +148,7 @@ class QuestionnaireViewModelTest : RobolectricTest() {
// Write practitioner and organization to shared preferences
sharedPreferencesHelper.write(
SharedPreferenceKey.PRACTITIONER_ID.name,
practitionerDetails().fhirPractitionerDetails.practitionerId.valueToString(),
practitionerDetails().fhirPractitionerDetails.id,
)

sharedPreferencesHelper.write(ResourceType.Organization.name, listOf("105"))
Expand Down Expand Up @@ -1208,11 +1208,10 @@ class QuestionnaireViewModelTest : RobolectricTest() {

private fun practitionerDetails(): PractitionerDetails {
return PractitionerDetails().apply {
userDetail = KeycloakUserDetails().apply { id = "12345" }
fhirPractitionerDetails =
FhirPractitionerDetails().apply {
id = "12345"
practitionerId = StringType("12345")
practitioner = Practitioner().apply { id = "12345" }
}
}
}
Expand Down
Loading