From a3ef1891f9e3184f84ef104c661a0c766557d419 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Fri, 31 Mar 2023 12:04:55 +0200
Subject: [PATCH 1/7] Copy and Paste implementiert

---
 BeWo/BeWo.csproj                              |   3 +
 BeWo/Ressources/Icons/Copy24.png              | Bin 0 -> 784 bytes
 BeWo/View/Detail/MassnahmenTreeViewView.xaml  |  22 ++-
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 149 +++++++++++++-----
 4 files changed, 132 insertions(+), 42 deletions(-)
 create mode 100644 BeWo/Ressources/Icons/Copy24.png

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index 0fb39222f..1bf91a13a 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -3047,6 +3047,9 @@
     <Resource Include="Ressources\Icons\imassnahme.png" />
     <Resource Include="Ressources\Icons\iziel.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Ressources\Icons\Copy24.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/BeWo/Ressources/Icons/Copy24.png b/BeWo/Ressources/Icons/Copy24.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ab929f0bd3e13189bac4fde2a992c5105ced0a
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0;NerK~zXfwN<^2
z+CUIqY&gORQgA5EMF<ofCoV;bh@L7f;te7iDhi~WM4cB&MV^3;0;P!%PXNL=2RRTz
z;!N<#a0Yub`{T9E5#bc~p^x#fJ3l)!UeHS;#HA1Aa`{c8(fB6I@_i%{LE&(i{vHas
z+ZT()v{)>D<!W%$YPGk$UQbyrmw2-=u(h}FF$@L+g_{INy<Wdm@6=!8@faJ%2Jdz|
zY*`kzZTlJf{eGYT5|^k@C|s0Er61Z-%NT|MWsyZmY>X)(alxPv0rL6$$D5n??{e4I
zD4Wfaf>TG3FM^aQA#=w62*A3>ads9#63<#>dEjd{o6#Vv)hgcUbUwqgZ&0e$>UTv^
zp1A6wQmK5>A0KJ$HybavR2o32JD$(ySl4xInkM+RcZckDyI;6V3Q-~gQgaL?fsGzo
z2pWxM(<#;C@i>Y`qX<TrWKJqT2}&63!;p;cL~a0C7Bz<<VT}c8SvDFDhiI+q$lUFq
zjAuxan3>aXW_P^#ZUD%VW$Xk2g4DDJluTZrY$k(pS65=Pyv|+HB_I4H0=lJPd@@ax
zc%5LGi&HX(^pqqSF5y>d<ApB(D~o?5iK7Ty6*P0cZo_FwUx>7!gpMS858)5Mox;1z
zo<S0Xc+JH+m;che5CQh^5t~R>T$0m}mqDxn=?R@A9Ni&vC*Yo7&l?9#_DNV0Q{~i~
z=m*0f0_?$&2Qrr^l}aUFou7YD)zNe`;#Af9?RG1r)9Hi=NJ-A*(fKnOlF4M!ZZ?}g
znb!blx7)XW)@%HrX(vhcwOXxPZc5>6@^MJ+@q>_CIS3E{jGU$iAbfE<hLZuPp|^>r
z$n6{iDiL|9f)f4$eV3h2Ifhs)b_thT4jzx(G|v!%APP+0Z?3;I5c&(sA2CBfsilMf
O0000<MNUMnLSTY5v{i@z

literal 0
HcmV?d00001

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
index ae3a9c6f6..6a73b4b17 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
@@ -29,6 +29,22 @@
                         <Image Source="..\..\Ressources\Icons\Rename24.png"/>
                     </MenuItem.Icon>
                 </MenuItem>
+                <Separator />
+                <MenuItem Header="Knoten kopieren">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Copy24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Teilbaum kopieren">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Copy24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
+                <MenuItem Header="Einfügen">
+                    <MenuItem.Icon>
+                        <Image Source="..\..\Ressources\Icons\Paste24.png"/>
+                    </MenuItem.Icon>
+                </MenuItem>
                 <!--<MenuItem Header="Umbenennen">
                     <MenuItem.Icon>
                         <Image Source="..\..\Ressources\Icons\Rename24.png"/>
@@ -53,12 +69,14 @@
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
 
                 <Label Grid.Column="0" Content="Neues Ziel" />
                 <TextBox Grid.Column="1" Margin="1" VerticalContentAlignment="Center" Text="{Binding ViewModel.NewVM.Description, UpdateSourceTrigger=PropertyChanged}" />
-                <Button Grid.Column="2" Height="25" Content="Hinzufügen" Margin="1" Click="ZielHinzufuegenButton_Click" />
-                <Button Grid.Column="3" Height="25" Content="Icf Importieren" Margin="1" Click="IcfImport_Click" />
+                <Button Grid.Column="2" Height="25" Content="Hinzufügen" Margin="3" Click="ZielHinzufuegenButton_Click" />
+                <Button Grid.Column="3" Height="25" Content="Icf Importieren" Margin="3" Click="IcfImport_Click" />
+                <ToggleButton Grid.Column="4" Height="25" Content="Bearbeiten" Margin="3" Checked="ToggleButton_Checked" Unchecked="ToggleButton_Unchecked" />
             </Grid>
             <GroupBox Grid.Row="1" Style="{StaticResource ObjectEditGroupBox}">
                 <TreeView x:Name="TreeView" Margin="3 3 7 3" Grid.Row="1" Padding="0 5 10 5"
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index 93c47b1ea..eebd9285d 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -1,6 +1,17 @@
-using System;
+using BeWo.Core;
+using BeWo.Core.Service;
+using BeWo.ServiceProxy;
+using BeWo.View.Controls;
+using BeWo.View.Detail.Report;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.ClientPartials;
+using BS.Shared.Extensions;
+using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
 using System.Windows;
@@ -11,30 +22,24 @@ using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Threading;
 
-using BeWo.Core;
-using BeWo.Core.Service;
-using BeWo.ServiceProxy;
-using BeWo.View.Controls;
-using BeWo.View.Detail.Report;
-using BeWo.ViewModel;
-using BeWo.ViewModel.ListViewModel;
-
-using BS.Shared;
-using BS.Shared.Core;
-using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
-
 namespace BeWo.View.Detail
 {
+    public enum MassnahmenTreeCopyType
+    {
+        Node, Subtree
+    }
+
     public partial class MassnahmenTreeViewView
     {
+        private bool _Bearbeitungsmodus;
 
         private TreeViewItem _SelectedGoalTreeNode;
         private GenericValueListEntryListVM _ViewModel;
         private List<ValueListEntryDC> _Children2Delete;
         private List<SupportConceptGoalTreeItem> _TreeViewItemsList;
-        
+
+        private MassnahmenTreeCopyType _CopyType;
+        private SupportConceptGoalTreeItem _CopyItem;
 
         public MassnahmenTreeViewView(GenericValueListEntryListVM pViewModel)
         {
@@ -43,8 +48,26 @@ namespace BeWo.View.Detail
             ViewModel = pViewModel;
 
             DataContext = this;
+
+            _Bearbeitungsmodus = false;
         }
-        
+
+        public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
+
+        public GenericValueListEntryListVM ViewModel
+        {
+            get => _ViewModel;
+            set
+            {
+                _ViewModel = value;
+                InitGoalCategoriesTreeView();
+                TreeView.ItemsSource = GoalTree;
+            }
+        }
+
+        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
+
+        public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
 
         private void GoalTreeViewItem_PreviewMouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
@@ -116,6 +139,49 @@ namespace BeWo.View.Detail
                     if (selectedItem != null)
                         EditTreeItem(selectedItem.GoalEntryVM);
                     break;
+                case "Knoten kopieren":
+                    if (selectedItem != null)
+                    {
+                        _CopyItem = selectedItem;
+                        _CopyType = MassnahmenTreeCopyType.Node;
+                    }
+                    break;
+                case "Teilbaum kopieren":
+                    if (selectedItem != null)
+                    {
+                        _CopyItem = selectedItem;
+                        _CopyType = MassnahmenTreeCopyType.Subtree;
+                    }
+                    break;
+                case "Einfügen":
+                    if (!_Bearbeitungsmodus)
+                    {
+                        MessageBox.Show("Bearbeitungsmodus deaktiviert", "Aktion nicht möglich");
+                    }
+                    else
+                    {
+                        if (selectedItem != null)
+                            CopyTreeItem(selectedItem, _CopyItem);
+                    }
+                    
+                    break;
+            }
+        }
+
+        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source)
+        {
+            if (source == null || parent == null)
+                throw new NotImplementedException("#43298467891364987");
+
+            var wm = source.GoalEntryVM;
+            var node = AddTreeItem(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
+
+            if (_CopyType == MassnahmenTreeCopyType.Subtree)
+            {
+                foreach (var child in source.Items)
+                {
+                    CopyTreeItem(node, child);
+                }
             }
         }
 
@@ -139,6 +205,14 @@ namespace BeWo.View.Detail
                     {
                         menuitem.IsEnabled = goal != null; // && goal.IsGoal;
                     }
+                    else if (menuitem.Header.Equals("Einfügen"))
+                    {
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal;
+                    }
+                    else if (menuitem.Header.Equals("Teilbaum kopieren"))
+                    {
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal;
+                    }
 
                     menuitem.IsEnabled = menuitem.IsEnabled && IsAllowedToEditGoals;
                 }
@@ -196,7 +270,7 @@ namespace BeWo.View.Detail
                 vorhandeneZiele.AddRange(GetAllChildren(item, null));
             }
 
-//#if DEBUG                                                                                       
+            //#if DEBUG                                                                                       
             var control2 = new IcfImportControl(ServiceFacade.DoOperationsServiceSync(x => x.GetWholeIcfOhneImportierte(vorhandeneZiele)));
 
             var beWoWindow2 = new BeWoWindow
@@ -223,7 +297,7 @@ namespace BeWo.View.Detail
             beWoWindow2.ShowDialog();
 
             return;
-//#endif
+            //#endif
             //var control = new IcfImportControl(ServiceFacade.DoOperationsServiceSync(x => x.GetWholeIcf()));
 
             //var beWoWindow = new BeWoWindow
@@ -258,7 +332,7 @@ namespace BeWo.View.Detail
             if (dcItem == null)
             {
                 returnThis.Add(treeItem.GoalEntryDC);
-         
+
                 if (treeItem.Children.Count > 0)
                 {
                     foreach (var child in treeItem.Children)
@@ -283,25 +357,10 @@ namespace BeWo.View.Detail
             return returnThis;
         }
 
-        
-        public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
 
-        public GenericValueListEntryListVM ViewModel
-        {
-            get => _ViewModel;
-            set
-            {
-                _ViewModel = value;
-                InitGoalCategoriesTreeView();
-                TreeView.ItemsSource = GoalTree;
-            }
-        }
 
-        public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
 
-        public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
-        
-        
+
         public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
         {
             var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()), null);
@@ -579,7 +638,7 @@ namespace BeWo.View.Detail
 
             foreach (var goal in ViewModel.VMList.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType)))
             {
-                
+
                 var item = new SupportConceptGoalTreeItem { GoalEntryVM = goal };
 
                 if (goal.ParentEntry == null || !goal.ParentEntry.ValueListEntryOid.HasValue || !dictOid2TreeItem.ContainsKey(goal.ParentEntry.ValueListEntryOid.Value))
@@ -672,8 +731,8 @@ namespace BeWo.View.Detail
             return AddTreeItem(parent, ValueListEntryType.SupportConceptGoalCategoryType,
                 goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
         }
-        
-        
+
+
 
         private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
         {
@@ -695,6 +754,16 @@ namespace BeWo.View.Detail
             }
             return false;
         }
+
+        private void ToggleButton_Checked(object sender, RoutedEventArgs e)
+        {
+            _Bearbeitungsmodus = true;
+        }
+
+        private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _Bearbeitungsmodus = false;
+        }
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

From 5c0e2db7d1372cde77102876af94de9cb73c7e79 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Fri, 31 Mar 2023 15:52:23 +0200
Subject: [PATCH 2/7] =?UTF-8?q?simples=20drag=20n=20drop=20->=20egde=20cas?=
 =?UTF-8?q?es=20m=C3=BCssen=20noch=20betrachtet=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/View/Detail/MassnahmenTreeViewView.xaml  |   6 +-
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 147 +++++++++++++++++-
 2 files changed, 146 insertions(+), 7 deletions(-)

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
index 6a73b4b17..aa81659a3 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
@@ -83,7 +83,9 @@
 						      ItemContainerStyle="{DynamicResource igoal_treeitemstyle}"
                   ItemTemplate="{DynamicResource igoal_treeitemtemplate}" Grid.RowSpan="1" ContextMenu="{StaticResource cmGoals}"
                   PreviewMouseDown="GoalTreeViewItem_PreviewMouseRightButtonDown" 
-						      ItemsSource="{Binding IndividualGoalTree, UpdateSourceTrigger=PropertyChanged}" >
+						      ItemsSource="{Binding IndividualGoalTree, UpdateSourceTrigger=PropertyChanged}" 
+                          MouseDown="TreeView_MouseDown" MouseMove="TreeView_MouseMove" 
+                           AllowDrop="True" PreviewDragOver="TreeView_PreviewDragOver" PreviewDrop="TreeView_PreviewDrop"  >
                     <TreeView.Resources>
                         <Style x:Key="igoal_treeitemstyle" TargetType="TreeViewItem">
                             <Setter Property="IsExpanded" Value="{Binding Path=IsExpanded, Mode=TwoWay}" />
@@ -102,7 +104,7 @@
                                 <TextBox Margin="0,0,0,0" Cursor="Arrow" Background="Transparent" Height="21" Padding="0,3,0,0" VerticalAlignment="Center" 
 								           LostFocus="TextBox_LostFocus" KeyDown="TextBox_KeyDown" BorderThickness="0" 
 								           IsReadOnly="True" Text="{Binding Path=GoalEntryVM.DisplayName, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}"
-								           FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}" ToolTipService.ShowDuration="100000">
+								           FontWeight="{Binding Path=IsGoal, Converter={StaticResource ValueListEntryTypeToFontWeightConverter}}" ToolTipService.ShowDuration="100000" Focusable="False">
                                     <TextBox.ToolTip>
                                         <StackPanel Orientation="Vertical">
                                             <Label FontWeight="Bold" Content="{Binding Path=GoalEntryVM.DisplayName, Mode=OneWay}"/>
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index eebd9285d..997bb8c64 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -40,6 +40,9 @@ namespace BeWo.View.Detail
 
         private MassnahmenTreeCopyType _CopyType;
         private SupportConceptGoalTreeItem _CopyItem;
+        private Point _lastMouseDown;
+        private SupportConceptGoalTreeItem _draggedItem;
+        private SupportConceptGoalTreeItem _parent;
 
         public MassnahmenTreeViewView(GenericValueListEntryListVM pViewModel)
         {
@@ -86,6 +89,11 @@ namespace BeWo.View.Detail
             {
                 _SelectedGoalTreeNode = null;
             }
+
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                _lastMouseDown = e.GetPosition(TreeView);
+            }
         }
 
         private void TextBox_LostFocus(object sender, RoutedEventArgs e)
@@ -161,14 +169,14 @@ namespace BeWo.View.Detail
                     else
                     {
                         if (selectedItem != null)
-                            CopyTreeItem(selectedItem, _CopyItem);
+                            CopyTreeItem(selectedItem, _CopyItem, false);
                     }
-                    
+
                     break;
             }
         }
 
-        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source)
+        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, bool force_deep_copy)
         {
             if (source == null || parent == null)
                 throw new NotImplementedException("#43298467891364987");
@@ -176,11 +184,11 @@ namespace BeWo.View.Detail
             var wm = source.GoalEntryVM;
             var node = AddTreeItem(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
 
-            if (_CopyType == MassnahmenTreeCopyType.Subtree)
+            if (_CopyType == MassnahmenTreeCopyType.Subtree || force_deep_copy)
             {
                 foreach (var child in source.Items)
                 {
-                    CopyTreeItem(node, child);
+                    CopyTreeItem(node, child, force_deep_copy);
                 }
             }
         }
@@ -764,6 +772,135 @@ namespace BeWo.View.Detail
         {
             _Bearbeitungsmodus = false;
         }
+
+        private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                _lastMouseDown = e.GetPosition(TreeView);
+            }
+        }
+
+        private void TreeView_MouseMove(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (e.LeftButton == MouseButtonState.Pressed)
+                {
+                    Point currentPosition = e.GetPosition(TreeView);
+
+                    if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
+                        (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
+                    {
+                        _draggedItem = (SupportConceptGoalTreeItem)TreeView.SelectedItem;
+                        if (_draggedItem != null)
+                        {
+                            DragDropEffects finalDropEffect = DragDrop.DoDragDrop(TreeView, _SelectedGoalTreeNode, DragDropEffects.Move);
+                            //Checking target is not null and item is
+                            //dragging(moving)
+                            if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
+                            {
+                                var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
+                                var parent = _parent;
+                                var child = _draggedItem;
+                                
+                                origin_parent.Items.Remove(child);
+                                child.GoalEntryVM.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+                                parent.Items.Add(_draggedItem);
+                                parent.IsExpanded = true;
+                                TreeView.RefreshUI();                                
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private SupportConceptGoalTreeItem GetNearestContainer(UIElement element)
+        {
+            // Walk up the element tree to the nearest tree view item.
+            TreeViewItem container = element as TreeViewItem;
+            while ((container == null) && (element != null))
+            {
+                element = VisualTreeHelper.GetParent(element) as UIElement;
+                container = element as TreeViewItem;
+            }
+            return container.DataContext as SupportConceptGoalTreeItem;
+            //return container;
+        }
+
+        private bool CheckDropTarget(SupportConceptGoalTreeItem _sourceItem, SupportConceptGoalTreeItem _targetItem)
+        {
+            if (_sourceItem == null || _targetItem == null)
+                return false;
+
+            //Check whether the target item is meeting your condition
+
+            var source = _sourceItem as SupportConceptGoalTreeItem;
+            var target = _targetItem as SupportConceptGoalTreeItem;
+
+            bool _isEqual = false;
+            // Unterschiedlicher Parent
+            if (source.GoalEntryVM.ParentEntry.ValueListEntryOid.Value != target.GoalEntryDC.ValueListEntryOid.Value)
+            {
+                // Nicht eigener
+                if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
+                {
+                    _isEqual = true;
+                }
+            }
+            return _isEqual;
+        }
+
+        private void TreeView_PreviewDragOver(object sender, DragEventArgs e)
+        {
+            try
+            {
+                Point currentPosition = e.GetPosition(TreeView);
+
+                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 0.0) ||
+                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 0.0))
+                {
+                    // Verify that this is a valid drop and then store the drop target
+                    var item = GetNearestContainer(e.OriginalSource as UIElement);
+                    if (CheckDropTarget(_draggedItem, item))
+                    {
+                        e.Effects = DragDropEffects.Move;
+                    }
+                    else
+                    {
+                        e.Effects = DragDropEffects.None;
+                    }
+                }
+                e.Handled = true;
+            }
+            catch (Exception)
+            {
+            }
+        }
+
+        private void TreeView_PreviewDrop(object sender, DragEventArgs e)
+        {
+            try
+            {
+                e.Effects = DragDropEffects.None;
+                e.Handled = true;
+
+                // Verify that this is a valid drop and then store the drop target
+                var target = GetNearestContainer(e.OriginalSource as UIElement);
+                if (target != null && _draggedItem != null)
+                {
+                    _parent = target;
+                    e.Effects = DragDropEffects.Move;
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

From bf683161bb3395471afffd9b9fa81f6209f16040 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Fri, 31 Mar 2023 16:31:07 +0200
Subject: [PATCH 3/7] reorder + minor bug fix

---
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 429 +++++++++---------
 1 file changed, 202 insertions(+), 227 deletions(-)

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index 997bb8c64..aa041a89c 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -95,12 +95,10 @@ namespace BeWo.View.Detail
                 _lastMouseDown = e.GetPosition(TreeView);
             }
         }
-
         private void TextBox_LostFocus(object sender, RoutedEventArgs e)
         {
             UpdateSelectedTreeItemText((TextBox)sender);
         }
-
         private void TextBox_KeyDown(object sender, KeyEventArgs e)
         {
             if (e.Key == Key.Return)
@@ -108,7 +106,6 @@ namespace BeWo.View.Detail
                 UpdateSelectedTreeItemText((TextBox)sender);
             }
         }
-
         private void ContextMenuGoals_Click(object sender, RoutedEventArgs e)
         {
             if (!(e.OriginalSource is MenuItem twi)) return;
@@ -175,24 +172,6 @@ namespace BeWo.View.Detail
                     break;
             }
         }
-
-        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, bool force_deep_copy)
-        {
-            if (source == null || parent == null)
-                throw new NotImplementedException("#43298467891364987");
-
-            var wm = source.GoalEntryVM;
-            var node = AddTreeItem(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
-
-            if (_CopyType == MassnahmenTreeCopyType.Subtree || force_deep_copy)
-            {
-                foreach (var child in source.Items)
-                {
-                    CopyTreeItem(node, child, force_deep_copy);
-                }
-            }
-        }
-
         private void ContextMenuGoals_Opened(object sender, RoutedEventArgs e)
         {
             if (e.OriginalSource is ContextMenu menu)
@@ -226,7 +205,6 @@ namespace BeWo.View.Detail
                 }
             }
         }
-
         private void GoalTreeItemContainerGenerator_StatusChanged(object sender, EventArgs e)
         {
             var ig = (ItemContainerGenerator)sender;
@@ -254,7 +232,6 @@ namespace BeWo.View.Detail
 
             _SelectedGoalTreeNode.ItemContainerGenerator.StatusChanged -= GoalTreeItemContainerGenerator_StatusChanged;
         }
-
         private void ZielHinzufuegenButton_Click(object sender, RoutedEventArgs e)
         {
             var newItem = new SupportConceptGoalTreeItem();
@@ -268,7 +245,6 @@ namespace BeWo.View.Detail
 
             GoalTree.Sort((x, y) => x.GoalEntryVM?.DisplayName?.CompareTo(y.GoalEntryVM?.DisplayName) ?? string.Compare(string.Empty, y.GoalEntryVM?.DisplayName, StringComparison.Ordinal));
         }
-
         private void IcfImport_Click(object sender, RoutedEventArgs e)
         {
             var vorhandeneZiele = new List<ValueListEntryDC>();
@@ -332,6 +308,110 @@ namespace BeWo.View.Detail
             //beWoWindow.ShowDialog();
         }
 
+        private void ToggleButton_Checked(object sender, RoutedEventArgs e)
+        {
+            _Bearbeitungsmodus = true;
+            TreeView.AllowDrop = true;
+        }
+        private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
+        {
+            _Bearbeitungsmodus = false;
+            TreeView.AllowDrop = false;
+        }
+
+        private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Left)
+            {
+                _lastMouseDown = e.GetPosition(TreeView);
+            }
+        }
+        private void TreeView_MouseMove(object sender, MouseEventArgs e)
+        {
+            try
+            {
+                if (e.LeftButton == MouseButtonState.Pressed)
+                {
+                    Point currentPosition = e.GetPosition(TreeView);
+
+                    if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
+                        (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
+                    {
+                        _draggedItem = (SupportConceptGoalTreeItem)TreeView.SelectedItem;
+                        if (_draggedItem != null)
+                        {
+                            DragDropEffects finalDropEffect = DragDrop.DoDragDrop(TreeView, _SelectedGoalTreeNode, DragDropEffects.Move);
+                            //Checking target is not null and item is
+                            //dragging(moving)
+                            if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
+                            {
+                                MoveTreeItem(_draggedItem, _parent);
+
+                                //var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
+                                //var parent = _parent;
+                                //var child = _draggedItem;
+
+                                //origin_parent.Items.Remove(child);
+                                //child.GoalEntryVM.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+                                //parent.Items.Add(_draggedItem);
+                                //parent.IsExpanded = true;
+                                //TreeView.RefreshUI();                                
+                            }
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+            }
+        }
+        private void TreeView_PreviewDragOver(object sender, DragEventArgs e)
+        {
+            try
+            {
+                Point currentPosition = e.GetPosition(TreeView);
+
+                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 0.0) ||
+                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 0.0))
+                {
+                    // Verify that this is a valid drop and then store the drop target
+                    var item = GetNearestContainer(e.OriginalSource as UIElement);
+                    if (CheckDropTarget(_draggedItem, item))
+                    {
+                        e.Effects = DragDropEffects.Move;
+                    }
+                    else
+                    {
+                        e.Effects = DragDropEffects.None;
+                    }
+                }
+                e.Handled = true;
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
+        private void TreeView_PreviewDrop(object sender, DragEventArgs e)
+        {
+            try
+            {
+                e.Effects = DragDropEffects.None;
+                e.Handled = true;
+
+                // Verify that this is a valid drop and then store the drop target
+                var target = GetNearestContainer(e.OriginalSource as UIElement);
+                if (target != null && _draggedItem != null)
+                {
+                    _parent = target;
+                    e.Effects = DragDropEffects.Move;
+                }
+            }
+            catch (Exception ex)
+            {
+
+            }
+        }
 
         public List<ValueListEntryDC> GetAllChildren(SupportConceptGoalTreeItem treeItem, SupportConceptGoalDC dcItem)
         {
@@ -364,89 +444,6 @@ namespace BeWo.View.Detail
 
             return returnThis;
         }
-
-
-
-
-
-        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
-        {
-            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()), null);
-
-            var beWoWindow = new BeWoWindow();
-
-            control.CancelButtonClicked += () =>
-            {
-                if (control.ValueListEntry.IsDirty)
-                {
-                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
-                        return;
-                    control.ResetValueListEntry();
-                }
-                beWoWindow.Close();
-            };
-
-            control.SaveButtonClicked += () =>
-            {
-                var vm = control.ValueListEntry;
-                AddTreeItem(parent, valueListEntryType, vm.Description, vm.Abbreviation, vm.Notice);
-                beWoWindow.Close();
-            };
-
-            beWoWindow.Height = 200;
-            beWoWindow.Width = 500;
-            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
-            beWoWindow.GroupBoxContent = control;
-            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
-            beWoWindow.rootGroupBox.Header = viewHeader;
-            beWoWindow.ShowDialog();
-        }
-
-        public SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
-        {
-            if (!valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalCategoryType) &&
-                !valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalType))
-                throw new ArgumentOutOfRangeException();
-
-            var vm = ViewModel.NewVM;
-            vm.Type = valueListEntryType;
-            vm.Description = description;
-            vm.Abbreviation = abbreviation;
-            vm.Notice = notice;
-
-            var newItem = new SupportConceptGoalTreeItem
-            {
-                GoalEntryVM = vm,
-                GoalEntryDC = vm.CommitToDataContract(),
-                ParentGoal = parent
-            };
-
-            ViewModel.AddNewVMToList();
-
-            if (parent == null) return newItem;
-
-            vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
-            parent.GoalEntryVM = parent.GoalEntryVM;
-            parent.Items.Add(newItem);
-            parent.IsExpanded = true;
-
-            return newItem;
-        }
-
-        internal void DeleteIndividualGoal(SupportConceptGoalTreeItem selectedItem)
-        {
-            _Children2Delete = new List<ValueListEntryDC>();
-            TraverseCollection(selectedItem);
-
-            var parent = selectedItem.ParentGoal as SupportConceptGoalTreeItem;
-            if (parent != null && parent.Items != null)
-                parent.Items.Remove(selectedItem);
-            else
-                GoalTree.Remove(selectedItem);
-
-            ViewModel.VMList.Remove(selectedItem.GoalEntryVM);
-        }
-
         protected override void Save()
         {
             var lToDos = new List<Action<IValueListService>>();
@@ -488,7 +485,6 @@ namespace BeWo.View.Detail
 
             Cache.GetInstance().ClearAllValueListEntries();
         }
-
         private static void EditTreeItem(ValueListEntryVM valueListEntry)
         {
             if (valueListEntry == null) return;
@@ -520,7 +516,6 @@ namespace BeWo.View.Detail
             beWoWindow.rootGroupBox.Header = "Bearbeiten";
             beWoWindow.ShowDialog();
         }
-
         private static void EditItem(TreeView tv, TreeViewItem tvi, object item, bool isNoticeTextBox = false)
         {
             if (item != null)
@@ -550,7 +545,6 @@ namespace BeWo.View.Detail
                 }
             }
         }
-
         private static void UpdateSelectedTreeItemText(TextBoxBase textBox)
         {
             if (!textBox.IsReadOnly)
@@ -561,7 +555,6 @@ namespace BeWo.View.Detail
                 textBox.Padding = new Thickness(1, 3, 1, 3);
             }
         }
-
         private static SupportConceptGoalTreeItem SearchGoalTreeItem(SupportConceptGoalTreeItem supportConceptGoalTreeItem,
             string description, string abbreviation, string notice)
         {
@@ -591,7 +584,6 @@ namespace BeWo.View.Detail
                 ViewModel = vm;
             }));
         }
-
         private void InitGoalCategoriesTreeView()
         {
             var categoriesWithParent = new List<SupportConceptGoalTreeItem>();
@@ -663,7 +655,6 @@ namespace BeWo.View.Detail
 
             GoalTree = iGoalList;
         }
-
         private void TraverseCollection(SupportConceptGoalTreeItem item)
         {
             var result = new List<ValueListEntryDC> { item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract() };
@@ -675,7 +666,6 @@ namespace BeWo.View.Detail
 
             _Children2Delete.AddRange(result);
         }
-
         private void GetAllTreeViewItems()
         {
             foreach (var parent in GoalTree)
@@ -683,7 +673,6 @@ namespace BeWo.View.Detail
                 TraverseTreeViewItem(parent);
             }
         }
-
         private void TraverseTreeViewItem(SupportConceptGoalTreeItem item)
         {
             _TreeViewItemsList.Add(item);
@@ -692,7 +681,6 @@ namespace BeWo.View.Detail
                 TraverseTreeViewItem(child);
             }
         }
-
         private void ImportIcf(SupportConceptGoalDC goal)
         {
             if (goal == null) return;
@@ -702,7 +690,6 @@ namespace BeWo.View.Detail
             if (goal.IsChecked)
                 AddIcf(goal);
         }
-
         private SupportConceptGoalTreeItem AddIcf(SupportConceptGoalDC goal)
         {
             if (goal == null) return null;
@@ -740,88 +727,105 @@ namespace BeWo.View.Detail
                 goal.GoalEntryDC.TypeDescription, goal.GoalEntryDC.Abbreviation, goal.GoalEntryDC.Notice);
         }
 
-
-
-        private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
+        public void AddTreeItemWithControl(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string viewHeader)
         {
-            if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
+            var control = new ValueListEntryEditControl(new ValueListEntryVM(new ValueListEntryDC()), null);
+
+            var beWoWindow = new BeWoWindow();
+
+            control.CancelButtonClicked += () =>
             {
-                return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
-            }
-            else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
-            {
-                if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
+                if (control.ValueListEntry.IsDirty)
                 {
-                    bool test = ziel1.Equals(ziel2);
-                    return ziel1.Description == ziel2.Description;
+                    if (MessageBox.Show("Möchten Sie die Änderung verwerfen?", "Änderungen vorhanden", MessageBoxButton.YesNo, MessageBoxImage.Question) != MessageBoxResult.Yes)
+                        return;
+                    control.ResetValueListEntry();
                 }
-                else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
+                beWoWindow.Close();
+            };
+
+            control.SaveButtonClicked += () =>
+            {
+                var vm = control.ValueListEntry;
+                AddTreeItem(parent, valueListEntryType, vm.Description, vm.Abbreviation, vm.Notice);
+                beWoWindow.Close();
+            };
+
+            beWoWindow.Height = 200;
+            beWoWindow.Width = 500;
+            beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+            beWoWindow.GroupBoxContent = control;
+            beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+            beWoWindow.rootGroupBox.Header = viewHeader;
+            beWoWindow.ShowDialog();
+        }
+        public SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
+        {
+            if (!valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalCategoryType) &&
+                !valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalType))
+                throw new ArgumentOutOfRangeException();
+
+            var vm = ViewModel.NewVM;
+            vm.Type = valueListEntryType;
+            vm.Description = description;
+            vm.Abbreviation = abbreviation;
+            vm.Notice = notice;
+
+            var newItem = new SupportConceptGoalTreeItem
+            {
+                GoalEntryVM = vm,
+                GoalEntryDC = vm.CommitToDataContract(),
+                ParentGoal = parent
+            };
+
+            ViewModel.AddNewVMToList();
+
+            if (parent == null) return newItem;
+
+            vm.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
+            parent.GoalEntryVM = parent.GoalEntryVM;
+            parent.Items.Add(newItem);
+            parent.IsExpanded = true;
+
+            return newItem;
+        }
+        internal void DeleteIndividualGoal(SupportConceptGoalTreeItem selectedItem)
+        {
+            _Children2Delete = new List<ValueListEntryDC>();
+            TraverseCollection(selectedItem);
+
+            var parent = selectedItem.ParentGoal as SupportConceptGoalTreeItem;
+            if (parent != null && parent.Items != null)
+                parent.Items.Remove(selectedItem);
+            else
+                GoalTree.Remove(selectedItem);
+
+            ViewModel.VMList.Remove(selectedItem.GoalEntryVM);
+        }
+        private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, bool force_deep_copy)
+        {
+            if (source == null || parent == null)
+                throw new NotImplementedException("#43298467891364987");
+
+            var wm = source.GoalEntryVM;
+            var node = AddTreeItem(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
+
+            if (_CopyType == MassnahmenTreeCopyType.Subtree || force_deep_copy)
+            {
+                foreach (var child in source.Items)
                 {
-                    return ziel1.Description == ziel2.Description;
+                    CopyTreeItem(node, child, force_deep_copy);
                 }
             }
-            return false;
         }
-
-        private void ToggleButton_Checked(object sender, RoutedEventArgs e)
+        private void MoveTreeItem(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem parent)
         {
-            _Bearbeitungsmodus = true;
-        }
-
-        private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
-        {
-            _Bearbeitungsmodus = false;
-        }
-
-        private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left)
-            {
-                _lastMouseDown = e.GetPosition(TreeView);
-            }
-        }
-
-        private void TreeView_MouseMove(object sender, MouseEventArgs e)
-        {
-            try
-            {
-                if (e.LeftButton == MouseButtonState.Pressed)
-                {
-                    Point currentPosition = e.GetPosition(TreeView);
-
-                    if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
-                        (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
-                    {
-                        _draggedItem = (SupportConceptGoalTreeItem)TreeView.SelectedItem;
-                        if (_draggedItem != null)
-                        {
-                            DragDropEffects finalDropEffect = DragDrop.DoDragDrop(TreeView, _SelectedGoalTreeNode, DragDropEffects.Move);
-                            //Checking target is not null and item is
-                            //dragging(moving)
-                            if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
-                            {
-                                var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
-                                var parent = _parent;
-                                var child = _draggedItem;
-                                
-                                origin_parent.Items.Remove(child);
-                                child.GoalEntryVM.ParentEntry = parent.GoalEntryDC ?? parent.GoalEntryVM.CommitToDataContract();
-                                parent.Items.Add(_draggedItem);
-                                parent.IsExpanded = true;
-                                TreeView.RefreshUI();                                
-                            }
-                        }
-                    }
-                }
-            }
-            catch (Exception)
-            {
-            }
+            CopyTreeItem(parent, child, true);
+            DeleteIndividualGoal(child);
         }
 
         private SupportConceptGoalTreeItem GetNearestContainer(UIElement element)
         {
-            // Walk up the element tree to the nearest tree view item.
             TreeViewItem container = element as TreeViewItem;
             while ((container == null) && (element != null))
             {
@@ -829,9 +833,7 @@ namespace BeWo.View.Detail
                 container = element as TreeViewItem;
             }
             return container.DataContext as SupportConceptGoalTreeItem;
-            //return container;
         }
-
         private bool CheckDropTarget(SupportConceptGoalTreeItem _sourceItem, SupportConceptGoalTreeItem _targetItem)
         {
             if (_sourceItem == null || _targetItem == null)
@@ -854,52 +856,25 @@ namespace BeWo.View.Detail
             }
             return _isEqual;
         }
-
-        private void TreeView_PreviewDragOver(object sender, DragEventArgs e)
+        private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
         {
-            try
+            if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
             {
-                Point currentPosition = e.GetPosition(TreeView);
-
-                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 0.0) ||
-                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 0.0))
+                return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
+            }
+            else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
+            {
+                if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
                 {
-                    // Verify that this is a valid drop and then store the drop target
-                    var item = GetNearestContainer(e.OriginalSource as UIElement);
-                    if (CheckDropTarget(_draggedItem, item))
-                    {
-                        e.Effects = DragDropEffects.Move;
-                    }
-                    else
-                    {
-                        e.Effects = DragDropEffects.None;
-                    }
+                    bool test = ziel1.Equals(ziel2);
+                    return ziel1.Description == ziel2.Description;
                 }
-                e.Handled = true;
-            }
-            catch (Exception)
-            {
-            }
-        }
-
-        private void TreeView_PreviewDrop(object sender, DragEventArgs e)
-        {
-            try
-            {
-                e.Effects = DragDropEffects.None;
-                e.Handled = true;
-
-                // Verify that this is a valid drop and then store the drop target
-                var target = GetNearestContainer(e.OriginalSource as UIElement);
-                if (target != null && _draggedItem != null)
+                else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
                 {
-                    _parent = target;
-                    e.Effects = DragDropEffects.Move;
+                    return ziel1.Description == ziel2.Description;
                 }
             }
-            catch (Exception)
-            {
-            }
+            return false;
         }
     }
 

From 663cc97f118e42554891386391ee878e61b5c4cb Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Fri, 31 Mar 2023 16:43:16 +0200
Subject: [PATCH 4/7] bug fix : ziel eigene tiefere Ebene verschieben

---
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index aa041a89c..a28c38b05 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -345,7 +345,10 @@ namespace BeWo.View.Detail
                             //dragging(moving)
                             if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
                             {
-                                MoveTreeItem(_draggedItem, _parent);
+                                if (ContainsItem(_draggedItem, _parent))
+                                    MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
+                                else
+                                    MoveTreeItem(_draggedItem, _parent);
 
                                 //var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
                                 //var parent = _parent;
@@ -876,6 +879,20 @@ namespace BeWo.View.Detail
             }
             return false;
         }
+        private bool ContainsItem(SupportConceptGoalDC root, SupportConceptGoalDC item)
+        {
+            if (root == item)
+                return true;
+
+            if(root.Children is object && root.Children.Any())
+            foreach (var child in root.Children)
+            {
+                if (ContainsItem(child, item))
+                    return true;
+            }
+
+            return false;
+        }
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

From e1ed848c7807664313f021aee92dd7fe363625ee Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Fri, 12 May 2023 09:51:43 +0200
Subject: [PATCH 5/7] Bearbeitungsmodus auf Drag and Drop angewandt. Bugs
 behoben.

---
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 75 +++++++++++++------
 1 file changed, 53 insertions(+), 22 deletions(-)

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index a28c38b05..23c74f086 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -52,7 +52,7 @@ namespace BeWo.View.Detail
 
             DataContext = this;
 
-            _Bearbeitungsmodus = false;
+            Bearbeitungsmodus = false;
         }
 
         public static bool IsAllowedToEditGoals => BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConcept_AllowEditGoals);
@@ -68,6 +68,24 @@ namespace BeWo.View.Detail
             }
         }
 
+        public bool Bearbeitungsmodus
+        {
+            get
+            {
+                return _Bearbeitungsmodus;
+            }
+            set
+            {
+                // Wenn True aber keine Rechte
+                if (value && !IsAllowedToEditGoals)
+                    return;
+
+                _Bearbeitungsmodus = value;
+
+                TreeView.AllowDrop = _Bearbeitungsmodus;
+            }
+        }
+
         public ObservableSortCollection<SupportConceptGoalTreeItem> GoalTree { get; private set; }
 
         public override bool IsDirty => ViewModel != null && ViewModel.IsDirty;
@@ -194,11 +212,15 @@ namespace BeWo.View.Detail
                     }
                     else if (menuitem.Header.Equals("Einfügen"))
                     {
-                        menuitem.IsEnabled = goal != null && !goal.IsGoal;
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null;
                     }
                     else if (menuitem.Header.Equals("Teilbaum kopieren"))
                     {
-                        menuitem.IsEnabled = goal != null && !goal.IsGoal;
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus;
+                    }
+                    else if (menuitem.Header.Equals("Knoten kopieren"))
+                    {
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus;
                     }
 
                     menuitem.IsEnabled = menuitem.IsEnabled && IsAllowedToEditGoals;
@@ -310,18 +332,16 @@ namespace BeWo.View.Detail
 
         private void ToggleButton_Checked(object sender, RoutedEventArgs e)
         {
-            _Bearbeitungsmodus = true;
-            TreeView.AllowDrop = true;
+            Bearbeitungsmodus = true;
         }
         private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
         {
-            _Bearbeitungsmodus = false;
-            TreeView.AllowDrop = false;
+            Bearbeitungsmodus = false;
         }
 
         private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
         {
-            if (e.ChangedButton == MouseButton.Left)
+            if (e.ChangedButton == MouseButton.Left && Bearbeitungsmodus)
             {
                 _lastMouseDown = e.GetPosition(TreeView);
             }
@@ -330,7 +350,7 @@ namespace BeWo.View.Detail
         {
             try
             {
-                if (e.LeftButton == MouseButtonState.Pressed)
+                if (e.LeftButton == MouseButtonState.Pressed && Bearbeitungsmodus)
                 {
                     Point currentPosition = e.GetPosition(TreeView);
 
@@ -835,7 +855,7 @@ namespace BeWo.View.Detail
                 element = VisualTreeHelper.GetParent(element) as UIElement;
                 container = element as TreeViewItem;
             }
-            return container.DataContext as SupportConceptGoalTreeItem;
+            return container?.DataContext as SupportConceptGoalTreeItem;
         }
         private bool CheckDropTarget(SupportConceptGoalTreeItem _sourceItem, SupportConceptGoalTreeItem _targetItem)
         {
@@ -849,14 +869,20 @@ namespace BeWo.View.Detail
 
             bool _isEqual = false;
             // Unterschiedlicher Parent
-            if (source.GoalEntryVM.ParentEntry.ValueListEntryOid.Value != target.GoalEntryDC.ValueListEntryOid.Value)
+
+            if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
             {
-                // Nicht eigener
-                if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
-                {
-                    _isEqual = true;
-                }
+                _isEqual = true;
             }
+
+            //if (source.GoalEntryVM.ParentEntry.ValueListEntryOid.Value != target.GoalEntryDC.ValueListEntryOid.Value)
+            //{
+            //    // Nicht eigener
+            //    if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
+            //    {
+            //        _isEqual = true;
+            //    }
+            //}
             return _isEqual;
         }
         private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
@@ -884,15 +910,20 @@ namespace BeWo.View.Detail
             if (root == item)
                 return true;
 
-            if(root.Children is object && root.Children.Any())
-            foreach (var child in root.Children)
-            {
-                if (ContainsItem(child, item))
-                    return true;
-            }
+            if (root.Children is object && root.Children.Any())
+                foreach (var child in root.Children)
+                {
+                    if (ContainsItem(child, item))
+                        return true;
+                }
 
             return false;
         }
+
+        private void TreeView_DragEnter(object sender, DragEventArgs e)
+        {
+
+        }
     }
 
     public class ValueListEntryTypeToFontWeightConverter : IValueConverter

From 02d276b6e8751b4fca380d1ca425dcc6b97c7d88 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Mon, 22 May 2023 10:19:40 +0200
Subject: [PATCH 6/7] Umbennenung + Selbe ID beim verschieben

---
 BeWo/View/Detail/MassnahmenTreeViewView.xaml  |  4 +-
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 94 +++++++++++++++----
 2 files changed, 78 insertions(+), 20 deletions(-)

diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
index aa81659a3..22cdbd327 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml
@@ -30,12 +30,12 @@
                     </MenuItem.Icon>
                 </MenuItem>
                 <Separator />
-                <MenuItem Header="Knoten kopieren">
+                <MenuItem Header="Einzelnes Element kopieren">
                     <MenuItem.Icon>
                         <Image Source="..\..\Ressources\Icons\Copy24.png"/>
                     </MenuItem.Icon>
                 </MenuItem>
-                <MenuItem Header="Teilbaum kopieren">
+                <MenuItem Header="Elementbaum kopieren">
                     <MenuItem.Icon>
                         <Image Source="..\..\Ressources\Icons\Copy24.png"/>
                     </MenuItem.Icon>
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index 23c74f086..c43456e38 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -162,14 +162,14 @@ namespace BeWo.View.Detail
                     if (selectedItem != null)
                         EditTreeItem(selectedItem.GoalEntryVM);
                     break;
-                case "Knoten kopieren":
+                case "Einzelnes Element kopieren":
                     if (selectedItem != null)
                     {
                         _CopyItem = selectedItem;
                         _CopyType = MassnahmenTreeCopyType.Node;
                     }
                     break;
-                case "Teilbaum kopieren":
+                case "Elementbaum kopieren":
                     if (selectedItem != null)
                     {
                         _CopyItem = selectedItem;
@@ -184,7 +184,7 @@ namespace BeWo.View.Detail
                     else
                     {
                         if (selectedItem != null)
-                            CopyTreeItem(selectedItem, _CopyItem, false);
+                            StartCopyItem(selectedItem, _CopyItem);
                     }
 
                     break;
@@ -212,15 +212,15 @@ namespace BeWo.View.Detail
                     }
                     else if (menuitem.Header.Equals("Einfügen"))
                     {
-                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null;
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null && (_CopyType == MassnahmenTreeCopyType.Node || !ContainsItem(_CopyItem, goal));
                     }
-                    else if (menuitem.Header.Equals("Teilbaum kopieren"))
+                    else if (menuitem.Header.Equals("Elementbaum kopieren"))
                     {
                         menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus;
                     }
-                    else if (menuitem.Header.Equals("Knoten kopieren"))
+                    else if (menuitem.Header.Equals("Einzelnes Element kopieren"))
                     {
-                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus;
+                        menuitem.IsEnabled = goal != null && Bearbeitungsmodus;
                     }
 
                     menuitem.IsEnabled = menuitem.IsEnabled && IsAllowedToEditGoals;
@@ -339,6 +339,21 @@ namespace BeWo.View.Detail
             Bearbeitungsmodus = false;
         }
 
+        private void StartCopyItem(SupportConceptGoalTreeItem _item, SupportConceptGoalTreeItem _copy)
+        {
+            if (ContainsItem(_copy, _item))
+                MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
+            else
+                CopyTreeItem(_item, _copy, false);
+
+        }
+        private void StartMoveItem(SupportConceptGoalTreeItem _draggedItem, SupportConceptGoalTreeItem _parent)
+        {
+            if (ContainsItem(_draggedItem, _parent))
+                MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
+            else
+                MoveTreeItem(_draggedItem, _parent);
+        }
         private void TreeView_MouseDown(object sender, MouseButtonEventArgs e)
         {
             if (e.ChangedButton == MouseButton.Left && Bearbeitungsmodus)
@@ -365,10 +380,8 @@ namespace BeWo.View.Detail
                             //dragging(moving)
                             if ((finalDropEffect == DragDropEffects.Move) && (_parent != null) && _parent != _draggedItem)
                             {
-                                if (ContainsItem(_draggedItem, _parent))
-                                    MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
-                                else
-                                    MoveTreeItem(_draggedItem, _parent);
+                                StartMoveItem(_draggedItem, _parent);
+                                
 
                                 //var origin_parent = _draggedItem.ParentGoal as SupportConceptGoalTreeItem;
                                 //var parent = _parent;
@@ -831,11 +844,12 @@ namespace BeWo.View.Detail
                 throw new NotImplementedException("#43298467891364987");
 
             var wm = source.GoalEntryVM;
+            var childs = source.Items.ToList();
             var node = AddTreeItem(parent, wm.Type, wm.Description, wm.Abbreviation, wm.Notice);
 
             if (_CopyType == MassnahmenTreeCopyType.Subtree || force_deep_copy)
             {
-                foreach (var child in source.Items)
+                foreach (var child in childs)
                 {
                     CopyTreeItem(node, child, force_deep_copy);
                 }
@@ -843,8 +857,24 @@ namespace BeWo.View.Detail
         }
         private void MoveTreeItem(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem parent)
         {
-            CopyTreeItem(parent, child, true);
-            DeleteIndividualGoal(child);
+            var ex_parent = FindParent(child);
+
+            if (ex_parent == parent)
+                return;
+
+            // Entferne child aus Ex-Parent
+            ex_parent.Items.Remove(child);
+            
+            // Füge child parent hinzu
+            parent.Items.Add(child);
+
+            // Setze child Parent Entry
+            parent.GoalEntryDC = parent.GoalEntryVM.CommitToDataContract();
+            child.GoalEntryVM.ParentEntry = parent.GoalEntryDC;
+
+
+            //CopyTreeItem(parent, child, true);
+            //DeleteIndividualGoal(child);
         }
 
         private SupportConceptGoalTreeItem GetNearestContainer(UIElement element)
@@ -905,13 +935,13 @@ namespace BeWo.View.Detail
             }
             return false;
         }
-        private bool ContainsItem(SupportConceptGoalDC root, SupportConceptGoalDC item)
+        private bool ContainsItem(SupportConceptGoalTreeItem root, SupportConceptGoalTreeItem item)
         {
             if (root == item)
                 return true;
 
-            if (root.Children is object && root.Children.Any())
-                foreach (var child in root.Children)
+            if (root.Items is object && root.Items.Any())
+                foreach (var child in root.Items)
                 {
                     if (ContainsItem(child, item))
                         return true;
@@ -920,9 +950,37 @@ namespace BeWo.View.Detail
             return false;
         }
 
-        private void TreeView_DragEnter(object sender, DragEventArgs e)
+        private SupportConceptGoalTreeItem FindParent(SupportConceptGoalTreeItem lostchild)
         {
+            foreach (var root_goal in GoalTree)
+            {
+                if(FindParent(null, root_goal, lostchild, out var found))
+                {
+                    return found;
+                }
+            }
 
+            throw new IndexOutOfRangeException("#3432432431a4 - Parent Support Goal Tree Item not found");
+        }
+
+        private bool FindParent(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem current, SupportConceptGoalTreeItem lostchild, out SupportConceptGoalTreeItem foundchild)
+        {
+            if (current == lostchild)
+            {
+                foundchild = parent;
+                return true;
+            }
+
+            foreach (var current_child in current.Items)
+            {
+                if(FindParent(current, current_child, lostchild, out foundchild))
+                {
+                    return true;
+                }
+            }
+
+            foundchild = null;
+            return false;
         }
     }
 

From a0dd8ff853c6674bf01344089b69f2d1d2b723e0 Mon Sep 17 00:00:00 2001
From: rene <rene.evertz@ownsoft.de>
Date: Mon, 22 May 2023 11:59:43 +0200
Subject: [PATCH 7/7] Renames + Bug fix (wiederholtes Tauschen wird nicht
 geupdatet)

---
 BeWo/Core/SupportConceptGoalTreeItem.cs       |  13 +-
 .../Detail/MassnahmenTreeViewView.xaml.cs     | 124 ++++++++----------
 2 files changed, 59 insertions(+), 78 deletions(-)

diff --git a/BeWo/Core/SupportConceptGoalTreeItem.cs b/BeWo/Core/SupportConceptGoalTreeItem.cs
index 35681ccdb..b789e160c 100644
--- a/BeWo/Core/SupportConceptGoalTreeItem.cs
+++ b/BeWo/Core/SupportConceptGoalTreeItem.cs
@@ -1,19 +1,20 @@
-using System.ComponentModel;
-
+using BeWo.ViewModel;
 using BS.Shared;
-
-using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace BeWo.Core
 {
+    [DebuggerDisplay("{GoalEntryVM.Abbreviation}: {GoalEntryVM.Description}")]
     public class SupportConceptGoalTreeItem : SupportConceptGoalDC
     {
         private ValueListEntryVM _GoalEntryVM;
         private BindingList<SupportConceptGoalTreeItem> _Children;
         private bool _ShowNotice;
 
+        public SupportConceptGoalTreeItem() { }
+
         public ValueListEntryVM GoalEntryVM
         {
             get => _GoalEntryVM;
@@ -56,7 +57,7 @@ namespace BeWo.Core
                 return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
             }
         }
-        
+
         public bool IsOfType(ValueListEntryType t)
         {
 
diff --git a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
index c43456e38..499ddfb60 100644
--- a/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
+++ b/BeWo/View/Detail/MassnahmenTreeViewView.xaml.cs
@@ -154,7 +154,7 @@ namespace BeWo.View.Detail
                                             "Alle verknüpften Eintragungen in der Zeiterfassung bleiben erhalten.\n\n" +
                                             "Wollen Sie " + zielOderMassnahme + " '" + selectedItem.GoalEntryVM?.DisplayName + "' wirklich löschen?", "Löschen bestätigen", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.Yes)
                         {
-                            DeleteIndividualGoal(selectedItem);
+                            DeleteTreeItem(selectedItem);
                         }
                     }
                     break;
@@ -212,7 +212,7 @@ namespace BeWo.View.Detail
                     }
                     else if (menuitem.Header.Equals("Einfügen"))
                     {
-                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null && (_CopyType == MassnahmenTreeCopyType.Node || !ContainsItem(_CopyItem, goal));
+                        menuitem.IsEnabled = goal != null && !goal.IsGoal && Bearbeitungsmodus && _CopyItem != null && (_CopyType == MassnahmenTreeCopyType.Node || !ContainsTreeItem(_CopyItem, goal));
                     }
                     else if (menuitem.Header.Equals("Elementbaum kopieren"))
                     {
@@ -341,7 +341,7 @@ namespace BeWo.View.Detail
 
         private void StartCopyItem(SupportConceptGoalTreeItem _item, SupportConceptGoalTreeItem _copy)
         {
-            if (ContainsItem(_copy, _item))
+            if (ContainsTreeItem(_copy, _item))
                 MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
             else
                 CopyTreeItem(_item, _copy, false);
@@ -349,7 +349,7 @@ namespace BeWo.View.Detail
         }
         private void StartMoveItem(SupportConceptGoalTreeItem _draggedItem, SupportConceptGoalTreeItem _parent)
         {
-            if (ContainsItem(_draggedItem, _parent))
+            if (ContainsTreeItem(_draggedItem, _parent))
                 MessageBox.Show("Kopieren in tiefere Ziele/Maßnamhen nicht möglich!");
             else
                 MoveTreeItem(_draggedItem, _parent);
@@ -407,8 +407,10 @@ namespace BeWo.View.Detail
             {
                 Point currentPosition = e.GetPosition(TreeView);
 
-                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 0.0) ||
-                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 0.0))
+                e.Effects = DragDropEffects.None;
+
+                if ((Math.Abs(currentPosition.X - _lastMouseDown.X) > 10.0) ||
+                   (Math.Abs(currentPosition.Y - _lastMouseDown.Y) > 10.0))
                 {
                     // Verify that this is a valid drop and then store the drop target
                     var item = GetNearestContainer(e.OriginalSource as UIElement);
@@ -636,6 +638,7 @@ namespace BeWo.View.Detail
                     GoalEntryVM = ViewModel.VMList.FirstOrDefault(f => f.DataContract.ValueListEntryOid.Value == category.GoalEntryDC.ValueListEntryOid.Value),
                     IsExpanded = true,
                     ParentGoal = category.ParentGoal
+
                 };
                 if (item.GoalEntryDC.ParentOid == null)
                 {
@@ -691,17 +694,7 @@ namespace BeWo.View.Detail
 
             GoalTree = iGoalList;
         }
-        private void TraverseCollection(SupportConceptGoalTreeItem item)
-        {
-            var result = new List<ValueListEntryDC> { item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract() };
-
-            foreach (var child in item.Items)
-            {
-                TraverseCollection(child);
-            }
-
-            _Children2Delete.AddRange(result);
-        }
+        
         private void GetAllTreeViewItems()
         {
             foreach (var parent in GoalTree)
@@ -795,7 +788,8 @@ namespace BeWo.View.Detail
             beWoWindow.rootGroupBox.Header = viewHeader;
             beWoWindow.ShowDialog();
         }
-        public SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
+        
+        private SupportConceptGoalTreeItem AddTreeItem(SupportConceptGoalTreeItem parent, ValueListEntryType valueListEntryType, string description, string abbreviation, string notice)
         {
             if (!valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalCategoryType) &&
                 !valueListEntryType.HasFlag(ValueListEntryType.SupportConceptGoalType))
@@ -825,10 +819,10 @@ namespace BeWo.View.Detail
 
             return newItem;
         }
-        internal void DeleteIndividualGoal(SupportConceptGoalTreeItem selectedItem)
+        private void DeleteTreeItem(SupportConceptGoalTreeItem selectedItem)
         {
             _Children2Delete = new List<ValueListEntryDC>();
-            TraverseCollection(selectedItem);
+            DeleteTreeItemRec(selectedItem);
 
             var parent = selectedItem.ParentGoal as SupportConceptGoalTreeItem;
             if (parent != null && parent.Items != null)
@@ -838,6 +832,17 @@ namespace BeWo.View.Detail
 
             ViewModel.VMList.Remove(selectedItem.GoalEntryVM);
         }
+        private void DeleteTreeItemRec(SupportConceptGoalTreeItem item)
+        {
+            var result = new List<ValueListEntryDC> { item.GoalEntryDC ?? item.GoalEntryVM.CommitToDataContract() };
+
+            foreach (var child in item.Items)
+            {
+                DeleteTreeItemRec(child);
+            }
+
+            _Children2Delete.AddRange(result);
+        }
         private void CopyTreeItem(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem source, bool force_deep_copy)
         {
             if (source == null || parent == null)
@@ -857,7 +862,7 @@ namespace BeWo.View.Detail
         }
         private void MoveTreeItem(SupportConceptGoalTreeItem child, SupportConceptGoalTreeItem parent)
         {
-            var ex_parent = FindParent(child);
+            var ex_parent = GetParent(child);
 
             if (ex_parent == parent)
                 return;
@@ -871,6 +876,7 @@ namespace BeWo.View.Detail
             // Setze child Parent Entry
             parent.GoalEntryDC = parent.GoalEntryVM.CommitToDataContract();
             child.GoalEntryVM.ParentEntry = parent.GoalEntryDC;
+            child.ParentGoal = parent;
 
 
             //CopyTreeItem(parent, child, true);
@@ -892,50 +898,15 @@ namespace BeWo.View.Detail
             if (_sourceItem == null || _targetItem == null)
                 return false;
 
-            //Check whether the target item is meeting your condition
+            if (_targetItem.Items.Contains(_sourceItem))
+                return false;
 
-            var source = _sourceItem as SupportConceptGoalTreeItem;
-            var target = _targetItem as SupportConceptGoalTreeItem;
+            if (FindAncestor(_sourceItem, _targetItem))
+                return false;
 
-            bool _isEqual = false;
-            // Unterschiedlicher Parent
-
-            if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
-            {
-                _isEqual = true;
-            }
-
-            //if (source.GoalEntryVM.ParentEntry.ValueListEntryOid.Value != target.GoalEntryDC.ValueListEntryOid.Value)
-            //{
-            //    // Nicht eigener
-            //    if (!IstGleichesZiel(source.GoalEntryVM, target.GoalEntryVM))
-            //    {
-            //        _isEqual = true;
-            //    }
-            //}
-            return _isEqual;
+            return _sourceItem != _targetItem;
         }
-        private bool IstGleichesZiel(ValueListEntryVM ziel1, ValueListEntryVM ziel2)
-        {
-            if (ziel1.DataContract.ValueListEntryOid.HasValue && ziel2.DataContract.ValueListEntryOid.HasValue)
-            {
-                return ziel1.DataContract.ValueListEntryOid.Value == ziel2.DataContract.ValueListEntryOid.Value;
-            }
-            else if (!ziel1.DataContract.ValueListEntryOid.HasValue && !ziel2.DataContract.ValueListEntryOid.HasValue)
-            {
-                if (ziel1.ParentEntry != null && ziel2.ParentEntry != null && ziel1.ParentEntry.Equals(ziel1.ParentEntry))
-                {
-                    bool test = ziel1.Equals(ziel2);
-                    return ziel1.Description == ziel2.Description;
-                }
-                else if (ziel1.ParentEntry == null && ziel2.ParentEntry == null)
-                {
-                    return ziel1.Description == ziel2.Description;
-                }
-            }
-            return false;
-        }
-        private bool ContainsItem(SupportConceptGoalTreeItem root, SupportConceptGoalTreeItem item)
+        private bool ContainsTreeItem(SupportConceptGoalTreeItem root, SupportConceptGoalTreeItem item)
         {
             if (root == item)
                 return true;
@@ -943,26 +914,35 @@ namespace BeWo.View.Detail
             if (root.Items is object && root.Items.Any())
                 foreach (var child in root.Items)
                 {
-                    if (ContainsItem(child, item))
+                    if (ContainsTreeItem(child, item))
                         return true;
                 }
 
             return false;
         }
 
-        private SupportConceptGoalTreeItem FindParent(SupportConceptGoalTreeItem lostchild)
+        private bool FindAncestor(SupportConceptGoalTreeItem ancestor, SupportConceptGoalTreeItem child)
         {
-            foreach (var root_goal in GoalTree)
-            {
-                if(FindParent(null, root_goal, lostchild, out var found))
-                {
-                    return found;
-                }
-            }
+            if (child == null || ancestor == null)
+                return false;
+
+            var parent = GetParent(child);
+
+            if (parent is object)
+                return parent == ancestor || FindAncestor(ancestor, parent);
+
+            return false;
+        }
+
+        private SupportConceptGoalTreeItem GetParent(SupportConceptGoalTreeItem lostchild)
+        {
+            if (lostchild.ParentGoal is SupportConceptGoalTreeItem item)
+                return item;
+
+            return null;
 
             throw new IndexOutOfRangeException("#3432432431a4 - Parent Support Goal Tree Item not found");
         }
-
         private bool FindParent(SupportConceptGoalTreeItem parent, SupportConceptGoalTreeItem current, SupportConceptGoalTreeItem lostchild, out SupportConceptGoalTreeItem foundchild)
         {
             if (current == lostchild)