From c85e21a5eab9fce08a714cc01a9fc555b5d9c162 Mon Sep 17 00:00:00 2001
From: Lyndon <lyndonj@gmx.de>
Date: Mon, 1 Jul 2019 15:11:19 +0200
Subject: [PATCH] =?UTF-8?q?Bugfixes=20f=C3=BCr=20die=20Anzeige=20der=20Ter?=
 =?UTF-8?q?mine=20im=20HomeView=20Buttons=20zur=20Erzeugung=20und=20dem=20?=
 =?UTF-8?q?L=C3=B6schen=20von=20Testterminen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWo/BeWo.csproj                              |   1 +
 BeWo/BeWoApp.xaml.cs                          |   3 +-
 BeWo/Core/BeWoUtils.cs                        |   1 +
 BeWo/MainControl.xaml.cs                      |   8 +-
 BeWo/MainWindow.xaml.cs                       |   5 +-
 BeWo/Scheduler/Utils/AppointmentExtensions.cs |   5 +
 .../View/AbstractAppointmentEditForm.cs       |   2 +-
 BeWo/Scheduler/View/NewSchedulerView.xaml     |  80 +-
 BeWo/Scheduler/View/NewSchedulerView.xaml.cs  | 340 ++++-----
 .../View/SchedulerAppointmentEditForm.xaml    |  93 +--
 .../View/SchedulerAppointmentEditForm.xaml.cs |  42 +-
 .../Scheduler/ViewModel/CustomFieldStorage.cs |  15 +
 BeWo/ServiceProxy/Generated.cs                |  37 +
 BeWo/ServiceProxy/ServiceFacade.cs            |   9 +-
 BeWo/View/HomeDragPanelView.xaml              | 246 +++---
 BeWo/View/HomeDragPanelView.xaml.cs           | 573 ++++++++++++--
 BeWo/View/Master/SchedulerMasterView.xaml     |   8 +-
 BeWo/View/Master/SchedulerMasterView.xaml.cs  |  17 +-
 BeWo/ownChat/ChatView.xaml.cs                 |  36 +-
 BeWoPlanerMobil/BeWoPlanerMobil.csproj        |   1 +
 BeWoPlanerMobil/Content/BeWoMobileStyle.css   |   6 +-
 BeWoPlanerMobil/Scripts/mainView.js           |  52 +-
 BeWoPlanerMobil/Util/JSONCustomer.cs          |   7 +-
 BeWoPlanerMobil/Views/Main/Main.cshtml        |  28 +-
 Data/Access/SearchDAO.cs                      |  90 ++-
 Data/Data.csproj                              |   2 +
 Data/DefaultHibernateSessionManager.cs        |   9 +-
 .../Entities/Employee2SchedulerAppointment.cs |  49 +-
 Data/Entities/SchedulerAppointment.cs         |  11 +-
 Data/WCFHibernateSessionManager.cs            |   9 +-
 Host/Multitenancy/demo.config                 |   4 +-
 Service/Core/Utils.cs                         |  22 +
 Service/ServiceContracts/IResourceService.cs  |  12 +
 .../EmployeeServiceImp.cs                     |   3 +-
 .../OperationsServiceImp.cs                   |  90 ++-
 .../ResourceServiceImp.cs                     | 720 +++++++++++++++++-
 Shared/BeWoEntityEnums.cs                     |   3 +-
 Shared/Core/DateTimeUtils.cs                  | 106 ++-
 Shared/Core/Utils.cs                          | 100 ++-
 .../DataContracts/SchedulerAppointmentDC.cs   |   8 +-
 Shared/Extensions/DateTimeExtensions.cs       |  34 +
 41 files changed, 2343 insertions(+), 544 deletions(-)

diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj
index e5656c134..d9cc1558a 100644
--- a/BeWo/BeWo.csproj
+++ b/BeWo/BeWo.csproj
@@ -606,6 +606,7 @@
       <DependentUpon>ProxyLoginView.xaml</DependentUpon>
     </Compile>
     <Compile Include="Scheduler\Utils\AppointmentExtensions.cs" />
+    <Compile Include="Scheduler\Utils\Utils.cs" />
     <Compile Include="Scheduler\ViewModel\CustomFieldStorage.cs" />
     <Compile Include="SchulbegleitenderDienst\SchulbegleitenderDienstEmployeeView.xaml.cs">
       <DependentUpon>SchulbegleitenderDienstEmployeeView.xaml</DependentUpon>
diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs
index 52210e7c3..d5a355832 100644
--- a/BeWo/BeWoApp.xaml.cs
+++ b/BeWo/BeWoApp.xaml.cs
@@ -659,7 +659,6 @@ namespace BeWo
 			}
 		}
 
-
 		internal void FirePropertyChanged(string pPropertyName)
 		{
 			if (PropertyChanged != null)
@@ -985,7 +984,7 @@ namespace BeWo
 #else
                 Login login = new Login(BeWoApp.Tenant);
 #endif
-                chatServerURL = login._serverUrl;
+                chatServerURL = login.ServerUrl;
             }
             return chatServerURL;
             
diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index 3e043849b..9b68ee089 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -52,6 +52,7 @@ using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.DocumentViewer;
 using DevExpress.Xpf.Printing.PreviewControl.Bars;
 using DevExpress.XtraScheduler;
+using Utils = BS.Shared.Core.Utils;
 
 namespace BeWo.Core
 {
diff --git a/BeWo/MainControl.xaml.cs b/BeWo/MainControl.xaml.cs
index e3b44636a..848b9f4f0 100644
--- a/BeWo/MainControl.xaml.cs
+++ b/BeWo/MainControl.xaml.cs
@@ -923,12 +923,12 @@ namespace BeWo
             //Hier das mit Chat Refreshen 
             if (BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null)
             {
-
                 if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null &&
-                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer != null)
                 {
-                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
-                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.disableKontaktNachrichtenThread = true;
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer.Stop();
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer = null;
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.ShouldInterruptContactsThread = true;
                 }
 
                 if (BeWoApp.MainControl.HomeView.ServiceChatView.ServiceChat._emojiView != null)
diff --git a/BeWo/MainWindow.xaml.cs b/BeWo/MainWindow.xaml.cs
index 413e51823..dbcc36e9e 100644
--- a/BeWo/MainWindow.xaml.cs
+++ b/BeWo/MainWindow.xaml.cs
@@ -82,9 +82,10 @@ namespace BeWo
             if(BeWoApp.MainControl != null && BeWoApp.MainControl.HomeView.ServiceChatView != null) {
 
                 if (BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl != null && 
-                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread != null)
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer != null)
                 {
-                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.newThread = null;
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer.Stop();
+                    BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.GlobalListeningThreadtimer = null;
                     //BeWoApp.MainControl.HomeView.ServiceChatView.ChatMainControl.disableKontaktNachrichtenThread = true;
                 }
 
diff --git a/BeWo/Scheduler/Utils/AppointmentExtensions.cs b/BeWo/Scheduler/Utils/AppointmentExtensions.cs
index d04cd8980..af5f2c007 100644
--- a/BeWo/Scheduler/Utils/AppointmentExtensions.cs
+++ b/BeWo/Scheduler/Utils/AppointmentExtensions.cs
@@ -85,6 +85,11 @@ namespace BeWo.Scheduler.Utils
             return appointment.GetCustomFieldStorage()?.Originator;
         }
 
+        public static long? CF_SchedulerAppointmentOid(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.SchedulerAppointmentOid;
+        }
+
 
         
         
diff --git a/BeWo/Scheduler/View/AbstractAppointmentEditForm.cs b/BeWo/Scheduler/View/AbstractAppointmentEditForm.cs
index 6e9f9d438..018d08d29 100644
--- a/BeWo/Scheduler/View/AbstractAppointmentEditForm.cs
+++ b/BeWo/Scheduler/View/AbstractAppointmentEditForm.cs
@@ -15,7 +15,7 @@ namespace BeWo.Scheduler.View
 {
     public class AbstractAppointmentEditForm : UserControl
     {
-	    protected AbstractAppointmentEditForm() { }
+	    public AbstractAppointmentEditForm() { }
         
         public AbstractAppointmentEditForm(SchedulerControl schedulerControl, Appointment appointment)
         {
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml b/BeWo/Scheduler/View/NewSchedulerView.xaml
index f2c17be99..97a7e6be4 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml
@@ -23,7 +23,7 @@
 			<view:AppointmentToolTipConverter x:Key="AppointmentToolTipConverter" />
 			<view:WidthAdditionMultiConverter x:Key="WidthAdditionMultiConverter" />
 			<view:FilterBackgroundConverter x:Key="DickbuttConverter" />
-      <view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
+            <view:EmployeeBrushConverter x:Key="EmployeeBrushConverter" />
 			<view:AppointmentBorderZusageConverter x:Key="AppointmentBorderZusageConverter" />
 			<view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
 			
@@ -265,8 +265,8 @@
                         <dxschint:HorizontalAppointmentEndClockControl Grid.Row="0" Grid.Column="2" VerticalAlignment="Top" ViewInfo="{Binding}" Foreground="Black" Margin="0,6,0,0" />
 
                         <TextBlock Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="4" Text="{Binding Subject}" VerticalAlignment="Center"
-			                             dxschint:VerticalAppointmentContentPanel.AlwaysOnNewRow="True" TextWrapping="Wrap" Margin="11,6,0,0"
-			                             Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
+			                       dxschint:VerticalAppointmentContentPanel.AlwaysOnNewRow="True" TextWrapping="Wrap" Margin="11,6,0,0"
+			                       Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
 
                         <dxschint:AppointmentImagesControl Grid.Row="0" Grid.Column="4" Margin="0,4,10,0" ViewInfo="{Binding}" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" />
                     </Grid>
@@ -282,16 +282,16 @@
 						<ColumnDefinition Width="Auto" />
 					</Grid.ColumnDefinitions>
 					<StackPanel Grid.Column="0" Orientation="Horizontal" VerticalAlignment="Center">
-            <dxschint:AppointmentContinueStartDateControl ViewInfo="{Binding}" Margin="12, 4, 0, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
+                    <dxschint:AppointmentContinueStartDateControl ViewInfo="{Binding}" Margin="12, 4, 0, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
 						<dxschint:HorizontalAppointmentStartClockControl ViewInfo="{Binding}" Margin="12, 4, 0, 2" VerticalAlignment="Center" />
 					</StackPanel>
 					<dxschint:HorizontalAppointmentContentPanel Grid.Column="1" ClipToBounds="True" VerticalAlignment="Center" Margin="2,0,2,0">
 						<dxschint:AppointmentImagesControl HorizontalAlignment="Center" ViewInfo="{Binding}" Orientation="Horizontal" />
-            <TextBlock Text="{Binding Subject}" VerticalAlignment="Center" TextWrapping="Wrap" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" Margin="8, 2, 0, 0" />
+                        <TextBlock Text="{Binding Subject}" VerticalAlignment="Center" TextWrapping="Wrap" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" Margin="8, 2, 0, 0" />
 					</dxschint:HorizontalAppointmentContentPanel>
 					<StackPanel Grid.Column="2" Orientation="Horizontal" VerticalAlignment="Center">
 						<dxschint:HorizontalAppointmentEndClockControl ViewInfo="{Binding}" Margin="0, 4, 12, 2" VerticalAlignment="Center" />
-            <dxschint:AppointmentContinueEndDateControl ViewInfo="{Binding}" Margin="0, 4, 12, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
+                        <dxschint:AppointmentContinueEndDateControl ViewInfo="{Binding}" Margin="0, 4, 12, 2" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" VerticalAlignment="Center" />
 					</StackPanel>
 				</Grid>
 			</DataTemplate>
@@ -320,17 +320,17 @@
 						</Grid.ColumnDefinitions>
 						<StackPanel Grid.Column="0" Orientation="Horizontal" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}">
 						    <TextBlock Text="{Binding Path=StartTimeText}" />
-                    <TextBlock Text=" - " />
+                            <TextBlock Text=" - " />
 						    <TextBlock Text="{Binding Path=EndTimeText}" />
 							<TextBlock Text=" Uhr" Margin="0,0,4,0" />
 						</StackPanel>
-            <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding ElementName=Scheduler, Path=ActualWidth}" />
+                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding ElementName=Scheduler, Path=ActualWidth}" />
 					</Grid>
 					<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTrennstrichVisibility}" />
 					
 					<TextBlock Margin="0,0,3,0" Grid.Row="2" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
 					<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
-							       Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
+							   Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
 
 					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{markup:Translate Mitarbeiter:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />
 
@@ -401,10 +401,10 @@
 										<Grid.ColumnDefinitions>
 											<ColumnDefinition Width="*" />
 											<ColumnDefinition Width="Auto" />
-                      <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
 										<TextBlock VerticalAlignment="Center" Grid.Column="0" Text="{Binding Converter={StaticResource TextFromIDataContractConverter}}" Margin="3,0,0,0" FontSize="14" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-                    <Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
+                                        <Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
 										<Button x:Name="btnRemoveElement" Grid.Column="2" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Element aus der Liste entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="BtnRemoveElement_Click" Margin="3,0,0,0" />
 									</Grid>
 								</Border>
@@ -550,18 +550,16 @@
 				<Button Margin="1" Height="24" Width="24" ToolTip="Zeitleiste anzeigen" Click="ButtonTimelineView_Click">
 					<Image Source="/BeWoPlaner;component/Ressources/Icons/History24.png" />
 				</Button>
-        <Button Margin="1" Height="24" Width="24" ToolTip="Termine löschen" x:Name="ButtonDeleteAppointments" Click="ButtonDeleteAppointmentsInInterval_Click">
-            <Image Source="/BeWoPlaner;component/Ressources/Icons/Delete24.png" />
-        </Button>
+                <Button Margin="1" Height="24" Width="24" ToolTip="Termine löschen" x:Name="ButtonDeleteAppointments" Click="ButtonDeleteAppointmentsInInterval_Click">
+                    <Image Source="/BeWoPlaner;component/Ressources/Icons/Delete24.png" />
+                </Button>
 				<StackPanel x:Name="DayViewOptions" Orientation="Horizontal" Visibility="Visible">
 					<Label VerticalAlignment="Center" Content="anz Tage:" />
-					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditDayViewDayCount" AllowNullInput="False"
-								        Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
+					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditDayViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditDayViewDayCount_EditValueChanged" />
 				</StackPanel>
 				<StackPanel x:Name="TimelineViewOptions" Orientation="Horizontal" Visibility="Collapsed">
 					<Label VerticalAlignment="Center" Content="anz Tage:" />
-					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditTimelineViewDayCount" AllowNullInput="False"
-								  Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditTimelineViewDayCount_EditValueChanged" />
+					<dxe:SpinEdit MaxValue="100" VerticalAlignment="Center" x:Name="SpinEditTimelineViewDayCount" AllowNullInput="False" Height="23" Width="50" IsFloatValue="False" EditValueChanged="SpinEditTimelineViewDayCount_EditValueChanged" />
 				</StackPanel>
 				<Button Click="ReloadButton_OnClick" Margin="5,1,1,1" ToolTip="Kalender aktualisieren" Width="24" Height="24">
 					<Button.Template>
@@ -587,18 +585,18 @@
 					<ColumnDefinition Width="Auto" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<CheckBox Grid.Column="0" Content="{markup:Translate Mitarbeiterfarben Ein/Aus}" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked" 
+				<CheckBox Grid.Column="0" Content="{markup:Translate Mitarbeiterfarben}" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked" 
 							Unchecked="MitarbeiterfarbenEinAusCheckBox_OnChecked"
 							IsChecked="{Binding Path=IsEmployeeBrushVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type view:NewSchedulerView}}, Mode=TwoWay}" />
-				<CheckBox Grid.Column="1" Content="Abwesenheiten Ein/Aus" Margin="17,0,0,0" x:Name="AbwesenheitenEinAusCheckBox" Checked="AbwesenheitenEinAusCheckBox_OnChecked" 
+				<CheckBox Grid.Column="1" Content="Abwesenheiten" Margin="10,0,0,0" x:Name="AbwesenheitenEinAusCheckBox" Checked="AbwesenheitenEinAusCheckBox_OnChecked" 
 						  Unchecked="AbwesenheitenEinAusCheckBox_OnChecked" 
 						  IsChecked="{Binding Path=IsAbsenceTimeVisible, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type view:NewSchedulerView}}, Mode=TwoWay}" />
+                <CheckBox Grid.Column="2" Margin="10,0,0,0"  VerticalAlignment="Center" Content="Aufgaben" x:Name="ShowTasksCheckBox" Click="ShowTasksCheckBox_OnClick" />
                 <TextBlock IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}" Grid.Column="0" Grid.ColumnSpan="3" VerticalAlignment="Center" HorizontalAlignment="Center">
 					<Hyperlink RequestNavigate="ShowAppointmentRequests" NavigateUri="#" IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}">
 						<TextBlock Text="{Binding Requests, UpdateSourceTrigger=PropertyChanged}" />
 					</Hyperlink>
 				</TextBlock>
-                <CheckBox Grid.Column="2" HorizontalAlignment="Right" Margin="0,0,6,0"  VerticalAlignment="Center" Content="Aufgaben Ein/Aus" x:Name="ShowTasksCheckBox" Click="ShowTasksCheckBox_OnClick" />
                 <CheckBox Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center" Content="Nur private Termine anzeigen" x:Name="ShowPrivateAppointmentsCheckBox" Click="ShowPrivateAppointmentsCheckBox_OnClick" />
             </Grid>
 			<Border Grid.Row="0" Grid.Column="3" Width="{Binding ElementName=RightExpanderButton, Path=ActualWidth}" />
@@ -914,22 +912,23 @@
 
       <!-- SchedulerControl -->
 			<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black"
-                                FormCustomizationUsingMVVMLocal="False"
-                                InplaceEditorShowing="Scheduler_OnInplaceEditorShowing"
-							                  GroupType="None" AppointmentDrag="Scheduler_OnAppointmentDrag"
-                                VerticalAlignment="Stretch"
-							                  EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
-							                  EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"
+                                    FormCustomizationUsingMVVMLocal="False"
+                                    InplaceEditorShowing="Scheduler_OnInplaceEditorShowing"
+							        GroupType="None" AppointmentDrag="Scheduler_OnAppointmentDrag"
+                                    VerticalAlignment="Stretch"
+							        EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
+							        EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"
 		                            PopupMenuShowing="Scheduler_PopupMenuShowing" 
-                                InitNewAppointment="Scheduler_InitNewAppointment"
-			                          AppointmentViewInfoCustomizing="Scheduler_AppointmentViewInfoCustomizing"
-								                AllowAppointmentDrag="AllowAppointmentAenderung" 
-                                AllowAppointmentEdit="AllowAppointmentAenderung"
-								                AllowAppointmentResize="AllowAppointmentAenderung" 
-                                AllowAppointmentCreate="AllowAppointmentCreateEvent"
-							                  AllowAppointmentDragBetweenResources="AllowAppointmentAenderung"
-							                  AllowAppointmentDelete="AllowAppointmentAenderung" 
-                                ActiveViewType="WorkWeek">
+                                    InitNewAppointment="Scheduler_InitNewAppointment"
+			                        AppointmentViewInfoCustomizing="Scheduler_AppointmentViewInfoCustomizing"
+								    AllowAppointmentDrag="AllowAppointmentAenderung" 
+                                    AllowAppointmentEdit="AllowAppointmentAenderung"
+								    AllowAppointmentResize="AllowAppointmentAenderung" 
+                                    AllowAppointmentCreate="AllowAppointmentCreateEvent"
+							        AllowAppointmentDragBetweenResources="AllowAppointmentAenderung"
+							        AllowAppointmentDelete="AllowAppointmentAenderung" 
+                                    ActiveViewType="WorkWeek"
+                                    >
 				        <dxsch:SchedulerControl.DayView>
 					        <dxsch:DayView AppointmentToolTipContentTemplate="{StaticResource {dxscht:SchedulerViewThemeKey ResourceKey=AppointmentToolTipContentTemplate}}" />
 				        </dxsch:SchedulerControl.DayView>
@@ -947,10 +946,11 @@
                 </dxsch:SchedulerControl.TimelineView>
                 <dxsch:SchedulerControl.Storage>
                   <dxsch:SchedulerStorage 
-                      AppointmentsChanged="NewSchedulerStorage_AppointmentsChanged"
+                                          AppointmentsChanged="NewSchedulerStorage_AppointmentsChanged"
 										  AppointmentDeleting="NewSchedulerStorage_AppointmentDeleting"
 										  AppointmentsInserted="NewSchedulerStorage_AppointmentsInserted"
-										  FetchAppointments="SchedulerStorage_OnFetchAppointments">
+										  FetchAppointments="SchedulerStorage_OnFetchAppointments"
+                                          >
 						        <dxsch:SchedulerStorage.AppointmentStorage>
 							        <dxsch:AppointmentStorage>
 								        <dxsch:AppointmentStorage.Mappings>
@@ -989,8 +989,8 @@
 
 					<dxb:AddBarItemAction>
 						<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem" 
-										           Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}" 
-										           ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
+										   Content="{markup:Translate Verfügbare Mitarbeiter anzeigen}" 
+										   ItemClick="MitarbeiterVerfuegbarkeitPruefenButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
 
 					<dxb:BarButtonItemLink BarItemName="MitarbeiterVerfuegbarkeitPruefenButtonItem" />
diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
index 2823b60a3..e759a1320 100644
--- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
+++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs
@@ -6,6 +6,8 @@ using System.Diagnostics;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Text;
+using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
@@ -22,20 +24,20 @@ using BeWo.Scheduler.Utils;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
 using BeWo.View;
+
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 using BS.Shared.Translation;
-using DevExpress.Utils.Extensions;
+
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Scheduler;
 using DevExpress.Xpf.Scheduler.Reporting;
 using DevExpress.XtraScheduler;
-using DevExpress.XtraScheduler.Internal.Implementations;
-using DevExpress.XtraScheduler.Native;
+
 using Appointment            = DevExpress.XtraScheduler.Appointment;
 using AppointmentViewInfoCustomizingEventArgs = DevExpress.Xpf.Scheduler.AppointmentViewInfoCustomizingEventArgs;
 using ColorConverter         = System.Windows.Media.ColorConverter;
@@ -47,8 +49,6 @@ namespace BeWo.Scheduler.View
 {
 	public partial class NewSchedulerView : INotifyPropertyChanged
 	{
-	    public static bool IsInHomeDragPanelView { get; set; }
-	    
         private bool _IsEmployeeBrushVisible;
 
 	    public bool IsEmployeeBrushVisible
@@ -399,22 +399,27 @@ namespace BeWo.Scheduler.View
 			ConstructObject();
 		}
 
-	    public NewSchedulerView(bool pIsInHomeDragPanelView)
-	    {
-            IsInHomeDragPanelView = pIsInHomeDragPanelView;
-	        IsTasksVisible = true;
-	        
-            ConstructObject();
-        }
-	    
 		public NewSchedulerView()
 		{
-            IsInHomeDragPanelView = false;
-		    
 			ConstructObject();
 		}
 
-	    private void GetCacheObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
+        private DateTime? _SelectedAppointmentStartDate;
+
+        private readonly SchedulerAppointmentDC _SelectedAppointmentFromHomePanelView;
+        private bool _IsComingFromHomeDragPanel;
+        public NewSchedulerView(DateTime pIntervalStartDate, SchedulerAppointmentDC pAppointment)
+        {
+            _IsComingFromHomeDragPanel = true;
+
+            _SelectedAppointmentFromHomePanelView = pAppointment;
+
+            _SelectedAppointmentStartDate = pIntervalStartDate;
+
+            ConstructObject();
+        }
+
+        private void GetCacheObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
 	    {
 	        Cache.GetInstance().GetAllActiveEmployeesCompact(allEmployees =>
 	        {
@@ -523,7 +528,7 @@ namespace BeWo.Scheduler.View
 
 			    if(_IstErsterAufruf)
 			    {
-			        if(MainControl.HatNeueTermine && !IsInHomeDragPanelView)
+			        if(MainControl.HatNeueTermine && !_IsComingFromHomeDragPanel)
 			        {
 			            FensterOeffnen();
 			        }
@@ -535,43 +540,38 @@ namespace BeWo.Scheduler.View
 
 		private void InitScheduler()
 		{
-            Scheduler.Start                                            = DateTime.Today;
-			_TimelineDayCount                                           = 0;
-			Scheduler.DayView.NavigationButtonVisibility               = NavigationButtonVisibility.Always;
-			Scheduler.DayView.AppointmentDisplayOptions.ShowRecurrence = true;
-			Scheduler.DayView.AppointmentDisplayOptions.ShowReminder   = true;
-			Scheduler.DayView.ResourcesPerPage                         = 1;
+            if(_IsComingFromHomeDragPanel && _SelectedAppointmentStartDate.HasValue)
+            {
+                var monday = _SelectedAppointmentStartDate.Value.FirstDateOfWeek(_SelectedAppointmentStartDate.Value.GetIso8601WeekOfYear());
 
-			Scheduler.WorkWeekView.ShowFullWeek                        = false;
-			Scheduler.WorkWeekView.ShowWorkTimeOnly                    = false;
-			Scheduler.WorkWeekView.NavigationButtonVisibility          = NavigationButtonVisibility.Always;
-			Scheduler.WorkWeekView.ResourcesPerPage                    = 1;
-
-			Scheduler.WeekView.NavigationButtonVisibility              = NavigationButtonVisibility.Always;
-			Scheduler.WeekView.ResourcesPerPage                        = 1;
-
-			Scheduler.MonthView.NavigationButtonVisibility             = NavigationButtonVisibility.Always;
-			Scheduler.MonthView.ResourcesPerPage                       = 1;
-
-			Scheduler.TimelineView.NavigationButtonVisibility          = NavigationButtonVisibility.Always;
-			Scheduler.TimelineView.ResourcesPerPage                    = 1;
-
-		    if(IsInHomeDragPanelView)
-		    {
-                Scheduler.ActiveViewType = SchedulerViewType.Day;
-		        Scheduler.Start = DateTime.Today;
-
-		        Scheduler.DayView.TopRowTime = DateTime.Now.TimeOfDay.Subtract(new TimeSpan(1, 0, 0));
-		        
-                _CurrentViewType = Scheduler.ActiveViewType;
-		        UpdateOptionPanel();
-
-                Scheduler.ActiveView.GotoTimeInterval(new TimeInterval(DateTime.Today.Date, new TimeSpan(8, 0, 0)));
-		        Scheduler.DayView.DayCount = 14;
-
-                DayViewOptions.Visibility = Visibility.Visible;
-		        TimelineViewOptions.Visibility = Visibility.Collapsed;
+                Scheduler.Start = monday;
             }
+            else
+            {
+                Scheduler.Start = DateTime.Today;
+                
+            }
+
+            _TimelineDayCount = 0;
+            Scheduler.DayView.NavigationButtonVisibility = NavigationButtonVisibility.Always;
+            Scheduler.DayView.AppointmentDisplayOptions.ShowRecurrence = true;
+            Scheduler.DayView.AppointmentDisplayOptions.ShowReminder = true;
+            Scheduler.DayView.ResourcesPerPage = 1;
+
+            Scheduler.WorkWeekView.ShowFullWeek = _IsComingFromHomeDragPanel && Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Saturday) || Scheduler.Start.DayOfWeek.Equals(DayOfWeek.Sunday);
+            Scheduler.WorkWeekView.ShowWorkTimeOnly = false;
+
+            Scheduler.WorkWeekView.NavigationButtonVisibility = NavigationButtonVisibility.Always;
+            Scheduler.WorkWeekView.ResourcesPerPage = 1;
+
+            Scheduler.WeekView.NavigationButtonVisibility = NavigationButtonVisibility.Always;
+            Scheduler.WeekView.ResourcesPerPage = 1;
+
+            Scheduler.MonthView.NavigationButtonVisibility = NavigationButtonVisibility.Always;
+            Scheduler.MonthView.ResourcesPerPage = 1;
+
+            Scheduler.TimelineView.NavigationButtonVisibility = NavigationButtonVisibility.Always;
+            Scheduler.TimelineView.ResourcesPerPage = 1;
         }
 
 		private void InitRights()
@@ -586,24 +586,6 @@ namespace BeWo.Scheduler.View
 		    MitarbeiterfarbenEinAusCheckBox.Visibility = MitarbeiterTabItem.Visibility;
 
             ButtonDeleteAppointments.Visibility = BeWoApp.LoggedOnUser.HasRight(UserRightType.Termine_IntervalDelete) ? Visibility.Visible : Visibility.Collapsed;
-		    
-		    if(IsInHomeDragPanelView)
-		    {
-		        TopBarGrid.Visibility                 = Visibility.Collapsed;
-		        ObjectSelectionGrid.Visibility        = Visibility.Collapsed;
-		        FilterCheckBoxenStackPanel.Visibility = Visibility.Collapsed;
-		        LeftExpanderButton.Visibility         = Visibility.Collapsed;
-		        PrintAdapter.Visibility               = Visibility.Collapsed;
-		        RightExpanderButton.Visibility        = Visibility.Collapsed;
-		        DateNavigator.Visibility              = Visibility.Collapsed;
-
-                Scheduler.OptionsCustomization.AllowAppointmentResize = UsedAppointmentType.None;
-		        Scheduler.OptionsCustomization.AllowAppointmentEdit   = UsedAppointmentType.None;
-		        Scheduler.OptionsCustomization.AllowAppointmentDrag   = UsedAppointmentType.None;
-		        Scheduler.OptionsCustomization.AllowAppointmentDelete = UsedAppointmentType.None;
-		        Scheduler.OptionsCustomization.AllowInplaceEditor     = UsedAppointmentType.None;
-		        Scheduler.OptionsCustomization.AllowAppointmentCreate = UsedAppointmentType.None;
-		    }
         }
 
 		private void UpdateDataSource(ISchedulerViewModel vm)
@@ -670,11 +652,29 @@ namespace BeWo.Scheduler.View
 		private void UpdateSchedulerSettings()
 		{
             var settings = ViewModel.GetActiveSettings();
+            Scheduler.Start = settings.StartDate;
+            var starttimeInterval = settings.StartDate.Date;
 
-			Scheduler.Start = settings.StartDate;
-			var starttimeInterval = settings.StartDate.Date;
-			starttimeInterval = starttimeInterval.AddHours(Scheduler.WorkWeekView.WorkTime.Start.Hours);
-			settings.ViewType = ViewTypeConvert.ToAppointmentViewType(_CurrentViewType);
+            if (_SelectedAppointmentStartDate.HasValue)
+            {
+                var weekOfYear = _SelectedAppointmentStartDate.Value.GetIso8601WeekOfYear();
+                var monday = _SelectedAppointmentStartDate.Value.FirstDateOfWeek(weekOfYear);
+
+                settings.StartDate = monday;
+
+                Scheduler.Start = monday;
+                starttimeInterval = settings.StartDate;
+
+                settings.ViewType = _SelectedAppointmentStartDate.Value.DayOfWeek == DayOfWeek.Saturday || _SelectedAppointmentStartDate.Value.DayOfWeek == DayOfWeek.Sunday ? AppointmentViewType.Week : AppointmentViewType.WorkWeek;
+                _SelectedAppointmentStartDate = null;
+            }
+            else
+            {
+                settings.ViewType = ViewTypeConvert.ToAppointmentViewType(_CurrentViewType);
+            }
+
+            starttimeInterval = starttimeInterval.AddHours(Scheduler.WorkWeekView.WorkTime.Start.Hours);
+			
 
 			switch (settings.ViewType)
 			{
@@ -979,6 +979,8 @@ namespace BeWo.Scheduler.View
                 return;
 			}
 
+            WriteToDebug("AppointmentsChanged, bitch");
+
             var appList = e.Objects.Cast<Appointment>().ToList();
             
             if (appList.Any(f => f.CF_IsPrivate()))
@@ -1064,10 +1066,10 @@ namespace BeWo.Scheduler.View
 		private void Scheduler_EditAppointmentFormShowing(object sender, EditAppointmentFormEventArgs e)
 		{
             var control = (SchedulerControl) sender;
-
+            
 		    IgnoreChangeEvents = true;
-		    
-			if (_IsNew)
+
+            if (_IsNew)
 			{
 				var n = new ObservableCollection<Employee2SchedulerAppointmentDC>(SelectedEmployees.Select(item => new Employee2SchedulerAppointmentDC { Employee = item, ParticipationAnswer = ParticipationAnswer.Offen }).ToList());
 				e.Appointment.CF_EmployeeList(n);
@@ -1103,30 +1105,22 @@ namespace BeWo.Scheduler.View
 
 		private void Scheduler_PopupMenuShowing(object sender, SchedulerMenuEventArgs e)
 		{
-		    if(IsInHomeDragPanelView)
-		    {
-		        var neuerTerminMenu = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && (((BarButtonItemLink) f).Item?.Name.Contains("NewAppointment") ?? false));
-		        if(neuerTerminMenu != null)
-		        {
-		            e.Menu.ItemLinks.Remove(neuerTerminMenu);
-		        }
-		        
-		        var aufgabeAnlegenMenu = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && (((BarButtonItemLink)f).Item?.Name.Contains("AufgabeAnlegenButtonItem") ?? false));
-		        if(aufgabeAnlegenMenu != null)
-		        {
-		            e.Menu.ItemLinks.Remove(aufgabeAnlegenMenu);
-		        }
-
-                var switchViewMenu = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarSubItemLink) && (((BarSubItemLink)f).Item.Name?.Contains("SwitchViewMenu") ?? false));
-                if(switchViewMenu != null)
+		    if(Scheduler.SelectedAppointments?.Count == 1)
+            {
+                bool isAllowedToEdit;
+                var test = Scheduler.SelectedAppointments.First();
+                if(test.IsOccurrence)
                 {
-                    e.Menu.ItemLinks.Remove(switchViewMenu);
-                }
-            }
+                    var patternAppointment = test.RecurrencePattern;
+                    var sourceObject = patternAppointment.GetSourceObject(Scheduler.GetCoreStorage());
+                    var viewModel = (SchedulerAppointmentVM) sourceObject;
 
-		    if(Scheduler.SelectedAppointments?.Count > 0)
-		    {
-		        var isAllowedToEdit = Scheduler.SelectedAppointments.Any(a => BeWoUtils.CheckSchedulerRights(a, ((SchedulerAppointmentVM) a.GetSourceObject(Scheduler.GetCoreStorage())).IsNew, SchedulerRightsCheckType.Edit));
+                    isAllowedToEdit = BeWoUtils.CheckSchedulerRights(test, viewModel.IsNew, SchedulerRightsCheckType.Edit);
+                }
+                else
+                {
+                    isAllowedToEdit = Scheduler.SelectedAppointments.Any(a => BeWoUtils.CheckSchedulerRights(a, ((SchedulerAppointmentVM)a.GetSourceObject(Scheduler.GetCoreStorage())).IsNew, SchedulerRightsCheckType.Edit));
+                }
 
 		        if(!isAllowedToEdit)
 		        {
@@ -1139,7 +1133,7 @@ namespace BeWo.Scheduler.View
 		        }
 		    }
 		    
-            if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen) || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewAll) || IsInHomeDragPanelView)
+            if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen) || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewAll))
             {
                 var verfuegbarkeitMenue = e.Menu.ItemLinks.FirstOrDefault(f => f.GetType() == typeof(BarButtonItemLink) && (((BarButtonItemLink)f).Item?.Name.Contains("MitarbeiterVerfuegbarkeitPruefenButtonItem") ?? false));
 
@@ -1292,7 +1286,7 @@ namespace BeWo.Scheduler.View
 
 		private void AllowAppointmentCreateEvent(object sender, AppointmentOperationEventArgs e)
 		{
-            var darfAnlegen = (BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAnlegen) || BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnlegen)) && !IsInHomeDragPanelView;
+            var darfAnlegen = (BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAnlegen) || BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnlegen));
 
 			e.Allow = darfAnlegen;
 		}
@@ -1648,10 +1642,18 @@ namespace BeWo.Scheduler.View
 
 		private void SchedulerStorage_OnFetchAppointments(object sender, FetchAppointmentsEventArgs e)
 		{
+            if(_LastFetchingDateTime != null && _LastFetchingDateTime.Value < DateTime.Now.AddMilliseconds(-500d))
+            {
+                return;
+            }
+
+            _LastFetchingDateTime = DateTime.Now;
+
             ReloadVM();
         }
 
 	    private bool _ReloadingViewModel;
+        private DateTime? _LastFetchingDateTime;
 
         private void ReloadVM(bool shouldForceReload = false)
         {
@@ -1701,7 +1703,7 @@ namespace BeWo.Scheduler.View
             {
                 return;
             }
-
+            
             var start = pIntervalStart - FetchPadding;
             var end   = pIntervalEnd + FetchPadding;
 
@@ -1733,8 +1735,6 @@ namespace BeWo.Scheduler.View
                                     ViewModel.SchedulerSettings = ViewModel.GetActiveSettings();
                                     ViewModel.SchedulerSettings.StartDate = pIntervalStart;
 
-
-
                                     GefilterteMitarbeiter = ViewModel.ActiveAppointmentViewModel.AllEmployees;
                                     AllEmployees = ViewModel.ActiveAppointmentViewModel.AllEmployees;
                                     GefilterteKlienten = ViewModel.ActiveAppointmentViewModel.AllCustomers;
@@ -1754,77 +1754,45 @@ namespace BeWo.Scheduler.View
 
                                     Scheduler.Storage.RefreshData();
                                     Scheduler.Storage.RefreshUI();
+
+                                    if (_IsComingFromHomeDragPanel && _SelectedAppointmentFromHomePanelView != null)
+                                    {
+                                        var apps = Scheduler.ActiveView.GetAppointments().ToList();
+
+                                        var oid = _SelectedAppointmentFromHomePanelView.SchedulerAppointmentOid;
+                                        Appointment appointmentToOpen;
+
+                                        if (oid != null)
+                                        {
+                                            appointmentToOpen = apps.Find(app =>
+                                            {
+                                                var oidValue = app.CF_SchedulerAppointmentOid();
+
+                                                return oidValue.HasValue && oidValue.Value == oid;
+                                            });
+
+
+                                            if (appointmentToOpen != null)
+                                            {
+                                                Scheduler.ShowEditAppointmentForm(appointmentToOpen);
+                                            }
+                                        }
+                                        else if (_SelectedAppointmentFromHomePanelView.RecurrenceId != null && _SelectedAppointmentFromHomePanelView.RecurrenceIndex > 0)
+                                        {
+                                            appointmentToOpen = apps.Find(appointment => appointment.RecurrenceInfo.Id.ToString().Equals(_SelectedAppointmentFromHomePanelView.RecurrenceId));
+
+                                            if (appointmentToOpen != null)
+                                            {
+                                                Scheduler.ShowEditAppointmentForm(appointmentToOpen);
+                                            }
+                                        }
+
+                                        _IsComingFromHomeDragPanel = false;
+                                    }
                                 });
                             });
                     });
             });
-
-            //Cache.GetInstance().GetAllActiveEmployeesCompact(allEmployees =>
-            //{
-            //    ServiceFacade.DoResourceServiceAsync(s => s.GetAllCategories2ResourcesInDictionary(), cats2Res =>
-            //    {
-            //        ServiceFacade.DoResourceServiceAsync(s2 => s2.LoadFilteredAppointmentsMitAufgaben(BeWoApp.HasLoggedOnUserRight(new[] { UserRightType.KalenderMitarbeitertermineAnsehen }), BeWoApp.LoggedOnEmployee.EmployeeOid.Value, start, end, pSelectedEmployees, pSelectedCustomer, pSelectedResources, pEmployeesOnly, pCustomersOnly, pResourcesOnly, pPrivateAppointmentsOnly, pOnlyMyAppointments, IsTasksVisible),
-            //            appointments =>
-            //            {
-            //                Cache.GetInstance().GetAllActiveCustomersCompact(customers =>
-            //                {
-            //                    if (BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
-            //                    {
-            //                        customers = customers.Where(c => BeWoApp.LoggedOnEmployee.RelatedCustomers.Any(a => a.Customer.Equals(c))).ToList();
-            //                    }
-
-            //                    ServiceFacade.DoResourceServiceAsync(s3 => s3.GetAllActiveAbsenceTimesInInterval(start, end, BeWoApp.LoggedOnEmployee.EmployeeOid.Value, BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)),
-            //                        absenceTimes =>
-            //                        {
-            //                            this.Dispatch(() =>
-            //                            {
-            //                                var prefilteredAppointments = appointments.Where(w => (w.EmployeeList.Count == 0 && w.Originator.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid) ||
-            //                                                                                       w.EmployeeList.Count > 0 && w.EmployeeList.Any(a => a.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)) ||
-            //                                                                                       BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen)) && (!w.EmployeeList.TrueForAll(e2a => e2a.ParticipationAnswer == ParticipationAnswer.Absage) || w.EmployeeList == null || w.EmployeeList.Count == 0)).ToList();
-
-                                            
-
-            //                                var vm = new SchedulerAppointmentListVM(prefilteredAppointments, customers, allEmployees, cats2Res);
-            //                                if (pShouldShowAbsenceTimes)
-            //                                {
-            //                                    vm.Appointments.AddRange(ViewModel.ConvertAbsenceTimesToAppointments(absenceTimes.Where(w =>
-            //                                    {
-            //                                        return SelectedEmployees.Count == 0 || SelectedEmployees.Any(a => a.EmployeeOid == w.EmployeeOid);
-            //                                    }), end, allEmployees));
-            //                                }
-
-            //                                ViewModel.ActiveAppointmentViewModel = vm;
-
-            //                                ViewModel.SchedulerSettings = ViewModel.GetActiveSettings();
-            //                                ViewModel.SchedulerSettings.StartDate = pIntervalStart;
-
-                                            
-
-            //                                GefilterteMitarbeiter = ViewModel.ActiveAppointmentViewModel.AllEmployees;
-            //                                AllEmployees = ViewModel.ActiveAppointmentViewModel.AllEmployees;
-            //                                GefilterteKlienten = ViewModel.ActiveAppointmentViewModel.AllCustomers;
-            //                                AllCustomers = ViewModel.ActiveAppointmentViewModel.AllCustomers;
-
-            //                                Category2ResourcesDictionary = ViewModel.ActiveAppointmentViewModel.Categories2Resources;
-
-            //                                SelectedEmployees = AllEmployees.Where(w => SelectedEmployees.Any(a => a.EmployeeOid.Equals(w.EmployeeOid))).ToList();
-            //                                SelectedCustomers = AllCustomers.Where(w => SelectedCustomers.Any(a => a.CustomerOid.Equals(w.CustomerOid))).ToList();
-            //                                SelectedResources = AllResources.Where(w => SelectedResources.Any(a => a.ResourceOid.Equals(w.ResourceOid))).ToList();
-
-            //                                var items = SelectedItems;
-
-            //                                var testtesttest = ViewModel.ActiveAppointmentViewModel;
-
-            //                                _ReloadingViewModel = false;
-                                            
-            //                                Scheduler.Storage.RefreshData();
-            //                                Scheduler.Storage.RefreshUI();
-            //                            });
-            //                        });
-            //                });
-            //            });
-            //    });
-            //});
         }
 
         //private void ExportAsiCal(object sender, RoutedEventArgs e)
@@ -2083,8 +2051,6 @@ namespace BeWo.Scheduler.View
 
 		private void DateNavigator_OnSelectedDatesChanged(object sender, EventArgs e)
 		{
-            //WriteToDebugLog("Selected dates changed");
-
             _CurrentViewType = Scheduler.ActiveViewType;
 
 		    var navigator = (DevExpress.Xpf.Editors.DateNavigator.DateNavigator) sender;
@@ -2094,7 +2060,7 @@ namespace BeWo.Scheduler.View
 		    var isSelectedDateFetched = _LastFetchedInterval.ContainsEveryDateFromList(selectedDates);
 		    if(!isSelectedDateFetched && !(_LastFetchedInterval.Start.Equals(new DateTime(1,1,1,0,0,0)) && _LastFetchedInterval.End.Equals(new DateTime(1, 1, 1, 0, 30, 0))))
 		    {
-		        ReloadVM();
+                ReloadVM();
 		    }
         }
 
@@ -2383,6 +2349,27 @@ namespace BeWo.Scheduler.View
                 editedAppointment.CF_DueDate(editedDueDate);
             }
         }
+
+
+        private static void WriteToDebug(string pText)
+        {
+            Debug.WriteLine($"-----------------------> {pText}");
+        }
+
+        private void LogStorage()
+        {
+            var storageAppointments = Scheduler.Storage.AppointmentStorage.Items.ToList();
+
+            var sb = new StringBuilder();
+            sb.Append("AppointmentStorage-Inhalt:\n");
+
+            foreach (var app in storageAppointments)
+            {
+                sb.Append($"{app.Subject} {app.Start:dd.MM.yyyy HH:mm}-{app.End:dd.MM.yyyy HH:mm}\n");
+            }
+
+            WriteToDebug(sb.ToString());
+        }
     }
 
 	#region Converter
@@ -2654,6 +2641,11 @@ namespace BeWo.Scheduler.View
 	{
 		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
 		{
+            if(!(value is Employee2SchedulerAppointmentDC))
+            {
+                return null;
+            }
+
 			if (parameter != null && parameter.Equals("GibName"))
 			{
 			    var v = (Employee2SchedulerAppointmentDC) value;
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
index 7c88b62fe..2b1c39311 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml
@@ -24,7 +24,7 @@
 	  <Style x:Key="MultiSupportConceptSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
           <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
           <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
-          <Setter Property="Margin" Value="0,2,0,0" />
+          <Setter Property="Margin" Value="2,2,2,0" />
           <Setter Property="Template">
               <Setter.Value>
                   <ControlTemplate>
@@ -52,7 +52,7 @@
 
                                   <TextBlock x:Name="txtDetail1" Grid.Column="0" Grid.Row="0" Text="{Binding Path=CustomerName}" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
                                   <TextBlock x:Name="txtDetail2" Grid.Column="0" Grid.Row="1" ToolTip="{Binding Path=FirstCostBearerDetailString}" Text="{Binding Path=FirstCostBearerDetailString}" FontSize="10" Foreground="{Binding ForegroundBrush}" FontFamily="Microsoft Sans Serif" />
-                                  <Button x:Name="btnRemoveSupportConcept" Grid.Column="2" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Hilfeplan aus der Liste entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="BtnRemoveSupportConcept_Click" Margin="3,0,0,0" />
+                                  <Button x:Name="btnRemoveSupportConcept" Grid.Column="1" Grid.Row="0" Grid.RowSpan="2" Width="20" Height="20" ToolTip="Hilfeplan aus der Liste entfernen" Tag="{Binding}" Style="{DynamicResource CloseButtonStyle}" Click="BtnRemoveSupportConcept_Click" Margin="3,0,0,0" />
                               </Grid>
                           </Border>
                       </Grid>
@@ -290,7 +290,7 @@
 			<!-- Endregion -->
 				
 			<!-- Region Start -->
-            <Label x:Name="StartLabel"  Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Start"/>
+            <Label x:Name="StartLabel" Grid.Column="0" Grid.Row="2" VerticalAlignment="Center" Content="Start"/>
             <dxe:DateEdit Grid.Column="1" Grid.Row="2" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayStartDate}" x:Name="StartDate"/>
             <dxe:TextEdit Grid.Column="2" Grid.Row="2" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayStartTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="StartTime"/>
             <dxe:CheckEdit x:Name="AllDay" Grid.Column="3" Grid.Row="2" Content="Ganztägig" EditValue ="{Binding Controller.AllDay}" HorizontalAlignment="Right" Margin="3" />
@@ -302,13 +302,13 @@
 			<dxe:TextEdit Grid.Column="2" Grid.Row="3" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayEndTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="EndTime"/>
 			<!-- Endregion -->
 
-		  <!-- Region Zu erledigen bis -->
-		  <Label Visibility="Collapsed" x:Name="DueDateLabel" Grid.Column="0" Grid.Row="4" VerticalAlignment="Center" Content="Zu erledigen bis" />
-      <dxe:DateEdit Visibility="Collapsed" AllowNullInput="True" x:Name="DueDate" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayDueDateDate}" />
-      <dxe:TextEdit Visibility="Collapsed" Width="38" AllowNullInput="True" x:Name="DueDateTime" Grid.Column="3" Grid.ColumnSpan="2" Grid.Row="4" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayDueDateTime}" />
-		  <!-- Endregion -->
+	        <!-- Region Zu erledigen bis -->
+            <Label Visibility="Collapsed" Grid.Column="0" Grid.Row="4" x:Name="DueDateLabel" VerticalAlignment="Center" Content="Zu erledigen bis" />
+            <dxe:DateEdit Visibility="Collapsed" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" AllowNullInput="True" x:Name="DueDate" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayDueDateDate}" />
+            <dxe:TextEdit Visibility="Collapsed" Grid.Column="3" Grid.ColumnSpan="2" Grid.Row="4" Width="38" AllowNullInput="True" x:Name="DueDateTime" MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValue ="{Binding Controller.DisplayDueDateTime}" />
+		    <!-- Endregion -->
 
-      <!-- Region Mitarbeiter -->
+            <!-- Region Mitarbeiter -->
 			<Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="Mitarbeiter"/>
 			<Grid Grid.Column="1" Grid.Row="5" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
 				<Grid.ColumnDefinitions>
@@ -344,8 +344,8 @@
 			<!-- Endregion -->
 				
 			<!-- Region Klienten -->
-			<Label Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="Klienten"/>
-			<Grid Grid.Column="1" Grid.Row="7" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
+			<Label x:Name="CustomersLabel" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="Klienten"/>
+            <Grid x:Name="CustomersGrid" Grid.Column="1" Grid.Row="7" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
@@ -359,12 +359,12 @@
 					<Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
 				</Grid>
 			</Button>
-			<Popup Grid.Column="1" Grid.Row="7" Margin="10" Name="PopupCustomer" StaysOpen="False" Placement="MousePoint" Width="450" Height="300" >
+			<Popup Grid.Column="1" Grid.Row="7" Margin="10" Name="CustomerSearchViewPopup" StaysOpen="False" Placement="MousePoint" Width="450" Height="300" >
 				<search:MultiCustomerSearchView x:Name="MultiCustomerSearch" ResultListBackground="{StaticResource CustomerListBrush}" SelectionChanged="MultiCustomerSearch_OnSelectionChanged" SelectedCustomers="{Binding Controller.CustomerList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
 			</Popup>
-			<ListBox Grid.Column="1" Grid.Row="8" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedCustomers, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" IsSynchronizedWithCurrentItem="True"
+            <ListBox Grid.Column="1" Grid.Row="8" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedCustomers, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" IsSynchronizedWithCurrentItem="True"
 						HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.ColumnSpan="3"
-						ItemContainerStyle="{DynamicResource MultiElementSelectionControlStyle}" MaxHeight="70" Height="70" x:Name="SelectedKlient"
+						ItemContainerStyle="{DynamicResource MultiElementSelectionControlStyle}" MaxHeight="70" Height="70" x:Name="SelectedCustomersListBox"
 						Visibility="{Binding IsChecked, ElementName=KlientenToggleButton, Converter={StaticResource BoolVisibilityConverter}}">
 				<ListBox.Template>
 					<ControlTemplate TargetType="{x:Type ListBox}">
@@ -413,42 +413,33 @@
 			</ListBox>
 			<!-- Endregion -->
 
-      <!-- Region Hilfepläne -->
-      <Label Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" Content="Hilfepläne" Visibility="Collapsed" x:Name="SupportConceptBtn" />
-      <Grid Grid.Column="1" Grid.Row="11" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3" Visibility="Collapsed" x:Name="SupportConceptsGrid">
-          <Grid.ColumnDefinitions>
-              <ColumnDefinition Width="*" />
-              <ColumnDefinition Width="Auto" />
-          </Grid.ColumnDefinitions>
-          <TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedSupportConcepts, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-          <ToggleButton Grid.Column="1" x:Name="SupportConceptsToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Hilfepläne anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
-      </Grid>
-      <Button x:Name="SupportConceptsPopUpOeffnenBtn" Grid.Column="4" Grid.Row="11" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="SupportConceptsPopUpClick" Visibility="Collapsed">
-          <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
-              <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
-              <Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
-          </Grid>
-      </Button>
-      <Popup Grid.Column="1" Grid.Row="11" Margin="10" Name="PopupSupportConcepts" StaysOpen="False" Placement="MousePoint" Width="450" Height="300">
-        <search:SupportConceptSearchView x:Name="SupportConceptsTreeSearchView" ItemSelected="SupportConceptSelectionControl_ItemSelected" ShowFilterPanel="True" />
-      </Popup>
-      <ListBox Grid.Column="1" Grid.Row="12" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedSupportConcepts, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" IsSynchronizedWithCurrentItem="True" 
-					HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.ColumnSpan="3" 
-					ItemContainerStyle="{StaticResource MultiSupportConceptSelectionControlStyle}" MaxHeight="70" Height="70"
-					Visibility="{Binding IsChecked, ElementName=SupportConceptsToggleButton, Converter={StaticResource BoolVisibilityConverter}}">
-          <ListBox.Template>
-              <ControlTemplate TargetType="{x:Type ListBox}">
-                  <Border x:Name="Bd" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                      <ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}" HorizontalScrollBarVisibility="Disabled">
-                          <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                      </ScrollViewer>
-                  </Border>
-              </ControlTemplate>
-          </ListBox.Template>
-      </ListBox>
-		  <!-- Endregion -->
+            <!-- Region Hilfeplan -->
+            <Label Grid.Column="0" Grid.Row="11" VerticalAlignment="Center" Content="Hilfeplan" Visibility="Collapsed" x:Name="SupportConceptBtn" />
+            <Button x:Name="SupportConceptsPopUpOeffnenBtn" Grid.Column="4" Grid.Row="11" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="SupportConceptsPopUpClick" Visibility="Collapsed">
+              <Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
+                  <Line X1="4" X2="12" Y1="8" Y2="8" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
+                  <Line X1="8" X2="8" Y1="4" Y2="12" Fill="{x:Null}" Stroke="#FFFFFFFF" StrokeStartLineCap="Round" StrokeEndLineCap="Round" StrokeThickness="2" HorizontalAlignment="Center" VerticalAlignment="Center" Width="16" Height="16" />
+              </Grid>
+            </Button>
+            <Popup Grid.Column="1" Grid.Row="11" Margin="10" Name="PopupSupportConcepts" StaysOpen="False" Placement="MousePoint" Width="450" Height="300">
+            <search:SupportConceptSearchView x:Name="SupportConceptsTreeSearchView" ItemSelected="SupportConceptSelectionControl_ItemSelected" ShowFilterPanel="True" />
+            </Popup>
+            <ListBox Grid.Column="1" Grid.Row="11" Background="White" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedSupportConcepts, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" IsSynchronizedWithCurrentItem="True" 
+			         HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.ColumnSpan="3" Name="SelectedSupportConceptsListBox" 
+			         ItemContainerStyle="{StaticResource MultiSupportConceptSelectionControlStyle}" MaxHeight="35" Height="35" Visibility="Collapsed">
+              <ListBox.Template>
+                  <ControlTemplate TargetType="{x:Type ListBox}">
+                      <Border x:Name="Bd" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                          <ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}" HorizontalScrollBarVisibility="Disabled">
+                              <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                          </ScrollViewer>
+                      </Border>
+                  </ControlTemplate>
+              </ListBox.Template>
+            </ListBox>
+	        <!-- Endregion -->
 
-      <!-- Region Beschreibung -->
+            <!-- Region Beschreibung -->
       <Label x:Name="TaskDescriptionLabel" Visibility="Collapsed" Grid.Column="0" Grid.Row="13" VerticalAlignment="Top" Content="Beschreibung"/>
       <TextBox Visibility="Collapsed" Grid.Column="1" Grid.Row="13" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
 		        HorizontalScrollBarVisibility="Disabled" Height="45" Margin="3" TextWrapping="Wrap" x:Name="TaskDescription"
@@ -456,12 +447,12 @@
 
 		  <!-- Endregion -->
 
-		  <!-- Region Erledigt am -->
+		    <!-- Region Erledigt am -->
           <Label Visibility="Collapsed" x:Name="CompletedDateLabel" Grid.Column="0" Grid.Row="14" VerticalAlignment="Center" Content="Erledigt am" />
           <dxe:DateEdit Visibility="Collapsed" x:Name="CompletedDate" Grid.Column="1" Grid.ColumnSpan="4" Grid.Row="14" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayCompletedDateDate}" />
 		  <!-- Endregion -->
 
-      <!-- Region Notiz -->
+            <!-- Region Notiz -->
 			<Label x:Name="NoticeLabel" Grid.Column="0" Grid.Row="15" VerticalAlignment="Top" Content="Notiz"/>
 			<TextBox Grid.Column="1" Grid.Row="15" Grid.ColumnSpan="4" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
 						HorizontalScrollBarVisibility="Disabled" Height="45" Margin="3" TextWrapping="Wrap" x:Name="Notice"
diff --git a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
index 9363ff5c6..a2101aac4 100644
--- a/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
+++ b/BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs
@@ -35,7 +35,6 @@ namespace BeWo.Scheduler.View
 	public partial class SchedulerAppointmentEditForm : INotifyPropertyChanged
 	{
 		public bool IsInCustomerViewMode { get; set; }
-		public bool IsInHomePanelView { get; set; }
 
 	    private readonly bool IsInTaskViewMode;
 
@@ -146,7 +145,6 @@ namespace BeWo.Scheduler.View
 		    IsOwnAppointment = Equals(BeWoApp.CompactLoggedOnEmployee, NewSchedulerAppointmentFormController.Originator) && (NewSchedulerAppointmentFormController.EmployeeList?.Count == 0 || NewSchedulerAppointmentFormController.EmployeeList.Any(a => Equals(a.Employee, BeWoApp.CompactLoggedOnEmployee)));
 
             IsInTaskViewMode = pIsInTaskViewMode;
-		    IsInHomePanelView = NewSchedulerView.IsInHomeDragPanelView;
 
             InitializeComponent();
 
@@ -179,13 +177,13 @@ namespace BeWo.Scheduler.View
 
 			MultiCustomerSearch.Sauce = customers.ToObservableCollection();
 			MultiCustomerSearch.AusgewaehlteKlienten = SelectedCustomers.ToList();
-			MultiCustomerSearch.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { PopupCustomer.IsOpen = false; })));
+			MultiCustomerSearch.CommandBindings.Add(new CommandBinding(ApplicationCommands.Close, (s, e) => this.Dispatch(() => { CustomerSearchViewPopup.IsOpen = false; })));
 
 			EdtRecurrenceType.CustomDisplayText += EdtRecurrenceType_CustomDisplayText;
 
 		    if(IsInTaskViewMode && !SelectedEmployees.Any(a => a.Employee.Equals(BeWoApp.CompactLoggedOnEmployee)))
 		    {
-		        SelectedEmployees.Add(new Employee2SchedulerAppointmentDC() { Employee = BeWoApp.CompactLoggedOnEmployee });
+		        SelectedEmployees.Add(new Employee2SchedulerAppointmentDC { Employee = BeWoApp.CompactLoggedOnEmployee });
 		        MitarbeiterToggleButton.IsChecked = true;
 		    }
 		    
@@ -246,24 +244,11 @@ namespace BeWo.Scheduler.View
 		    var checkType = IsNew ? SchedulerRightsCheckType.Create : SchedulerRightsCheckType.Edit;
             var allowedToChange = BS.Shared.Core.Utils.CheckSchedulerRights(SelectedCustomers.ToList(), SelectedResources.ToList(), SelectedEmployees.ToList(), NewSchedulerAppointmentFormController.Originator, IsNew, checkType, BeWoApp.LoggedOnUser);
 
-		    
-		    
-		    if(NewSchedulerView.IsInHomeDragPanelView)
-		    {
-		        OkButton.Visibility     = Visibility.Collapsed;
-		        DeleteButton.Visibility = Visibility.Collapsed;
-
-		        CancelButton.Content = "Schließen";
-		        CancelButton.HorizontalAlignment = HorizontalAlignment.Right;
-		    }
-		    
 		    if(IsInTaskViewMode)
 		    {
                 BetreffLabel.Content = "Titel";
+                StartLabel.Content = "Beginn";
 
-		        StartDate.Visibility            = Visibility.Collapsed;
-		        StartTime.Visibility            = Visibility.Collapsed;
-		        StartLabel.Visibility           = Visibility.Collapsed;
 		        EndDate.Visibility              = Visibility.Collapsed;
 		        EndTime.Visibility              = Visibility.Collapsed;
 		        EndLabel.Visibility             = Visibility.Collapsed;
@@ -284,8 +269,16 @@ namespace BeWo.Scheduler.View
 		        TaskDescription.Visibility      = Visibility.Visible;
 
 		        SupportConceptBtn.Visibility              = Visibility.Visible;
-		        SupportConceptsGrid.Visibility            = Visibility.Visible;
 		        SupportConceptsPopUpOeffnenBtn.Visibility = Visibility.Visible;
+                SelectedSupportConceptsListBox.Visibility = Visibility.Visible;
+
+                CustomersLabel.Visibility = Visibility.Collapsed;
+                CustomersGrid.Visibility = Visibility.Collapsed;
+                CustomerSearchViewPopup.Visibility = Visibility.Collapsed;
+                SelectedCustomersListBox.Visibility = Visibility.Collapsed;
+                KlientenPopUpOeffnenBtn.Visibility = Visibility.Collapsed;
+
+                SelectedCustomers.Clear();
 
                 if (!Controller.IsNewAppointment)
 		        {
@@ -387,7 +380,7 @@ namespace BeWo.Scheduler.View
 		private void CustomerPopUpEditClick(object sender, RoutedEventArgs e)
 		{
 			ResourcesTreeSearchView.AusgewaehlteRessourcen = _SelectedResources.ToList();
-			PopupCustomer.IsOpen = true;
+			CustomerSearchViewPopup.IsOpen = true;
 		}
 
 		private void ResourcePopUpClick(object sender, RoutedEventArgs e)
@@ -521,7 +514,7 @@ namespace BeWo.Scheduler.View
 	    private void CreatZeiterfassungButtonClick(object sender, RoutedEventArgs e)
 	    {
             var employ = SelectedMitarbeiter.Items;
-	        var y = SelectedKlient.Items;
+	        var y = SelectedCustomersListBox.Items;
 
 
 	        if(y.Count == 0)
@@ -621,17 +614,14 @@ namespace BeWo.Scheduler.View
         private void SupportConceptsPopUpClick(object sender, RoutedEventArgs e)
 	    {
 	        PopupSupportConcepts.IsOpen = true;
-
 	    }
 
 	    private void SupportConceptSelectionControl_ItemSelected(object sender, EventArgs<CompactSupportConceptDC> e)
 	    {
 	        PopupSupportConcepts.IsOpen = false;
 
-	        if(!SelectedSupportConcepts.Contains(e.Data))
-	        {
-	            SelectedSupportConcepts.Add(e.Data);
-	        }
+            SelectedSupportConcepts.Clear();
+            SelectedSupportConcepts.Add(e.Data);
 
 	        OnPropertyChanged(nameof(CountSelectedSupportConcepts));
 	        OnPropertyChanged(nameof(SelectedSupportConcepts));
diff --git a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
index f9f85250a..fc15eef57 100644
--- a/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
+++ b/BeWo/Scheduler/ViewModel/CustomFieldStorage.cs
@@ -53,6 +53,11 @@ namespace BeWo.Scheduler.ViewModel
         public DateTime? CompletedDate { get; set; }
         public string CompletedNotice { get; set; }
         public string TaskDescription { get; set; }
+
+        public long? SchedulerAppointmentOid { get; set; }
+
+        public string RecurrenceId { get; set; }
+        public int RecurrenceIndex { get; set; }
         
         public CompactEmployeeDC Originator { get; set; }
 
@@ -80,6 +85,11 @@ namespace BeWo.Scheduler.ViewModel
 
             Originator = pAppointment.Originator;
             Subject = pAppointment.Subject;
+
+            SchedulerAppointmentOid = pAppointment.DataContract?.SchedulerAppointmentOid;
+
+            RecurrenceId = pAppointment.DataContract?.RecurrenceId;
+            RecurrenceIndex = pAppointment.DataContract?.RecurrenceIndex ?? 0;
         }
 
         public CustomFieldStorage(SchedulerAppointmentDC pAppointment)
@@ -101,6 +111,11 @@ namespace BeWo.Scheduler.ViewModel
 
             Originator = pAppointment.Originator;
             Subject    = pAppointment.Subject;
+
+            SchedulerAppointmentOid = pAppointment.SchedulerAppointmentOid;
+
+            RecurrenceId = pAppointment.RecurrenceId;
+            RecurrenceIndex = pAppointment.RecurrenceIndex;
         }
 
         public CustomFieldStorage(ObservableCollection<Employee2SchedulerAppointmentDC> pEmployees, List<CompactCustomerDC> pCustomers, List<ResourceDC> pResources, CompactEmployeeDC pOriginator, bool pIsPrivate, bool pIsTask, string pTaskDescription, DateTime? pDueDate, DateTime? pCompletedDate, string pCompletedNotice, List<CompactSupportConceptDC> pSupportConcepts, string pSubject, bool pIsAllDay)
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index af4762384..b845827cb 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -3914,6 +3914,19 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/GetSchedulerAppointmentTasksForEmployeeBySupp" +
             "ortConecptBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.SchedulerAppointmentDC> GetSchedulerAppointmentTasksForEmployeeBySupportConecpt(long pEmployeeOid, long pSupportConceptOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceService/LoadTasksAndAppointmentsForEmployee", ReplyAction="http://tempuri.org/IResourceService/LoadTasksAndAppointmentsForEmployeeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/LoadTasksAndAppointmentsForEmployeeBeWoFaultF" +
+            "ault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.SchedulerAppointmentDC> LoadTasksAndAppointmentsForEmployee(long pEmployeeOid, System.DateTime pInvertalStart, int pBufferSize, System.Nullable<long> pEmployeeAppointmentsOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceService/InsertTestAppointments", ReplyAction="http://tempuri.org/IResourceService/InsertTestAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/InsertTestAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void InsertTestAppointments(long pEmployeeOid);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IResourceService/DeleteTestAppointments", ReplyAction="http://tempuri.org/IResourceService/DeleteTestAppointmentsResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IResourceService/DeleteTestAppointmentsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        void DeleteTestAppointments();
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -4174,6 +4187,21 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.GetSchedulerAppointmentTasksForEmployeeBySupportConecpt(pEmployeeOid, pSupportConceptOid);
         }
+        
+        public System.Collections.Generic.List<BS.Shared.DataContracts.SchedulerAppointmentDC> LoadTasksAndAppointmentsForEmployee(long pEmployeeOid, System.DateTime pInvertalStart, int pBufferSize, System.Nullable<long> pEmployeeAppointmentsOid)
+        {
+            return base.Channel.LoadTasksAndAppointmentsForEmployee(pEmployeeOid, pInvertalStart, pBufferSize, pEmployeeAppointmentsOid);
+        }
+        
+        public void InsertTestAppointments(long pEmployeeOid)
+        {
+            base.Channel.InsertTestAppointments(pEmployeeOid);
+        }
+        
+        public void DeleteTestAppointments()
+        {
+            base.Channel.DeleteTestAppointments();
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -4436,6 +4464,10 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/SaveSbdConfigBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void SaveSbdConfig(BS.Shared.DataContracts.SbdConfigDC config);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetSignature", ReplyAction="http://tempuri.org/IOperationsService/GetSignatureResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetSignatureBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        BS.Shared.DataContracts.SignatureDC GetSignature(long pSignatureOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptions", ReplyAction="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateServiceDescriptionsBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions);
@@ -5347,6 +5379,11 @@ namespace BeWo.ServiceProxy
             base.Channel.SaveSbdConfig(config);
         }
         
+        public BS.Shared.DataContracts.SignatureDC GetSignature(long pSignatureOid)
+        {
+            return base.Channel.GetSignature(pSignatureOid);
+        }
+        
         public void UpdateServiceDescriptions(System.Collections.Generic.List<BS.Shared.DataContracts.ServiceDescriptionDC> pServiceDescriptions)
         {
             base.Channel.UpdateServiceDescriptions(pServiceDescriptions);
diff --git a/BeWo/ServiceProxy/ServiceFacade.cs b/BeWo/ServiceProxy/ServiceFacade.cs
index 1c12f67b0..34e19ed52 100644
--- a/BeWo/ServiceProxy/ServiceFacade.cs
+++ b/BeWo/ServiceProxy/ServiceFacade.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.ServiceModel;
 using System.Threading;
@@ -814,7 +815,13 @@ namespace BeWo.ServiceProxy
 			if (lClient == null)
 			{
 				lClient = new TClient();
-				_ProxyCache.Add(typeof(TClient), lClient);
+
+                if(!_ProxyCache.ContainsKey(lClient.GetType()))
+                {
+                    _ProxyCache.Add(typeof(TClient), lClient);
+                }
+
+
 				lClient.Endpoint.Behaviors.Add(new SecurityHeaderEndpointBehavior());
 				lClient.Endpoint.Behaviors.Add(new MultitenancyEndpointBehavior());
 
diff --git a/BeWo/View/HomeDragPanelView.xaml b/BeWo/View/HomeDragPanelView.xaml
index 0094d63c2..68f4ea266 100644
--- a/BeWo/View/HomeDragPanelView.xaml
+++ b/BeWo/View/HomeDragPanelView.xaml
@@ -5,21 +5,24 @@
 					xmlns:blc="clr-namespace:Blacklight.Wpf.Controls;assembly=Blacklight.Wpf.Controls"
 					xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
 					xmlns:view="clr-namespace:BeWo.Scheduler.View"
-					xmlns:xtraScheduler="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1"
-					xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-					xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
 					xmlns:viewModel="clr-namespace:BeWo.Scheduler.ViewModel"
-					HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True" Loaded="HomeDragPanelView_OnLoaded">
+					xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+					xmlns:security="clr-namespace:BeWo.Security"
+					HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
 
 	<localView:BeWoView.Resources>
 		<localView:TaskDateDescriptionConverter x:Key="TaskDateDescriptionConverter" />
-	  <localView:TaskListItemBackgroundConverter x:Key="TaskListItemBackgroundConverter" />
-    <localView:TaskListItemForegroundConverter x:Key="TaskListItemForegroundConverter" />
-    <localView:TaskAppointmentToolTipConverter x:Key="TaskAppointmentToolTipConverter" />
+	    <localView:TaskListItemBackgroundConverter x:Key="TaskListItemBackgroundConverter" />
+        <localView:TaskListItemForegroundConverter x:Key="TaskListItemForegroundConverter" />
+        <localView:TaskAppointmentToolTipConverter x:Key="TaskAppointmentToolTipConverter" />
+        <view:NichtNochEinConverter x:Key="NichtNochEinConverter" />
+        <localView:BorderHeightConverter x:Key="BorderHeightConverter" />
+        <localView:TaskAppointmentVisibilityConverter x:Key="TaskAppointmentVisibilityConverter" />
+        <localView:BorderCornerRadiusConverter x:Key="BorderCornerRadiusConverter" />
 
 		<ControlTemplate x:Key="HomeViewListBoxTemplate" TargetType="{x:Type ListBox}">
 			<Border x:Name="Bd" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-				<ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}" HorizontalScrollBarVisibility="Disabled">
+				<ScrollViewer Focusable="False" Padding="{TemplateBinding Padding}" HorizontalScrollBarVisibility="Auto">
 					<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 				</ScrollViewer>
 			</Border>
@@ -38,7 +41,12 @@
 				<Setter.Value>
 					<ControlTemplate TargetType="{x:Type ListBoxItem}">
 						<Border x:Name="Bd" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}">
-							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+							<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" 
+                                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" 
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                              Content="{TemplateBinding Content}" 
+                                              ContentStringFormat="{TemplateBinding ContentStringFormat}" 
+                                              ContentTemplate="{TemplateBinding ContentTemplate}" />
 						</Border>
 						<ControlTemplate.Triggers>
 							<Trigger Property="IsEnabled" Value="False">
@@ -49,7 +57,8 @@
 				</Setter.Value>
 			</Setter>
 		</Style>
-		<!--<Style x:Key="InboxItemStyle" TargetType="{x:Type ListBoxItem}">
+        
+        <!--<Style x:Key="InboxItemStyle" TargetType="{x:Type ListBoxItem}">
             <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}"/>
             <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}"/>
             <Setter Property="Margin" Value="0,2,0,0" />
@@ -234,18 +243,7 @@
           
         </StackPanel>
 			</GroupBox.Header>
-
 			<Grid x:Name="RootGrid" ScrollViewer.VerticalScrollBarVisibility="Disabled" ScrollViewer.CanContentScroll="False" Background="{StaticResource ObjectEditBackgroundBrush}">
-				<!--<Grid.Background>
-                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                        <GradientStop Color="#FFFFFFFF" Offset="0"/>
-                        <GradientStop Color="#FFFFF4D5" Offset="0.996"/>
-                        <GradientStop Color="#FFFFF9EA" Offset="0.723"/>
-                    </LinearGradientBrush>
-
-                </Grid.Background>-->
-
-
 				<Grid Margin="5,5,5,5">
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
@@ -263,11 +261,11 @@
 								<DockPanel>
 									<Image Source="..\Ressources\Icons\AlertsDisabled.png" />
 									<TextBlock Text="{t:Translate Aufgaben}" TextWrapping="Wrap" FontSize="16" Foreground="#E0E0E0" VerticalAlignment="Bottom" Margin="5,0,0,5" />
-								  <TextBlock x:Name="RequestsTextBlock" VerticalAlignment="Center" HorizontalAlignment="Center">
-								      <Hyperlink RequestNavigate="ShowAppointmentRequests" NavigateUri="#" x:Name="RequestsHyperlink" Foreground="CornflowerBlue">
-								          <TextBlock x:Name="RequestsHyperLinkTextBlock" Foreground="CornflowerBlue" />
-								      </Hyperlink>
-								  </TextBlock>
+							        <TextBlock x:Name="RequestsTextBlock" VerticalAlignment="Center" HorizontalAlignment="Center">
+								        <Hyperlink RequestNavigate="ShowAppointmentRequests" NavigateUri="#" x:Name="RequestsHyperlink" Foreground="CornflowerBlue">
+								            <TextBlock x:Name="RequestsHyperLinkTextBlock" Foreground="CornflowerBlue" />
+								        </Hyperlink>
+							        </TextBlock>
 								</DockPanel>
 							</blc:DragDockPanel.Header>
 							<Grid Grid.IsSharedSizeScope="True" x:Name="TasksContainerGrid">
@@ -275,6 +273,7 @@
 									<ColumnDefinition Width="*" />
 								</Grid.ColumnDefinitions>
 								<Grid.RowDefinitions>
+									<RowDefinition Height="Auto" />
 									<RowDefinition Height="Auto" />
 									<RowDefinition Height="*" />
 								</Grid.RowDefinitions>
@@ -283,17 +282,100 @@
 									<RadioButton x:Name="rb_open" IsChecked="True" Margin="3" GroupName="task_filter">Offene Aufgaben</RadioButton>
 									<RadioButton x:Name="rb_closed" Margin="3" GroupName="task_filter">Erledigte Aufgaben</RadioButton>
 									<RadioButton x:Name="rb_all" Margin="3" GroupName="task_filter">Alle Aufgaben</RadioButton>
-									<RadioButton x:Name="rb_appointments" Margin="3" GroupName="task_filter">Termine</RadioButton>
+                                    <RadioButton x:Name="rb_appointments" Margin="3" GroupName="task_filter" security:DemandUserRight.VisibleDemands="ViewAll, KalenderAnsehen">Termine</RadioButton>
 								</StackPanel>
 
-								<ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxTasks"
+                                <StackPanel Grid.Row="1" Orientation="Horizontal" x:Name="TimeIntervalNavigationStackPanel" HorizontalAlignment="Center" Margin="0, 5, 0, 0" Visibility="Collapsed">
+                                    <Button x:Name="TestTermineAnlegenButton" Content="Testtermine +" Margin="0, 0, 5, 0" Visibility="Collapsed" Click="CreateTestAppointmentsButtonOnClick" FontSize="9" />
+                                    <Button x:Name="TestTermineLoeschenButton" Content="Testtermine -" Margin="0, 0, 5, 0" Visibility="Collapsed" Click="DeleteTestAppointmentsButtonOnClick" FontSize="9" />
+                                    <Label Content="Für Mitarbeiter " x:Name="employeeFilterLabel" Visibility="Collapsed" />
+                                    <ComboBox x:Name="employeeFilterBox" Margin="0, 0, 5, 0" Width="150" Visibility="Collapsed" SelectionChanged="EmployeeFilterBox_OnSelectionChanged" ItemsSource="{Binding Path=EmployeesForAppointmentView, UpdateSourceTrigger=PropertyChanged}" />
+                                    <Button Content="🠜" x:Name="TimeIntervalBackButton" Click="TimeIntervalBackButtonOnClick" />
+
+                                    <Grid HorizontalAlignment="Stretch" VerticalAlignment="Center">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <TextBlock Grid.Column="0" x:Name="AppointmentDateTextBlock" Margin="10, 0, 5, 0" VerticalAlignment="Center" />
+                                        <dxe:DateEdit Grid.Column="1" x:Name="AppointmentTimeIntervalDateEdit" Margin="5, 0, 10, 0"  MaskType="DateTime" VerticalAlignment="Center" EditValue="{Binding Mode=TwoWay, Path=CurrentDate, UpdateSourceTrigger=PropertyChanged}" Width="100" />
+                                    </Grid>
+                                    
+                                    <Button Content="🠞" x:Name="TimeIntervalForwardsButton" Click="TimeIntervalForwardsButtonOnClick" />
+                                </StackPanel>
+
+								<ListBox Grid.Row="2" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxTasks"
                                          Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0"
                                          HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}"
-                                         ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxTasks_MouseDoubleClick" Background="{x:Null}">
+                                         ScrollViewer.IsDeferredScrollingEnabled="False" 
+                                         ScrollViewer.HorizontalScrollBarVisibility="Auto"
+                                         MouseDoubleClick="listboxTasks_MouseDoubleClick" Background="{x:Null}">
 									<ListBox.ItemTemplate>
 										<DataTemplate DataType="{x:Type viewModel:SchedulerAppointmentVM}">
-											<Grid Margin="0,1,0,1" ToolTip="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}}" TextBlock.Foreground="{Binding Path=TextBlock.Foreground, RelativeSource={RelativeSource TemplatedParent}}">
-												<Grid.ColumnDefinitions>
+                                            <Grid Margin="0,1,0,1">
+                                                <Grid.ToolTip>
+                                                    <Grid>
+                                                        <Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto" />
+                                                            <ColumnDefinition Width="*" />
+                                                        </Grid.ColumnDefinitions>
+                                                        <Grid Grid.Row="0" Grid.Column="0" Margin="0,0,3,0" Grid.ColumnSpan="2">
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="Auto" />
+                                                                <ColumnDefinition Width="*" />
+                                                            </Grid.ColumnDefinitions>
+                                                            <StackPanel Grid.Column="0" Orientation="Horizontal" Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipTimeVisibility}">
+                                                            <TextBlock Text="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}, ConverterParameter=TimeText}" Margin="0,0,4,0" />
+                                                            </StackPanel>
+                                                            <TextBlock Grid.Column="1" Text="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}, ConverterParameter=ToolTip}" TextWrapping="Wrap" MaxWidth="{Binding ActualWidth, Source={x:Reference listboxTasks}}" />
+                                                        </Grid>
+                                                        <Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipTrennstrichVisibility}" />
+                                                        <TextBlock Margin="0,0,3,0" Grid.Row="2" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipResourcesVisibility}" />
+                                                        <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}, ConverterParameter=Resources}"
+							                                       Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipResourcesVisibility}" />
+
+                                                        <TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="{t:Translate Mitarbeiter:}" Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipEmployeesVisibility}" />
+
+                                                        <ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}, ConverterParameter=Employees}" Grid.Column="1" Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
+                                                            <ListView.ItemsPanel>
+                                                                <ItemsPanelTemplate>
+                                                                    <WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}" 
+                                                                               ItemWidth="{Binding (ListView.View).ItemWidth, RelativeSource={RelativeSource AncestorType=ListView}}" 
+                                                                               MinWidth="{Binding ItemWidth, RelativeSource={RelativeSource Self}}" 
+                                                                               ItemHeight="{Binding (ListView.View).ItemHeight, RelativeSource={RelativeSource AncestorType=ListView}}" />
+                                                                </ItemsPanelTemplate>
+                                                            </ListView.ItemsPanel>
+                                                            <ListView.ItemTemplate>
+                                                                <DataTemplate>
+                                                                    <Grid>
+                                                                        <Grid.ColumnDefinitions>
+                                                                            <ColumnDefinition Width="Auto" />
+                                                                            <ColumnDefinition Width="*" />
+                                                                        </Grid.ColumnDefinitions>
+                                                                        <Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" 
+                                                                                Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipZusageVisibility, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}" />
+                                                                        <TextBlock Grid.Column="1" Foreground="DimGray" Text="{Binding Converter={StaticResource NichtNochEinConverter}, ConverterParameter=GibName}" />
+                                                                    </Grid>
+                                                                </DataTemplate>
+                                                            </ListView.ItemTemplate>
+                                                        </ListView>
+
+                                                        <TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{t:Translate Klienten:}" 
+                                                                   Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipCustomersVisibility}" />
+                                                        <TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Converter={StaticResource TaskAppointmentToolTipConverter}, ConverterParameter=Customers}"
+							                                       Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ToolTipCustomersVisibility}" />
+                                                    </Grid>
+                                                </Grid.ToolTip>
+                                                <Grid.ColumnDefinitions>
 													<ColumnDefinition Width="Auto" SharedSizeGroup="col1" />
 													<ColumnDefinition Width="*" />
 													<ColumnDefinition Width="Auto" />
@@ -301,24 +383,44 @@
 												<Grid.RowDefinitions>
 													<RowDefinition Height="Auto" />
 												</Grid.RowDefinitions>
-												<Border x:Name="BackgroundColorBorder" CornerRadius="5" MinHeight="24" Background="{Binding Converter={ StaticResource TaskListItemBackgroundConverter}}" Grid.ColumnSpan="3" Margin="0,0,0,0" OpacityMask="{x:Null}" />
-												<Border x:Name="ItemBorder" CornerRadius="5" MinHeight="24" Background="#FF000000" Grid.ColumnSpan="3" Margin="0,0,0,0">
+                                                <Border x:Name="BackgroundColorBorder" CornerRadius="5" MinHeight="24" 
+                                                        Background="{Binding Converter={StaticResource TaskListItemBackgroundConverter}}" Grid.ColumnSpan="3"
+                                                        Grid.Column="0" Margin="0,0,0,0" OpacityMask="{x:Null}" />
+                                                <Border CornerRadius="5,0,0,5" Grid.Row="0" Grid.Column="0" Background="{Binding Converter={StaticResource TaskListItemBackgroundConverter}, ConverterParameter=EmployeeBackgroundBrush}" MinHeight="24" 
+                                                        VerticalAlignment="Center" Width="10" Margin="1" HorizontalAlignment="Left" 
+                                                        Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=EmployeeBorderVisibility}" />
+                                                <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="24" Background="#FF000000" Grid.ColumnSpan="3" Grid.Column="0" Margin="0,0,0,0">
 													<Border.OpacityMask>
 														<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
 															<GradientStop Color="#19000000" Offset="0" />
 															<GradientStop Color="#26000000" Offset="1" />
 														</LinearGradientBrush>
 													</Border.OpacityMask>
-
 												</Border>
-												<TextBlock Margin="5 5" FontSize="12" Foreground="{Binding Converter={StaticResource TaskListItemForegroundConverter}}" Grid.Column="0" Grid.Row="0">
-													<TextBlock.Text>
-														<MultiBinding StringFormat="{}{0}">
-															<Binding Path="Subject" />
-														</MultiBinding>
-													</TextBlock.Text>
-												</TextBlock>
-												<TextBlock Text="{Binding Converter={StaticResource TaskDateDescriptionConverter}}" Margin="5 5" FontSize="12" Foreground="{Binding Converter={StaticResource TaskListItemForegroundConverter}}" Grid.Column="2" Grid.Row="0"></TextBlock>
+                                                <Border CornerRadius="{Binding Converter={StaticResource BorderCornerRadiusConverter}, ConverterParameter=Resources}" Grid.Column="2" Grid.Row="0" 
+                                                        Background="{Binding Converter={StaticResource TaskListItemBackgroundConverter}, ConverterParameter=ResourceBackgroundBrush}" Width="10" VerticalAlignment="Bottom" 
+                                                        HorizontalAlignment="Right" Margin="1" MaxHeight="24"
+                                                        Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=ResourceBorderVisibility}">
+                                                    <Border.Height>
+                                                        <MultiBinding Converter="{StaticResource BorderHeightConverter}">
+                                                            <Binding ElementName="ItemBorder" Path="ActualHeight" />
+                                                            <Binding />
+                                                        </MultiBinding>
+                                                    </Border.Height>
+                                                </Border>
+                                                <Border CornerRadius="{Binding Converter={StaticResource BorderCornerRadiusConverter}, ConverterParameter=Customers}" Grid.Column="2" Grid.Row="0" 
+                                                        Background="{Binding Converter={StaticResource TaskListItemBackgroundConverter}, ConverterParameter=CustomerBackgroundBrush}" Width="10" VerticalAlignment="Top" 
+                                                        HorizontalAlignment="Right" Margin="1" MaxHeight="24"
+                                                        Visibility="{Binding Converter={StaticResource TaskAppointmentVisibilityConverter}, ConverterParameter=CustomerBorderVisibility}">
+                                                    <Border.Height>
+                                                        <MultiBinding Converter="{StaticResource BorderHeightConverter}">
+                                                            <Binding ElementName="ItemBorder" Path="ActualHeight" />
+                                                            <Binding />
+                                                        </MultiBinding>
+                                                    </Border.Height>
+                                                </Border>
+                                                <TextBlock Margin="15, 5, 5, 5" FontSize="12" Foreground="{Binding Converter={StaticResource TaskListItemForegroundConverter}}" Grid.Column="0" Grid.Row="0" Text="{Binding Path=Subject}" />
+												<TextBlock Text="{Binding Converter={StaticResource TaskDateDescriptionConverter}}" Margin="5, 5, 15, 5" FontSize="12" Foreground="{Binding Converter={StaticResource TaskListItemForegroundConverter}}" Grid.Column="2" Grid.Row="0" />
 											</Grid>
 											<DataTemplate.Triggers>
 												<Trigger Property="IsMouseOver" Value="True">
@@ -331,69 +433,11 @@
 														</Setter.Value>
 													</Setter>
 												</Trigger>
-
 											</DataTemplate.Triggers>
 										</DataTemplate>
 									</ListBox.ItemTemplate>
 								</ListBox>
-
-                <!--<ListBox Grid.Row="1" ScrollViewer.CanContentScroll="True" IsSynchronizedWithCurrentItem="True" x:Name="listboxTasks" Visibility="Collapsed"
-                                       Margin="0,3,0,0" Padding="0,0,0,0" Width="Auto" HorizontalAlignment="Stretch" MinWidth="0"
-                                       HorizontalContentAlignment="Stretch" Style="{DynamicResource HomeViewListStyle}" ItemContainerStyle="{DynamicResource HomeViewListBoxItemStyle}"
-                                       ScrollViewer.IsDeferredScrollingEnabled="False" MouseDoubleClick="listboxTasks_MouseDoubleClick" Background="{x:Null}">
-                  <ListBox.ItemTemplate>
-                    <DataTemplate DataType="{x:Type localViewModel:TaskVM}">
-                      <Grid Margin="0,1,0,1" ToolTip="{Binding Description}" TextBlock.Foreground="{Binding Path=TextBlock.Foreground, RelativeSource={RelativeSource TemplatedParent}}">
-                        <Grid.ColumnDefinitions>
-                          <ColumnDefinition Width="Auto" SharedSizeGroup="col1" />
-                          <ColumnDefinition Width="*" />
-                          <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-                        <Grid.RowDefinitions>
-                          <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Border x:Name="BackgroundColorBorder" CornerRadius="5" MinHeight="24" Background="{DynamicResource SupportConceptListBrush}" Grid.ColumnSpan="3" Margin="0,0,0,0" OpacityMask="{x:Null}" />
-                        <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="24" Background="#FF000000" Grid.ColumnSpan="3" Margin="0,0,0,0">
-                          <Border.OpacityMask>
-                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                              <GradientStop Color="#19000000" Offset="0" />
-                              <GradientStop Color="#26000000" Offset="1" />
-                            </LinearGradientBrush>
-                          </Border.OpacityMask>
-
-                        </Border>
-                        <TextBlock Margin="5 5" FontSize="12" Foreground="#FFD2D2D2" Grid.Column="0" Grid.Row="0">
-                          <TextBlock.Text>
-                            <MultiBinding StringFormat="{}{0}">
-                              <Binding Path="Title" />
-                            </MultiBinding>
-                          </TextBlock.Text>
-                        </TextBlock>
-                        <TextBlock Text="{Binding Converter={StaticResource TaskDateDescriptionConverter}}" Margin="5 5" FontSize="12" Foreground="#FFD2D2D2" Grid.Column="2" Grid.Row="0"></TextBlock>
-                      </Grid>
-                      <DataTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                          <Setter Property="OpacityMask" TargetName="ItemBorder">
-                            <Setter.Value>
-                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                <GradientStop Color="#44000000" Offset="0" />
-                                <GradientStop Color="#77000000" Offset="1" />
-                              </LinearGradientBrush>
-                            </Setter.Value>
-                          </Setter>
-                        </Trigger>
-
-                      </DataTemplate.Triggers>
-                    </DataTemplate>
-                  </ListBox.ItemTemplate>
-
-                  <sharedCompact:CompactSupportConceptDC ActivationType="Active" ConferenceDate="2010-01-01" />
-                  <sharedCompact:CompactSupportConceptDC ActivationType="Active" ConferenceDate="2010-01-01" />
-                  <sharedCompact:CompactSupportConceptDC ActivationType="Active" ConferenceDate="2010-01-01" />
-
-                </ListBox>-->
-
-              </Grid>
+                            </Grid>
 						</blc:DragDockPanel>
 
 						<blc:DragDockPanel x:Name="ExpiringSupportConcepts">
diff --git a/BeWo/View/HomeDragPanelView.xaml.cs b/BeWo/View/HomeDragPanelView.xaml.cs
index 4e8b1670c..d4947d47f 100644
--- a/BeWo/View/HomeDragPanelView.xaml.cs
+++ b/BeWo/View/HomeDragPanelView.xaml.cs
@@ -1,8 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Text;
 using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
@@ -28,9 +31,14 @@ using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 using BS.Shared.RSS;
 using System.Text.RegularExpressions;
+using BeWo.Annotations;
 using BeWo.ownChat;
+using BeWo.Scheduler.Utils;
 using BeWo.Scheduler.View;
+using BeWo.View.Master;
 using ChatController.HauptKlassen;
+using DevExpress.XtraScheduler;
+using DevExpress.XtraScheduler.Xml;
 using Brushes = System.Windows.Media.Brushes;
 using Button = System.Windows.Controls.Button;
 using Color = System.Windows.Media.Color;
@@ -45,19 +53,25 @@ namespace BeWo.View
     /// <summary>
     ///     Interaction logic for HomeView.xaml
     /// </summary>
-    public partial class HomeDragPanelView : BeWoView
+    public partial class HomeDragPanelView : BeWoView, INotifyPropertyChanged
     {
         private List<TaskDC> _AllTasks;
         private List<SchedulerAppointmentDC> _AllSchedulerTasks;
-       
+
+        private bool _IsAllowedToSeeMitarbeitertermine;
+        private bool _IsAllowedToSeeCustomerAppointments;
+        private bool _IsAllowedToSeeResourceAppointments;
+
         //chat berechtigung
-        protected bool berechtigt = false;
+        protected bool berechtigt;
     
         //int staerke
         public HomeDragPanelView()
         {
             InitializeComponent();
 
+            DataContext = this;
+
             txtHeader.Text = String.Format("{0} {1}", BeWoApp.LoggedOnUser.Employee.FirstName,BeWoApp.LoggedOnUser.Employee.LastName);
                 
             txtVersion.Text = BeWoApp.Version;
@@ -75,7 +89,8 @@ namespace BeWo.View
                 
 
 #if DEBUG
-            txtChangePassword.Visibility = Visibility.Visible;
+            //txtChangePassword.Visibility = Visibility.Visible;
+            //TestTermineAnlegenButton.Visibility = Visibility.Visible;
 #else
 			if (BeWoApp.Tenant == "demo" || !BeWoApp.LoggedOnUser.HasRight(UserRightType.AllowChangeOwnPassword))
 			{
@@ -114,21 +129,27 @@ namespace BeWo.View
             berechtigt = true;
 #endif
 
-            if (berechtigt)
-            {
-                //asx = new Thread(ConnectWithServer);                   
-                //asx.Start();
-                BewoChat.Visibility = Visibility.Visible;//Hidden
-            }
-            else
-            {
-
-                BewoChat.Visibility = Visibility.Hidden;//Hidden
-            }
+            BewoChat.Visibility = berechtigt ? Visibility.Visible : Visibility.Hidden;
 
             PruefePasswortStaerke();
         }
 
+        private bool _IsShowingAppointments;
+
+        private bool _HasRightsToSeeAppointments;
+
+        private List<CompactEmployeeDC> _EmployeesForAppointmentView;
+        public List<CompactEmployeeDC> EmployeesForAppointmentView
+        {
+            get => _EmployeesForAppointmentView ?? (_EmployeesForAppointmentView = new List<CompactEmployeeDC>());
+
+            set
+            {
+                _EmployeesForAppointmentView = value;
+                OnPropertyChanged(nameof(EmployeesForAppointmentView));
+            }
+        }
+
         private void PruefePasswortStaerke()
         {
             if ( BeWoApp.PasswortStrength == PasswortSecurityStrength.SehrSchwach)
@@ -229,8 +250,14 @@ namespace BeWo.View
             InitContent();
             //Warum klappt das bei Köln Ring nicht?=
             if (BeWoApp.LoggedOnUser == null || BeWoApp.LoggedOnUser.ResetPasswordInfos == null)
+            {
                 return;
-            if (!BeWoApp.LoggedOnUser.ResetPasswordInfos.Any(a => a.HasToChangePW)) return;
+            }
+
+            if (!BeWoApp.LoggedOnUser.ResetPasswordInfos.Any(a => a.HasToChangePW))
+            {
+                return;
+            }
 
             var fenster = new PasswortAenderungsView {AbbrechenButton = {IsEnabled = false}};
             fenster.CommandBindings.Clear();
@@ -364,6 +391,7 @@ namespace BeWo.View
             
             rb_open.IsChecked = true;
             UpdateInternalNews();
+            InitTasks();
         }
 
         private void InitExpiredSupportConcepts()
@@ -698,7 +726,7 @@ namespace BeWo.View
 
         private void InitTasks()
         {
-            int test = 0;
+            var test = 0;
             
             while (BeWoApp.LoggedOnEmployee == null && test < 50)
             {
@@ -708,27 +736,129 @@ namespace BeWo.View
             
             if (BeWoApp.LoggedOnEmployee != null)
             {
-                // TODO: normale Tasks und AppointmentTasks laden
+                var rights = new List<UserRightType> { UserRightType.KalenderAnsehen };
 
-                //Scheduler = new NewSchedulerView(true);
+                _HasRightsToSeeAppointments = BeWoUtils.HasRight(UserRightType.KalenderAnsehen) || BeWoUtils.HasRight(UserRightType.ViewAll);
 
-                //RequestsHyperLinkTextBlock.Text = Scheduler.Requests;
-                //RequestsTextBlock.IsEnabled = Scheduler.Enabled;
-                //RequestsHyperlink.IsEnabled = Scheduler.Enabled;
+                var r2 = rights;
+                r2.Add(UserRightType.KalenderMitarbeitertermineAnsehen);
 
-                //Grid.SetRow(Scheduler, 1);
+                var r3 = rights;
+                r3.Add(UserRightType.KalenderKliententermineAlleAnsehen);
 
-                //TasksContainerGrid.Children.Add(Scheduler);
+                var r5 = rights;
+                r5.Add(UserRightType.KalenderRessourcentermineAnsehen);
 
-                ServiceFacade.DoResourceServiceAsync(s => s.GetAllTasksForEmployee(BeWoApp.LoggedOnEmployeeOid.Value), cb =>
+                _IsAllowedToSeeMitarbeitertermine = r2.All(BeWoUtils.HasRight) || BeWoUtils.HasRight(UserRightType.ViewAll);
+                _IsAllowedToSeeCustomerAppointments = r3.All(BeWoUtils.HasRight) || BeWoUtils.HasRight(UserRightType.ViewAll);
+                _IsAllowedToSeeResourceAppointments = r5.All(BeWoUtils.HasRight) || BeWoUtils.HasRight(UserRightType.ViewAll);
+
+                if (_HasRightsToSeeAppointments && _IsAllowedToSeeMitarbeitertermine)
                 {
-                    this.Dispatch(delegate
-                    {
-                        _AllSchedulerTasks = cb;
+#if DEBUG
+                    //TestTermineLoeschenButton.Visibility = Visibility.Visible;
+#endif
 
-                        listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => i.IsTask && !i.CompletedDate.HasValue).OrderBy(i => i.DueDate).ToList();
+                    employeeFilterBox.Visibility = Visibility.Visible;
+
+                    ServiceFacade.DoEmployeeServiceAsync(s => s.GetAllActiveEmployeesCompact(), cb =>
+                    {
+                        this.Dispatch(delegate
+                        {
+                            EmployeesForAppointmentView = cb.OrderBy(o => o.LastName + ", " + o.FirstName).ToList();
+                            employeeFilterBox.SelectedItem = BeWoApp.CompactLoggedOnEmployee;
+                        });
                     });
-                });
+                }
+                else
+                {
+                    EmployeesForAppointmentView = new List<CompactEmployeeDC> { BeWoApp.CompactLoggedOnEmployee };
+                    employeeFilterBox.SelectedItem = BeWoApp.CompactLoggedOnEmployee;
+                }
+
+                ShowAppointments(false);
+                LoadTasksAndAppointments(true, true);
+            }
+        }
+
+        private void BuildRecurringAppointments(List<SchedulerAppointmentDC> pRecurringAppointments, DateTime pStartDate, DateTime pEndDate)
+        {
+            var patternToExceptions = new List<RecurringAppointment>();
+            var recurrenceInterval = new TimeInterval(pStartDate, pEndDate - pStartDate);
+
+            var scheduler = new SchedulerControl();
+
+            foreach(var appointment in pRecurringAppointments.OrderBy(o => o.Type))
+            {
+                if(appointment.Type == (int) AppointmentType.Pattern)
+                {
+                    var id = Utils.ExtractIdFromRecurrenceInfo(appointment.RecurrenceInfo);
+
+                    patternToExceptions.Add(new RecurringAppointment(id, pRecurringAppointments.Where(w => w.RecurrenceInfo.Contains(id) && w.Type != (int) AppointmentType.Pattern).ToDictionary(x => Utils.ExtractIndexFromRecurrenceInfo(x.RecurrenceInfo), y => y), appointment));
+                }
+            }
+
+            foreach (var appointment in patternToExceptions)
+            {
+                var patternAppointment = appointment.Pattern;
+
+                var recurrenceInfo = RecurrenceInfoXmlPersistenceHelper.ObjectFromXml(patternAppointment.RecurrenceInfo);
+                var instance = OccurrenceCalculator.CreateInstance(recurrenceInfo);
+
+                scheduler.Storage = new SchedulerStorage();
+
+                var pattern = scheduler.Storage.CreateAppointment(AppointmentType.Pattern, appointment.Pattern.StartDate.Value, appointment.Pattern.EndDate.Value);
+
+                var occurrences = instance.CalcOccurrences(recurrenceInterval, pattern);
+                
+                foreach(var devExpressAppointment in occurrences)
+                {
+                    var index = devExpressAppointment.RecurrenceIndex;
+
+                    if(index == 0 && appointment.Occurrences.ContainsKey(0))
+                    {
+                        _AllSchedulerTasks.Remove(appointment.Pattern);
+                    }
+
+                    var indizes = appointment.Occurrences.Keys.ToList();
+
+                    if (indizes.Contains(index) || devExpressAppointment.Type == AppointmentType.Occurrence && devExpressAppointment.RecurrenceIndex == 0)
+                    {
+                        continue;
+                    }
+
+                    var occurrence = new SchedulerAppointmentDC
+                    {
+                        CustomerList = patternAppointment.CustomerList,
+                        AllDay = patternAppointment.AllDay,
+                        EndDate = devExpressAppointment.End,
+                        RecurrenceInfo = devExpressAppointment.RecurrenceInfo.ToXml(),
+                        StartDate = devExpressAppointment.Start,
+                        Type = (int) AppointmentType.Occurrence,
+                        CompletedDate = patternAppointment.CompletedDate,
+                        Description = patternAppointment.Description,
+                        DueDate = patternAppointment.DueDate,
+                        EmployeeList = patternAppointment.EmployeeList,
+                        CompletedNotice = patternAppointment.CompletedNotice,
+                        FormerBookingSequenceOid = patternAppointment.FormerBookingSequenceOid,
+                        FormerTaskOid = patternAppointment.FormerTaskOid,
+                        IsPrivate = patternAppointment.IsPrivate,
+                        IsTeilnahmeBestaetigung = patternAppointment.IsTeilnahmeBestaetigung,
+                        SupportConceptList = patternAppointment.SupportConceptList,
+                        TaskDescription = patternAppointment.TaskDescription,
+                        IsTask = patternAppointment.IsTask,
+                        ResourceList = patternAppointment.ResourceList,
+                        Originator = patternAppointment.Originator,
+                        Subject = patternAppointment.Subject,
+                        Location = patternAppointment.Location,
+                        Status = patternAppointment.Status,
+                        LabelId = patternAppointment.LabelId,
+                        RecurrenceIndex = devExpressAppointment.RecurrenceIndex,
+                        RecurrenceId = appointment.RecurrenceId
+                    };
+
+                    _AllSchedulerTasks.Add(occurrence);
+                }
             }
         }
 
@@ -788,24 +918,144 @@ namespace BeWo.View
         {
             if (_AllSchedulerTasks != null)
             {
-                switch (((Control) e.OriginalSource).Name)
+                var controlName = ((Control) e.OriginalSource).Name;
+
+                switch (controlName)
                 {
                     case "rb_all":
+                        _IsShowingAppointments = false;
                         listboxTasks.ItemsSource = _AllSchedulerTasks.Where(w => w.IsTask).OrderBy(i => i.CompletedDate ?? i.DueDate).ToList();
+                        ShowAppointments(false);
                         break;
                     case "rb_open":
+                        _IsShowingAppointments = false;
                         listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => !i.CompletedDate.HasValue && i.IsTask).OrderBy(i => i.DueDate).ToList();
+                        ShowAppointments(false);
                         break;
                     case "rb_closed":
+                        _IsShowingAppointments = false;
                         listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => i.CompletedDate.HasValue && i.IsTask).OrderByDescending(i => i.CompletedDate).ToList();
+                        ShowAppointments(false);
                         break;
                     case "rb_appointments":
+                        _IsShowingAppointments = true;
                         listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => !i.IsTask).OrderByDescending(i => i.EndDate).ToList();
+                        ShowAppointments(true);
                         break;
                 }
             }
         }
 
+        private const int _DateBuffer = 14;
+        private DateTime _BufferDate = DateTime.Today.AddDays(-1 * _DateBuffer);
+        private DateTime _CurrentDate = DateTime.Today;
+
+        public DateTime CurrentDate
+        {
+            get => _CurrentDate;
+            set
+            {
+                if(!Equals(_CurrentDate, value))
+                {
+                    _CurrentDate = value;
+                    UpdateAppointmentDateTextBlock(value);
+                    OnPropertyChanged(nameof(CurrentDate));
+                }
+            }
+        }
+
+        private void ShowAppointments(bool pShouldShowAppointments)
+        {
+            TimeIntervalNavigationStackPanel.Visibility = pShouldShowAppointments ? Visibility.Visible : Visibility.Collapsed;
+            TimeIntervalBackButton.Visibility = pShouldShowAppointments ? Visibility.Visible : Visibility.Collapsed;
+            AppointmentDateTextBlock.Visibility = pShouldShowAppointments ? Visibility.Visible : Visibility.Collapsed;
+            TimeIntervalForwardsButton.Visibility = pShouldShowAppointments ? Visibility.Visible : Visibility.Collapsed;
+
+            if(pShouldShowAppointments)
+            {
+                CurrentDate = DateTime.Today;
+                UpdateAppointmentDateTextBlock(null);
+            }
+        }
+
+        public void TimeIntervalBackButtonOnClick(object sender, EventArgs args)
+        {
+            CurrentDate = CurrentDate.AddDays(-1);
+            UpdateAppointmentDateTextBlock(_CurrentDate);
+        }
+
+        public void TimeIntervalForwardsButtonOnClick(object sender, EventArgs args)
+        {
+            CurrentDate = CurrentDate.AddDays(1);
+            UpdateAppointmentDateTextBlock(_CurrentDate);
+        }
+
+        private void UpdateAppointmentDateTextBlock(DateTime? pDate)
+        {
+            var date = pDate ?? DateTime.Today;
+
+            var weekOfYear = date.GetIso8601WeekOfYear().ToString();
+            var dayOfWeek = date.ToString("dddd");
+
+            AppointmentDateTextBlock.Text = $"KW {weekOfYear}, {dayOfWeek} ";
+
+            LoadTasksAndAppointments(false);
+        }
+
+        private void LoadTasksAndAppointments(bool pIsShowingTasks, bool pForceUpdate = false)
+        {
+            if(_CurrentDate < _BufferDate || _CurrentDate > _BufferDate.AddDays(3 * _DateBuffer) || pForceUpdate)
+            {
+                _BufferDate = _CurrentDate.AddDays(-1 * _DateBuffer);
+
+                ServiceFacade.DoResourceServiceAsync(s => s.LoadTasksAndAppointmentsForEmployee(BeWoApp.LoggedOnEmployeeOid.Value, _CurrentDate, _DateBuffer, _SelectedEmployeeForAppointments?.EmployeeOid), cb =>
+                {
+                    this.Dispatch(delegate
+                    {
+                        _AllSchedulerTasks = cb;
+
+                        BuildRecurringAppointments(_AllSchedulerTasks.Where(w => w.RecurrenceInfo != null).ToList(), _CurrentDate, _CurrentDate.AddDays(3 * _DateBuffer));
+
+                        if (pIsShowingTasks)
+                        {
+                            listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => i.IsTask && !i.CompletedDate.HasValue).OrderBy(i => i.DueDate).OrderBy(o => o.StartDate.Value).ToList();
+                        }
+                        else
+                        {
+                            listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => !i.IsTask &&
+                                                                                     i.StartDate.HasValue && i.StartDate.Value.InBetween(_CurrentDate, _CurrentDate.AddDays(14), true) &&
+                                                                                     i.EndDate.HasValue && i.EndDate.Value.InBetween(_CurrentDate, _CurrentDate.AddDays(14), true) &&
+                                                                                     i.Type != (int) AppointmentType.DeletedOccurrence).OrderBy(o => o.StartDate.Value).ToList();
+                        }
+                    });
+                });
+            }
+            else
+            {
+                if (pIsShowingTasks)
+                {
+                    listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => i.IsTask && !i.CompletedDate.HasValue).OrderBy(i => i.DueDate).OrderBy(o => o.StartDate.Value).ToList();
+                }
+                else
+                {
+                    listboxTasks.ItemsSource = _AllSchedulerTasks.Where(i => !i.IsTask &&
+                                                                             i.StartDate.HasValue && i.StartDate.Value.InBetween(_CurrentDate, _CurrentDate.AddDays(14), true) &&
+                                                                             i.EndDate.HasValue && i.EndDate.Value.InBetween(_CurrentDate, _CurrentDate.AddDays(14), true) &&
+                                                                             i.Type != (int) AppointmentType.DeletedOccurrence).OrderBy(o => o.StartDate.Value).ToList();
+
+                    foreach (var app in listboxTasks.ItemsSource)
+                    {
+                        var a = (SchedulerAppointmentDC)app;
+
+                        if (a.IsTask || a.RecurrenceInfo == null)
+                        {
+                            continue;
+                        }
+                    }
+                }
+            }
+        }
+
         private void ReloadRssFeed(RssFeed feed)
         {
             ReloadRssFeed(feed, true);
@@ -1036,7 +1286,6 @@ namespace BeWo.View
 
         private void listboxTasks_MouseDoubleClick(object sender, MouseButtonEventArgs e)
         {
-            // TODO: Anpassen an Kalendertermine!
             if (!IsPartOf(e.OriginalSource, typeof (ScrollBar)))
             {
                 if (((ListBox) sender).SelectedItem is SchedulerAppointmentDC sc && sc.IsTask && sc.SupportConceptList.Count == 1 &&
@@ -1060,6 +1309,12 @@ namespace BeWo.View
                                 //});
                             }));
                 }
+                else if(((ListBox)sender).SelectedItem is SchedulerAppointmentDC sc2 && !sc2.IsTask &&
+                        (BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderAnsehen) ||
+                         BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll)) && sc2.StartDate.HasValue)
+                {
+                    MainControl.NavigateTo(new SchedulerMasterView(sc2.StartDate.Value, sc2) { ParentView = this});
+                }
             }
         }
 
@@ -1226,7 +1481,7 @@ namespace BeWo.View
 
         private void LinkNewDatenschutz_OnRequestNavigate(object sender, RequestNavigateEventArgs e)
         {
-            System.Diagnostics.Process.Start(new System.Diagnostics.ProcessStartInfo((sender as System.Windows.Documents.Hyperlink).NavigateUri.ToString()));
+            Process.Start(new ProcessStartInfo((sender as Hyperlink)?.NavigateUri.ToString()));
         }
 
       
@@ -1436,9 +1691,54 @@ namespace BeWo.View
             }
         }
 
-        private void HomeDragPanelView_OnLoaded(object sender, RoutedEventArgs e)
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
         {
-            InitTasks();
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+
+        private CompactEmployeeDC _SelectedEmployeeForAppointments;
+        private void EmployeeFilterBox_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if(e?.AddedItems?.Count > 0 && _IsShowingAppointments)
+            {
+                _SelectedEmployeeForAppointments = (CompactEmployeeDC) e.AddedItems[0];
+                LoadTasksAndAppointments(false, true);
+            }
+        }
+
+        private void CreateTestAppointmentsButtonOnClick(object sender, RoutedEventArgs e)
+        {
+            ServiceFacade.DoResourceServiceAsync(s =>
+            {
+                if(BeWoApp.LoggedOnEmployeeOid != null)
+                {
+                    s.InsertTestAppointments(BeWoApp.LoggedOnEmployeeOid.Value);
+
+                    this.Dispatch(() =>
+                    {
+                        LoadTasksAndAppointments(false, true);
+                    });
+                }
+            });
+        }
+
+        private void DeleteTestAppointmentsButtonOnClick(object sender, RoutedEventArgs e)
+        {
+            ServiceFacade.DoResourceServiceAsync(s =>
+            {
+                if(BeWoApp.LoggedOnEmployeeOid != null)
+                {
+                    s.DeleteTestAppointments();
+
+                    this.Dispatch(() =>
+                    {
+                        LoadTasksAndAppointments(false, true);
+                    });
+                }
+            });
         }
     }
 
@@ -1465,28 +1765,38 @@ namespace BeWo.View
 
 			    if(task.StartDate.HasValue)
 			    {
-			        return $"{task.StartDate:d} {task.StartDate:t}";
+			        return task.AllDay ? $"{task.StartDate:d}" : $"{task.StartDate:d} {task.StartDate:t}";
 			    }
 			}
 			return string.Empty;
 		}
 
-		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-		{
-			throw new NotImplementedException();
-		}
-	}
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
 
     public class TaskListItemBackgroundConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if(value is SchedulerAppointmentDC task && task.IsTask)
+            if(value is SchedulerAppointmentDC task && !task.IsTask)
             {
-                return new LinearGradientBrush(Color.FromRgb(153, 59, 59), Color.FromRgb(92, 25, 25), new Point(0, 0), new Point(0, 1));
+                if(parameter != null)
+                {
+                    switch(parameter.ToString())
+                    {
+                        case "ResourceBackgroundBrush":
+                            return task.ResourceList?.Count > 0 ? task.ResourceList.First().GetBrush() : new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
+                        case "CustomerBackgroundBrush":
+                            return new SolidColorBrush(task.CustomerList?.Count > 0 ? Color.FromRgb(59, 119, 153) : Color.FromArgb(0, 0, 0, 0));
+                        case "EmployeeBackgroundBrush":
+                            return task.EmployeeList?.Count > 0 ? task.EmployeeList.First().Employee.FilterableBrush : task.Originator?.FilterableBrush ?? new SolidColorBrush(Color.FromArgb(0, 0, 0, 0));
+                    }
+                }
+
+                return new LinearGradientBrush(Color.FromRgb(192, 255, 208), Color.FromRgb(192, 255, 208), new Point(0, 0), new Point(1, 1));
             }
-            
-            return new LinearGradientBrush(Color.FromRgb(192, 255, 208), Color.FromRgb(192, 255, 208), new Point(0, 0), new Point(1, 1));
+
+            return new LinearGradientBrush(Color.FromRgb(153, 59, 59), Color.FromRgb(92, 25, 25), new Point(0, 0), new Point(0, 1));
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
@@ -1494,7 +1804,32 @@ namespace BeWo.View
             throw new NotImplementedException();
         }
     }
-    
+
+    public class BorderCornerRadiusConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var fallbackCornerRadius = new CornerRadius(0, 5, 5, 0);
+
+            if(value is SchedulerAppointmentDC appointment && !appointment.IsTask && parameter != null)
+            {
+                switch(parameter.ToString())
+                {
+                    case "Customers":
+                        return appointment.CustomerList?.Count > 0 && appointment.ResourceList?.Count > 0 ? new CornerRadius(0, 5, 0, 0) : fallbackCornerRadius;
+                    case "Resources":
+                        return appointment.CustomerList?.Count > 0 && appointment.ResourceList?.Count > 0 ? new CornerRadius(0, 0, 5, 0) : fallbackCornerRadius;
+                    default:
+                        return fallbackCornerRadius;
+                }
+            }
+
+            return fallbackCornerRadius;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
+
     public class TaskListItemForegroundConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
@@ -1513,21 +1848,161 @@ namespace BeWo.View
         }
     }
 
+    public class TaskAppointmentVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is SchedulerAppointmentDC taskAppointment)
+            {
+                switch(parameter?.ToString())
+                {
+                    case "ToolTipTimeVisibility":
+                        return taskAppointment.IsTask || taskAppointment.AllDay ? Visibility.Collapsed : Visibility.Visible;
+                    case "ToolTipTrennstrichVisibility":
+                        return !taskAppointment.IsTask && (taskAppointment.EmployeeList?.Count > 0 || taskAppointment.CustomerList?.Count > 0 || taskAppointment.ResourceList?.Count > 0) ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipResourcesVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.ResourceList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipEmployeesVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.EmployeeList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipCustomersVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.CustomerList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipZusageVisibility":
+                        return !taskAppointment.IsTask ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipCustomerColorVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.CustomerList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "ToolTipResourcesColorVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.ResourceList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "CustomerBorderVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.CustomerList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case "ResourceBorderVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.ResourceList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
+                    case"EmployeeBorderVisibility":
+                        return !taskAppointment.IsTask && taskAppointment.EmployeeList?.Count > 0 ||taskAppointment.Originator != null ? Visibility.Visible : Visibility.Collapsed;
+                }
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
+
     public class TaskAppointmentToolTipConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             if(value is SchedulerAppointmentDC taskAppointment)
             {
-                return taskAppointment.IsTask ? taskAppointment.TaskDescription : taskAppointment.Description;
+                if(!taskAppointment.IsTask)
+                {
+                    var custoemrs = taskAppointment.CustomerList;
+                    var resources = taskAppointment.ResourceList;
+                    var toolTip = string.Empty;
+                    var seperator = "; ";
+                    var selection = new List<IFilterableDC>();
+                    var isResourceOrCustomer = false;
+
+                    switch (parameter?.ToString())
+                    {
+                        case "TimeText":
+                            return $"{taskAppointment.StartDate?.ToString("HH:mm")} - {taskAppointment.EndDate?.ToString("HH:mm")} Uhr";
+                        case "ToolTip":
+                            return taskAppointment.Subject;
+                        case "Resources":
+                            isResourceOrCustomer = true;
+                            seperator = ", ";
+                            if (resources != null)
+                            {
+                                selection = resources.Cast<IFilterableDC>().ToList();
+                            }
+                            break;
+                        case "Employees":
+                            return taskAppointment.EmployeeList;
+                        case "Customers":
+                            isResourceOrCustomer = true;
+                            if (custoemrs != null)
+                            {
+                                selection = custoemrs.Cast<IFilterableDC>().ToList();
+                            }
+                            break;
+                    }
+
+                    if(isResourceOrCustomer)
+                    {
+                        foreach (var item in selection)
+                        {
+                            var index = selection.IndexOf(item);
+
+                            if (index % 3 == 0 && index < selection.Count - 1 && index > 0)
+                            {
+                                toolTip += "\n";
+                            }
+
+                            toolTip += item.ToString();
+
+                            if (index < selection.Count - 1)
+                            {
+                                toolTip += seperator;
+                            }
+                        }
+
+                        return toolTip;
+                    }
+                }
+                else
+                {
+                    switch(parameter?.ToString())
+                    {
+                        case "TimeText":
+                            return string.Empty;
+                    }
+                }
+
+                if(parameter != null && parameter.Equals("ToolTip"))
+                {
+                    return taskAppointment.IsTask ? taskAppointment.TaskDescription : taskAppointment.Description;
+                }
             }
             
             return null;
         }
 
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
+
+    public class BorderHeightConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
         {
-            throw new NotImplementedException();
+            const double fallbackValue = 0d;
+
+            if(values.Length == 2)
+            {
+                var actualHeight = (double) values[0];
+                var appointment = (SchedulerAppointmentDC) values[1];
+
+                var newHeight = appointment?.CustomerList?.Count > 0 && appointment.ResourceList?.Count > 0 ? actualHeight / 2 : actualHeight;
+
+                return newHeight;
+            }
+
+            return fallbackValue;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture) => throw new NotImplementedException();
+    }
+
+    public struct RecurringAppointment
+    {
+        public string RecurrenceId { get; set;}
+        public Dictionary<int, SchedulerAppointmentDC> Occurrences { get; set; }
+        public SchedulerAppointmentDC Pattern { get; set;}
+
+        public RecurringAppointment(string pRecurrenceId, Dictionary<int, SchedulerAppointmentDC> pOccurrences, SchedulerAppointmentDC pPattern)
+        {
+            RecurrenceId = pRecurrenceId;
+            Occurrences = pOccurrences;
+            Pattern = pPattern;
         }
     }
 }
\ No newline at end of file
diff --git a/BeWo/View/Master/SchedulerMasterView.xaml b/BeWo/View/Master/SchedulerMasterView.xaml
index ef13f001a..2776c5500 100644
--- a/BeWo/View/Master/SchedulerMasterView.xaml
+++ b/BeWo/View/Master/SchedulerMasterView.xaml
@@ -5,11 +5,6 @@
                     xmlns:localView="clr-namespace:BeWo.View"
                     xmlns:localSchedView="clr-namespace:BeWo.Scheduler.View"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-    <localView:BeWoView.Resources>
-        <ResourceDictionary>
-			<localSchedView:NewSchedulerView x:Key="NewSchedulerMain" Grid.Row="1"/>
-        </ResourceDictionary>
-    </localView:BeWoView.Resources>
     <Grid Width="Auto" Height="Auto">
 		<uc:ShadowChrome>
 			<GroupBox Style="{StaticResource MainContentGroupBoxStyle}">
@@ -40,10 +35,9 @@
 							<ColumnDefinition Width="*"/>
 						</Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
-                           
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
-                      <localSchedView:NewSchedulerView></localSchedView:NewSchedulerView>
+                      <!--<localSchedView:NewSchedulerView></localSchedView:NewSchedulerView>-->
                     </Grid>
                     <Border Grid.Row="2" Grid.ColumnSpan="3" Height="35" Margin="0,0,0,0" VerticalAlignment="Stretch" Background="#FF000000">
 						<Border.OpacityMask>
diff --git a/BeWo/View/Master/SchedulerMasterView.xaml.cs b/BeWo/View/Master/SchedulerMasterView.xaml.cs
index 2dfc1e110..e75d08c75 100644
--- a/BeWo/View/Master/SchedulerMasterView.xaml.cs
+++ b/BeWo/View/Master/SchedulerMasterView.xaml.cs
@@ -1,10 +1,25 @@
-namespace BeWo.View.Master
+using System;
+using BeWo.Scheduler.View;
+using BS.Shared.DataContracts;
+
+namespace BeWo.View.Master
 {
     public partial class SchedulerMasterView
     {
         public SchedulerMasterView()
         {
             InitializeComponent();
+            var scheduler = new NewSchedulerView();
+
+            grid_root.Children.Add(scheduler);
+        }
+
+        public SchedulerMasterView(DateTime pIntervalStartDate, SchedulerAppointmentDC pAppointment)
+        {
+            InitializeComponent();
+            var scheduler = new NewSchedulerView(pIntervalStartDate, pAppointment);
+
+            grid_root.Children.Add(scheduler);
         }
     }
 }
\ No newline at end of file
diff --git a/BeWo/ownChat/ChatView.xaml.cs b/BeWo/ownChat/ChatView.xaml.cs
index 5084d9301..39879a547 100644
--- a/BeWo/ownChat/ChatView.xaml.cs
+++ b/BeWo/ownChat/ChatView.xaml.cs
@@ -95,35 +95,41 @@ namespace BeWo.ownChat
 
         private void ChatMainControl_OnClickContextMenuItem(string menuItem)
         {
-            var aktuellerKontakt = ChatMainControl.GetCurrentContact();
+            var selectedContact = ChatMainControl.GetCurrentContact();
 
-            if (aktuellerKontakt != null)
+            if (selectedContact != null)
             {
                 var itemListe = ChatMainControl.GetSelectedMessages();
 
                 if (itemListe != null)
                 {
-                    var sdf = new List<long> { aktuellerKontakt.CustomerOid.Value };
+                    // TODO: Mike fragen
+                    // Z.B. "C5" -> alles nach dem C bei Klienten
 
-                    var compactCustomerlist = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomersById(sdf));
+                    if(!string.IsNullOrEmpty(selectedContact.UserIdManage))
+                    {
+                        var rawCustomerOid = selectedContact.UserIdManage.Substring(1);
+                        var customerOid = long.Parse(rawCustomerOid);
 
-                    if (compactCustomerlist != null && compactCustomerlist.Count > 0)
-                    {
-                        CompactCustomerDC compactCustomer = compactCustomerlist[0];
-                        
-                        OpenServiceRecordEditView(itemListe, compactCustomer);
-                        
-                    }
-                    else
-                    {
-                        MessageBox.Show("Der/die ausgewählte Klient/in wurde nicht gefunden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                        ServiceFacade.DoCustomerServiceAsync(s => s.GetCompactCustomerDC(customerOid), compactCustomer =>
+                        {
+                            if(compactCustomer == null)
+                            {
+                                MessageBox.Show("Der/die ausgewählte Klient/in wurde nicht gefunden.", "Dokumentieren nicht möglich", MessageBoxButton.OK, MessageBoxImage.Exclamation);
+                                return;
+                            }
+
+                            this.Dispatch(delegate
+                            {
+                                OpenServiceRecordEditView(itemListe, compactCustomer);
+                            });
+                        });
                     }
                 }
                 else
                 {
                     MessageBox.Show("Bitte Nachricht auswählen", "Nachricht auswählen", MessageBoxButton.OK, MessageBoxImage.Information);
                 }
-
             }
             else
             {
diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index 2b6a53261..1da51b462 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -177,6 +177,7 @@
     </Compile>
     <Compile Include="Util\JSONCustomer.cs" />
     <Compile Include="Util\MobileUtils.cs" />
+    <Compile Include="Util\ReferenceNumberWithNotice.cs" />
     <Compile Include="Util\ServiceRecord2Validation.cs" />
     <Compile Include="Util\TextbausteinDisplayItem.cs" />
     <Compile Include="Util\Umfeldsperson.cs" />
diff --git a/BeWoPlanerMobil/Content/BeWoMobileStyle.css b/BeWoPlanerMobil/Content/BeWoMobileStyle.css
index 97534d2ca..47f7e177f 100644
--- a/BeWoPlanerMobil/Content/BeWoMobileStyle.css
+++ b/BeWoPlanerMobil/Content/BeWoMobileStyle.css
@@ -455,7 +455,7 @@ textarea {
     margin-top: 1em;
 }
 
-#umfeldContainer, #kommentarContainer {
+#umfeldContainer, #kommentarContainer, #aktenzeichenContainer {
     display: none;
 }
 
@@ -963,4 +963,8 @@ input[type="checkbox"] {
 .showSignatureButton {
     width: auto;
     padding: 7.5px 15px;
+}
+
+#aktenzeichenTable tr:last-child hr {
+    display: none;
 }
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Scripts/mainView.js b/BeWoPlanerMobil/Scripts/mainView.js
index 931b0c607..fa6e16058 100644
--- a/BeWoPlanerMobil/Scripts/mainView.js
+++ b/BeWoPlanerMobil/Scripts/mainView.js
@@ -752,6 +752,7 @@ function klientenLaden() {
         $("#klientenTabelle").hide();
         $("#umfeldContainer").hide();
         $("#kommentarContainer").hide();
+        $("#aktenzeichenContainer").hide();
 
         hideSanduhr();
 
@@ -762,6 +763,7 @@ function klientenLaden() {
         $("#klientenTabelle").show();
         $("#umfeldContainer").show();
         $("#kommentarContainer").show();
+        $("#aktenzeichenContainer").show();
 
 		if(json === "SessionTimeout") {
 			window.location.href = window.redirectLink;
@@ -803,7 +805,8 @@ function KlientenVM() {
     this.Wohnheim                     = ko.observable("");
     this.mobileLink                   = ko.observable("");
     this.landLineLink                 = ko.observable("");
-    this.kommentar                    = ko.observable("");
+    this.kommentar = ko.observable("");
+    this.aktenzeichenMitNotiz = ko.observableArray([]);
 
     this.update = function(data) {
         this.vorname(data.Vorname);
@@ -829,20 +832,37 @@ function KlientenVM() {
         this.mobileLink('tel:' + data.Handy);
         this.landLineLink('tel:' + data.Telefon);
         this.kommentar(data.Kommentar);
-        console.log(data);
+        
         var mappedUmfeldpersonen = $.map(data.Umfeldpersonen, function(item) { return new UmfPers(item); });
 
+        var mappedAktenzeichen = $.map(data.ReferenceNumbers, function (item) { return new AktenzeichenMitNotiz(item); });
+
         if(mappedUmfeldpersonen.length === 0) {
             $("#WohnheimContainer").css("display", "none");
         }
 
         this.umfeldpersonen(mappedUmfeldpersonen);
+        this.aktenzeichenMitNotiz(mappedAktenzeichen);
 
         calcPropFieldMinSizes();
         updateEigenschaftsfelder();
     };
 }
 
+function AktenzeichenMitNotiz(referenceNumberAndNotice) {
+    var self = this;
+
+    self.aktenzeichen = ko.observable(referenceNumberAndNotice.ReferenceNumber);
+    self.notiz = ko.observable(referenceNumberAndNotice.Notice);
+    self.kostentraeger = ko.observable(referenceNumberAndNotice.Costbearer);
+
+    self.update = function(updateData) {
+	    self.aktenzeichen(updateData.ReferenceName);
+        self.notice(updateData.Notice);
+        self.kostentraeger(updateData.Costbearer);
+    }
+}
+
 function UmfPers(initdata) {
     var self = this;
     
@@ -865,20 +885,20 @@ function UmfPers(initdata) {
         return titel + self.umfvorname() + " " + self.umfnachname();
     });
 
-    self.update = function (updatedata) {
-        self.umfvorname(updatedata.Vorname);
-        self.umfnachname(updatedata.Nachname);
-        self.umfstrnr(updatedata.StrNameNr);
-        self.umfplzort(updatedata.PLZOrt);
-        self.umfmobil("tel:" + updatedata.Mobil);
-        self.nurmobil(updatedata.Mobil);
-        self.umfemail("mailto:" + updatedata.EMail);
-        self.nuremail(ko.observable(updatedata.EMail));
-        self.umffax(updatedata.Fax);
-        self.umfrolle(updatedata.Rolle);
-        self.umftitel(updatedata.Titel);
-        self.umftelnr("tel:" + updatedata.TelNr);
-        self.nurtelnr(updatedata.TelNr);
+    self.update = function(updatedata) {
+	    self.umfvorname(updatedata.Vorname);
+	    self.umfnachname(updatedata.Nachname);
+	    self.umfstrnr(updatedata.StrNameNr);
+	    self.umfplzort(updatedata.PLZOrt);
+	    self.umfmobil("tel:" + updatedata.Mobil);
+	    self.nurmobil(updatedata.Mobil);
+	    self.umfemail("mailto:" + updatedata.EMail);
+	    self.nuremail(ko.observable(updatedata.EMail));
+	    self.umffax(updatedata.Fax);
+	    self.umfrolle(updatedata.Rolle);
+	    self.umftitel(updatedata.Titel);
+	    self.umftelnr("tel:" + updatedata.TelNr);
+	    self.nurtelnr(updatedata.TelNr);
     }
 }
 
diff --git a/BeWoPlanerMobil/Util/JSONCustomer.cs b/BeWoPlanerMobil/Util/JSONCustomer.cs
index 0e474185d..d50929a09 100644
--- a/BeWoPlanerMobil/Util/JSONCustomer.cs
+++ b/BeWoPlanerMobil/Util/JSONCustomer.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using BS.Shared;
 using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
 
 namespace BeWoPlanerMobil.Util
 {
@@ -30,13 +31,15 @@ namespace BeWoPlanerMobil.Util
 
         public List<Umfeldsperson> Umfeldpersonen { get; set; }
 
+        public List<ReferenceNumberWithNotice> ReferenceNumbers { get; set; } = new List<ReferenceNumberWithNotice>();
+
         public JSONCustomer(CustomerDC init)
         {
             Vorname = init.FirstName;
             Nachname = init.LastName;
             Geburtstag = init.DateOfBirth?.ToShortDateString() ?? String.Empty;
             Geschlecht = init.Sex == Sex.Male ? "Männlich" : "Weiblich";
-
+            
             Adresszusatz = init.AddressLine1;
             Strasse = init.Street;
             Postleitzahl = init.PostalCode;
@@ -49,6 +52,8 @@ namespace BeWoPlanerMobil.Util
 
             Kommentar = init.Notice;
 
+            init.CostBearers?.DoForEach(cb => { ReferenceNumbers.AddIfNotIn(new ReferenceNumberWithNotice(cb.ReferenceNumber, cb.Notice, cb.CostBearer.Name)); });
+
             foreach (var iContactDC in init.ContactInformations)
             {
                 switch (iContactDC.ContactType)
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index eb1b4e07f..58b2f6c67 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -5,7 +5,6 @@
 @{
     ViewBag.Title = "BeWoPlaner Mobil";
 }
-
 <div class="header-div">
     <span class="header-span">Willkommen, @string.Format("{0} {1}", Model.Employee.FirstName, Model.Employee.LastName)</span>
     <input type="button" id="menu-btn" onclick="toggleMenu()" />
@@ -36,7 +35,7 @@
 </div>
 
 <img id="sanduhr" class="warte-animation" alt="Lade..." src="@Url.Content("~/Content/images/spinner.png")">
-<script>function topkek() { console.log("onclick called..."); }</script>
+
 <div id="zeiterfassung">
     <div class="margin-div" style="overflow: hidden;">
 
@@ -831,6 +830,30 @@
         </table>
         </div>-->
     </div>
+    
+    <div style="padding-right: 1em; margin-bottom: 16px" id="aktenzeichenContainer">
+        <h4 style="display: inline; color: #AB4A07;">Aktenzeichen pro Kostenträger</h4>
+        <hr />
+        <table id="aktenzeichenTable" class="width-inheriting-table">
+            <thead>
+                <tr>
+                    <th scope="col"><p style="float: left;">Kostenträger</p></th>
+                    <th scope="col"><p style="float: right;">Aktenzeichen</p></th>
+                </tr>
+            </thead>
+            <tbody data-bind="foreach: aktenzeichenMitNotiz">
+                <tr class="testklasse">
+                    <td class="customer-td" data-bind="text: kostentraeger"></td>
+                    <td class="contentTd" data-bind="text: aktenzeichen"></td>
+                </tr>
+                <tr class="testklasse">
+                    <td colspan="2">
+                        <hr/>
+                    </td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
 
     <div style="padding-right: 1em;" id="kommentarContainer">
         <h4 style="display: inline; color: #AB4A07;">Kommentar</h4>
@@ -887,7 +910,6 @@
             </div>
         </div>
     </div>
-
 </div>
 
 <div id="Kalender">
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 11a834cc2..5b6bcad3a 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -1134,7 +1134,7 @@ namespace BeWo.Data.Access
 				.Add(Restrictions.Eq("c2s.CustomerOid", customerOid))
 				.List<AdditionalServiceBooking>();
 		}
-
+        
 		public AssessmentSheetCategory GetAddServiceAssessmentSheetCategoryWithName(string name)
 		{
 			return CreateCriteriaIsActive<AssessmentSheetCategory>()
@@ -2860,5 +2860,93 @@ namespace BeWo.Data.Access
             
             return c.List<SchedulerAppointment>();
         }
+
+        public IList<InvoiceBase> GetInvoiceBasesBySupportConceptOids(List<long> pSupprortConceptOids)
+        {
+            var c = CreateCriteria<InvoiceBase>();
+
+            c.Add(Restrictions.In(nameof(InvoiceBase.SupportConceptOid), pSupprortConceptOids));
+
+            return c.List<InvoiceBase>();
+        }
+
+        public IEnumerable<SettlementInvoice> GetSettlementInvoiceBySupportConceptOids(List<long> pSupportConceptOids)
+        {
+            return CreateCriteria<SettlementInvoice>()
+                .CreateAlias(SettlementInvoice.PropertyName_InvoiceBase, "ib", JoinType.InnerJoin)
+                .Add(Restrictions.In("ib." + InvoiceBase.PropertyName_SupportConceptOid, pSupportConceptOids))
+                .List<SettlementInvoice>();
+        }
+
+        public IList<ServiceInvoice> GetServiceInvoicesByInvoiceBaseOids(List<long> pIinvoiceBaseOids)
+        {
+            var res = CreateCriteria<ServiceInvoice>()
+                .CreateAlias(ServiceInvoice.PropertyName_InvoiceBase, "ib", JoinType.InnerJoin)
+                .Add(Restrictions.In("ib." + BeWoEntityBase.PropertyName_Oid, pIinvoiceBaseOids))
+                .List<ServiceInvoice>();
+
+            return res;
+        }
+
+        public IList<AdditionalServiceBooking> GetAllAdditionalServiceBookingsForCustomer(long pCustomerOid)
+        {
+            return CreateCriteria<AdditionalServiceBooking>()
+                .CreateAlias(AdditionalServiceBooking.PropertyName_Customer2AddServiceBookings, "c2s", JoinType.InnerJoin)
+                .Add(Restrictions.Eq("c2s.CustomerOid", pCustomerOid))
+                .List<AdditionalServiceBooking>();
+        }
+
+        public IList<AdditionalServiceGroupOfPeople> GetAdditionalServiceGroupOfPeopleForCustomer(long pCustomerOid)
+        {
+            var c = CreateCriteria<AdditionalServiceGroupOfPeople>();
+
+            c.CreateCriteria(nameof(AdditionalServiceGroupOfPeople.CustomerList), JoinType.InnerJoin)
+                .Add(Restrictions.Eq(nameof(BeWoEntityBase.Oid), pCustomerOid));
+
+            return c.List<AdditionalServiceGroupOfPeople>();
+        }
+
+        public IList<SchedulerAppointment> GetTasksAndAppointmentsBySupportConceptOids(List<long> pSupportConceptOids)
+        {
+            var c = CreateCriteria<SchedulerAppointment>();
+
+            var list = "";
+            for (var i = 0; i < pSupportConceptOids.Count; i++)
+            {
+                if (i != pSupportConceptOids.Count - 1)
+                {
+                    list += "" + pSupportConceptOids[i] + ",";
+                }
+                else
+                {
+                    list += "" + pSupportConceptOids[i];
+                }
+            }
+
+            var blah = $"{nameof(BeWoEntityBase.Oid)} IN (SELECT newschappoid FROM supportconcept2newschapp WHERE supportconceptoid IN ({list}))";
+            var supportConceptCriterion = Expression.Sql(blah);
+
+            c.Add(supportConceptCriterion);
+
+            return c.List<SchedulerAppointment>();
+        }
+
+        public IList<Customer2Token> GetCustomer2TokensByCustomerOid(long pCustomerOid)
+        {
+            var c = CreateCriteria<Customer2Token>();
+
+            c.Add(Restrictions.Eq(nameof(Customer2Token.Customer) + "." + nameof(BeWoEntityBase.Oid), pCustomerOid));
+
+            return c.List<Customer2Token>();
+        }
+
+        public IList<SchedulerAppointment> GetTestAppointments()
+        {
+            var c = CreateCriteria<SchedulerAppointment>();
+
+            c.Add(Restrictions.Eq(nameof(BeWoEntityBase.Notice), Utils.TestAppointmentNotice));
+
+            return c.List<SchedulerAppointment>();
+        }
     }
 }
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 565b54864..93f274607 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -124,6 +124,7 @@
     <Compile Include="ASPHibernateSessionManager.cs" />
     <Compile Include="DefaultHibernateSessionManager.cs" />
     <Compile Include="Entities\BuchungsExport.cs" />
+    <Compile Include="Entities\DeletionHistory.cs" />
     <Compile Include="Entities\NotizenKategorie.cs" />
     <Compile Include="Entities\NotizenEintrag.cs" />
     <Compile Include="Entities\Feiertag.cs" />
@@ -574,6 +575,7 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ICD10\icd10gm2012syst_claml_20110923.xml" />
+    <EmbeddedResource Include="Mappings\DeletionHistory.hbm.xml" />
     <EmbeddedResource Include="Mappings\BuchungsExport.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
diff --git a/Data/DefaultHibernateSessionManager.cs b/Data/DefaultHibernateSessionManager.cs
index 176dc2709..6d5ba9d4f 100644
--- a/Data/DefaultHibernateSessionManager.cs
+++ b/Data/DefaultHibernateSessionManager.cs
@@ -53,10 +53,11 @@ namespace BeWo.Data
                     if (!_SessionFactories.ContainsKey(CurrentTenant))
                     {
 #if DEBUG
-                        var hierarchy = (Hierarchy)LogManager.GetRepository();
-                        var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
-                        logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
-                        hierarchy.Configured = true;
+                        //TODO: wieder einkommentieren!
+                        //var hierarchy = (Hierarchy)LogManager.GetRepository();
+                        //var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
+                        //logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
+                        //hierarchy.Configured = true;
 #endif
 
                         var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
diff --git a/Data/Entities/Employee2SchedulerAppointment.cs b/Data/Entities/Employee2SchedulerAppointment.cs
index 43dc72dfc..d57d89b45 100644
--- a/Data/Entities/Employee2SchedulerAppointment.cs
+++ b/Data/Entities/Employee2SchedulerAppointment.cs
@@ -22,57 +22,70 @@ namespace BeWo.Data.Entities
 			_Tid = TableID.Employee2SchedulerAppointment;
 		}
 
+        public Employee2SchedulerAppointment(Employee pEmployee)
+        {
+            _Tid = TableID.Employee2SchedulerAppointment;
+            Employee = pEmployee;
+        }
+
 		public virtual ParticipationAnswer ParticipationAnswer
 		{
-			get { return _ParticipationAnswer; }
-			set
+			get => _ParticipationAnswer;
+            set
 			{
 				if (AreDifferent(_ParticipationAnswer, value))
-					_ParticipationAnswer = value;
+                {
+                    _ParticipationAnswer = value;
+                }
 			}
 		}
 
 		public virtual long? SchedulerAppointmentOid
 		{
-			get { return _SchedulerAppointmentOid; }
-			set
+			get => _SchedulerAppointmentOid;
+            set
 			{
 				if (AreDifferent(_SchedulerAppointmentOid, value))
-					_SchedulerAppointmentOid = value;
+                {
+                    _SchedulerAppointmentOid = value;
+                }
 			}
 		}
 
 		public virtual bool IsPChanged
 		{
-			get { return _IsPChanged; }
-			set
+			get => _IsPChanged;
+            set
 			{
 				if (AreDifferent(_IsPChanged, value))
-					_IsPChanged = value;
+                {
+                    _IsPChanged = value;
+                }
 			}
 		}
 
 		public virtual DateTime? IsPC_CheckedTs
 		{
-			get { return _IsPC_CheckedTs; }
-			set
+			get => _IsPC_CheckedTs;
+            set
 			{
 				if (AreDifferent(_IsPC_CheckedTs, value))
-					_IsPC_CheckedTs = value;
+                {
+                    _IsPC_CheckedTs = value;
+                }
 			}
 		}
 
 		public virtual Employee Employee
 		{
-			get
-			{
-				return _Employee;
-			}
+			get => _Employee;
 
-			set
+            set
 			{
 				if (AreDifferent(_Employee, value))
-					_Employee = value;
+                {
+                    _Employee = value;
+                }
 			}
 		}
 	}
diff --git a/Data/Entities/SchedulerAppointment.cs b/Data/Entities/SchedulerAppointment.cs
index 1c349b588..1130fe2ae 100644
--- a/Data/Entities/SchedulerAppointment.cs
+++ b/Data/Entities/SchedulerAppointment.cs
@@ -124,9 +124,9 @@ namespace BeWo.Data.Entities
 		public virtual string Subject { get; set; }
 
 
-	    //Normal = 0,
-	    //Pattern = 1,
-	    //Occurrence = 2,
+	    //Normal            = 0,
+	    //Pattern           = 1,
+	    //Occurrence        = 2,
 	    //ChangedOccurrence = 3,
 	    //DeletedOccurrence = 4
 		public virtual int Type { get; set; }
@@ -226,5 +226,10 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public override string ToString()
+        {
+            return $"{StartDate?.ToString("dd.MM.yyyy HH:mm:ss")} - {EndDate?.ToString("dd.MM.yyyy HH:mm:ss")}: {Subject}";
+        }
     }
 }
\ No newline at end of file
diff --git a/Data/WCFHibernateSessionManager.cs b/Data/WCFHibernateSessionManager.cs
index 362981b73..7ffaaec53 100644
--- a/Data/WCFHibernateSessionManager.cs
+++ b/Data/WCFHibernateSessionManager.cs
@@ -46,10 +46,11 @@ namespace BeWo.Data
                     if (!_SessionFactories.ContainsKey(MultitenancyOperationContextExt.Current.Tenant))
                     {
 #if DEBUG
-                        var hierarchy = (Hierarchy)LogManager.GetRepository();
-                        var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
-                        logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
-                        hierarchy.Configured = true;
+                        //TODO: wieder einkommentieren!
+                        //var hierarchy = (Hierarchy)LogManager.GetRepository();
+                        //var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
+                        //logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
+                        //hierarchy.Configured = true;
 #endif
                         _SessionFactories[MultitenancyOperationContextExt.Current.Tenant] = new Configuration().Configure(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Multitenancy\" + MultitenancyOperationContextExt.Current.Tenant + ".config")).BuildSessionFactory();
                     }
diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config
index 32769335f..f15f97573 100644
--- a/Host/Multitenancy/demo.config
+++ b/Host/Multitenancy/demo.config
@@ -38,8 +38,8 @@
                 NHibernate.ByteCode.Castle.ProxyFactoryFactory, NHibernate.ByteCode.Castle
             </property>
             <property name="hbm2ddl.keywords">none</property>
-            <property name="show_sql">true</property>
-            <property name="format_sql">true</property>
+            <property name="show_sql">false</property> <!-- Bei true wird das SQL im Output Window angezeigt -->
+            <property name="format_sql">false</property>
 
             <mapping assembly="BeWo.Data" />
         </session-factory>
diff --git a/Service/Core/Utils.cs b/Service/Core/Utils.cs
index 10c87febf..8b8ce18f3 100644
--- a/Service/Core/Utils.cs
+++ b/Service/Core/Utils.cs
@@ -24,6 +24,9 @@ namespace BeWo.Service.Core
 {
     public class Utils
     {
+        private static readonly Regex indexRegex = new Regex("(?:Index=\"){1}([0-9]+)\"{1}");
+        private static readonly Regex idRegex = new Regex("(?:Id=\")(([a-z0-9]{8})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{4})-{1}([a-z0-9]{12}))(?=\"{1})");
+
         public static FaultException<BeWoFault> CreateBeWoFaultException(Exception ex)
         {
             try
@@ -288,5 +291,24 @@ namespace BeWo.Service.Core
             
             return result;
         }
+
+        public static string ExtractIdFromRecurrenceInfo(string pRecurrenceInfo)
+        {
+            return pRecurrenceInfo != null ? idRegex.Match(pRecurrenceInfo).Groups[1].Value : null;
+        }
+
+        public static int ExtractIndexFromRecurrenceInfo(string pRecurrenceInfo)
+        {
+            if (pRecurrenceInfo != null)
+            {
+                var indexString = indexRegex.Match(pRecurrenceInfo).Groups[1].Value;
+
+                var index = !string.IsNullOrEmpty(indexString) ? int.Parse(indexString) : 0;
+
+                return index;
+            }
+
+            return -1;
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IResourceService.cs b/Service/ServiceContracts/IResourceService.cs
index d27dc3f80..c3757d7ea 100644
--- a/Service/ServiceContracts/IResourceService.cs
+++ b/Service/ServiceContracts/IResourceService.cs
@@ -188,5 +188,17 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<SchedulerAppointmentDC> GetSchedulerAppointmentTasksForEmployeeBySupportConecpt(long pEmployeeOid, long pSupportConceptOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<SchedulerAppointmentDC> LoadTasksAndAppointmentsForEmployee(long pEmployeeOid, DateTime pInvertalStart, int pBufferSize, long? pEmployeeAppointmentsOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void InsertTestAppointments(long pEmployeeOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        void DeleteTestAppointments();
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index 0d36e1aec..857010e0f 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -30,9 +30,8 @@ namespace BeWo.Service.ServiceImplementations
             {
                 var e = DAOFactory.GenericDAO.LoadByID<Employee>(pOid);
                 e.Person.IsActive = ActivationTypeId.Archived;
-
+                
                 ServiceLogic.SetActivationType<Employee>(pOid, pVersion, ActivationTypeId.Archived);
-
             }
             catch (Exception e)
             {
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index aaf0eead6..75b554199 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -5293,12 +5293,52 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        // TODO: Den ersten Buchstaben des Klienten und den Namen des Mitarbeiters speichern, der ihn gelöscht hat. -> Neue Tabelle
         public void DeleteCustomerForGood(long pCustomerOid)
         {
             try
             {
+                var deletionHistoryEntry = new DeletionHistory();
+
                 var appointments = DAOFactory.SearchDAO.FindAppointmentsForCustomer(pCustomerOid);
                 var customer = DAOFactory.GenericDAO.LoadByID<Customer>(pCustomerOid);
+                var supportConceptOids = customer.SupportConcepts.Select(sc => sc.Oid.Value).ToList();
+
+                UserDC user;
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                {
+                    user = MapperFactory.UserDC_User.MapToNewDC(LoggedInUserOperationContextExt.Current.User);
+                }
+                else
+                {
+                    user = MapperFactory.UserDC_User.MapToNewDC(SessionFacade.LoggedInUser);
+                }
+
+                if(user != null)
+                {
+                    string initial;
+
+                    if(customer.Person.FirstName.Length > 0)
+                    {
+                        initial = customer.Person.FirstName[0].ToString();
+                    }
+                    else if(customer.Person.LastName.Length > 0)
+                    {
+                        initial = customer.Person.LastName[0].ToString();
+                    }
+                    else if(customer.CustomerAlias?.Length > 0)
+                    {
+                        initial = customer.CustomerAlias[0].ToString();
+                    }
+                    else
+                    {
+                        initial = "unbekannt";
+                    }
+
+                    deletionHistoryEntry.DeletingEmployeeName = $"{user.Employee.FirstName} {user.Employee.LastName}";
+                    deletionHistoryEntry.DeletedEntityName = initial;
+                    deletionHistoryEntry.DeletedEntityTableId = TableID.Customer;
+                }
 
                 appointments.DoForEach(app => app.CustomerList.Remove(customer));
 
@@ -5324,6 +5364,23 @@ namespace BeWo.Service.ServiceImplementations
 
                 DAOFactory.GenericDAO.Update(customer.SupportConcepts);
 
+                var additionalServiceGroups = DAOFactory.SearchDAO.GetAdditionalServiceGroupOfPeopleForCustomer(customer.Oid.Value);
+                foreach(var additionalServiceGroup in additionalServiceGroups)
+                {
+                    additionalServiceGroup.CustomerList.Remove(customer);
+                }
+
+                DAOFactory.GenericDAO.Update(additionalServiceGroups);
+
+                var additionalServiceBookings = DAOFactory.SearchDAO.GetAllAdditionalServiceBookingsForCustomer(customer.Oid.Value);
+                DAOFactory.GenericDAO.Delete(additionalServiceBookings);
+
+                var images2delete = customer.Person.Images;
+                customer.Person.Images.Clear();
+
+                DAOFactory.GenericDAO.Delete(images2delete);
+                DAOFactory.GenericDAO.Update(customer);
+
                 customer.SupportConcepts.DoForEach(s => s.CostBearer2SupportConceptList?.Clear());
                 foreach(var assessmentSheetCategory in customer.AssessmentSheetCategoryList)
                 {
@@ -5331,7 +5388,33 @@ namespace BeWo.Service.ServiceImplementations
                 }
 
                 var assessmentSheetEntries = DAOFactory.SearchDAO.GetAssessmentSheetEntriesForCustomer(customer.Oid.Value, DateTime.MinValue, DateTime.MaxValue);
-                
+
+                var invoiceBases2Delete = DAOFactory.SearchDAO.GetInvoiceBasesBySupportConceptOids(supportConceptOids);
+                invoiceBases2Delete.DoForEach(ib => ib.InvoiceItems.Clear());
+
+                var settlementInvoices = DAOFactory.SearchDAO.GetSettlementInvoiceBySupportConceptOids(supportConceptOids);
+                var serviceInvoices = DAOFactory.SearchDAO.GetServiceInvoicesByInvoiceBaseOids(invoiceBases2Delete.Select(s => s.Oid.Value).ToList());
+
+                var invoiceItems = new List<InvoiceItem>();
+                invoiceBases2Delete.DoForEach(ib => invoiceItems.AddRange(ib.InvoiceItems));
+                DAOFactory.GenericDAO.Update(invoiceBases2Delete);
+
+                if(supportConceptOids.Any())
+                {
+                    var tasksAndAppointments2Delete = DAOFactory.SearchDAO.GetTasksAndAppointmentsBySupportConceptOids(supportConceptOids);
+                    DAOFactory.GenericDAO.Delete(tasksAndAppointments2Delete);
+                }
+
+                DAOFactory.GenericDAO.Delete(invoiceItems);
+                DAOFactory.GenericDAO.Delete(settlementInvoices);
+                DAOFactory.GenericDAO.Delete(serviceInvoices);
+
+                invoiceBases2Delete = DAOFactory.SearchDAO.GetInvoiceBasesBySupportConceptOids(supportConceptOids);
+                DAOFactory.GenericDAO.Delete(invoiceBases2Delete);
+
+                var customer2Tokens2Delete = DAOFactory.SearchDAO.GetCustomer2TokensByCustomerOid(customer.Oid.Value);
+                DAOFactory.GenericDAO.Delete(customer2Tokens2Delete);
+
                 DAOFactory.GenericDAO.Delete(assessmentSheetEntries);
                 
                 DAOFactory.GenericDAO.Update(customer);
@@ -5339,6 +5422,11 @@ namespace BeWo.Service.ServiceImplementations
                 DAOFactory.GenericDAO.Delete(customer.SupportConcepts);
 
                 DAOFactory.GenericDAO.Delete(DAOFactory.GenericDAO.LoadByID<Customer>(customer.Oid.Value));
+
+                if(deletionHistoryEntry.DeletingEmployeeName != null)
+                {
+                    DAOFactory.GenericDAO.Insert(deletionHistoryEntry);
+                }
             }
             catch(Exception e)
             {
diff --git a/Service/ServiceImplementations/ResourceServiceImp.cs b/Service/ServiceImplementations/ResourceServiceImp.cs
index 30ae2a1a3..706a25903 100644
--- a/Service/ServiceImplementations/ResourceServiceImp.cs
+++ b/Service/ServiceImplementations/ResourceServiceImp.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.ServiceModel;
@@ -13,13 +15,18 @@ using BeWo.Service.DCEntityMapper;
 using BeWo.Service.ServiceContracts;
 
 using BS.Shared;
+using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
+using DevExpress.ReportServer.ServiceModel.DataContracts;
 using DevExpress.XtraScheduler;
+using DevExpress.XtraScheduler.Xml;
 using static System.String;
+using Appointment = BeWo.Data.Entities.Appointment;
 using Resource = BeWo.Data.Entities.Resource;
 using Utils = BeWo.Service.Core.Utils;
+using SUtils = BS.Shared.Core.Utils;
 
 namespace BeWo.Service.ServiceImplementations
 {
@@ -1265,7 +1272,7 @@ namespace BeWo.Service.ServiceImplementations
 
                 var result = FilterAppointments(all, pEmployeeOid, filteredEmployeeOids, pSelectedCustomer, pSelectedResources, pCustomersOnly, pResourcesOnly);
                 
-                //Check fehlerhaftes RecurrenceInfos
+                //Check fehlerhafte RecurrenceInfos
                 foreach (var app in result)
                 {
                     if (!IsNullOrEmpty(app.RecurrenceInfo))
@@ -1457,5 +1464,716 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(e);
             }
         }
+
+        public List<SchedulerAppointmentDC> LoadTasksAndAppointmentsForEmployee(long pEmployeeOid, DateTime pInvertalStart, int pBufferSize, long? pEmployeeAppointmentsOid)
+        {
+            try
+            {
+                var oldTasks = DAOFactory.SearchDAO.LoadTasksForConversion(pEmployeeOid);
+                var taskAppointments = new List<SchedulerAppointment>();
+
+                foreach (var task in oldTasks)
+                {
+                    var taskAsAppointment = new SchedulerAppointment
+                    {
+                        SupportConceptList = new List<SupportConcept> { task.SupportConcept },
+                        EmployeeList = new List<Employee2SchedulerAppointment>(),
+                        FormerTaskOid = task.Oid,
+                        Subject = task.Title,
+                        CompletedNotice = task.CompletedNotice,
+                        TaskDescription = task.Description,
+                        IsActive = task.IsActive,
+                        IsTask = true,
+                        DueDate = task.DueDate,
+                        StartDate = task.CompletedDate.HasValue ? task.DueDate?.GetShortDateTime() : task.InsTs?.GetShortDateTime(),
+                        EndDate = task.DueDate?.GetShortDateTime().AddDays(1) ?? DateTime.MaxValue.Date
+                    };
+
+                    foreach (var employee in task.EmployeeList)
+                    {
+                        var rel = new Employee2SchedulerAppointment
+                        {
+                            Employee = DAOFactory.GenericDAO.LoadByID<Employee>(employee.Oid.Value),
+                            ParticipationAnswer = ParticipationAnswer.Offen
+                        };
+
+                        taskAsAppointment.EmployeeList.AddIfNotIn(rel);
+                    }
+
+                    taskAppointments.Add(taskAsAppointment);
+                }
+
+                InsertSchedulerAppointments(MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(taskAppointments));
+
+                var taskAppointmentDCs = DAOFactory.SearchDAO.LoadTaskAppointmentsForEmployee(pEmployeeOid);
+
+                var monday = DateTime.Today.FirstDateOfWeek(pInvertalStart.AddDays(-1 * pBufferSize).GetIso8601WeekOfYear());
+
+                if(!pEmployeeAppointmentsOid.HasValue)
+                {
+                    pEmployeeAppointmentsOid = pEmployeeOid;
+                }
+
+                var appointments = DAOFactory.SearchDAO.LoadFilteredAppointmentsForEmployee(false, pEmployeeAppointmentsOid.Value, monday, monday.AddDays(3 * pBufferSize), new List<long>(), new List<long>(), new List<long>(), false, false, false, false, true, false).ToList();
+
+
+                UserDC user;
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                {
+                    user = MapperFactory.UserDC_User.MapToNewDC(LoggedInUserOperationContextExt.Current.User);
+                }
+                else
+                {
+                    user = MapperFactory.UserDC_User.MapToNewDC(SessionFacade.LoggedInUser);
+                }
+
+                var loggedInEmployee = DAOFactory.GenericDAO.LoadByID<Employee>(pEmployeeOid);
+
+                if(!user.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen))
+                {
+                    var appointments2remove = appointments.Where(appointment => appointment.EmployeeList.Count > 0 && appointment.EmployeeList.Any(a => !a.Employee.Equals(loggedInEmployee))).ToList();
+                    appointments = appointments.Except(appointments2remove).ToList();
+                }
+
+                // TODO: Testen!
+                if(!user.HasRight(UserRightType.KalenderKliententermineAlleAnsehen))
+                {
+                    var ownCustomers = loggedInEmployee.Employee2CustomerList.Select(s => s.Customer).ToList();
+                    var appointmentsWithOtherCustomers = appointments.Where(w => w.CustomerList.Any(a => !ownCustomers.Contains(a))).ToList();
+
+                    appointments = appointments.Except(appointmentsWithOtherCustomers).ToList();
+                }
+
+                if(!user.HasRight(UserRightType.KalenderRessourcentermineAnsehen))
+                {
+                    var appsToRemove = appointments.Where(appointment => appointment.ResourceList.Any()).ToList();
+                    appointments = appointments.Except(appsToRemove).ToList();
+                }
+
+
+                var nullerIndex = new List<SchedulerAppointment>();
+
+                var recurringAppointments = appointments.Where(app => app.RecurrenceInfo != null);
+                recurringAppointments.DoForEach(app =>
+                {
+                    var index = Utils.ExtractIndexFromRecurrenceInfo(app.RecurrenceInfo);
+
+                    if(index == 0)
+                    {
+                        nullerIndex.Add(app);
+                    }
+                });
+
+                nullerIndex.DoForEach(app =>
+                {
+                    var id = Utils.ExtractIdFromRecurrenceInfo(app.RecurrenceInfo);
+
+                    if(app.Type == (int) AppointmentType.ChangedOccurrence)
+                    {
+                        var toRemove = appointments.Find(f => f.RecurrenceInfo != null && f.RecurrenceInfo.Contains(id) && !f.RecurrenceInfo.Contains("Index") && f.Type == (int) AppointmentType.Pattern);
+                        appointments.Remove(toRemove);
+                    }
+                });
+
+                taskAppointmentDCs.AddRangeIfElementsNotIn(appointments);
+
+                return MapperFactory.SchedulerAppointmentDCSchedulerAppointment.MapToNewDCs(taskAppointmentDCs);
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public void InsertTestAppointments(long pEmployeeOid)
+        {
+            try
+            {
+                // Appointments speichern, dann die Mitarbeiterlisten...
+                CreateTestAppointmentsForEmployee(pEmployeeOid);
+            }
+            catch(Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        private static void CreateTestAppointmentsForEmployee(long pEmployeeOid)
+        {
+            #if DEBUG
+            var employee = DAOFactory.GenericDAO.LoadByID<Employee>(pEmployeeOid);
+            var employeesWithoutEmployee = DAOFactory.GenericDAO.GetAllActive<Employee>().Where(emp => !emp.Equals(employee)).ToList();
+            var customers = DAOFactory.GenericDAO.GetAllActive<Customer>();
+            var ownCustomers = employee.Employee2CustomerList.Select(e2c => e2c.Customer).ToList();
+            var resources = DAOFactory.GenericDAO.GetAllActive<Resource>();
+
+            var secondEmployee = employeesWithoutEmployee.FirstOrDefault() ?? employee;
+            var fiveOfSecondEmployeesCustomers = secondEmployee.Employee2CustomerList.Select(e2c => e2c.Customer).TakeWhile((t, j) => j != 5).ToList();
+
+            var fiveOfMyOwnCustomers = ownCustomers.TakeWhile((t, i) => i != 5).ToList();
+            var fiveCustomers = customers.TakeWhile((t, i) => i != 5).ToList();
+            var fiveResources = resources.TakeWhile((t, i) => i != 3).ToList();
+
+            var employeeList = employeesWithoutEmployee.TakeWhile((t, i) => i != 5).Select(t => new Employee2SchedulerAppointment(t)).ToList();
+
+            var employeeListIncludingLoggedInEmployee = employeesWithoutEmployee.TakeWhile((t, i) => i != 4).Select(t => new Employee2SchedulerAppointment(t)).ToList();//new List<Employee2SchedulerAppointment>();
+            employeeListIncludingLoggedInEmployee.Add(new Employee2SchedulerAppointment(employee));
+
+            var monday = DateTime.Today.FirstDateOfWeek(DateTime.Today.GetIso8601WeekOfYear());
+            var tuesday = monday.AddDays(1);
+            var wednesday = monday.AddDays(2);
+            var thursday = monday.AddDays(3);
+            var friday = monday.AddDays(4);
+            var saturday = monday.AddDays(5);
+            var sunday = monday.AddDays(6);
+
+
+            //Originator ist angemeldeten Mitarbeiter
+            GenerateAppointments(monday, false, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeList, null);
+            
+            //Termin von anderem Mitarbeiter
+            GenerateAppointments(tuesday, false, secondEmployee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null);
+            
+            //Originator ist angemeldeter Mitarbeiter und in Liste
+            GenerateAppointments(wednesday, false, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null);
+            
+            //Originator ist nicht angemeldeter Mitarbeiter und der ist auch nicht in der Liste
+            GenerateAppointments(thursday, false, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeList, null);
+            
+
+            //Private Termine
+            GenerateAppointments(friday, true, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeList, null);
+            GenerateAppointments(saturday, true, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeList, null);
+            GenerateAppointments(sunday, true, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null);
+            GenerateAppointments(friday.AddHours(12), true, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null);
+
+
+            //AllDay-Termine ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+            var mon = monday.AddDays(7);
+            var tue = tuesday.AddDays(7);
+            var wed = wednesday.AddDays(7);
+            var thu = thursday.AddDays(7);
+            var fri = friday.AddDays(7);
+            var sat = saturday.AddDays(7);
+            var sun = sunday.AddDays(7);
+
+            //Originator ist angemeldeten Mitarbeiter
+            GenerateAppointments(mon, false, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeList, null, true);
+
+            //Termin von anderem Mitarbeiter
+            GenerateAppointments(tue, false, secondEmployee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null, true);
+
+            //Originator ist angemeldeter Mitarbeiter und in Liste
+            GenerateAppointments(wed, false, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null, true);
+
+            //Originator ist nicht angemeldeter Mitarbeiter und der ist auch nicht in der Liste
+            GenerateAppointments(thu, false, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeList, null, true);
+
+
+            //Private Termine
+            GenerateAppointments(fri, true, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeList, null, true);
+            GenerateAppointments(sat, true, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeList, null, true);
+            GenerateAppointments(sun, true, secondEmployee, fiveCustomers, fiveOfSecondEmployeesCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null, true);
+            GenerateAppointments(fri.AddHours(12), true, employee, fiveCustomers, fiveOfMyOwnCustomers, fiveResources, employeeListIncludingLoggedInEmployee, null, true);
+            // --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+            var mo = mon.AddDays(7);
+            var tu = tue.AddDays(7);
+
+            // Tägliche Termine
+            var everyThirdMondayNoEnd = GenerateTestAppointment(false, false, mo.AddHours(9), mo.AddHours(10), AppointmentType.Pattern, "Täglich, alle 3 Tage. Endlos", employee);
+            everyThirdMondayNoEnd.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 0, 0, mo.AddHours(9), null, 1);
+            DAOFactory.GenericDAO.Insert(everyThirdMondayNoEnd);
+
+            var everyWeekdayNoEnd = GenerateTestAppointment(false, false, mo.AddHours(10), mo.AddHours(11), AppointmentType.Pattern, "Wochentäglich. Endlos", employee);
+            everyWeekdayNoEnd.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 0, 1, mo.AddHours(10), null, 1);
+            DAOFactory.GenericDAO.Insert(everyWeekdayNoEnd);
+
+            var everyThirdMondayEndsAfter12Times = GenerateTestAppointment(false, false, mo.AddHours(11), mo.AddHours(12), AppointmentType.Pattern, "Täglich, alle 3 Tage. Endet nach 12 Terminen", employee);
+            everyThirdMondayEndsAfter12Times.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 1, 0, mo.AddHours(11), null, 1);
+            DAOFactory.GenericDAO.Insert(everyThirdMondayEndsAfter12Times);
+
+            var everyWorkdayEndsAfter12Times = GenerateTestAppointment(false, false, mo.AddHours(12), mo.AddHours(13), AppointmentType.Pattern, "Wochentäglich. Endet nach 12 Terminen", employee);
+            everyWorkdayEndsAfter12Times.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 1, 1, mo.AddHours(12), null, 1);
+            DAOFactory.GenericDAO.Insert(everyWorkdayEndsAfter12Times);
+
+            var everyWorkdayEndsOnSpecificDate = GenerateTestAppointment(false, false, mo.AddHours(13), mo.AddHours(14), AppointmentType.Pattern, $"Wochentäglich. Endet am {mo.AddHours(13).AddDays(11):dd.MM.yyyy}", employee);
+            everyWorkdayEndsOnSpecificDate.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 2, 1, mo.AddHours(13), everyWorkdayEndsOnSpecificDate.StartDate.Value.AddDays(11), 0);
+            DAOFactory.GenericDAO.Insert(everyWorkdayEndsOnSpecificDate);
+
+            var everyThreeDaysEndsOnSpecificDate = GenerateTestAppointment(false, false, mo.AddHours(15), mo.AddHours(16), AppointmentType.Pattern, "Jeden dritten Tag. Endet 11 Tage nach Beginn", employee);
+            everyThreeDaysEndsOnSpecificDate.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Daily, 2, 0, mo.AddHours(15), mo.AddHours(15).AddDays(11), 0);
+            DAOFactory.GenericDAO.Insert(everyThreeDaysEndsOnSpecificDate);
+
+            // Wöchentliche Termine
+            var everyThirdWeekMondayAndTuesday = GenerateTestAppointment(false, false, mo.AddHours(16), mo.AddHours(17), AppointmentType.Pattern, "Jede dritte Woche Montags und Dienstags. Endlos", employee);
+            everyThirdWeekMondayAndTuesday.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Weekly, 0, 0, mo.AddHours(16), null, 1);
+            DAOFactory.GenericDAO.Insert(everyThirdWeekMondayAndTuesday);
+
+            var everySecondWeekMondaysAndTuesdays = GenerateTestAppointment(false, false, mo.AddHours(18), mo.AddHours(19), AppointmentType.Pattern, "Jede zweite Woche am Montag und Dienstag. Endet nach 17 Terminen", employee);
+            everySecondWeekMondaysAndTuesdays.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Weekly, 0, 1, mo.AddHours(18), null, 17);
+            DAOFactory.GenericDAO.Insert(everySecondWeekMondaysAndTuesdays);
+
+            var everyWeekMondaysAndTuesdays = GenerateTestAppointment(false, false, mo.AddHours(19), mo.AddHours(20), AppointmentType.Pattern, $"Jede Woche am Montag und Dienstag. Endet am {mo.AddHours(19).AddDays(20):dd.MM.yyyy}", employee);
+            everyWeekMondaysAndTuesdays.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Weekly, 1, 1, mo.AddHours(19), mo.AddHours(19).AddDays(20), 1);
+            DAOFactory.GenericDAO.Insert(everyWeekMondaysAndTuesdays);
+
+            // Monatliche Termine
+            var m1 = GenerateTestAppointment(false, false, tu.AddHours(8), tu.AddHours(9), AppointmentType.Pattern, $"Am {tu.FirstDateOfWeek(tu.GetIso8601WeekOfYear())} jedes 2. Monats. Endlos", employee);
+            m1.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 0, 0, tu.AddHours(8), null, 1);
+            DAOFactory.GenericDAO.Insert(m1);
+
+            var m2 = GenerateTestAppointment(false, false, tu.AddHours(9), tu.AddHours(10), AppointmentType.Pattern, "Jeden dritten Mittwoch jedes 2. Monats. Endlos", employee);
+            m2.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 0, 1, tu.AddHours(9), null, 1);
+            DAOFactory.GenericDAO.Insert(m2);
+
+            var m3 = GenerateTestAppointment(false, false, tu.AddHours(10), tu.AddHours(11), AppointmentType.Pattern, "Jeden 3. jedes 3. Monats. Endet nach 3 Terminen", employee);
+            m3.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 1, 0, tu.AddHours(10), null, 3);
+            DAOFactory.GenericDAO.Insert(m3);
+
+            var m4 = GenerateTestAppointment(false, false, tu.AddHours(11), tu.AddHours(12), AppointmentType.Pattern, "Jeden 3. Montag jedes 3. Monats. Endet nach 3 Terminen", employee);
+            m4.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 1, 1, tu.AddHours(11), null, 3);
+            DAOFactory.GenericDAO.Insert(m4);
+
+            var m5 = GenerateTestAppointment(false, false, tu.AddHours(12), tu.AddHours(13), AppointmentType.Pattern, $"Am 17. jedes 3. Monats. Endet am {tu.AddMonths(6):dd.MM.yyyy}", employee);
+            m5.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 2, 0, tu.AddHours(12), tu.AddHours(12).AddMonths(6), 1);
+            DAOFactory.GenericDAO.Insert(m5);
+
+            var m6 = GenerateTestAppointment(false, false, tu.AddHours(13), tu.AddHours(14), AppointmentType.Pattern, $"Jeden 3. Montag jedes Monats. Endet am {tu.AddMonths(4):dd.MM.yyyy}", employee);
+            m6.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Monthly, 2, 1, tu.AddHours(13), tu.AddHours(13).AddMonths(4), 1);
+            DAOFactory.GenericDAO.Insert(m6);
+
+            // Jährliche Termine
+
+            var y1 = GenerateTestAppointment(false, false, tu.AddHours(14), tu.AddHours(16), AppointmentType.Pattern, $"Jährlich am {tu:dd.MM.}. Endlos", employee);
+            y1.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 0, 0, tu.AddHours(14), null, 1);
+            DAOFactory.GenericDAO.Insert(y1);
+
+
+            var y2 = GenerateTestAppointment(false, false, tu.AddHours(16), tu.AddHours(17), AppointmentType.Pattern, $"Jährlich am 3. Montag im {tu:MMMM}. Endlos", employee);
+            y2.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 0, 1, tu.AddHours(16), null, 1);
+            DAOFactory.GenericDAO.Insert(y2);
+
+            var y3 = GenerateTestAppointment(false, false, tu.AddHours(17), tu.AddHours(18), AppointmentType.Pattern, $"Jährlich jeden {tu.Day}. im {mo.Month:MMMM}. Endet nach 3 Terminen", employee);
+            y3.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 1, 0, tu.AddHours(17), null, 3);
+            DAOFactory.GenericDAO.Insert(y3);
+
+            var y4 = GenerateTestAppointment(false, false, tu.AddHours(18), tu.AddHours(19), AppointmentType.Pattern, $"Jährlich jeden 3. Montag im {mo.Month:MMMM}. Endet nach 3 Terminen", employee);
+            y4.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 1, 1, tu.AddHours(18), null, 3);
+            DAOFactory.GenericDAO.Insert(y4);
+
+            var y5 = GenerateTestAppointment(false, false, tu.AddHours(19), tu.AddHours(20), AppointmentType.Pattern, $"Jährlich am x. [Monat]. Endet am xx.xx.xxxx (1 Jahr später)", employee);
+            y5.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 2, 0, tu.AddHours(19), tu.AddHours(19).AddYears(1), 3);
+            DAOFactory.GenericDAO.Insert(y5);
+
+            var y6 = GenerateTestAppointment(false, false, tu.AddHours(20), tu.AddHours(21), AppointmentType.Pattern, $"Jährlich jeden 3. Mittwoch im {tu:MMMM}. Endet am {tu.AddHours(20).AddYears(1):dd.MM.yyyy}", employee);
+            y6.RecurrenceInfo = GenerateRecurrenceInfo(RecurrenceType.Yearly, 2, 1, tu.AddHours(20), tu.AddHours(20).AddYears(1), 3);
+            DAOFactory.GenericDAO.Insert(y6);
+            // --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+#endif
+        }
+
+        private static string CreateRandomLocationName()
+        {
+            var random = new Random(Convert.ToInt32(DateTime.Now.Ticks.ToString().Substring(0, 9))).Next();
+            var location = "";
+
+            if(random % 2 == 0)
+            {
+                location = "Duisburg";
+            }
+            else if(random % 3 == 0)
+            {
+                location = "Düsseldorf";
+            }
+            else if (random % 5 == 0)
+            {
+                location = "Köln";
+            }
+
+            return location;
+        }
+
+        private static void GenerateAppointments(DateTime pFirstDate, bool pIsPrivate, Employee pEmployee, IList<Customer> pCustomerList, IList<Customer> pOwnCustomers, IList<Resource> pResourceList, IList<Employee2SchedulerAppointment> pEmployees, string pRecurrenceInfo, bool pIsAllDay = false)
+        {
+            const int startHours = 6;
+
+            for(var i = 0; i < 12; i++)
+            {
+                var appointment = GenerateTestAppointment(
+                    pIsPrivate, 
+                    new List<Customer>(), 
+                    new List<Resource>(), 
+                    new List<Employee2SchedulerAppointment>(), 
+                    pIsAllDay, 
+                    pIsAllDay ? pFirstDate.GetShortDateTime() : pFirstDate.AddHours(startHours + i), 
+                    pIsAllDay ? pFirstDate.GetShortDateTime().AddDays(1) : pFirstDate.AddHours(startHours + i + 1), 
+                    AppointmentType.Normal, 
+                    $"Testtermin von {pEmployee.Person.FirstNameLastName}", 
+                    pEmployee);
+
+                switch (i)
+                {
+                    case 1:
+                        appointment.CustomerList = pCustomerList;
+                        appointment.Subject += " mit Klienten";
+                        break;
+                    case 2:
+                        appointment.EmployeeList = pEmployees;
+                        appointment.Subject += " mit Mitarbeitern";
+                        break;
+                    case 3:
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit Ressourcen";
+                        break;
+                    case 4:
+                        appointment.CustomerList = pCustomerList;
+                        appointment.EmployeeList = pEmployees;
+                        appointment.Subject += " mit Klienten und Mitarbeitern";
+                        break;
+                    case 5:
+                        appointment.CustomerList = pCustomerList;
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit Klienten und Ressourcen";
+                        break;
+                    case 6:
+                        appointment.CustomerList = pCustomerList;
+                        appointment.EmployeeList = pEmployees;
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit Klienten, Mitarbeitern und Ressourcen";
+                        break;
+                    case 7:
+                        appointment.EmployeeList = pEmployees;
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit Mitarbeitern und Ressourcen";
+                        break;
+                    case 8:
+                        appointment.CustomerList = pOwnCustomers;
+                        appointment.Subject += " mit eigenen Klienten";
+                        break;
+                    case 9:
+                        appointment.CustomerList = pOwnCustomers;
+                        appointment.EmployeeList = pEmployees;
+                        appointment.Subject += " mit eigenen Klienten und Mitarbeitern";
+                        break;
+                    case 10:
+                        appointment.CustomerList = pOwnCustomers;
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit eigenen Klienten und Ressourcen";
+                        break;
+                    case 11:
+                        appointment.CustomerList = pOwnCustomers;
+                        appointment.EmployeeList = pEmployees;
+                        appointment.ResourceList = pResourceList;
+                        appointment.Subject += " mit eigenen Klienten, Mitarbeitern und Ressourcen";
+                        break;
+                }
+
+                if (pEmployees != null)
+                {
+                    DAOFactory.GenericDAO.Insert(pEmployees);
+                }
+
+                appointment.Subject = (pIsPrivate ? "Privat: " : "") + appointment.Subject;
+
+                DAOFactory.GenericDAO.Insert(appointment);
+            }
+        }
+
+        private static string GenerateRecurrenceInfo(RecurrenceType pType, int pRecurrenceMode, int pRecurrenceOption, DateTime pStartDate, DateTime? pRecurrenceEndDate, int pOccurrenceCount)
+        {
+            // pRecurrenceOption ist z.B. bei täglich "Alle x Tage" oder "Jeden Arbeitstag"
+            var monday = pStartDate.FirstDateOfWeek(pStartDate.GetIso8601WeekOfYear());
+
+            // XML für die RecurrenceInfo bauen
+            var ri = new RecurrenceInfo
+            {
+                Start = pStartDate,
+                Type = pType
+            };
+
+            switch(pRecurrenceMode)
+            {
+                case 0: // Ohne Enddatum
+                    ri.Range = RecurrenceRange.NoEndDate;
+                    ri.Periodicity = 3;
+
+                    switch (pType)
+                    {
+                        case RecurrenceType.Daily:
+                            ri.Start = monday;
+
+                            if(pRecurrenceOption == 1) // Jeden Arbeitstag
+                            {
+                                ri.WeekDays = WeekDays.WorkDays;
+                            }
+                            break;
+                        case RecurrenceType.Weekly:
+                            ri.WeekDays = WeekDays.Monday | WeekDays.Tuesday;
+                            break;
+                        case RecurrenceType.Monthly:
+                            ri.WeekDays = ri.Start.GetSchedulerWeekDays();
+                            ri.Periodicity = 2;
+                            ri.WeekOfMonth = pRecurrenceOption == 0 ? 0 : WeekOfMonth.Third;
+
+                            if(pRecurrenceOption == 1) // Am x. Wochentag jedes y.
+                            {
+                                var date = DateTimeUtils.GetNthDayOfWeekInMonth(ri.Start, 3, DayOfWeek.Monday);
+                                ri.Start = date;
+                                ri.WeekDays = date.GetSchedulerWeekDays();
+                            }
+                            else // Am x. jedes y. Monats
+                            {
+                                ri.DayNumber = monday.Day;
+                            }
+
+                            break;
+                        case RecurrenceType.Yearly:
+                            if(pRecurrenceOption == 0)
+                            {
+                                ri.DayNumber = monday.Day;
+                            }
+
+                            ri.Periodicity = 1;
+                            ri.WeekOfMonth = pRecurrenceOption == 0 ? 0 : WeekOfMonth.Third;
+                            ri.WeekDays = monday.GetSchedulerWeekDays();
+                            ri.Month = monday.Month;
+                            break;
+                    }
+
+                    break;
+                case 1: // Endet nach y Terminen
+                    ri.Range = RecurrenceRange.OccurrenceCount;
+
+                    var day = pStartDate;
+
+                    switch (pType)
+                    {
+                        case RecurrenceType.Daily:
+                            if(pRecurrenceOption == 1) // Jeden Arbeitstag endet nach y  Terminen
+                            {
+                                ri.WeekDays = WeekDays.WorkDays;
+                                var counter1 = 0;
+
+                                do
+                                {
+                                    if(day.DayOfWeek != DayOfWeek.Saturday && day.DayOfWeek != DayOfWeek.Sunday)
+                                    {
+                                        counter1++;
+                                    }
+
+                                    day = day.AddDays(1);
+                                } while(counter1 < pOccurrenceCount - 1);
+                            }
+                            else
+                            {
+                                ri.Periodicity = 3;
+                                ri.OccurrenceCount = pOccurrenceCount;
+
+                                for (var i = 0; i < pOccurrenceCount - 1; i++)
+                                {
+                                    day = day.AddDays(ri.Periodicity);
+                                }
+                            }
+
+                            ri.End = day;
+
+                            break;
+                        case RecurrenceType.Weekly:
+                            // Jeden Montag und Dienstag alle 2 Wochen
+                            ri.WeekDays = WeekDays.Monday | WeekDays.Tuesday;
+                            ri.OccurrenceCount = pOccurrenceCount;
+                            ri.Periodicity = 2;
+
+                            var weekDays = SUtils.GetWeekDaysFromNumber((int) ri.WeekDays);
+
+                            var counter = 1;
+                            var position = weekDays.IndexOf(day.DayOfWeek);
+
+                            do
+                            {
+                                for(var i = position; i < weekDays.Count; i++)
+                                {
+                                    day = SUtils.GetNextDateTime(day, weekDays.ElementAt(i), ri.Periodicity, RecurrenceType.Weekly);
+                                    counter++;
+                                }
+
+                                position = (weekDays.Count - 1) % (position == 0 ? position + 1 : position);
+                            } while(counter < pOccurrenceCount);
+
+                            ri.End = day;
+                            break;
+                        case RecurrenceType.Monthly:
+                            ri.WeekDays = pStartDate.GetSchedulerWeekDays();
+                            ri.WeekOfMonth = pRecurrenceOption == 0 ? 0 : pStartDate.GetWeekOfMonthForRecurrenceInfo();
+
+                            if (pRecurrenceOption == 0) // Am 3. jedes 3. Monats. Endet nach 3 Terminen
+                            {
+                                ri.DayNumber = pStartDate.Day;
+                                ri.Periodicity = 3;
+                                ri.OccurrenceCount = pOccurrenceCount;
+                            }
+                            else // Jeden 3. Montag jedes 3. Monats. Endet nach 3 Terminen
+                            {
+                                ri.End = pStartDate.AddMonths(3 * pOccurrenceCount);
+                            }
+                            break;
+                        case RecurrenceType.Yearly:
+                            ri.Month = pStartDate.Month;
+                            ri.WeekDays = pStartDate.GetSchedulerWeekDays();
+                            ri.OccurrenceCount = pOccurrenceCount;
+
+                            if (pRecurrenceOption == 0) // Am x. des Monats
+                            {
+                                ri.DayNumber = pStartDate.Day;
+                            }
+                            else // Jeden 3. Montag im Juni
+                            {
+                                ri.WeekOfMonth = pStartDate.GetWeekOfMonthForRecurrenceInfo();
+                            }
+                            break;
+                    }
+
+                    break;
+                case 2: // Endet am xx.xx.xxxx
+                    if(!pRecurrenceEndDate.HasValue)
+                    {
+                        return null;
+                    }
+
+                    ri.Range = RecurrenceRange.EndByDate;
+                    ri.End = pRecurrenceEndDate.Value;
+
+                    switch (pType)
+                    {
+                        // Start, End
+                        case RecurrenceType.Daily:
+                            if(pRecurrenceOption == 0) // Alle x Tage. Endet am xx.xx.xxxx
+                            {
+                                day = ri.Start;
+                                while(day < ri.End && ri.OccurrenceCount < 3)
+                                {
+                                    day = day.AddDays(3);
+                                    ri.OccurrenceCount++;
+                                }
+                            }
+                            else // Jeden Arbeitstag. Endet am xx.xx.xxxx
+                            {
+                                ri.WeekDays = WeekDays.WorkDays;
+                                ri.OccurrenceCount = (ri.End - ri.Start).Days + 1 - DateTimeUtils.GetNumberOfWeekEndDaysInBetween(ri.Start, ri.End);
+                            }
+                            break;
+                        case RecurrenceType.Weekly:
+                            ri.WeekDays = WeekDays.Monday | WeekDays.Wednesday | WeekDays.Friday;
+
+                            var weekDays = SUtils.GetWeekDaysFromNumber((int)ri.WeekDays);
+
+                            day = ri.Start;
+                            var position = weekDays.IndexOf(day.DayOfWeek) + (weekDays.Count > 1 ? 1 : 0);
+
+                            do
+                            {
+                                for (var i = position; i < weekDays.Count; i++)
+                                {
+                                    day = SUtils.GetNextDateTime(day, weekDays.ElementAt(i), 1, RecurrenceType.Weekly).Date;
+                                    ri.OccurrenceCount++;
+                                }
+
+                                position = (weekDays.Count - 1) % (position == 0 ? position + 1 : position);
+                            } while (day < ri.End.Date);
+
+                            break;
+                        case RecurrenceType.Monthly:
+                            ri.WeekOfMonth = pRecurrenceOption == 0 ? 0 : pStartDate.GetWeekOfMonthForRecurrenceInfo();
+
+                            if (pRecurrenceOption == 0) // Am 17. jedes 3. Monats. Endet am xx.xx.xxxx (17. diesen Monats + 6 Monate)
+                            {
+                                ri.End = new DateTime(ri.Start.AddMonths(7).Year, ri.Start.AddMonths(7).Month, 1, ri.Start.Hour, ri.Start.Minute, ri.Start.Second);
+                                ri.DayNumber = 17;
+                                ri.Periodicity = 3;
+                                ri.WeekDays = new DateTime(ri.Start.Year, ri.Start.Month, 17).GetSchedulerWeekDays();
+                                ri.OccurrenceCount = 3;
+                            }
+                            else // Am x. [Wochentag] jedes y. Monats. Endet am xx.xx.xxxx
+                            {
+                                // 5 mal
+                                var abc = DateTimeUtils.GetNthDayOfWeekInMonth(ri.Start.AddMonths(4), 3, DayOfWeek.Wednesday);
+                                ri.End = abc < pRecurrenceEndDate.Value ? pRecurrenceEndDate.Value : abc;
+                                ri.WeekOfMonth = WeekOfMonth.Third;
+                                ri.OccurrenceCount = 5;
+                                ri.WeekDays = WeekDays.Monday;
+                            }
+                            break;
+                        case RecurrenceType.Yearly:
+                            ri.WeekOfMonth = pRecurrenceOption == 0 ? 0 : pStartDate.GetWeekOfMonthForRecurrenceInfo();
+
+                            if (pRecurrenceOption == 0) // Am x. [Monat]. Endet am xx.xx.xxxx (1 Jahr später)
+                            {
+                                ri.End = ri.Start.AddYears(1);
+                                ri.DayNumber = ri.Start.Day;
+                                ri.WeekDays = ri.Start.GetSchedulerWeekDays();
+                                ri.Month = ri.Start.Month;
+                                ri.OccurrenceCount = ri.Start.AddYears(1).Year - ri.Start.Year + 1;
+                            }
+                            else // Jeden 3. Mittwoch im [Aktueller Monat]. Endet am xx.xx.xxxx (1 Jahr vom Startdatum entfernt)
+                            {
+                                var wednesday = ri.Start.FirstDateOfWeek(ri.Start.GetIso8601WeekOfYear()).AddDays(2);
+
+                                ri.WeekDays = WeekDays.Wednesday;
+                                ri.Start = DateTimeUtils.GetNthDayOfWeekInMonth(wednesday, 3, wednesday.DayOfWeek);
+                                ri.DayNumber = ri.Start.Day;
+                                ri.Month = ri.Start.Month;
+                                ri.End = DateTimeUtils.GetNthDayOfWeekInMonth(ri.Start.AddYears(1), 3, ri.Start.DayOfWeek);
+                                ri.OccurrenceCount = ri.End.Year - ri.Start.Year + 1;
+                            }
+                            break;
+                    }
+
+                    break;
+            }
+
+            return ri.ToXml();
+        }
+
+        private static SchedulerAppointment GenerateTestAppointment(bool pIsPrivate, bool pIsAllDay, DateTime pStart, DateTime pEnd, AppointmentType pType, string pSubject, Employee pOriginator)
+        {
+            return GenerateTestAppointment(pIsPrivate, new List<Customer>(), new List<Resource>(), new List<Employee2SchedulerAppointment>(), pIsAllDay, pStart, pEnd, pType, pSubject, pOriginator);
+        }
+
+        private static SchedulerAppointment GenerateTestAppointment(bool pIsPrivate, IList<Customer> pCustomerList, IList<Resource> pResourceList, IList<Employee2SchedulerAppointment> pEmployeeList, bool pIsAllDay, DateTime pStart, DateTime pEnd, AppointmentType pType, string pSubject, Employee pOriginator)
+        {
+            var appointment = new SchedulerAppointment
+            {
+                AllDay       = pIsAllDay,
+                CustomerList = pCustomerList,
+                EmployeeList = pEmployeeList,
+                ResourceList = pResourceList,
+                StartDate    = pStart,
+                EndDate      = pEnd,
+                Type         = (int) pType,
+                Location     = CreateRandomLocationName(),
+                IsPrivate    = pIsPrivate,
+                Subject      = pSubject,
+                Originator   = pOriginator,
+                Notice       = SUtils.TestAppointmentNotice
+            };
+
+
+            return appointment;
+        }
+
+        public void DeleteTestAppointments()
+        {
+            try
+            {
+                var testAppointments = DAOFactory.SearchDAO.GetTestAppointments();
+
+                DAOFactory.GenericDAO.Delete(testAppointments);
+            }
+            catch(Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index e1e21e8ea..413ccecd3 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -133,7 +133,8 @@ namespace BS.Shared
         Feiertag = 126,
         NotizenKategorie = 127,
         NotizenEintrag = 128,
-        BuchungsExport = 129
+        BuchungsExport = 129,
+        DeletionHistory = 130
     }
 
     public enum SystemEntryID
diff --git a/Shared/Core/DateTimeUtils.cs b/Shared/Core/DateTimeUtils.cs
index 5d224ab1b..a94f9e72a 100644
--- a/Shared/Core/DateTimeUtils.cs
+++ b/Shared/Core/DateTimeUtils.cs
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using DevExpress.XtraScheduler;
 
 namespace BS.Shared.Core
 {
@@ -64,7 +62,107 @@ namespace BS.Shared.Core
 
             return am;
         }
-        
+
+        public static WeekDays GetWeekDays(int number)
+        {
+            switch (number)
+            {
+                case 1:
+                    return WeekDays.Sunday;
+                case 2:
+                    return WeekDays.Monday;
+                case 4:
+                    return WeekDays.Tuesday;
+                case 8:
+                    return WeekDays.Wednesday;
+                case 16:
+                    return WeekDays.Thursday;
+                case 32:
+                    return WeekDays.Friday;
+                case 62:
+                    return WeekDays.WorkDays;
+                case 64:
+                    return WeekDays.Saturday;
+                case 65:
+                    return WeekDays.WeekendDays;
+                case 127:
+                    return WeekDays.EveryDay;
+                default:
+                    return WeekDays.Monday;
+            }
+        }
+
+        public static DayOfWeek ConvertWeekDaysToDayOfWeek(WeekDays weekDays)
+        {
+            try
+            {
+                if((int) weekDays <= 64)
+                {
+                    return (DayOfWeek) Convert.ToString((int) weekDays, 2).Length - 1;
+                }
+            }
+            catch(Exception)
+            {
+                return DayOfWeek.Sunday;
+            }
+
+            return DayOfWeek.Sunday;
+        }
+
+        public static int GetNumberOfWeekEndDaysInBetween(DateTime pStart, DateTime pEnd)
+        {
+            var numberOfWeekEndDays = 0;
+            var currentDate = pStart.Date;
+
+            var b = pEnd.Date;
+
+            while (currentDate <= b)
+            {
+                if (currentDate.DayOfWeek == DayOfWeek.Saturday || currentDate.DayOfWeek == DayOfWeek.Sunday)
+                {
+                    numberOfWeekEndDays++;
+                }
+
+                currentDate = currentDate.AddDays(1);
+            }
+
+            return numberOfWeekEndDays;
+        }
+
+        public static DateTime GetNthDayOfWeekInMonth(DateTime date, int number, DayOfWeek dayOfWeek)
+        {
+            if (number <= 0)
+            {
+                throw new ArgumentOutOfRangeException();
+            }
+
+            // Letzter Wochentag im Monat
+            if (number > 3)
+            {
+                return GetNthDayOfWeekInMonth(date.AddMonths(1), 1, dayOfWeek).AddDays(-7);
+            }
+
+            var firstDayOfMonth = new DateTime(date.Year, date.Month, 1);
+
+            var counter = 1;
+
+            do
+            {
+                if (firstDayOfMonth.DayOfWeek == dayOfWeek)
+                {
+                    if (counter == number)
+                    {
+                        return firstDayOfMonth;
+                    }
+
+                    counter++;
+                }
+
+                firstDayOfMonth = firstDayOfMonth.AddDays(1);
+            } while (counter <= number);
+
+            return firstDayOfMonth;
+        }
     }
 
     public class AnzahlMonate
diff --git a/Shared/Core/Utils.cs b/Shared/Core/Utils.cs
index 57862b03f..5ecc4bd91 100644
--- a/Shared/Core/Utils.cs
+++ b/Shared/Core/Utils.cs
@@ -12,13 +12,14 @@ using System.Xml.Serialization;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
+using DevExpress.XtraScheduler;
 
 namespace BS.Shared.Core
 {
     public class Utils
     {
         private static readonly Dictionary<char, string> criticals = new Dictionary<char, string>
-            {
+        {
                 { '"', "&quot;" }, 
                 { '€', "&euro;" }, 
                 { '¡', "&iexcl;" }, 
@@ -144,7 +145,7 @@ namespace BS.Shared.Core
             {
                 if (iObject is string)
                 {
-                    if (!string.IsNullOrEmpty(iObject as string))
+                    if (!String.IsNullOrEmpty(iObject as string))
                     {
                         return false;
                     }
@@ -279,7 +280,7 @@ namespace BS.Shared.Core
         {
             foreach (string iString in pStrings)
             {
-                if (string.IsNullOrEmpty(iString))
+                if (String.IsNullOrEmpty(iString))
                 {
                     return true;
                 }
@@ -522,8 +523,8 @@ namespace BS.Shared.Core
         {
             Bitmap originalBitmap = new Bitmap(image);
 
-            Point min = new Point(int.MaxValue, int.MaxValue);
-            Point max = new Point(int.MinValue, int.MinValue);
+            Point min = new Point(Int32.MaxValue, Int32.MaxValue);
+            Point max = new Point(Int32.MinValue, Int32.MinValue);
 
             for (int x = 0; x < originalBitmap.Width; ++x)
             {
@@ -543,7 +544,7 @@ namespace BS.Shared.Core
             }
 
             // Create a new bitmap from the crop rectangleig
-            if (min.X < int.MaxValue && min.Y < int.MaxValue && max.X > int.MinValue && max.Y > int.MinValue)
+            if (min.X < Int32.MaxValue && min.Y < Int32.MaxValue && max.X > Int32.MinValue && max.Y > Int32.MinValue)
             {
                 Rectangle cropRectangle = new Rectangle(min.X, min.Y, max.X - min.X, max.Y - min.Y);
                 if (cropRectangle.Width > 0 && cropRectangle.Height > 0)
@@ -634,7 +635,7 @@ namespace BS.Shared.Core
                 return null;
             }
             
-            var wasSuccessful = long.TryParse(object2Parse.ToString(), out var output);
+            var wasSuccessful = Int64.TryParse(object2Parse.ToString(), out var output);
 
             if(wasSuccessful)
             {
@@ -820,6 +821,91 @@ namespace BS.Shared.Core
         {
             return CheckSchedulerRights(pAppointment.CustomerList, pAppointment.ResourceList, pAppointment.EmployeeList, pAppointment.Originator, !pAppointment.SchedulerAppointmentOid.HasValue, pCheckType, pLoggedOnUser);
         }
+
+        public static bool IsPowerOfTwo(int number)
+        {
+            return ((number - 1) & number) == 0;
+        }
+
+        public static int FindClosestPowerOfTwo(int number)
+        {
+            if (IsPowerOfTwo(number))
+            {
+                return number;
+            }
+
+            while (!IsPowerOfTwo(number))
+            {
+                number--;
+            }
+
+            return number;
+        }
+
+        public static List<DayOfWeek> GetWeekDaysFromNumber(int number)
+        {
+            var weekDays = new List<DayOfWeek>();
+
+            if (number % 2 != 0)
+            {
+                number--;
+                weekDays.Add(DayOfWeek.Sunday);
+            }
+
+            var closestPowerOfTwo = FindClosestPowerOfTwo(number);
+            var rest = number - closestPowerOfTwo;
+            weekDays.Add(DateTimeUtils.ConvertWeekDaysToDayOfWeek(DateTimeUtils.GetWeekDays(closestPowerOfTwo)));
+
+            if (rest > 0)
+            {
+                do
+                {
+                    closestPowerOfTwo = FindClosestPowerOfTwo(rest);
+                    rest -= closestPowerOfTwo;
+                    weekDays.Add(DateTimeUtils.ConvertWeekDaysToDayOfWeek(DateTimeUtils.GetWeekDays(closestPowerOfTwo)));
+                } while (!IsPowerOfTwo(rest) || rest > 0);
+            }
+
+            return weekDays.OrderBy(day => (int)day).ToList();
+        }
+
+        public static DateTime GetNextDateTime(DateTime pDate, DayOfWeek pDayOfWeek, int pPeriodicity, RecurrenceType pType)
+        {
+            var dow = pDate.DayOfWeek;
+
+            if (dow > pDayOfWeek)
+            {
+                var date = pDate;
+
+                do
+                {
+                    date = date.AddDays(1);
+                } while (date.DayOfWeek != pDayOfWeek);
+
+                return CalculateNextDateTime(pType, date, pType == RecurrenceType.Weekly ? 7 * pPeriodicity - 1 : pPeriodicity - 1);
+            }
+
+            return CalculateNextDateTime(pType, pDate, pDayOfWeek - dow);
+        }
+
+        private static DateTime CalculateNextDateTime(RecurrenceType recurrenceType, DateTime date, int timeToAdd)
+        {
+            switch(recurrenceType)
+            {
+                case RecurrenceType.Daily:
+                    return date.AddDays(timeToAdd);
+                case RecurrenceType.Weekly:
+                    return date.AddDays(timeToAdd);
+                case RecurrenceType.Monthly:
+                    return date.AddMonths(timeToAdd);
+                default:
+                    return date.AddYears(timeToAdd);
+            }
+
+            
+        }
+
+        public static readonly string TestAppointmentNotice = "k9Rx2mU4y";
     }
 
     public struct NullCompareResult
diff --git a/Shared/DataContracts/SchedulerAppointmentDC.cs b/Shared/DataContracts/SchedulerAppointmentDC.cs
index 8b5851a9b..762967811 100644
--- a/Shared/DataContracts/SchedulerAppointmentDC.cs
+++ b/Shared/DataContracts/SchedulerAppointmentDC.cs
@@ -88,6 +88,10 @@ namespace BS.Shared.DataContracts
 	    [DataMember]
 	    public List<CompactSupportConceptDC> SupportConceptList { get; set; }
 
+        public int RecurrenceIndex { get; set; }
+
+        public string RecurrenceId { get; set; }
+
 	    [DataMember]
 	    public long? FormerTaskOid { get; set; }
 
@@ -125,5 +129,7 @@ namespace BS.Shared.DataContracts
 				? GetType().Name.GetHashCode() ^ SchedulerAppointmentOid.GetHashCode()
 				: base.GetHashCode();
 		}
-	}
+
+        public override string ToString() => $"{SchedulerAppointmentOid} {StartDate:dd.MM.yyyy HH:mm}-{EndDate:dd.MM.yyyy HH:mm}: {Subject}";
+    }
 }
diff --git a/Shared/Extensions/DateTimeExtensions.cs b/Shared/Extensions/DateTimeExtensions.cs
index adb55af79..1b0b5c68c 100644
--- a/Shared/Extensions/DateTimeExtensions.cs
+++ b/Shared/Extensions/DateTimeExtensions.cs
@@ -433,5 +433,39 @@ namespace BS.Shared.Extensions
         {
             return new DateTime(pDate.Year, pDate.Month, pDate.Day, pTimeSpan.Hours, pTimeSpan.Minutes, pTimeSpan.Seconds);
         }
+
+        public static WeekDays GetSchedulerWeekDays(this DateTime pDateTime)
+        {
+            return (WeekDays) (int) Math.Pow(2, (double) pDateTime.DayOfWeek);
+        }
+
+        public static WeekOfMonth GetWeekOfMonthForRecurrenceInfo(this DateTime pDate)
+        {
+            pDate = pDate.Date;
+            var firstMonthDay = new DateTime(pDate.Year, pDate.Month, 1);
+            var firstMonthMonday = firstMonthDay.AddDays((DayOfWeek.Monday + 7 - firstMonthDay.DayOfWeek) % 7);
+
+            if (firstMonthMonday > pDate)
+            {
+                firstMonthDay = firstMonthDay.AddMonths(-1);
+                firstMonthMonday = firstMonthDay.AddDays((DayOfWeek.Monday + 7 - firstMonthDay.DayOfWeek) % 7);
+            }
+
+            var weekNumber = (pDate - firstMonthMonday).Days / 7 + 1;
+
+            switch (weekNumber)
+            {
+                case 1:
+                    return WeekOfMonth.First;
+                case 2:
+                    return WeekOfMonth.Second;
+                case 3:
+                    return WeekOfMonth.Third;
+                case 4:
+                    return WeekOfMonth.Fourth;
+                default:
+                    return WeekOfMonth.None;
+            }
+        }
     }
 }
\ No newline at end of file