aufräumen

LehrerApp.Desktop/Views/Groups/GroupDetailView.axaml.cs

@@ -32,9 +32,8 @@ public partial class GroupDetailView : UserControl
 
         var dialogVm = new AddStudentToGroupDialogViewModel(
             App.Services.GetRequiredService<IStudentRepository>(),
-            App.Services.GetRequiredService<IEnrollmentRepository>(),
-            vm.Group.Id,
-            vm.Group.SchoolYear);
+            App.Services.GetRequiredService<IGroupMembershipRepository>(),
+            vm.Group.Id);
 
         var dialog = new AddStudentToGroupDialog { DataContext = dialogVm };
         var owner = TopLevel.GetTopLevel(this) as Window;
@@ -62,7 +61,7 @@ public partial class GroupDetailView : UserControl
             App.Services.GetRequiredService<IGradingKeyTemplateRepository>(),
             App.Services.GetRequiredService<GradingService>(),
             groupId, vm.Group.SubjectId, vm.Group.GradeLevel, vm.Group.GradingSystem,
-            vm.Group.Subject ?? "", vm.Group.IsDifferentiated, editingExam, duplicateSource);
+            vm.SubjectName, vm.Group.IsDifferentiated, editingExam, duplicateSource);
 
         var dialog = new ExamDialog { DataContext = dialogVm };
         var owner = TopLevel.GetTopLevel(this) as Window;
@@ -85,9 +84,9 @@ public partial class GroupDetailView : UserControl
         var dialogVm = new ExamGradingDialogViewModel(
             App.Services.GetRequiredService<IExamResultRepository>(),
             App.Services.GetRequiredService<IStudentRepository>(),
-            App.Services.GetRequiredService<IEnrollmentRepository>(),
+            App.Services.GetRequiredService<IGroupMembershipRepository>(),
             App.Services.GetRequiredService<GradingService>(),
-            exam, vm.Group.Id, vm.Group.SchoolYear);
+            exam, vm.Group.Id);
 
         var dialog = new ExamGradingDialog { DataContext = dialogVm };
         var owner = TopLevel.GetTopLevel(this) as Window;

LehrerApp.Desktop/Views/Groups/ParticipationTabView.axaml.cs

@@ -153,7 +153,7 @@ public partial class ParticipationTabView : UserControl
             App.Services.GetRequiredService<IParticipationRepository>(),
             App.Services.GetRequiredService<IParticipationAspectRepository>(),
             App.Services.GetRequiredService<IStudentRepository>(),
-            App.Services.GetRequiredService<IEnrollmentRepository>(),
+            App.Services.GetRequiredService<IGroupMembershipRepository>(),
             App.Services.GetRequiredService<IGradeRepository>(),
             App.Services.GetRequiredService<GradingService>(),
             tabVm.GroupId, tabVm.SchoolYear, tabVm.GradingSystem);