change-history-backup

.maestro/flows/001_001_invite_users_using_qr_code_or_link_test.yaml

@@ -101,9 +101,28 @@ onFlowComplete:
     text: "Apps"
 - assertVisible: "Apps"
 - assertVisible: "Assignments"
-- assertVisible: "People"
+- tapOn: "People"
+- tapOn: "TeacherA User"
+- tapOn:
+    id: "floating_action_button"
+- tapOn: "First names*"
+- runFlow:
+    file: "subflows/erase_text.yaml"
+    env:
+      TEXT: "First names*"
+- inputText: "TeacherB"
+- tapOn: "Date of birth"
+- runScript:
+    file: "scripts/setDate.js"
+- inputText: ${output.pastYearDateC}
+- tapOn: "Save"
+- tapOn: "Change History"
+- assertVisible:
+    id: "app_title"
+    text: "Change History"
+- assertVisible: 'Person name changed from "TeacherA User" to "TeacherB User"'
 - runFlow:
-    file: "subflows/admin_add_class.yaml"
+    file: "subflows/add_class.yaml"
     env:
       CLASSNAME: "New Class"
 - assertVisible:
@@ -199,6 +218,23 @@ onFlowComplete:
 - assertVisible: "Pending requests.*"
 - assertVisible: "Student User.*"
 - tapOn: "Accept Invite"
+- assertNotVisible: "Pending requests.*"
+- tapOn: "Change History"
+- assertVisible:
+    id: "app_title"
+    text: "Change History"
+- assertVisible: 'Join request approved for "Student User"'
+- tapOn: "People"
+- tapOn: "TeacherB User"
+- tapOn: "Change History"
+- assertVisible:
+    id: "app_title"
+    text: "Change History"
+- assertVisible: 'Person name changed from "TeacherA User" to "TeacherB User"'
+- back
+- back
+- tapOn: "Classes"
+- tapOn: "New Class"
 
 # E) Teacher share invite link for parent device based signup
 - tapOn: "Add student"

respect-app-compose/src/androidMain/kotlin/world/respect/AppKoinModule.kt

@@ -56,6 +56,8 @@ import world.respect.credentials.passkey.request.GetPasskeyProviderInfoUseCase
 import world.respect.credentials.password.SavePasswordUseCaseAndroidImpl
 import world.respect.datalayer.AuthTokenProvider
 import world.respect.datalayer.AuthenticatedUserPrincipalId
+import world.respect.datalayer.ChangeHistoryProvider
+import world.respect.datalayer.ChangeHistoryMarkSentToServer
 import world.respect.datalayer.RespectAppDataSource
 import world.respect.datalayer.SchoolDataSource
 import world.respect.datalayer.SchoolDataSourceLocal
@@ -66,6 +68,8 @@ import world.respect.datalayer.db.RespectSchoolDatabase
 import world.respect.datalayer.db.SchoolDataSourceDb
 import world.respect.datalayer.db.addCommonMigrations
 import world.respect.datalayer.db.networkvalidation.ExtendedDataSourceValidationHelperImpl
+import world.respect.datalayer.db.school.ChangeHistoryProviderDb
+import world.respect.datalayer.db.school.ChangeHistoryMarkSentToServerDb
 import world.respect.datalayer.db.school.GetAuthenticatedPersonUseCase
 import world.respect.datalayer.db.school.domain.CheckPersonPermissionUseCaseDbImpl
 import world.respect.datalayer.db.school.writequeue.RemoteWriteQueueDbImpl
@@ -235,6 +239,7 @@ import world.respect.shared.viewmodel.person.setusernameandpassword.CreateAccoun
 import world.respect.shared.viewmodel.person.setusernameandpassword.CreateAccountSetUserNameViewModel
 import world.respect.shared.viewmodel.schooldirectory.edit.SchoolDirectoryEditViewModel
 import world.respect.shared.viewmodel.schooldirectory.list.SchoolDirectoryListViewModel
+import world.respect.shared.viewmodel.apps.changehistory.ChangeHistoryViewModel
 import world.respect.shared.domain.sharelink.LaunchSendEmailUseCase
 import world.respect.shared.domain.sharelink.LaunchShareLinkUseCase
 import world.respect.shared.domain.sharelink.LaunchSendSmsUseCase
@@ -384,6 +389,7 @@ val appKoinModule = module {
     viewModelOf(::EnrollmentEditViewModel)
     viewModelOf(::InviteQrViewModel)
     viewModelOf(::CreateAccountSetPasswordViewModel)
+    viewModelOf(::ChangeHistoryViewModel)
 
 
     single<GetOfflineStorageOptionsUseCase> {
@@ -899,7 +905,17 @@ val appKoinModule = module {
                 defaultAppCatalogUrl = RespectBuildConfig.RESPECT_DEFAULT_APPLIST,
             )
         }
-
+        scoped<ChangeHistoryProvider> {
+            ChangeHistoryProviderDb(
+                schoolDb = get(),
+            )
+        }
+        scoped<ChangeHistoryMarkSentToServer> {
+            ChangeHistoryMarkSentToServerDb(
+                schoolDb = get(),
+                uidNumberMapper = get(),
+            )
+        }
         scoped<SchoolDataSource> {
             val schoolUrl = get<RespectAccountSchoolScopeLink>()
             val localDs = get<SchoolDataSourceLocal>()
@@ -916,7 +932,9 @@ val appKoinModule = module {
                     defaultAppCatalogUrl = RespectBuildConfig.RESPECT_DEFAULT_APPLIST,
                     opdsFeedValidationHelper = localDs.opdsFeedDataSource,
                     opdsPublicationValidationHelper = localDs.opdsPublicationDataSource
-                        .publicationNetworkValidationHelper
+                        .publicationNetworkValidationHelper,
+                    changeHistoryProvider = get(),
+                    markSentToServer = get(),
                 ),
                 validationHelper = get(),
                 remoteWriteQueue = get(),

respect-app-compose/src/commonMain/kotlin/world/respect/app/app/AppNavHost.kt

@@ -7,6 +7,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import world.respect.app.view.acknowledgement.AcknowledgementScreen
+import world.respect.app.view.apps.changehistory.ChangeHistoryScreen
 import world.respect.app.view.apps.detail.AppsDetailScreen
 import world.respect.app.view.apps.enterlink.EnterLinkScreen
 import world.respect.app.view.apps.launcher.AppLauncherScreen
@@ -73,6 +74,7 @@ import world.respect.shared.navigation.ClazzDetail
 import world.respect.shared.navigation.ClazzEdit
 import world.respect.shared.navigation.ClazzList
 import world.respect.shared.navigation.AcceptInvite
+import world.respect.shared.navigation.ChangeHistory
 import world.respect.shared.navigation.CopyCode
 import world.respect.shared.navigation.CreateAccount
 import world.respect.shared.navigation.CreateAccountSetPassword
@@ -655,6 +657,15 @@ fun AppNavHost(
                 )
             )
         }
+
+        composable<ChangeHistory> {
+            ChangeHistoryScreen(
+                viewModel = respectViewModel(
+                    onSetAppUiState = onSetAppUiState,
+                    navController = respectNavController,
+                )
+            )
+        }
     }
 }
 

respect-app-compose/src/commonMain/kotlin/world/respect/app/view/apps/changehistory/ChangeHistoryScreen.kt

@@ -0,0 +1,98 @@
+package world.respect.app.view.apps.changehistory
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import kotlinx.datetime.TimeZone
+import org.jetbrains.compose.resources.stringResource
+import world.respect.datalayer.db.school.ext.fullName
+import world.respect.datalayer.school.model.ChangeHistoryFieldEnum
+import world.respect.shared.generated.resources.Res
+import world.respect.shared.generated.resources.change_format
+import world.respect.shared.util.rememberFormattedDateTime
+import world.respect.shared.viewmodel.apps.changehistory.ChangeHistoryUiState
+import world.respect.shared.viewmodel.apps.changehistory.ChangeHistoryViewModel
+
+@Composable
+fun ChangeHistoryScreen(
+    viewModel: ChangeHistoryViewModel,
+) {
+    val uiState by viewModel.uiState.collectAsState()
+
+    ChangeHistoryScreen(
+        uiState = uiState
+    )
+
+}
+
+@Composable
+fun ChangeHistoryScreen(
+    uiState: ChangeHistoryUiState,
+) {
+    val changeHistoryEntryWithWhoDid = uiState.changeHistoryEntryWithWhoDid ?: return
+
+    Column(
+        modifier = Modifier
+            .fillMaxSize()
+            .verticalScroll(rememberScrollState())
+            .padding(16.dp)
+    ) {
+
+        changeHistoryEntryWithWhoDid.forEach { group ->
+
+            group.changeHistoryEntry.forEach { entry ->
+
+                entry.changes.forEach { change ->
+
+                    Text(
+                        text = group.person.fullName(),
+                    )
+                    val createdAtStr = rememberFormattedDateTime(
+                        timeInMillis = change.lastModified.toEpochMilliseconds(),
+                        timeZoneId = TimeZone.currentSystemDefault().id,
+                    )
+
+                    Text(text = createdAtStr)
+                    val text = when (change.field) {
+
+                        ChangeHistoryFieldEnum.JOIN_REQUEST_APPROVED ->
+                            "${change.field.displayName} \"${change.newVal}\""
+
+                        ChangeHistoryFieldEnum.JOIN_REQUEST_REJECTED ->
+                            "${change.field.displayName} \"${change.oldVal}\""
+
+                        ChangeHistoryFieldEnum.CLASS_TEACHER_ADDED,
+                        ChangeHistoryFieldEnum.CLASS_STUDENT_ADDED ->
+                            "${change.field.displayName}: \"${change.newVal}\""
+
+                        ChangeHistoryFieldEnum.CLASS_TEACHER_REMOVED,
+                        ChangeHistoryFieldEnum.CLASS_STUDENT_REMOVED ->
+                            "${change.field.displayName}: \"${change.newVal}\""
+
+                        else ->
+                            stringResource(
+                                Res.string.change_format,
+                                change.field.displayName,
+                                change.oldVal ?: "",
+                                change.newVal
+                            )
+                    }
+
+                    Text(text = text)
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                }
+            }
+        }
+    }
+}

respect-app-compose/src/commonMain/kotlin/world/respect/app/view/clazz/detail/ClazzDetailScreen.kt

@@ -59,9 +59,13 @@ import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.IconButton
 import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.filled.Replay
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
+import world.respect.app.components.RespectQuickActionButton
+import world.respect.shared.generated.resources.change_history
 import world.respect.shared.generated.resources.manage_enrollments
 import world.respect.shared.generated.resources.more_options
 import world.respect.shared.generated.resources.remove_from_class
@@ -83,6 +87,7 @@ fun ClazzDetailScreen(
         onTogglePendingSection = viewModel::onTogglePendingSection,
         onToggleTeachersSection = viewModel::onToggleTeachersSection,
         onToggleStudentsSection = viewModel::onToggleStudentsSection,
+        onClickChangeHistoryButton = viewModel::onClickChangeHistoryButton,
         onClickRemovePersonFromClass = viewModel::onClickRemovePersonFromClass,
         onClickManageEnrollments = viewModel::onClickManageEnrollments,
         onClickPerson = viewModel::onClickPerson,
@@ -97,6 +102,7 @@ fun ClazzDetailScreen(
     onSelectChip: (String) -> Unit,
     onClickAcceptInvite: (Person) -> Unit,
     onClickDismissInvite: (Person) -> Unit,
+    onClickChangeHistoryButton: () -> Unit,
     onTogglePendingSection: () -> Unit,
     onToggleTeachersSection: () -> Unit,
     onToggleStudentsSection: () -> Unit,
@@ -141,6 +147,16 @@ fun ClazzDetailScreen(
                 }
             )
         }
+        item {
+            HorizontalDivider()
+            RespectQuickActionButton(
+                labelText = stringResource(Res.string.change_history),
+                imageVector = Icons.Default.Replay,
+                onClick = onClickChangeHistoryButton,
+            )
+            HorizontalDivider()
+        }
+
 
         item {
             RespectListSortHeader(

respect-app-compose/src/commonMain/kotlin/world/respect/app/view/person/detail/PersonDetailScreen.kt

@@ -9,6 +9,7 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Key
+import androidx.compose.material.icons.filled.Replay
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
@@ -30,6 +31,7 @@ import world.respect.shared.generated.resources.email
 import world.respect.shared.generated.resources.family_members
 import world.respect.shared.generated.resources.gender
 import world.respect.shared.generated.resources.manage_account
+import world.respect.shared.generated.resources.change_history
 import world.respect.shared.generated.resources.phone_number
 import world.respect.shared.generated.resources.role
 import world.respect.shared.generated.resources.username_label
@@ -47,6 +49,7 @@ fun PersonDetailScreen(
         onClickManageAccount = viewModel::navigateToManageAccount,
         onClickCreateAccount = viewModel::onClickCreateAccount,
         onClickPhoneNumber = viewModel::onClickPhoneNumber,
+        onClickChangeHistoryButton = viewModel::onClickChangeHistoryButton,
         onClickFamilyMember = viewModel::onClickFamilyMember
     )
 }
@@ -56,6 +59,7 @@ fun PersonDetailScreen(
     uiState: PersonDetailUiState,
     onClickManageAccount:() -> Unit,
     onClickCreateAccount: () -> Unit,
+    onClickChangeHistoryButton: () -> Unit,
     onClickPhoneNumber: () -> Unit,
     onClickFamilyMember: (String) -> Unit,
 ) {
@@ -80,6 +84,11 @@ fun PersonDetailScreen(
                     onClick = onClickCreateAccount,
                 )
             }
+            RespectQuickActionButton(
+                labelText = stringResource(Res.string.change_history),
+                imageVector = Icons.Default.Replay,
+                onClick = onClickChangeHistoryButton,
+            )
         }
 
         HorizontalDivider()

respect-datalayer-db/build.gradle.kts

@@ -35,6 +35,8 @@ kotlin {
             api(libs.androidx.paging.common)
             api(libs.androidx.room.paging)
             implementation(libs.napier)
+            implementation(libs.koin.core)
+            implementation(project.dependencies.platform(libs.koin.bom))
 
         }