ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auswahl der Leistungen bei Gruppenbuchungen überarbeitet. Bei der Auswahl von einer einzelnen Person in einer Gruppenbuchung, werden nur die bei der Person hinterlegten Leistungen zur Auswahl gestellt

Browse Source
This commit is contained in:
Christian
2026-07-01 16:10:11 +02:00
parent c8199f2530
commit b1356b54a9
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
BeWo/View/Detail/Zeiterfassung/ServiceRecordView2.xaml.cs
View File

@@ -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)

17
BeWo/ViewModel/ListViewModel/ServiceRecordListVM.cs
View File

@@ -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<SupportConceptTreeNodeDetailInfoDC> allInfos)