From 1b449f9a9146c5991b1e3e274a368c1df3c95e6d Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 30 Dec 2025 12:35:43 +0100
Subject: [PATCH] Add/Edit Folder

---
 BeWo/BeWo.csproj                              |  3 +-
 .../View/SchedulerAppointmentEditForm.xaml    | 40 +++++++--------
 BeWo/Scheduling/View/AppointmentEditView.xaml |  4 +-
 BeWo/Services/BeWoWindowService.cs            |  2 +-
 .../AI/AiPromptbausteinComplexTreeView.xaml   | 15 ++----
 .../Detail/AI/AiPromptbausteinFolderView.xaml | 35 +++++++------
 BeWo/ViewModel/AiPromptbausteinFolderVM.cs    | 32 +++++++-----
 .../View/AI/AiConversationChatViewModel.cs    |  2 +-
 .../AI/AiPromptbausteinSelectionViewModel.cs  |  2 +-
 .../View/AcceptCancelDialogViewModel.cs       | 48 ++++++++++++++++++
 .../AiPromptbausteinComplexTreeViewModel.cs   | 50 +++++++++++++------
 .../AiPromptbausteinDetailViewModel.cs        |  2 +-
 .../AiPromptbausteinFolderViewModel.cs        | 31 +++++++++++-
 .../AiPromptbausteinPromptViewModel.cs        |  2 +-
 ...eDialogViewModel.cs => DialogViewModel.cs} |  8 +--
 .../Dialogs/GkvAbrechnungDialogViewModel.cs   |  4 +-
 .../DataContracts/AiPromptbausteinFolderDC.cs |  7 +--
 17 files changed, 197 insertions(+), 90 deletions(-)
 create mode 100644 BeWo/ViewModel/View/AcceptCancelDialogViewModel.cs
 rename BeWo/ViewModel/View/{Dialogs/BaseDialogViewModel.cs => DialogViewModel.cs} (71%)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index ac8bc20be..1662972ea 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -132,6 +132,7 @@
     <Compile Include="ViewModel\ListViewModel\AiPromptbausteinListVM.cs" />
     <Compile Include="ViewModel\ListViewModel\TextModuleListVM.cs" />
     <Compile Include="ViewModel\AiPromptbausteinVM.cs" />
+    <Compile Include="ViewModel\View\AcceptCancelDialogViewModel.cs" />
     <Compile Include="ViewModel\View\Administration\AiPromptbausteinDetailViewModel.cs" />
     <Compile Include="ViewModel\View\Administration\AiPromptbausteinComplexTreeViewModel.cs" />
     <Compile Include="ViewModel\View\Administration\AiPromptbausteinFolderViewModel.cs" />
@@ -139,7 +140,7 @@
     <Compile Include="ViewModel\View\Administration\AiPromptbausteinTreeViewModel.cs" />
     <Compile Include="ViewModel\View\AI\AiConversationChatViewModel.cs" />
     <Compile Include="ViewModel\View\AI\AiPromptbausteinSelectionViewModel.cs" />
-    <Compile Include="ViewModel\View\Dialogs\BaseDialogViewModel.cs" />
+    <Compile Include="ViewModel\View\DialogViewModel.cs" />
     <Compile Include="ViewModel\View\Dialogs\GkvAbrechnungDialogViewModel.cs" />
     <Compile Include="ViewModel\View\WindowViewModel.cs" />
     <Compile Include="View\Detail\AI\AiPromptbausteinPromptView.xaml.cs">
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
index 6d6692c99..89fddcf3d 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
@@ -396,45 +396,45 @@
     <Grid x:Name="FormContainer">
         <Grid HorizontalAlignment="Stretch" Background="#0C000000">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  0  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  1  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  2  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  3  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  4  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  5  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  6  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  7  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  8  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  9  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  10  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  11  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  12  -->
-                <RowDefinition Height="*" />    
+                <RowDefinition Height="*" />
                 <!--  13  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  14  -->
-                <RowDefinition Height="*" />    
+                <RowDefinition Height="*" />
                 <!--  15  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  16  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  17  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  18  -->
-                <RowDefinition Height="Auto" /> 
+                <RowDefinition Height="Auto" />
                 <!--  19  -->
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
diff --git a/BeWo/Scheduling/View/AppointmentEditView.xaml b/BeWo/Scheduling/View/AppointmentEditView.xaml
index 7068f4570..f00106b15 100644
--- a/BeWo/Scheduling/View/AppointmentEditView.xaml
+++ b/BeWo/Scheduling/View/AppointmentEditView.xaml
@@ -391,7 +391,7 @@
         </Style>
     </Window.Resources>
     <Grid Margin="5">
-        <Grid.ColumnDefinitions> 
+        <Grid.ColumnDefinitions>
             <!--  5 Spalten  -->
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="*" />
@@ -400,7 +400,7 @@
             <ColumnDefinition Width="Auto" />
             <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
-        <Grid.RowDefinitions> 
+        <Grid.RowDefinitions>
             <!--  19 Zeilen  -->
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
diff --git a/BeWo/Services/BeWoWindowService.cs b/BeWo/Services/BeWoWindowService.cs
index e682ce98d..00de94171 100644
--- a/BeWo/Services/BeWoWindowService.cs
+++ b/BeWo/Services/BeWoWindowService.cs
@@ -172,7 +172,7 @@ namespace BeWo.Services
 			{
 				var window = _windowFactory.GetAnimatedBeWoWindow(title, control, options.Height, options.Width);
 
-				if(windowViewModel is BaseDialogViewModel dialogViewModel)
+				if(windowViewModel is DialogViewModel dialogViewModel)
 				{
 					dialogViewModel.RequestClose += (s, e) => window.Close();
 				}
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
index 899711ad2..fcfe866f6 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinComplexTreeView.xaml
@@ -96,34 +96,29 @@
                                     </Style>
                                 </ResourceDictionary>
                             </ContextMenu.Resources>
-                            <MenuItem Command="{Binding AddOrdnerCommand}" Header="Neu">
+                            <MenuItem Command="{Binding OpenAddFolderDialogCommand}" Header="Neu">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Add24.png" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem Command="{Binding EditPromptbausteinCommand}" Header="Bearbeiten">
+                            <MenuItem Command="{Binding OpenEditFolderDialogCommand}" Header="Bearbeiten">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Rename24.png" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <Separator />
-                            <MenuItem Command="{Binding CopySinglePromptbausteinCommand}" Header="Einzelnes Element kopieren">
+                            <MenuItem Command="{Binding CopyFolderCommand}" Header="Kopieren">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Copy24.png" />
                                 </MenuItem.Icon>
                             </MenuItem>
-                            <MenuItem Command="{Binding CopyPromptbausteinCommand}" Header="Elementbaum kopieren">
-                                <MenuItem.Icon>
-                                    <Image Source="..\..\..\Ressources\Icons\Copy24.png" />
-                                </MenuItem.Icon>
-                            </MenuItem>
-                            <MenuItem Command="{Binding PastePromptbausteinCommand}" Header="Einfügen">
+                            <MenuItem Command="{Binding PasteFolderCommand}" Header="Einfügen">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Paste24.png" />
                                 </MenuItem.Icon>
                             </MenuItem>
                             <Separator />
-                            <MenuItem Command="{Binding DeletePromptbausteinCommand}" Header="Löschen">
+                            <MenuItem Command="{Binding DeleteFolderCommand}" Header="Löschen">
                                 <MenuItem.Icon>
                                     <Image Source="..\..\..\Ressources\Icons\Delete24.png" />
                                 </MenuItem.Icon>
diff --git a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
index 2f9486930..d21122aed 100644
--- a/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
+++ b/BeWo/View/Detail/AI/AiPromptbausteinFolderView.xaml
@@ -39,24 +39,25 @@
                 <RowDefinition Height="auto" />
                 <RowDefinition Height="auto" />
             </Grid.RowDefinitions>
-            <Label Grid.Row="0" Grid.Column="0">Name</Label>
+            <Label Grid.Row="0" Grid.Column="0">Titel</Label>
             <TextBox
                 Grid.Row="0"
                 Grid.Column="2"
                 IsEnabled="{Binding IsEditingMode}"
-                Text="{Binding Node.Displayname, UpdateSourceTrigger=PropertyChanged}" />
+                Text="{Binding ViewModel.Title, UpdateSourceTrigger=PropertyChanged}" />
 
             <Label
                 Grid.Row="1"
-                Grid.Column="0"
-                Content="{Binding PromptLabelDescription}" />
+                Grid.Column="0">
+                Beschreibung
+            </Label>
             <TextBox
                 Grid.Row="1"
                 Grid.Column="2"
                 IsEnabled="{Binding IsEditingMode}"
                 MaxLength="1024"
                 Style="{StaticResource TextBoxNoticeLarge}"
-                Text="{Binding Node.Content, UpdateSourceTrigger=PropertyChanged}"
+                Text="{Binding ViewModel.Description, UpdateSourceTrigger=PropertyChanged}"
                 TextWrapping="Wrap" />
             <Label
                 Grid.Row="2"
@@ -67,26 +68,30 @@
                 Grid.Column="2"
                 Margin="3"
                 IsEnabled="False"
-                SelectedCompactEmployeeDC="{Binding Node.Creator}" />
+                SelectedCompactEmployeeDC="{Binding ViewModel.CreatorOid}" />
 
-            <Label Grid.Row="3" Grid.Column="0">Verborgen</Label>
+            <Label Grid.Row="3" Grid.Column="0">Öffentlich</Label>
             <dxe:CheckEdit
                 Grid.Row="3"
                 Grid.Column="2"
                 Margin="3"
-                IsChecked="{Binding Node.IsOnlyForCreator}"
+                IsChecked="{Binding ViewModel.IsPublic}"
                 IsEnabled="{Binding IsEditingMode, UpdateSourceTrigger=PropertyChanged}" />
 
-            <Button
+            <StackPanel
                 Grid.Row="6"
-                Grid.Column="2"
-                Width="100"
+                Grid.ColumnSpan="3"
                 Margin="3,19,10,3"
                 HorizontalAlignment="Right"
-                Command="{Binding AddCommand}"
-                Visibility="{Binding IsAdd, Converter={StaticResource BoolVisibilityConverter}}">
-                Speichern
-            </Button>
+                Orientation="Horizontal">
+                <Button Width="100" Command="{Binding CancelCommand}" Visibility="Visible">
+                    Abbrechen
+                </Button>
+                <Button
+                    Width="100"
+                    Command="{Binding AcceptCommand}"
+                    Content="{Binding AcceptButtonText}" Visibility="Visible"/>
+            </StackPanel>
         </Grid>
     </Grid>
 </UserControl>
diff --git a/BeWo/ViewModel/AiPromptbausteinFolderVM.cs b/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
index ea60db54c..24580a07b 100644
--- a/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
+++ b/BeWo/ViewModel/AiPromptbausteinFolderVM.cs
@@ -3,6 +3,7 @@ using System.Windows;
 using BeWo.ViewModel.ListViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
 
 namespace BeWo.ViewModel
 {
@@ -11,8 +12,8 @@ namespace BeWo.ViewModel
 		private string _Title;
 		private string _Description;
 		private long? _ParentFolderOid;
-		private long _CreatorOid;
-		private bool _IsPrivate;
+		private CompactEmployeeDC _Creator;
+		private bool _IsPublic;
 		private int _Position;
 		private bool _IsExpanded;
 		private AiActionType _ActionType; 
@@ -42,16 +43,16 @@ namespace BeWo.ViewModel
 			set => SetProperty(ref _ParentFolderOid, value, nameof(ParentFolderOid), () => DataContract.ParentFolderOid);
 		}
 
-		public long CreatorOid
+		public CompactEmployeeDC Creator
 		{
-			get => _CreatorOid;
-			set => SetProperty(ref _CreatorOid, value, nameof(CreatorOid), () => DataContract.CreatorOid);
+			get => DataContract.Creator;
+			set => SetProperty(ref _Creator, value, nameof(Creator), () => DataContract.Creator);
 		}
 
-		public bool IsPrivate
+		public bool IsPublic
 		{
-			get => _IsPrivate;
-			set => SetProperty(ref _IsPrivate, value, nameof(IsPrivate), () => DataContract.IsPrivate);
+			get => _IsPublic;
+			set => SetProperty(ref _IsPublic, value, nameof(IsPublic), () => DataContract.IsPublic);
 		}
 
 		public int Position
@@ -91,8 +92,8 @@ namespace BeWo.ViewModel
 			_Title = pDataContract.Title;
 			_Description = pDataContract.Description;
 			_ParentFolderOid = pDataContract.ParentFolderOid;
-			_CreatorOid = pDataContract.CreatorOid;
-			_IsPrivate = pDataContract.IsPrivate;
+			_Creator = pDataContract.Creator;
+			_IsPublic = pDataContract.IsPublic;
 			_Position = pDataContract.Position;
 			_IsExpanded = pDataContract.IsExpanded;
 			_ActionType = pDataContract.ActionType;
@@ -105,8 +106,8 @@ namespace BeWo.ViewModel
 			pDataContract.Title = _Title;
 			pDataContract.Description = _Description;
 			pDataContract.ParentFolderOid = _ParentFolderOid;
-			pDataContract.CreatorOid = _CreatorOid;
-			pDataContract.IsPrivate = _IsPrivate;
+			pDataContract.Creator = _Creator;
+			pDataContract.IsPublic = _IsPublic;
 			pDataContract.Position = _Position;
 			pDataContract.ActionType = _ActionType;
 			pDataContract.SubFolders = _SubFolders.CopyToDCList(doCommit);
@@ -114,5 +115,12 @@ namespace BeWo.ViewModel
 
 			return pDataContract;
 		}
+
+		public override void UpdateByDataContract(AiPromptbausteinFolderDC pDataContract)
+		{
+			Title = pDataContract.Title;
+			Description = pDataContract.Description;
+			IsPublic = pDataContract.IsPublic;
+		}
 	}
 }
\ No newline at end of file
diff --git a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
index 6b7135af8..e83a6c307 100644
--- a/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiConversationChatViewModel.cs
@@ -17,7 +17,7 @@ using BS.Shared.Extensions;
 
 namespace BeWo.ViewModel.View.AI
 {
-	public class AiConversationChatViewModel : BaseDialogViewModel
+	public class AiConversationChatViewModel : DialogViewModel
 	{
 		private bool _IsSettingsOpen;
 		private bool _IsCloneOpen;
diff --git a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
index e252db518..4f7612ec7 100644
--- a/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
+++ b/BeWo/ViewModel/View/AI/AiPromptbausteinSelectionViewModel.cs
@@ -15,7 +15,7 @@ using System.Windows.Input;
 
 namespace BeWo.ViewModel.View.AI
 {
-	public class AiPromptbausteinSelectionViewModel : BaseDialogViewModel
+	public class AiPromptbausteinSelectionViewModel : DialogViewModel
 	{
 		public AiPromptbausteinSelectionViewModel()
 		{
diff --git a/BeWo/ViewModel/View/AcceptCancelDialogViewModel.cs b/BeWo/ViewModel/View/AcceptCancelDialogViewModel.cs
new file mode 100644
index 000000000..e273c480c
--- /dev/null
+++ b/BeWo/ViewModel/View/AcceptCancelDialogViewModel.cs
@@ -0,0 +1,48 @@
+using DevExpress.Mvvm;
+using DevExpress.Mvvm.POCO;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace BeWo.ViewModel.View
+{
+	public class AcceptCancelDialogViewModel : DialogViewModel
+	{
+		public event EventHandler Accept_Button_Clicked;
+		public event EventHandler Cancel_Button_Clicked;
+
+		public AcceptCancelDialogViewModel() : base()
+		{
+			AcceptCommand = new DelegateCommand(Accept, canAccept, false);
+			CancelCommand = new DelegateCommand(Cancel, canCancel, false);
+		}
+
+		public DelegateCommand AcceptCommand { get; set; }
+		public DelegateCommand CancelCommand { get; set; }
+
+		public void Accept()
+		{
+			Accept_Button_Clicked?.Invoke(this, EventArgs.Empty);
+			Close();
+		}
+
+		public void Cancel()
+		{
+			Cancel_Button_Clicked?.Invoke(this, EventArgs.Empty);
+			Close();
+		}
+
+		protected virtual bool canAccept()
+		{
+			return true;
+		}
+
+		protected virtual bool canCancel()
+		{
+			return true;
+		}
+	}
+}
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
index 2145c2a8f..d7843ebcc 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinComplexTreeViewModel.cs
@@ -54,11 +54,11 @@ namespace BeWo.ViewModel.View.Administration
 				return;
 			}
 
-			OpenAddFolderDialogCommand = new DelegateCommand(OpenAddFolderDialog, CanOpenAddFolderDialog, false);
-			OpenEditFolderDialogCommand = new DelegateCommand(OpenEditFolderDialog, CanOpenEditFolderDialog, false);
-			CopyFolderCommand = new DelegateCommand(CopyFolder, CanCopyFolder, false);
-			PasteFolderCommand = new DelegateCommand(PasteFolder, CanPasteFolder, false);
-			DeleteFolderCommand = new DelegateCommand(DeleteFolder, CanDeleteFolder, false);
+			OpenAddFolderDialogCommand = new DelegateCommand(OpenAddFolderDialog, canOpenAddFolderDialog, false);
+			OpenEditFolderDialogCommand = new DelegateCommand(OpenEditFolderDialog, canOpenEditFolderDialog, false);
+			CopyFolderCommand = new DelegateCommand(CopyFolder, canCopyFolder, false);
+			PasteFolderCommand = new DelegateCommand(PasteFolder, canPasteFolder, false);
+			DeleteFolderCommand = new DelegateCommand(DeleteFolder, canDeleteFolder, false);
 		}
 
 		public AiPromptbausteinComplexTreeViewModel(IBeWoWindowService windowService, AiActionType aiActionType) : this()
@@ -95,13 +95,33 @@ namespace BeWo.ViewModel.View.Administration
 
 		void OpenAddFolderDialog()
 		{
-			var vm = new AiPromptbausteinFolderViewModel();
+			var sel_folder = SelectedFolder;
+			var new_vm = sel_folder.SubFolders.NewVM;
+			sel_folder.SubFolders.NewVM = null;
+
+			var vm = new AiPromptbausteinFolderViewModel(new_vm, true);
+
+			vm.Accept_Button_Clicked += (s, e) => {
+				sel_folder.SubFolders.VMList.Add(new_vm);
+			};
 
 			WindowService.Show(vm);
 		}
 		void OpenEditFolderDialog()
 		{
+			var sel_folder = SelectedFolder;
+			var sel_dc = sel_folder.CommitToDataContract();
+			var edit_vm = new AiPromptbausteinFolderVM(sel_dc);
 
+			var vm = new AiPromptbausteinFolderViewModel(edit_vm, false);
+
+			vm.Accept_Button_Clicked += (s, e) =>
+			{
+				var edit_dc = edit_vm.CommitToDataContract();
+				sel_folder.UpdateByDataContract(edit_dc);
+			};
+
+			WindowService.Show(vm);
 		}
 		void CopyFolder()
 		{
@@ -116,24 +136,24 @@ namespace BeWo.ViewModel.View.Administration
 
 		}
 
-		bool CanOpenAddFolderDialog()
+		bool canOpenAddFolderDialog()
 		{
-			return false;
+			return true;
 		}
 
-		bool CanOpenEditFolderDialog()
+		bool canOpenEditFolderDialog()
+		{
+			return true;
+		}
+		bool canCopyFolder()
 		{
 			return false;
 		}
-		bool CanCopyFolder()
+		bool canPasteFolder()
 		{
 			return false;
 		}
-		bool CanPasteFolder()
-		{
-			return false;
-		}
-		bool CanDeleteFolder()
+		bool canDeleteFolder()
 		{
 			return false;
 		}
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs
index ef400c40f..59740bdaf 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinDetailViewModel.cs
@@ -11,7 +11,7 @@ using System.Windows.Input;
 
 namespace BeWo.ViewModel.View.Administration
 {
-	public class AiPromptbausteinDetailViewModel : BaseDialogViewModel
+	public class AiPromptbausteinDetailViewModel : DialogViewModel
 	{
 		private AiPromptbausteinDetailViewModel(AiPromptbausteinTreeViewModel viewModel, AiPromptbausteinTreeVM node, bool isAdd, AiPromptbausteinTreeListVM parent = null)
 		{
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
index 4e535af10..8e52e4439 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinFolderViewModel.cs
@@ -1,13 +1,42 @@
 using BeWo.ViewModel.View.Dialogs;
+using DevExpress.DataProcessing.InMemoryDataProcessor;
+using DevExpress.Mvvm;
+using DevExpress.Mvvm.POCO;
+using DevExpress.XtraBars.Docking2010.Views.WindowsUI;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.Windows.Input;
 
 namespace BeWo.ViewModel.View.Administration
 {
-	public class AiPromptbausteinFolderViewModel : BaseDialogViewModel
+	public class AiPromptbausteinFolderViewModel : AcceptCancelDialogViewModel
 	{
+		private bool _IsNew;
+
+		public AiPromptbausteinFolderViewModel(AiPromptbausteinFolderVM viewModel, bool isNew) : base()
+		{
+			ViewModel = viewModel;
+			_IsNew = isNew;
+
+			if (!_IsNew)
+			{
+				ViewModel.PropertyChanged += (s, e) =>
+				{
+					AcceptCommand.RaiseCanExecuteChanged();
+				};
+			}
+		}
+
+		public AiPromptbausteinFolderVM ViewModel { get; set; }
+
+		public string AcceptButtonText => _IsNew ? "Hinzufügen" : "Speichern";
+
+		protected override bool canAccept()
+		{
+			return _IsNew || ViewModel.IsDirty;
+		}
 	}
 }
diff --git a/BeWo/ViewModel/View/Administration/AiPromptbausteinPromptViewModel.cs b/BeWo/ViewModel/View/Administration/AiPromptbausteinPromptViewModel.cs
index 7f33df714..d4d94c176 100644
--- a/BeWo/ViewModel/View/Administration/AiPromptbausteinPromptViewModel.cs
+++ b/BeWo/ViewModel/View/Administration/AiPromptbausteinPromptViewModel.cs
@@ -7,7 +7,7 @@ using System.Threading.Tasks;
 
 namespace BeWo.ViewModel.View.Administration
 {
-	public class AiPromptbausteinPromptViewModel : BaseDialogViewModel
+	public class AiPromptbausteinPromptViewModel : DialogViewModel
 	{
 	}
 }
diff --git a/BeWo/ViewModel/View/Dialogs/BaseDialogViewModel.cs b/BeWo/ViewModel/View/DialogViewModel.cs
similarity index 71%
rename from BeWo/ViewModel/View/Dialogs/BaseDialogViewModel.cs
rename to BeWo/ViewModel/View/DialogViewModel.cs
index 51969754e..b36854137 100644
--- a/BeWo/ViewModel/View/Dialogs/BaseDialogViewModel.cs
+++ b/BeWo/ViewModel/View/DialogViewModel.cs
@@ -6,20 +6,20 @@ using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Input;
 
-namespace BeWo.ViewModel.View.Dialogs
+namespace BeWo.ViewModel.View
 {
-	public class BaseDialogViewModel : WindowViewModel
+	public class DialogViewModel : WindowViewModel
 	{
 		public event EventHandler RequestClose;
 
-		public BaseDialogViewModel() : base()
+		public DialogViewModel() : base()
 		{
 			CloseDialogCommand = new DelegateCommand(Close);
 		}
 
 		public ICommand CloseDialogCommand { get; set; }
 
-		private void Close()
+		protected void Close()
 		{
 			RequestClose?.Invoke(this, EventArgs.Empty);
 		}
diff --git a/BeWo/ViewModel/View/Dialogs/GkvAbrechnungDialogViewModel.cs b/BeWo/ViewModel/View/Dialogs/GkvAbrechnungDialogViewModel.cs
index ab0596a33..ba0980a78 100644
--- a/BeWo/ViewModel/View/Dialogs/GkvAbrechnungDialogViewModel.cs
+++ b/BeWo/ViewModel/View/Dialogs/GkvAbrechnungDialogViewModel.cs
@@ -7,11 +7,11 @@ using System.Threading.Tasks;
 
 namespace BeWo.ViewModel.View.Dialogs
 {
-	public class GkvAbrechnungDialogViewModel : BaseDialogViewModel
+	public class GkvAbrechnungDialogViewModel : DialogViewModel
 	{
 		public GkvAbrechnungLightVM Abrechnung { get; set; }
 
-		public GkvAbrechnungDialogViewModel(GkvAbrechnungLightVM abrechnung)
+		public GkvAbrechnungDialogViewModel(GkvAbrechnungLightVM abrechnung) : base()
 		{
 			Abrechnung = abrechnung;
 		}
diff --git a/Shared/DataContracts/AiPromptbausteinFolderDC.cs b/Shared/DataContracts/AiPromptbausteinFolderDC.cs
index b69410ccd..fb7214e92 100644
--- a/Shared/DataContracts/AiPromptbausteinFolderDC.cs
+++ b/Shared/DataContracts/AiPromptbausteinFolderDC.cs
@@ -1,4 +1,5 @@
-using BS.Shared.Text;
+using BS.Shared.DataContracts.Compact;
+using BS.Shared.Text;
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;
@@ -11,8 +12,8 @@ namespace BS.Shared.DataContracts
 		[DataMember] public string Title { get; set; }
 		[DataMember] public string Description { get; set; }
 		[DataMember] public long? ParentFolderOid { get; set; }
-		[DataMember] public long CreatorOid { get; set; }
-		[DataMember] public bool IsPrivate { get; set; }
+		[DataMember] public CompactEmployeeDC Creator { get; set; }
+		[DataMember] public bool IsPublic { get; set; }
 		[DataMember] public int Position { get; set; }
 		[DataMember] public bool IsExpanded { get; set; }
 		[DataMember] public AiActionType ActionType { get; set; }