Classes Xapi

.maestro/flows/003_admin_user_assigns_assignment_to_a_class_test.yaml

@@ -47,7 +47,7 @@ onFlowComplete:
 - tapOn: "Assignment title*"
 - inputText: "Homework 1"
 - tapOn: "Assign to"
-- tapOn: "TestClass"
+- tapOn: "TestClass students"
 - tapOn: "Description"
 - inputText: "Please complete this Homework on time."
 - runFlow:
@@ -97,7 +97,7 @@ onFlowComplete:
 - assertVisible: "In-progress (0)"
 - assertVisible: "Please complete this Homework on time."
 - assertVisible: "Assigned to"
-- assertVisible: "TestClass.*"
+- assertVisible: "TestClass students"
 - assertVisible: "StudentA User"
 - assertVisible: "StudentB User"
 - assertVisible: "StudentC User"
@@ -116,7 +116,11 @@ onFlowComplete:
     env:
       USERNAME: "studentauser"
       PASSWORD: "test123"
+- assertVisible: "Apps"
 - tapOn: "Assignments"
+- assertVisible:
+    id: "app_title"
+    text: "Assignments"
 - tapOn: "Homework 1"
 - assertVisible:
     id: "app_title"
@@ -151,7 +155,11 @@ onFlowComplete:
     env:
       USERNAME: "studentbuser"
       PASSWORD: "test123"
+- assertVisible: "Apps"
 - tapOn: "Assignments"
+- assertVisible:
+    id: "app_title"
+    text: "Assignments"
 - tapOn: "Homework 1"
 - assertVisible:
     id: "app_title"
@@ -177,9 +185,15 @@ onFlowComplete:
     env:
       USERNAME: "teacherauser"
       PASSWORD: "test123"
+- assertVisible: "Apps"
+- tapOn: "Classes"
+- assertVisible: "TestClass"
 - tapOn: "Assignments"
+- assertVisible:
+    id: "app_title"
+    text: "Assignments"
 - assertVisible: "Homework 1"
-- assertVisible: "TestClass.*"
+- assertVisible: "TestClass students"
 - tapOn: "Homework 1"
 - assertVisible: "All (3)"
 - assertVisible: "Completed (1)"
@@ -188,7 +202,7 @@ onFlowComplete:
 #- assertVisible: "Not started (1)"
 - assertVisible: "Please complete this Homework on time."
 - assertVisible: "Assigned to"
-- assertVisible: "TestClass.*"
+- assertVisible: "TestClass students"
 - assertVisible: "StudentA User"
 - assertVisible: "StudentB User"
 - assertVisible: "StudentC User"

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

@@ -261,6 +261,8 @@ import world.respect.shared.domain.opds.getxapiactivityid.GetXapiActivityForPubl
 import world.respect.shared.domain.xapi.getxapilaunchurl.GetXapiLaunchUrlUseCase
 import world.respect.shared.domain.xapi.getxapilaunchurl.GetXapiLaunchUrlUseCaseAndroid
 import world.respect.shared.domain.xapi.xapinanohttpd.XapiNanoHttpdResourceProviderAndroid
+import world.respect.shared.viewmodel.studentgrouping.detail.StudentGroupingDetailViewModel
+import world.respect.shared.viewmodel.studentgrouping.edit.StudentGroupingEditViewModel
 
 
 const val SHARED_PREF_SETTINGS_NAME = "respect_settings3_"
@@ -396,6 +398,8 @@ val appKoinModule = module {
     viewModelOf(::EnrollmentEditViewModel)
     viewModelOf(::InviteQrViewModel)
     viewModelOf(::CreateAccountSetPasswordViewModel)
+    viewModelOf(::StudentGroupingEditViewModel)
+    viewModelOf(::StudentGroupingDetailViewModel)
 
     single<GetOfflineStorageOptionsUseCase> {
         GetOfflineStorageOptionsUseCaseAndroid(

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

@@ -61,6 +61,8 @@ import world.respect.app.view.scanqrcode.ScanQRCodeScreen
 import world.respect.app.view.schooldirectory.edit.SchoolDirectoryEditScreen
 import world.respect.app.view.schooldirectory.list.SchoolDirectoryListScreen
 import world.respect.app.view.settings.SettingsScreenForViewModel
+import world.respect.app.view.studentgrouping.detail.StudentGroupingDetailScreen
+import world.respect.app.view.studentgrouping.edit.StudentGroupingEditScreen
 import world.respect.app.viewmodel.respectViewModel
 import world.respect.shared.navigation.AccountList
 import world.respect.shared.navigation.Acknowledgement
@@ -116,6 +118,8 @@ import world.respect.shared.navigation.SchoolDirectoryEdit
 import world.respect.shared.navigation.SchoolDirectoryList
 import world.respect.shared.navigation.Settings
 import world.respect.shared.navigation.SignupScreen
+import world.respect.shared.navigation.StudentGroupingDetail
+import world.respect.shared.navigation.StudentGroupingEdit
 import world.respect.shared.navigation.TermsAndCondition
 import world.respect.shared.navigation.WaitingForApproval
 import world.respect.shared.viewmodel.acknowledgement.AcknowledgementViewModel
@@ -157,6 +161,8 @@ import world.respect.shared.viewmodel.report.list.ReportTemplateListViewModel
 import world.respect.shared.viewmodel.schooldirectory.edit.SchoolDirectoryEditViewModel
 import world.respect.shared.viewmodel.schooldirectory.list.SchoolDirectoryListViewModel
 import world.respect.shared.viewmodel.settings.SettingsViewModel
+import world.respect.shared.viewmodel.studentgrouping.detail.StudentGroupingDetailViewModel
+import world.respect.shared.viewmodel.studentgrouping.edit.StudentGroupingEditViewModel
 
 
 @Composable
@@ -290,6 +296,26 @@ fun AppNavHost(
             )
         }
 
+        composable<StudentGroupingEdit> {
+            val viewModel: StudentGroupingEditViewModel = respectViewModel(
+                onSetAppUiState = onSetAppUiState,
+                navController = respectNavController
+            )
+            StudentGroupingEditScreen(
+                viewModel = viewModel
+            )
+        }
+
+        composable<StudentGroupingDetail> {
+            val viewModel: StudentGroupingDetailViewModel = respectViewModel(
+                onSetAppUiState = onSetAppUiState,
+                navController = respectNavController
+            )
+            StudentGroupingDetailScreen(
+                viewModel = viewModel
+            )
+        }
+
         composable<EnrollmentList> {
             val viewModel: EnrollmentListViewModel = respectViewModel(
                 onSetAppUiState = onSetAppUiState,

respect-app-compose/src/commonMain/kotlin/world/respect/app/view/assignment/edit/AssignmentEditScreen.kt

@@ -44,7 +44,7 @@ import world.respect.app.components.LangMapTextField
 import world.respect.app.components.RespectLocalDateTimeField
 import world.respect.app.components.defaultItemPadding
 import world.respect.app.components.uiTextStringResource
-import world.respect.datalayer.school.model.Clazz
+import world.respect.lib.xapi.model.XapiGroup
 import world.respect.lib.dataloadstate.ext.dataOrNull
 import world.respect.lib.xapi.ext.copyWithObjectActivityDescription
 import world.respect.lib.xapi.ext.copyWithObjectActivityName
@@ -91,7 +91,7 @@ fun AssignmentEditScreen(
     uiState: AssignmentEditUiState,
     onEntityChanged: (XapiStatement) -> Unit,
     onAssigneeTextChanged: (String) -> Unit,
-    onAssigneeClassSelected: (Clazz) -> Unit,
+    onAssigneeClassSelected: (XapiGroup) -> Unit,
     onClickAddLearningUnit: () -> Unit,
     onClickRemoveLearningUnit: (XapiActivity) -> Unit,
 ) {
@@ -153,14 +153,14 @@ fun AssignmentEditScreen(
                 expanded = expanded,
                 onDismissRequest = { expanded = false }
             ) {
-                uiState.classOptions.forEach { clazz ->
+                uiState.classOptions.forEach { group ->
                     DropdownMenuItem(
                         text = {
-                            Text(clazz.title)
+                            Text(group.name ?: "")
                         },
                         onClick = {
                             expanded = false
-                            onAssigneeClassSelected(clazz)
+                            onAssigneeClassSelected(group)
                         },
                         contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
                     )