From b1356b54a99cc4e568f12b524b88ff978c2d3b64 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jul 2026 16:10:11 +0200 Subject: [PATCH 01/14] =?UTF-8?q?Auswahl=20der=20Leistungen=20bei=20Gruppe?= =?UTF-8?q?nbuchungen=20=C3=BCberarbeitet.=20Bei=20der=20Auswahl=20von=20e?= =?UTF-8?q?iner=20einzelnen=20Person=20in=20einer=20Gruppenbuchung,=20werd?= =?UTF-8?q?en=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) From e6fc3f18ef9c0768c913ce2b2604c71026dc72b0 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jul 2026 16:10:46 +0200 Subject: [PATCH 02/14] Bugfix bei Bargeldkassen Berechnung des Saldo wenn eine Kasse neu angelegt wird --- BeWo/ViewModel/BargeldkassenVM.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/BeWo/ViewModel/BargeldkassenVM.cs b/BeWo/ViewModel/BargeldkassenVM.cs index 7b2bd8016..cf3a22f1e 100644 --- a/BeWo/ViewModel/BargeldkassenVM.cs +++ b/BeWo/ViewModel/BargeldkassenVM.cs @@ -156,9 +156,11 @@ namespace BeWo.ViewModel liste.DoForEach(f => f.Transaktionskassenbestand = 0); var vorherige = liste.FirstOrDefault(); - vorherige.Transaktionskassenbestand = Anfangsbestand ?? 0; + if (vorherige != null) { + vorherige.Transaktionskassenbestand = Anfangsbestand ?? 0; + foreach (var transaktion in liste) { transaktion.Transaktionskassenbestand = vorherige.Transaktionskassenbestand + transaktion.Betrag*(transaktion.Zahlungstyp.Enum == Zahlungstyp.Auszahlung ? -1 : 1); From 906310d04bb7c1876e69ccf5aa36c2fca9558a33 Mon Sep 17 00:00:00 2001 From: Christian Date: Wed, 1 Jul 2026 16:11:15 +0200 Subject: [PATCH 03/14] Client Version 3.32.2 erstellt --- BeWo/BeWo.csproj | 6 +++--- BeWo/BeWoApp.xaml.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 9fd9e03c9..84087528f 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -16,7 +16,7 @@ true Internet true - true + false 8E3A8E81F1C6F67A1C6D239593544EA33D8AC6A7 @@ -43,12 +43,12 @@ de-DE BeWoPlaner ownSoft GmbH - 2.0.1.297 + 2.0.1.298 true publish.htm false true - 298 + 299 2.0.1.%2a false true diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 76223f6f4..c6180b4e2 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -57,7 +57,7 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.32"; + public static string ShortVersion = "3.32.2"; public static string Version => BeWoAppInfo.BeWoAppVersion.ToString(); public static int RenderTier = 0; From 44afdc0e20afe2311edd5981878c41f31ef6b7a2 Mon Sep 17 00:00:00 2001 From: Christian Date: Thu, 9 Jul 2026 17:01:05 +0200 Subject: [PATCH 04/14] =?UTF-8?q?Merge=20Konflikte=20gel=C3=B6st?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BeWo/Services/BeWoWindowService.cs | 3 +- BeWo/Styles/ControlStyles/GroupBoxStyles.xaml | 125 --------- BeWo/View/Controls/AI/AiChatButton.xaml.cs | 5 +- .../AI/AiPromptbausteinLibraryControl.xaml | 253 +++++++++--------- .../Controls/GkvAbrechnungDetailControl.xaml | 4 +- .../Accounting/GkvAbrechnungOverview.xaml.cs | 13 +- BeWo/View/Windows/AnimatedBeWoWindow.xaml | 2 +- BeWo/View/Windows/AnimatedBeWoWindow.xaml.cs | 4 +- BeWo/ViewModel/AiPromptbausteinFolderVM.cs | 2 +- BeWo/ViewModel/Light/GkvAbrechnungLightVM.cs | 34 ++- BeWo/ViewModel/VMFactory.cs | 4 +- ...PromptbausteinComplexSelectionViewModel.cs | 33 +-- .../AiPromptbausteinComplexTreeViewModel.cs | 16 +- BeWo/ViewModel/View/DialogViewModel.cs | 28 +- .../systemPrompts/customPreSystemPrompt.txt | 13 - Server/Components/AICore/AICore.csproj | 1 - .../AICore/Prompt/AiSystemPromptFactory.cs | 17 +- .../AiConversationSystemPromptBuilder.cs | 115 ++++---- .../AiFunctionSystemPromptBuilder.cs | 78 +++--- .../AiGenericSystemPromptBuilder.cs | 57 ---- .../SystemPrompts/BaseSystemPromptBuilder.cs | 46 +--- Service/Plugins/AiPromptbausteineService.cs | 20 +- Service/Plugins/AiService2.cs | 2 +- .../Feature/AI/AiPromptbausteinFolderDC.cs | 157 ++++++----- .../Feature/AI/AiViewContextDC.cs | 3 - Shared/Text/AiPromptbausteineTexts.cs | 2 - 26 files changed, 398 insertions(+), 639 deletions(-) delete mode 100644 Server/Components/AICore/Prompt/SystemPrompts/AiGenericSystemPromptBuilder.cs diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs index fbabab803..39ae5d51f 100644 --- a/BeWo/Services/BeWoWindowService.cs +++ b/BeWo/Services/BeWoWindowService.cs @@ -237,8 +237,7 @@ namespace BeWo.Services if (windowViewModel is DialogViewModel dialogViewModel) { - dialogViewModel.Closing += (s, e) => window.Close(); - window.Closed += (s, e) => dialogViewModel.CloseFinalCommand.Execute(null); + dialogViewModel.RequestCloseFinal += (s, e) => window.Close(); } if (options.ShowAsDialog) diff --git a/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml index b145aae5b..deb694f71 100644 --- a/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml +++ b/BeWo/Styles/ControlStyles/GroupBoxStyles.xaml @@ -52,129 +52,4 @@ - - \ No newline at end of file diff --git a/BeWo/View/Controls/AI/AiChatButton.xaml.cs b/BeWo/View/Controls/AI/AiChatButton.xaml.cs index 644ff35e0..72ad7c438 100644 --- a/BeWo/View/Controls/AI/AiChatButton.xaml.cs +++ b/BeWo/View/Controls/AI/AiChatButton.xaml.cs @@ -67,13 +67,12 @@ namespace BeWo.View.Controls.AI { var viewmodel = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm); viewmodel.ItemAccepted += ItemAccepted; - viewmodel.Closed += (s, e) => viewmodel.ResetSelection(); + viewmodel.RequestCloseFinal += (s, e) => viewmodel.ResetSelection(); ViewModel.AllPromptsViewModel = viewmodel; var viewmodel2 = new AiPromptbausteinSelectionComplexViewModel(actionType, listvm, true); viewmodel2.ItemAccepted += ItemAccepted; - popup_promptbaustein_favoriten.Closed += (s, e) => viewmodel2.CloseFinalCommand.Execute(null); - viewmodel2.Closed += (s, e) => viewmodel2.ResetSelection(); + popup_promptbaustein_favoriten.Closed += (s, e) => viewmodel2.ResetSelection(); var view2 = new AiPromptbausteinComplexSelectionFavoritenView(viewmodel2); viewmodel2.SelectedFolder = viewmodel2.Folders.VMList[0]; view2.Padding = new Thickness(3); diff --git a/BeWo/View/Controls/AI/AiPromptbausteinLibraryControl.xaml b/BeWo/View/Controls/AI/AiPromptbausteinLibraryControl.xaml index 38b8b42c1..e2ab79dab 100644 --- a/BeWo/View/Controls/AI/AiPromptbausteinLibraryControl.xaml +++ b/BeWo/View/Controls/AI/AiPromptbausteinLibraryControl.xaml @@ -186,8 +186,8 @@ - - + + @@ -238,26 +238,25 @@ Background="Transparent" ContextMenuOpening="ListBox_ContextMenuOpening" PreviewMouseDown="Grid_PreviewMouseDown_2"> - - - - - - - - - - - - - - + + + + + + + + + + + + - - + - - - - - - + + + + - - - - + - - - - - - - - + + + + + + + - - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + @@ -416,16 +414,22 @@ - + - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - + + + + - - - - - - - + - - - - - - - + + + + + + + + - + + Text="{Binding Oid}" />