RAMP: August-September features

app/src/main/java/org/dhis2/simprints/SimprintsEnrollmentViewModel.kt

@@ -3,9 +3,12 @@ package org.dhis2.simprints
 import android.app.Activity.RESULT_OK
 import android.content.Intent
 import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CancellationException
 import org.dhis2.commons.simprints.repository.SimprintsD2Repository
 import org.dhis2.commons.simprints.repository.SimprintsSessionRepository
 import org.dhis2.commons.simprints.usecases.SimprintsResolvePendingEnrollmentActionUseCase
+import org.dhis2.commons.simprints.utils.SimprintsExternalCredentialUtils
+import timber.log.Timber
 import kotlin.concurrent.atomics.AtomicReference
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
@@ -87,6 +90,25 @@ class SimprintsEnrollmentViewModel(
                     attributeUid = resolvedAction.fieldUid,
                     value = value,
                 )
+                val externalCredentialValue =
+                    SimprintsExternalCredentialUtils.enrollmentExternalCredentialValue(
+                        resolvedAction.callout.launchIntent.action,
+                        value,
+                        data?.extras,
+                    )
+                if (externalCredentialValue != null && enrollmentUid != null) {
+                    try {
+                        simprintsD2Repository.saveEnrollmentExternalCredential(
+                            enrollmentUid = enrollmentUid,
+                            biometricAttributeUid = resolvedAction.fieldUid,
+                            externalCredentialValue = externalCredentialValue,
+                        )
+                    } catch (e: CancellationException) {
+                        throw e
+                    } catch (e: Exception) {
+                        Timber.e(e, "Unable to save Simprints external credential after enrollment")
+                    }
+                }
                 sessionRepository.clear()
                 RegisterLastResult.CONTINUE_FINISH
             }

app/src/main/java/org/dhis2/simprints/SimprintsSearchViewModel.kt

@@ -2,18 +2,23 @@ package org.dhis2.simprints
 
 import android.app.Activity.RESULT_OK
 import android.content.Intent
+import android.os.Bundle
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.receiveAsFlow
+import org.dhis2.commons.simprints.repository.SimprintsD2Repository
 import org.dhis2.commons.simprints.repository.SimprintsSessionRepository
 import org.dhis2.commons.simprints.usecases.SimprintsResolveConfirmIdentityCalloutUseCase
+import org.dhis2.commons.simprints.utils.SimprintsExternalCredentialUtils
 import org.dhis2.commons.simprints.utils.SimprintsIntentUtils
 import org.dhis2.commons.simprints.utils.SimprintsSearchUtils
 import org.dhis2.form.model.FieldUiModel
 import org.dhis2.form.model.FieldUiModelImpl
+import timber.log.Timber
 import kotlin.concurrent.atomics.AtomicReference
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
@@ -22,6 +27,7 @@ class SimprintsSearchViewModel(
     private val resolveConfirmIdentityCallout: SimprintsResolveConfirmIdentityCalloutUseCase,
     private val sessionRepository: SimprintsSessionRepository,
     private val resolveSingleBiometricSearchNavigation: SimprintsResolveSingleBiometricSearchNavigationUseCase,
+    private val simprintsD2Repository: SimprintsD2Repository,
 ) : ViewModel() {
     private data class PendingSimprintsMfidBiometricIdentification(
         val uid: String,
@@ -33,6 +39,7 @@ class SimprintsSearchViewModel(
         val programUid: String?,
         val enrollmentUid: String?,
         val isOnline: Boolean = false,
+        val biometricAttributeUid: String? = null,
     )
 
     sealed class DashboardAction {
@@ -46,6 +53,7 @@ class SimprintsSearchViewModel(
     }
 
     private val pendingDashboardNavigation = AtomicReference<PendingDashboardNavigation?>(null)
+    private var confirmIdentityStateRestored = false
     private val pendingSimprintsMfidBiometricIdentification =
         AtomicReference<PendingSimprintsMfidBiometricIdentification?>(null)
     private var useLastBiometricsForSequentialSearch = false
@@ -71,23 +79,24 @@ class SimprintsSearchViewModel(
             sessionRepository
                 .get()
                 ?.takeIf { searchState.hasBiometricIdentificationQuery || useSequentialSearchLastBiometrics }
-        val confirmIdentityIntent =
+        val confirmIdentityCallout =
             sessionId?.let {
                 resolveConfirmIdentityCallout(
                     teiUid = teiUid,
                     searchFields = searchFields,
                     sessionId = it,
                     allowBlankSearchValue = useSequentialSearchLastBiometrics,
-                )?.launchIntent
+                )
             }
 
         val navigation =
             PendingDashboardNavigation(
                 teiUid = teiUid,
                 programUid = programUid,
                 enrollmentUid = enrollmentUid,
+                biometricAttributeUid = confirmIdentityCallout?.biometricAttributeUid,
             )
-        if (confirmIdentityIntent == null) {
+        if (confirmIdentityCallout == null) {
             return DashboardAction.OpenDashboard(navigation)
         }
 
@@ -97,7 +106,7 @@ class SimprintsSearchViewModel(
             useLastBiometricsForSequentialSearch = false
             sessionRepository.clear()
         }
-        return DashboardAction.LaunchConfirmIdentity(confirmIdentityIntent)
+        return DashboardAction.LaunchConfirmIdentity(confirmIdentityCallout.launchIntent)
     }
 
     fun prepareEnrollmentQueryData(
@@ -124,10 +133,52 @@ class SimprintsSearchViewModel(
         sessionRepository.markPendingEnrollmentFromPossibleDuplicates()
     }
 
-    fun onConfirmIdentityResult(resultCode: Int): PendingDashboardNavigation? =
-        pendingDashboardNavigation
-            .exchange(null)
-            ?.takeIf { resultCode == RESULT_OK }
+    fun savePendingConfirmIdentity(outState: Bundle) {
+        val navigation = pendingDashboardNavigation.load()
+        outState.putString("simprints.confirmIdentity.teiUid", navigation?.teiUid)
+        outState.putString("simprints.confirmIdentity.programUid", navigation?.programUid)
+        outState.putString("simprints.confirmIdentity.enrollmentUid", navigation?.enrollmentUid)
+        outState.putString("simprints.confirmIdentity.biometricAttributeUid", navigation?.biometricAttributeUid)
+    }
+
+    fun restorePendingConfirmIdentity(savedState: Bundle?) {
+        if (confirmIdentityStateRestored) return
+        confirmIdentityStateRestored = true
+        val teiUid = savedState?.getString("simprints.confirmIdentity.teiUid")?.takeIf(String::isNotBlank) ?: return
+        pendingDashboardNavigation.compareAndSet(
+            null,
+            PendingDashboardNavigation(
+                teiUid = teiUid,
+                programUid = savedState.getString("simprints.confirmIdentity.programUid"),
+                enrollmentUid = savedState.getString("simprints.confirmIdentity.enrollmentUid"),
+                biometricAttributeUid = savedState.getString("simprints.confirmIdentity.biometricAttributeUid"),
+            ),
+        )
+    }
+
+    suspend fun onConfirmIdentityResult(
+        resultCode: Int,
+        data: Intent? = null,
+    ): PendingDashboardNavigation? {
+        val navigation = pendingDashboardNavigation.exchange(null) ?: return null
+        if (resultCode != RESULT_OK) return null
+
+        SimprintsExternalCredentialUtils.externalCredentialValue(data?.extras)?.let { externalCredentialValue ->
+            try {
+                simprintsD2Repository.saveExternalCredential(
+                    teiUid = navigation.teiUid,
+                    programUid = navigation.programUid,
+                    biometricAttributeUid = navigation.biometricAttributeUid,
+                    externalCredentialValue = externalCredentialValue,
+                )
+            } catch (e: CancellationException) {
+                throw e
+            } catch (e: Exception) {
+                Timber.e(e, "Unable to save Simprints external credential after identity confirmation")
+            }
+        }
+        return navigation
+    }
 
     fun onConfirmIdentityLaunchFailed() {
         pendingDashboardNavigation.store(null)

app/src/main/java/org/dhis2/simprints/di/SimprintsSearchViewModelFactory.kt

@@ -2,6 +2,7 @@ package org.dhis2.simprints.di
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
+import org.dhis2.commons.simprints.repository.SimprintsD2Repository
 import org.dhis2.commons.simprints.repository.SimprintsSessionRepository
 import org.dhis2.commons.simprints.usecases.SimprintsResolveConfirmIdentityCalloutUseCase
 import org.dhis2.simprints.SimprintsResolveSingleBiometricSearchNavigationUseCase
@@ -11,11 +12,13 @@ class SimprintsSearchViewModelFactory(
     private val resolveConfirmIdentityCallout: SimprintsResolveConfirmIdentityCalloutUseCase,
     private val sessionRepository: SimprintsSessionRepository,
     private val resolveSingleBiometricSearchNavigation: SimprintsResolveSingleBiometricSearchNavigationUseCase,
+    private val simprintsD2Repository: SimprintsD2Repository,
 ) : ViewModelProvider.Factory {
     override fun <T : ViewModel> create(modelClass: Class<T>): T =
         SimprintsSearchViewModel(
             resolveConfirmIdentityCallout = resolveConfirmIdentityCallout,
             sessionRepository = sessionRepository,
             resolveSingleBiometricSearchNavigation = resolveSingleBiometricSearchNavigation,
+            simprintsD2Repository = simprintsD2Repository,
         ) as T
 }

app/src/main/java/org/dhis2/simprints/ramp/data/DetailedEnrollmentRepository.kt

@@ -3,46 +3,39 @@ package org.dhis2.simprints.ramp.data
 import org.dhis2.bindings.userFriendlyValue
 import org.dhis2.commons.simprints.ramp.model.DetailedEnrollmentListingSettings
 import org.dhis2.simprints.ramp.model.DetailedEnrollment
-import org.dhis2.tracker.search.model.DomainEnrollment
-import org.dhis2.tracker.search.model.DomainProgram
 import org.hisp.dhis.android.core.D2
+import org.hisp.dhis.android.core.enrollment.Enrollment
 import org.hisp.dhis.android.core.event.Event
 import java.util.Date
 
 internal class DetailedEnrollmentRepository(
     private val d2: D2,
 ) {
     fun get(
-        enrollments: List<DomainEnrollment>?,
-        programs: List<DomainProgram>?,
+        enrollments: List<Enrollment>,
         settings: DetailedEnrollmentListingSettings,
-        excludedProgramUid: String? = null,
-    ): List<DetailedEnrollment> {
-        val includedEnrollments = enrollments?.filter { it.program != excludedProgramUid }.orEmpty()
-        if (includedEnrollments.isEmpty() || programs.isNullOrEmpty()) return emptyList()
+    ): Map<String, DetailedEnrollment> {
+        val includedEnrollments = enrollments.filter { !it.uid().isNullOrBlank() }
+        if (includedEnrollments.isEmpty()) return emptyMap()
 
-        val programNames = programs.associate { it.uid to it.displayName }
         val siteNames = getSiteNames(includedEnrollments)
         val eventDetails = getEventDetails(includedEnrollments, settings)
 
-        return includedEnrollments.mapNotNull { enrollment ->
-            programNames[enrollment.program]
-                ?.takeIf { it.isNotBlank() }
-                ?.let { programName ->
-                    val details = eventDetails[enrollment.uid]
-                    DetailedEnrollment(
-                        programName = programName,
-                        admitted = details?.admitted,
-                        discharge = details?.discharge,
-                        outcome = details?.outcome,
-                        site = siteNames[enrollment.orgUnit],
-                    )
-                }
+        return includedEnrollments.associate { enrollment ->
+            val enrollmentUid = enrollment.uid()
+            val details = eventDetails[enrollmentUid]
+            enrollmentUid to
+                DetailedEnrollment(
+                    admitted = details?.admitted,
+                    discharge = details?.discharge,
+                    outcome = details?.outcome,
+                    site = siteNames[enrollment.organisationUnit()],
+                )
         }
     }
 
-    private fun getSiteNames(enrollments: List<DomainEnrollment>): Map<String, String> {
-        val orgUnitIds = enrollments.mapNotNull { it.orgUnit }.distinct()
+    private fun getSiteNames(enrollments: List<Enrollment>): Map<String, String> {
+        val orgUnitIds = enrollments.mapNotNull { it.organisationUnit() }.distinct()
         if (orgUnitIds.isEmpty()) return emptyMap()
 
         return d2
@@ -59,7 +52,7 @@ internal class DetailedEnrollmentRepository(
     }
 
     private fun getEventDetails(
-        enrollments: List<DomainEnrollment>,
+        enrollments: List<Enrollment>,
         settings: DetailedEnrollmentListingSettings,
     ): Map<String, EnrollmentEventDetails> {
         if (
@@ -69,7 +62,7 @@ internal class DetailedEnrollmentRepository(
             return emptyMap()
         }
 
-        val enrollmentIds = enrollments.map { it.uid }.distinct()
+        val enrollmentIds = enrollments.map { it.uid() }.distinct()
         if (enrollmentIds.isEmpty()) return emptyMap()
 
         return d2

app/src/main/java/org/dhis2/simprints/ramp/data/EventHistoryTableRepository.kt

@@ -28,7 +28,9 @@ class EventHistoryTableRepository(
         val tableContext = getTableContext() ?: return null
         val config = tableContext.config
         val followUpVisitProgramStageUid = config.followUpVisitProgramStageId.trimToValue() ?: return null
-        val followUpVisitMaxNumber = config.followUpVisitMaxNumber?.takeIf { it >= 0 } ?: return null
+        val followUpVisitNumbers =
+            ((config.followUpVisitMinNumber ?: 0)..(config.followUpVisitMaxNumber ?: -1))
+                .takeIf { it.first in 0..it.last } ?: return null
         val headerVisitNumberDataElementUid = config.headerVisitNumberDataElementId.trimToValue() ?: return null
         val excludedDataElementIds =
             (
@@ -49,9 +51,9 @@ class EventHistoryTableRepository(
                 events = events,
                 eventDataValuesByUid = eventDataValuesByUid,
                 headerVisitNumberDataElementUid = headerVisitNumberDataElementUid,
-                followUpVisitMaxNumber = followUpVisitMaxNumber,
+                followUpVisitNumbers = followUpVisitNumbers,
             )
-        val columnIndexes = (0..followUpVisitMaxNumber).toList()
+        val columnIndexes = followUpVisitNumbers.toList()
         val optionDisplayNamesBySet = getOptionDisplayNamesBySet(rowDefinitions)
 
         fun eventForColumn(columnIndex: Int): Event? = eventsByColumnIndex[columnIndex]
@@ -107,6 +109,7 @@ class EventHistoryTableRepository(
                     columns = tableColumns,
                     sections = it,
                     dateRowValues = dateRowValues,
+                    visitLabel = config.followUpVisitLabel.trimToValue(),
                 )
             }
     }
@@ -325,14 +328,14 @@ class EventHistoryTableRepository(
         events: List<Event>,
         eventDataValuesByUid: Map<String, Map<String, String>>,
         headerVisitNumberDataElementUid: String,
-        followUpVisitMaxNumber: Int,
+        followUpVisitNumbers: IntRange,
     ): Map<Int, Event> =
         events
             .mapNotNull { event ->
                 eventDataValuesByUid[event.uid()]
                     ?.get(headerVisitNumberDataElementUid)
                     ?.toVisitNumber()
-                    ?.takeIf { it in 0..followUpVisitMaxNumber }
+                    ?.takeIf { it in followUpVisitNumbers }
                     ?.let { visitNumber -> visitNumber to event }
             }.toMap()
 

app/src/main/java/org/dhis2/simprints/ramp/model/DetailedEnrollment.kt

@@ -3,7 +3,6 @@ package org.dhis2.simprints.ramp.model
 import java.util.Date
 
 data class DetailedEnrollment(
-    val programName: String,
     val admitted: Date?,
     val discharge: Date?,
     val outcome: String?,

app/src/main/java/org/dhis2/simprints/ramp/model/EventHistoryTableModels.kt

@@ -20,6 +20,7 @@ data class EventHistoryTable(
     val columns: List<EventHistoryTableColumn>,
     val sections: List<EventHistoryTableSection>,
     val dateRowValues: List<String> = emptyList(),
+    val visitLabel: String? = null,
 )
 
 data class EventHistoryTableColumn(

app/src/main/java/org/dhis2/simprints/ramp/ui/EventHistoryTableScreen.kt

@@ -87,6 +87,7 @@ private fun HistoryTable(
                 .background(colorResource(id = R.color.white)),
     ) {
         VisitHeaderRow(
+            label = table.visitLabel ?: stringResource(R.string.simprints_ramp_visit),
             columns = table.columns,
             horizontalScrollState = horizontalScrollState,
         )
@@ -125,12 +126,13 @@ private fun HistoryTable(
 
 @Composable
 private fun VisitHeaderRow(
+    label: String,
     columns: List<EventHistoryTableColumn>,
     horizontalScrollState: ScrollState,
 ) {
     Row(modifier = Modifier.heightIntrinsicRow()) {
         HeaderCell(
-            text = stringResource(R.string.simprints_ramp_visit),
+            text = label,
             width = RowHeaderWidth,
             textAlign = TextAlign.Start,
         )