Merge pull request #2620 from opensrp/add_new_ecbis_flavor

Add new ecbis flavor
opensrp · Jul 25, 2023 · dc84f11 · dc84f11
2 parents 1d306f8 + 9f13ebe
commit dc84f11
Show file tree

Hide file tree

Showing 10 changed files with 3,136 additions and 12 deletions.
diff --git a/...ne/src/main/java/org/smartregister/fhircore/engine/util/extension/FhirContextExtension.kt b/...ne/src/main/java/org/smartregister/fhircore/engine/util/extension/FhirContextExtension.kt
@@ -20,19 +20,15 @@ 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 {
       registerCustomTypes(
         listOf(
           PractitionerDetails::class.java,
           FhirPractitionerDetails::class.java,
-          LocationHierarchy::class.java,
-          KeycloakUserDetails::class.java,
-          UserBioData::class.java
+          LocationHierarchy::class.java
         )
       )
     }

diff --git a/android/gradle/libs.versions.toml b/android/gradle/libs.versions.toml
@@ -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"

diff --git a/android/quest/build.gradle.kts b/android/quest/build.gradle.kts
@@ -168,14 +168,14 @@ android {
       dimension = "apps"
       applicationIdSuffix = ".ecbis"
       versionNameSuffix = "-ecbis"
-      manifestPlaceholders["appLabel"] = "MOH eCBIS Preview"
+      manifestPlaceholders["appLabel"] = "MOH eCBIS"
     }
 
-    create("ecbis_production") {
+    create("ecbis_preview") {
       dimension = "apps"
-      applicationIdSuffix = ".ecbis_production"
-      versionNameSuffix = "-ecbis_production"
-      manifestPlaceholders["appLabel"] = "MOH eCBIS"
+      applicationIdSuffix = ".ecbis_preview"
+      versionNameSuffix = "-ecbis_preview"
+      manifestPlaceholders["appLabel"] = "MOH eCBIS Preview"
     }
 
     create("g6pd") {

diff --git a/android/quest/src/ecbis/res/drawable/ic_app_logo.png b/android/quest/src/ecbis/res/drawable/ic_app_logo.png
diff --git a/...s_production/res/drawable/ic_app_logo.xml → ...st/src/ecbis/res/drawable/ic_app_logo.xml b/...s_production/res/drawable/ic_app_logo.xml → ...st/src/ecbis/res/drawable/ic_app_logo.xml
diff --git a/android/quest/src/ecbis/res/drawable/ic_launcher.png b/android/quest/src/ecbis/res/drawable/ic_launcher.png
diff --git a/...s_production/res/drawable/ic_launcher.xml → ...st/src/ecbis/res/drawable/ic_launcher.xml b/...s_production/res/drawable/ic_launcher.xml → ...st/src/ecbis/res/drawable/ic_launcher.xml
diff --git a/android/quest/src/ecbis_preview/res/drawable/ic_app_logo.xml b/android/quest/src/ecbis_preview/res/drawable/ic_app_logo.xml
diff --git a/android/quest/src/ecbis_preview/res/drawable/ic_launcher.xml b/android/quest/src/ecbis_preview/res/drawable/ic_launcher.xml
diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/ui/login/LoginViewModel.kt
@@ -319,7 +319,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)