update timezone

Author: sevenreup

Dockerfile

@@ -15,6 +15,7 @@ RUN gradle :server:buildFatJar --no-daemon
 
 # Stage 3: Create the Runtime Image
 FROM amazoncorretto:22 AS runtime
+ENV TZ="Africa/Blantyre"
 EXPOSE 4040
 RUN mkdir /app
 COPY --from=build /usr/src/app/server/build/libs/*.jar /app/ktor-app.jar

docker-compose.yml

@@ -6,6 +6,7 @@ services:
     ports:
       - "49100:4040"
     environment:
+      - TZ:"Africa/Blantyre"
       - KEYCLOAK_ID:${KEYCLOAK_ID}
       - KEYCLOAK_SECRET:${KEYCLOAK_SECRET}
       - KEYCLOAK_ISSUER:${KEYCLOAK_ISSUER}

server/src/main/kotlin/org/dtree/fhir/server/services/PatientType.kt

@@ -71,21 +71,22 @@ suspend fun fetchDataTest(client: FhirClient, actions: List<FilterFormData>): Fa
             val group = mapKeyToTitle(it.key)
             GroupedSummaryItem(
                 groupKey = it.key,
-                groupTitle = group.first,
+                groupTitle = group.title,
                 summaries = it.value,
-                order = group.second,
+                order = group.order,
+                startCollapsed = group.startCollapsed,
             )
         },
         date = LocalDate.now(), generatedDate = LocalDateTime.now(),
     )
 }
 
-fun mapKeyToTitle(key: String): Pair<String, Int> {
+fun mapKeyToTitle(key: String): GroupMeta {
     return when (key) {
-        "visits" -> Pair("Today's visits", 1)
-        "tasks" -> Pair("Today's Tasks", 2)
-        "newPatients" -> Pair("New clients today", 3)
-        else -> Pair("Facility Patient totals", 0)
+        "visits" -> GroupMeta("Today's visits", 1)
+        "tasks" -> GroupMeta("Today's Tasks", 2)
+        "newPatients" -> GroupMeta("New clients today", 3)
+        else -> GroupMeta("Facility Patient totals", 0, true)
     }
 }
 

server/src/main/kotlin/org/dtree/fhir/server/services/ResultDataOld.kt

@@ -3,16 +3,23 @@ package org.dtree.fhir.server.services
 import java.time.LocalDate
 import java.time.LocalDateTime
 
-data class FacilityResultData(val groups: List<GroupedSummaryItem>, val date: LocalDate, val generatedDate: LocalDateTime)
+data class FacilityResultData(
+    val groups: List<GroupedSummaryItem>,
+    val date: LocalDate,
+    val generatedDate: LocalDateTime,
+)
 
 data class GroupedSummaryItem(
     val groupKey: String,
     val groupTitle: String,
     val summaries: List<SummaryItem>,
     val order: Int,
+    val startCollapsed: Boolean = false,
 )
 
 data class SummaryItem(val name: String, val value: Int)
 
 
+data class GroupMeta(val title: String, val order: Int, val startCollapsed: Boolean = false,)
+
 data class ResultDataOld(val summaries: List<SummaryItem>, val date: List<String>?)