From b1356b54a99cc4e568f12b524b88ff978c2d3b64 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jul 2026 16:10:11 +0200 Subject: [PATCH] =?UTF-8?q?Auswahl=20der=20Leistungen=20bei=20Gruppenbuchu?= =?UTF-8?q?ngen=20=C3=BCberarbeitet.=20Bei=20der=20Auswahl=20von=20einer?= =?UTF-8?q?=20einzelnen=20Person=20in=20einer=20Gruppenbuchung,=20werden?= =?UTF-8?q?=20nur=20die=20bei=20der=20Person=20hinterlegten=20Leistungen?= =?UTF-8?q?=20zur=20Auswahl=20gestellt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Zeiterfassung/ServiceRecordView2.xaml.cs | 11 +++++++++++ .../ListViewModel/ServiceRecordListVM.cs | 17 +++++++++++------ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs index 131cd3f0d..bb879f194 100644 --- a/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs @@ -2314,6 +2314,7 @@ namespace BeWo.View.Detail.Zeiterfassung if (ViewModel != null) { ViewModel.IsGroupBooking = true; + ViewModel.IsMultiBooking = false; } supportConceptSelectionControl.Visibility = Visibility.Collapsed; @@ -2341,6 +2342,11 @@ namespace BeWo.View.Detail.Zeiterfassung SelectedItemChanged( SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null)); + if (multiSupportConceptControl.SelectedSupportConcepts != null && multiSupportConceptControl.SelectedSupportConcepts.Count > 0) + { + ViewModel.UpdateGroupServiceAccountings(multiSupportConceptControl.SelectedSupportConcepts); + } + } private void ChkGroupBooking_Unchecked(object sender, RoutedEventArgs e) @@ -2383,6 +2389,7 @@ namespace BeWo.View.Detail.Zeiterfassung if (ViewModel != null) { ViewModel.IsMultiBooking = true; + ViewModel.IsGroupBooking = false; } supportConceptSelectionControl.Visibility = Visibility.Collapsed; @@ -2409,6 +2416,10 @@ namespace BeWo.View.Detail.Zeiterfassung SelectedItemChanged( SupportConceptService.CreateFlatSupportConceptItem(multiSupportConceptControl.SelectedItem, null)); + if (multiSupportConceptControl.SelectedSupportConcepts != null && multiSupportConceptControl.SelectedSupportConcepts.Count > 0) + { + ViewModel.UpdateGroupServiceAccountings(multiSupportConceptControl.SelectedSupportConcepts); + } } private void ChkMultiBooking_Unchecked(object sender, RoutedEventArgs e) diff --git a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs index d50f72f3f..b0cdedfda 100644 --- a/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs +++ b/BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs @@ -1042,8 +1042,8 @@ namespace BeWo.ViewModel.ListViewModel { if (_SelectedCustomerNode.SupportConceptTreeNodeDC == null) { - //Gruppen- oder Mehrfachbuchung - PrototypeVM.UpdateServiceAccountings(null, _Category2Services, true); + //Gruppen- oder Mehrfachbuchung + PrototypeVM.UpdateServiceAccountings(null, _Category2Services, true); BuildServiceRecordsForTreeNode(_SelectedCustomerNode, true, OnlyWithThisType); } @@ -1844,13 +1844,18 @@ namespace BeWo.ViewModel.ListViewModel UpdateGruppenZiele(allInfos); - if (BeWoApp.AppSettings.FilterGroupServiceCategories) + if (BeWoApp.AppSettings.FilterGroupServiceCategories || oids.Count == 1) { var serviceAccountings = ErstelleServiceCategorySchnittmenge(allInfos); - PrototypeVM.UpdateServiceAccountings(serviceAccountings, _Category2Services, true); - } + PrototypeVM.UpdateServiceAccountings(serviceAccountings, _Category2Services, true); + } + else + { + PrototypeVM.UpdateServiceAccountings(null, _Category2Services, true); + } + - } + } } private void UpdateGruppenZiele(List allInfos)