Bug + cleaner

+ OrganisationView.xaml ScrollViewer wenn zu klein

.gitignore

@@ -1,3 +1,5 @@
+.cr
+.editorconfig
 /BeWoOhneReports.v12.suo
 /BeWo/bin
 /BeWo/obj
@@ -7,7 +9,6 @@
 /BeWoPlanerAndroid/obj
 /BeWoPlanerMobil/bin
 /BeWoPlanerMobil/obj
-/BeWoPlanerMobil/node_modules
 /Host/bin
 /Host/obj
 /Controls/bin
@@ -416,4 +417,230 @@
 /ReportImp/KuhringBetreuung/obj/Release
 /ReportImp/LebenshilfeFrankfurtOder/obj/Debug
 /ReportImp/LebenshilfeFrankfurtOder/obj/Release
-/BeWoPlanerMobil/delete_and_ignore_file.txt
+/ReportImp/AbwKlassen/bin/Debug
+/ReportImp/AbwKlassen/bin/Release
+/ReportImp/AbwKlassen/obj/Debug
+/ReportImp/AbwKlassen/obj/Release
+/ReportImp/DiakonischesWerkMuelheimTwg/bin/Debug
+/ReportImp/DiakonischesWerkMuelheimTwg/obj/Debug
+/ReportImp/DiakonischesWerkMuelheimTwg/obj/Release
+/ReportImp/Inkomm/obj/Debug
+/ReportImp/Inkomm/obj/Release
+/ReportImp/LebenshilfeDorsten/obj/Debug
+/ReportImp/LebenshilfeDorsten/obj/Release
+/ReportImp/QuerFaelltEin/obj/Debug
+/ReportImp/QuerFaelltEin/obj/Release
+/ReportImp/AsbRuhr/obj/Debug
+/ReportImp/AsbRuhr/obj/Release
+/ReportImp/DiePerspektive/obj/Debug
+/ReportImp/DiePerspektive/obj/Release
+/ReportImp/PhoenixBeWo/obj/Debug
+/ReportImp/PhoenixBeWo/obj/Release
+/ReportImp/EvangelischeKirchengemeindeBottrop/obj/Debug
+/ReportImp/EvangelischeKirchengemeindeBottrop/obj/Release
+/ReportImp/InputFamilienhilfe/obj/Debug
+/ReportImp/InputFamilienhilfe/obj/Release
+/ReportImp/LebenshilfeWolfsburg/obj/Debug
+/ReportImp/LebenshilfeWolfsburg/obj/Release
+/ReportImp/SichtWeise/obj/Debug
+/ReportImp/SichtWeise/obj/Release
+/packages
+/ReportImp/BfpDus/obj/Debug
+/ReportImp/BfpDus/obj/Release
+/ReportImp/DiakonischesWerkWesel/obj/Debug
+/ReportImp/DiakonischesWerkWesel/obj/Release
+/ReportImp/KcmGmbH/obj/Debug
+/ReportImp/KcmGmbH/obj/Release
+/ReportImp/LebenshilfeRodenkirchen2Reports/obj/Debug
+/ReportImp/LebenshilfeRodenkirchen2Reports/obj/Release
+/ReportImp/PraunheimerWerkstaetten3/obj/Debug
+/ReportImp/PraunheimerWerkstaetten3/obj/Release
+/ReportImp/PraunheimerWerkstaetten2/obj/Release
+/ReportImp/PraunheimerWerkstaetten2/obj/Debug
+/ReportImp/RosegGmbH/obj/Debug
+/ReportImp/RosegGmbH/obj/Release
+/ReportImp/VkmHamm2/obj/Debug
+/ReportImp/VkmHamm2/obj/Release
+/ReportImp/BellaDonna/obj/Debug
+/ReportImp/BellaDonna/obj/Release
+/ReportImp/PsychosozialeHilfenBochum/obj/Debug
+/ReportImp/PsychosozialeHilfenBochum/obj/Release
+/ReportImp/DieBrueckeHilfeUndHalt/obj/Debug
+/ReportImp/DieBrueckeHilfeUndHalt/obj/Release
+/ReportImp/DiakonischesWerkHerne/obj/Debug
+/ReportImp/DiakonischesWerkHerne/obj/Release
+/ReportImp/SabGmbH/obj/Debug
+/ReportImp/SabGmbH/obj/Release
+/ReportImp/BeWoFlex/obj/Debug
+/ReportImp/BeWoFlex/obj/Release
+/ReportImp/Neustart/obj/Debug
+/ReportImp/VerbandEvKirchengemeindenDorsten/obj/Debug
+/ReportImp/FabEvBerlin/obj/Debug
+/ReportImp/FabEvBerlin/obj/Release
+/ReportImp/Neustart/obj/Release
+/ReportImp/VerbandEvKirchengemeindenDorsten/obj/Release
+/ReportImp/MVZMedikusGmbH/obj
+/ReportImp/BetreuungsbueroFrankRoehrig/obj
+/ReportImp/BeWoMundo/obj/Debug
+/ReportImp/BeWoMundo/obj/Release
+/ReportImp/Kimm/obj/Debug
+/ReportImp/Kimm/obj/Release
+/ReportImp/KommAmbulanteDienste/obj/Debug
+/ReportImp/KommAmbulanteDienste/obj/Release
+/ReportImp/PassgenauUG/obj/Debug
+/ReportImp/PassgenauUG/obj/Release
+/ReportImp/KompassBeWoWesel/obj/Debug
+/ReportImp/MobiloAmbulant/obj/Debug
+/ReportImp/KompassBeWoWesel/obj/Release
+/ReportImp/MobiloAmbulant/obj/Release
+/ReportImp/EmpathieFachassistenz/obj/Debug
+/ReportImp/EmpathieFachassistenz/obj/Release
+/ReportImp/LebenUndWohnenChristianWilke/obj/Debug
+/ReportImp/CaritasverbandDuerenJuelichEV/obj/Debug
+/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Debug
+/ReportImp/BewegtSystemischeBeratung/obj/Debug
+/ReportImp/TeamPfeil/obj/Debug
+/ReportImp/AsbFassbacherHof/obj/Debug
+/ReportImp/AsbFassbacherHof/obj/Release
+/ReportImp/VereinSozialmedizinStade/obj/Release
+/ReportImp/VereinSozialmedizinStade/obj/Debug
+/ReportImp/BewegtSystemischeBeratung/obj/Release
+/ReportImp/TeamPfeil/obj/Release
+/ReportImp/Bewolonia/obj/Debug
+/ReportImp/AlzeyTeilhabe/obj/Debug
+/ReportImp/AlzeyTeilhabe/obj/Release
+/ReportImp/Bewolonia/obj/Release
+/ReportImp/ForumEV/obj/Release
+/ReportImp/Kette2/obj/Debug
+/ReportImp/Kette2/obj/Release
+/ReportImp/ForumEV/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz/obj/Release
+/ReportImp/VaroSozialagentur/obj/Debug
+/ReportImp/AmbulantBetreutesWohnenAstridPulm/obj/Debug
+/ReportImp/VaroSozialagentur/obj/Release
+/ReportImp/LebenshilfeDuisburg2/obj/Debug
+/ReportImp/LebenshilfeDuisburg2/obj/Release
+/ReportImp/LebenshilfeDuisburgAtz6860475645/obj/Debug
+/ReportImp/LebenshilfeDuisburgAtz6860475645/obj/Release
+/ReportImp/Kette2/obj/DebugRemote
+/ReportImp/DomizielAnsbach/obj/Debug
+/ReportImp/DomizielAnsbach/obj/Release
+/ReportImp/AbwMuenster/obj/Debug
+/ReportImp/AbwMuenster/obj/Release
+/ReportImp/InFamiliaGbr/obj/Debug
+/ReportImp/InFamiliaGbr/obj/Release
+/ReportImp/LebenshilfeDuisburgBeWo/obj/Debug
+/ReportImp/LebenshilfeDuisburgBeWo/obj/Release
+/ReportImp/LebenshilfeDuisburgHPFH/obj/Debug
+/ReportImp/LebenshilfeDuisburgHPFH/obj/Release
+/ReportImp/LebenshilfeDuisburgHPTG/obj/Debug
+/ReportImp/LebenshilfeDuisburgHPTG/obj/Release
+/ReportImp/ProIntegra/obj/Debug
+/ReportImp/ZuhauseWohnenIrisThimm/obj/Debug
+/ReportImp/FAMRheinSiegGbr/obj/Debug
+/ReportImp/ProIntegra/obj/Release
+/ReportImp/AmbulantBetreutesWohnenAstridPulm/obj/Release
+/ReportImp/SozialwerkAachenerChristen/obj/Debug
+/ReportImp/SicherlebenMichaelVoß/obj/Debug
+/ReportImp/DiakonischesWerkPassau/obj/Debug
+/ReportImp/BeWoRimbach/obj/Debug
+/ReportImp/Wichernhaus/obj
+/ReportImp/FAMRheinSiegGbr/obj/Release
+/ReportImp/KoelnerBeWoSelbstbestimmtLeben/obj/Release
+/ReportImp/DiakonischesWerkPassau/obj/Release
+/ReportImp/DiakonischesWerkRegensburg/obj/Debug
+/ReportImp/DiakonischesWerkRegensburg/obj/Release
+/ReportImp/CarlSonnenscheinHaus/obj/Debug
+/ReportImp/CarlSonnenscheinHaus/obj/Release
+/ReportImp/SozialwerkAachenerChristen/obj/Release
+/ReportImp/LebensWert/obj/Debug
+/ReportImp/PZDDuesseldorf/obj/Debug
+/ReportImp/PZDDuesseldorf/obj/Release
+/ReportImp/LebensWert/obj/Release
+/ReportImp/BehindertenhilfeMenden/obj/Debug
+/ReportImp/BehindertenhilfeMenden/obj/Release
+/ReportImp/ChristopherusHausFamilienhilfe/obj
+/ReportImp/RatPlusTat/obj
+obj
+/BeWoAllReports - Kopie.sln
+/BeWoAllReports.sln.BASE.sln
+/BeWoAllReports.sln.LOCAL.sln
+/BeWoAllReports.sln.REMOTE.sln
+/ReportImp/KundeArbeitszeit
+*.user
+/ReportImp/KundeMuster
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.designer.cs
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.resx
+/ReportImp/DiakonieKKKleve/Mitarbeiterarbeitszeitkonto.cs
+/ReportImp/DiakonieKKKleve/CustomMitarbeiterstundenkontoBerechnungTagesansicht.cs
+/ReportImp/AMBEWO/Endabrechnung Beispiel.jpg
+/ReportImp/AutismusKoelnBonn/Hintergrund.jpg
+/ReportImp/AutismusKoelnBonn/Briefpapier.jpg
+/ReportImp/RatPlusTat/CustomBudgetnachweisAnhangRO.cs
+/ReportImp/MusterArbeitszeit
+/BeWoDatabaseTerminator/.vs
+/LauncherHost/bin
+/LauncherHost/obj
+/SharedLauncher/bin
+/SharedLauncher/obj
+/BeWoLauncher/bin
+/BeWoLauncher/obj
+/UnitTests/bin
+/UnitTests/obj
+/DownloadServer/bin
+/DownloadServer/obj
+/BeWoTest/bin
+/BeWoTest/obj
+/UnitTestProject472/bin
+/UnitTestProject472/obj
+/UnitTestProject45/bin
+/UnitTestProject45/obj
+/BeWoPlanerMobil/node_modules/.bin/escodegen
+/BeWoPlanerMobil/node_modules/.bin/escodegen.cmd
+/BeWoPlanerMobil/node_modules/.bin/escodegen.ps1
+/BeWoPlanerMobil/node_modules/.bin/esgenerate
+/BeWoPlanerMobil/node_modules/.bin/esgenerate.cmd
+/BeWoPlanerMobil/node_modules/.bin/esgenerate.ps1
+/BeWoPlanerMobil/node_modules/.bin/esparse
+/BeWoPlanerMobil/node_modules/.bin/esparse.cmd
+/BeWoPlanerMobil/node_modules/.bin/esparse.ps1
+/BeWoPlanerMobil/node_modules/.bin/esvalidate
+/BeWoPlanerMobil/node_modules/.bin/esvalidate.cmd
+/BeWoPlanerMobil/node_modules/.bin/esvalidate.ps1
+/BeWoPlanerMobil/node_modules/.bin/pegjs
+/BeWoPlanerMobil/node_modules/.bin/pegjs.cmd
+/BeWoPlanerMobil/node_modules/.bin/pegjs.ps1
+/BeWoPlanerMobilAllReports.sln
+/ReportImp/Lazy/CustomMitarbeiterstundenkontoBerechnung.cs
+/ReportImp/Lazy/Lazy.csproj
+/ReportImp/Lazy/Mitarbeiterstundenkonto.cs
+/ReportImp/Lazy/Mitarbeiterstundenkonto.designer.cs
+/ReportImp/Lazy/Mitarbeiterstundenkonto.resx
+/ReportImp/Lazy/Properties/AssemblyInfo.cs
+/ReportImp/Lazy/Properties/licenses.licx
+/CustomerDlls
+/Dakota/bin
+/Dakota/obj
+/DakotaSender/bin
+/DakotaSender/obj
+/DakotaUnitTest/bin
+/DakotaUnitTest/obj
+/WohneinheitUnitTest/bin
+/WohneinheitUnitTest/obj
+/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Debug
+/BeWoDatabaseTerminator/BeWoDatabaseTerminator/bin/Release
+/ReportImp/TestLWV
+
+/TranslationUnitTest/bin
+/ReportImp/demo_Sozio/Invoicing/CustomInvoiceFactory.cs
+/ReportImp/demo_Sozio/Invoicing/SoziotherapieInvoiceCreation.cs
+/ReportImp/demo_Sozio/LeistungsnachweisSoziotherapie.cs
+/ReportImp/demo_Sozio/LeistungsnachweisSoziotherapie.designer.cs
+/ReportImp/demo_Sozio/LeistungsnachweisSoziotherapie.resx
+/ReportImp/demo_Sozio/Properties/AssemblyInfo.cs
+/ReportImp/demo_Sozio/Properties/licenses.licx
+/ReportImp/demo_Sozio/SoziotherapieRechnung.Designer.cs
+/ReportImp/demo_Sozio/SoziotherapieRechnung.cs
+/ReportImp/demo_Sozio/SoziotherapieRechnung.resx
+/ReportImp/demo_Sozio/demo_Sozio.csproj

BeWo/AI/AiChatController.cs

@@ -0,0 +1,45 @@
+using BeWo.AI.View;
+using BeWo.View;
+using BS.Shared;
+using BS.Shared.Translation;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo.AI
+{
+    class AiChatController
+    {
+        private static void CreateAiChatWindow(AiChatView view, double height, double width)
+        {
+            var beWoWindow = BeWoWindowBuilder.GetBeWoWindow(Translator.Translate("Frage unsere KI"), view, height, width);
+
+            view.CloseButtonClicked += () => beWoWindow.Close();
+
+            beWoWindow.ShowDialog();
+        }
+
+        public static void ShowAiChatViewForServiceRecords(long c2sOid, DateTime start, DateTime end, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitServiceRecordQuery(c2sOid, start, end);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+
+        public static void ShowAiChatViewForSingleCustomer(long customerOid, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitSingleCustomerQuery(customerOid);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+
+        public static void ShowAiChatViewForObjects(TableID tableId, double height, double width)
+        {
+            var ctrl = new AiChatView();
+            ctrl.InitObjectQuery(tableId);
+            CreateAiChatWindow(ctrl, height, width);
+        }
+    }
+}

BeWo/AI/View/AiChatView.xaml

@@ -0,0 +1,84 @@
+<view:BeWoView x:Class="BeWo.AI.View.AiChatView"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+               xmlns:view="clr-namespace:BeWo.View"
+               xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
+               xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+               xmlns:validation="clr-namespace:BeWo.Validation"
+               xmlns:core="clr-namespace:BS.Shared.Core;assembly=BS.Shared"
+               xmlns:dxlc="http://schemas.devexpress.com/winfx/2008/xaml/layoutcontrol"
+               xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+               xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
+               Height="Auto" Width="Auto" HorizontalAlignment="Stretch"
+               mc:Ignorable="d" VerticalAlignment="Stretch" Focusable="True">
+    <view:BeWoView.Resources>
+        <!--<Expander x:Name="ExpanderTemplate" IsExpanded="True">
+            <Expander.Header>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Label HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="14" Margin="0" />
+                </Grid>
+            </Expander.Header>
+        </Expander>-->
+    </view:BeWoView.Resources>
+    <Grid Margin="0"  Background="{DynamicResource ObjectEditBackgroundBrush}">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <dxlc:LayoutControl Orientation="Vertical" Padding="0">
+            <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True" Height="200">
+
+                <Grid Margin="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Button Grid.Row="0" Content="Einstellungen" HorizontalAlignment="Left" Click="btnSettings_Click"/>
+                    <Popup Grid.Row="0" Grid.RowSpan="3" StaysOpen="True" Placement="MousePoint" Width="400" Height="300" x:Name="PopupTemplate">
+                        <Grid Background="{DynamicResource ObjectEditBackgroundBrush}" Margin="2,2,2,2">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Label Grid.Row="0" Content="{t:Translate Datensatz Template}"></Label>
+                            <TextBox x:Name="TextBoxTemplate" Grid.Row="1" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"></TextBox>
+                            <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
+                                <Button Grid.Row="2" Content="Übernehmen" Click="btnSaveSettings_Click" Margin="3"/>
+                                <Button Grid.Row="2" Content="Abbrechen" Click="btnCancelSettings_Click" Margin="3"/>
+                            </StackPanel>
+                            
+                        </Grid>
+                    </Popup>
+                    <Label Grid.Row="1" Content="{t:Translate Formulieren Sie hier Ihre Anfrage}"></Label>
+                    <TextBox x:Name="TextBoxAnfrage" Grid.Row="2" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"></TextBox>
+                </Grid>
+            </dxlc:LayoutGroup>
+            <dxlc:LayoutGroup dxlc:LayoutControl.AllowVerticalSizing="True">
+
+                <Grid Margin="5">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"></RowDefinition>
+                        <RowDefinition Height="*"></RowDefinition>
+                    </Grid.RowDefinitions>
+                    <Label Content="{t:Translate Ergebnis}"></Label>
+                    <TextBox x:Name="TextBoxErgebnis" Grid.Row="1" MinHeight="60" AcceptsReturn="True" AcceptsTab="True" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" TextWrapping="Wrap"             ></TextBox>
+                </Grid>
+            </dxlc:LayoutGroup>
+        </dxlc:LayoutControl>
+    
+        <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center" Height="Auto" Margin="5,10,10,10" HorizontalAlignment="Right">
+            <Button x:Name="btnSend" Content="{t:Translate Absenden}" Margin="0,0,3,0" Height="25" Click="btnSend_Click"/>
+            <Button x:Name="btnClose" Content="  Schließen  " Margin="0,0,3,0" Height="25" Click="btnClose_Click"/>
+        </StackPanel>
+    </Grid>
+</view:BeWoView>

BeWo/AI/View/AiChatView.xaml.cs

@@ -0,0 +1,161 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Forms;
+using System.Windows.Input;
+
+using BeWo.Annotations;
+using BeWo.Core;
+using BeWo.ServiceProxy;
+using BeWo.Validation;
+using BeWo.View;
+using BeWo.View.Controls;
+using BeWo.ViewModel;
+using BeWo.ViewModel.ListViewModel;
+
+using BS.Shared;
+using BS.Shared.Core;
+using BS.Shared.DataContracts;
+using BS.Shared.Extensions;
+using BS.Shared.Translation;
+using DevExpress.Utils;
+using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
+using MessageBox = System.Windows.MessageBox;
+
+namespace BeWo.AI.View
+{
+    public partial class AiChatView : BeWoView
+    {
+        public event Action CloseButtonClicked;
+
+        int type = 0; //0 = ServiceRecordQuery, 1 = SingleCustomerQuery, 2 = AllCustomerQuery
+
+        private long cb2scOid;
+        private long customerOid;
+        private TableID tableID;
+        private DateTime startDate;
+        private DateTime endDate;
+        private AiSettingsDC aiSettings;
+
+        public AiChatView()
+        {
+            InitializeComponent();
+            
+        }
+        
+        public void InitServiceRecordQuery(long c2sOid, DateTime start, DateTime end)
+        {
+            type = 0;
+            this.cb2scOid = c2sOid;
+            this.startDate = start;
+            this.endDate = end;
+
+            LoadAiSettings(1);
+        }
+
+
+        public void InitSingleCustomerQuery(long customerOid)
+        {
+            type = 1;
+            this.customerOid = customerOid;
+        }
+
+        public void InitObjectQuery(TableID tableId)
+        {
+            type = 2;
+            tableID = tableId;
+        }
+
+        private void LoadAiSettings(int settingsType)
+        {
+            aiSettings = ServiceFacade.DoOperationsServiceSync(s => s.GetAiSettings(settingsType));
+        }
+
+        private void ReloadViewModel(AiChatDC dc)
+        {
+            TextBoxErgebnis.Text = dc.Result;
+        }
+
+        private void btnSend_Click(object sender, RoutedEventArgs e)
+        {
+            var acdc = new AiChatDC();
+            acdc.Prompt = TextBoxAnfrage.Text;
+
+            if (type == 1)
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForSingleCustomer(acdc, customerOid),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+            else if (type == 2)
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForObjects(acdc, (int)tableID),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+            else
+            {
+                ServiceFacade.DoOperationsServiceAsync(s => s.CreateAiQueryForServiceRecords(acdc, cb2scOid, startDate, endDate),
+                               dc =>
+                               {
+                                   this.Dispatch(delegate
+                                   {
+                                       ReloadViewModel(dc);
+                                   });
+                               });
+            }
+        }
+        private void btnClose_Click(object sender, RoutedEventArgs e)
+        {
+            CloseButtonClicked?.Invoke();
+        }
+
+        private void btnSettings_Click(object sender, RoutedEventArgs e)
+        {
+            if (aiSettings != null)
+            {
+                TextBoxTemplate.Text = aiSettings.Settings;
+            }
+            PopupTemplate.IsOpen = true;
+        }
+
+
+        private void btnSaveSettings_Click(object sender, RoutedEventArgs e)
+        {
+            PopupTemplate.IsOpen = false;
+            if (aiSettings != null)
+            {
+                aiSettings.Settings = TextBoxTemplate.Text;
+
+                ServiceFacade.DoOperationsServiceAsync(s => s.UpdateAiSettings(aiSettings),
+                                   dc =>
+                                   {
+                                       this.Dispatch(delegate
+                                       {
+                                           aiSettings = dc;
+                                       });
+                                   });
+            }
+        }
+
+        private void btnCancelSettings_Click(object sender, RoutedEventArgs e)
+        {
+            PopupTemplate.IsOpen = false;
+        }
+    }
+}

BeWo/BeWo.csproj.user

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\|C:\Projects\beyondsoft\BeWoPlaner\Publish\</PublishUrlHistory>
-    <InstallUrlHistory>http://app.beyondsoft.de/sbdtest/|http://app.beyondsoft.de/dev/|http://app.beyondsoft.de/sbd/|http://app.beyondsoft.de/lha/|http://fortis-bewoplaner.fortis-ev.org.local/</InstallUrlHistory>
+    <PublishUrlHistory>D:\Projects\beyondsoft\BeWoPlaner\Publish\|publish\|D:\Projects\beyondsoft\BeWoPlaner\PublishTest\|D:\Projects\beyondsoft\BeWoPlaner\PublishDev\|D:\Projects\beyondsoft\BeWoPlaner\Publish45\</PublishUrlHistory>
+    <InstallUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/test/|https://app.ownsoft.de/dev/|http://app.ownsoft.de/dev/|http://app.beyondsoft.de/dev/</InstallUrlHistory>
     <SupportUrlHistory />
-    <UpdateUrlHistory />
+    <UpdateUrlHistory>https://app.ownsoft.de/|https://app.ownsoft.de/bewoplaner.application/</UpdateUrlHistory>
     <BootstrapperUrlHistory />
     <ErrorReportUrlHistory />
     <FallbackCulture>de-DE</FallbackCulture>
     <VerifyUploadedFiles>false</VerifyUploadedFiles>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
   <PropertyGroup>
     <EnableSecurityDebugging>false</EnableSecurityDebugging>

BeWo/ConfirmDemoDialog.xaml

@@ -17,7 +17,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                 <Grid Grid.Row="1" Margin="0,10,0,0">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />
@@ -26,15 +26,16 @@
                         <RowDefinition Height="*" ></RowDefinition>
                         <RowDefinition Height="Auto" ></RowDefinition>
                     </Grid.RowDefinitions>
+
                     <TextBlock TextWrapping="Wrap" Margin="3" FontSize="14">WICHTIG! Bitte tragen Sie keine echten Daten bei Ihren Tests ein, da es sich um einen öffentlichen Testzugang handelt, auf den jeder Zugriff hat!</TextBlock>
-                    <Button x:Name="CountButton" Grid.Row="2" Grid.Column ="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
+                    <Button x:Name="CountButton" Grid.Row="2" Grid.Column="1" Width="120" Margin="3,25,3,3" IsDefault="True" HorizontalAlignment="Right" Click="ButtonBase_OnClick">OK</Button>
                     <!--<Button Grid.Row="2" Grid.Column ="2" Width="100" Margin="3" IsCancel="True" IsEnabled="False" HorizontalAlignment="Right">Abbrechen</Button>-->
                 </Grid>
             </Grid>
         </Border>
+
         <Line Grid.ColumnSpan="4" Stroke="#FFADADAD" X1="14" Y1="70" X2="585" Y2="70" StrokeThickness="1"></Line>
         <Line x:Name="linkLine" Stroke="#FFADADAD" X1="14" Y1="340" X2="585" Y2="340" StrokeThickness="1" Margin="0,30,0,-30"></Line>
-
     </Grid>
             
         

BeWo/Converter/AppSettingsConverter.cs

@@ -0,0 +1,36 @@
+using BeWo.Core.Config;
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+	public class AppSettingsConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+				return false;
+
+			if(parameter is string setting)
+			{
+				// Kann gerne erweitert werden
+				// Achtung! Verwende bei Parameter SettingsKeys
+				if (setting == SettingsKeys.AllowGkvAbrechnung)
+					return BeWoApp.AppSettings.AllowGkvAbrechnung;
+			}
+
+			return false;
+		}
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

BeWo/Converter/ArchiveRight2VisibilityConverter.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using BS.Shared;
+
+namespace BeWo.Converter
+{
+	public class ArchiveRight2VisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			if (parameter == null)
+			{
+				return Visibility.Collapsed;
+			}
+
+			var hasRight = false;
+
+			switch (parameter.ToString())
+			{
+				case "Person":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Person_AllowArchiving);
+					break;
+				case "Organisation":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Organisation_AllowArchiving);
+					break;
+				case "SupportConcept":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.SupportConceptView_AllowArchiving);
+					break;
+				case "Customer":
+					hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_AllowArchiving);
+					break;
+				case "Employee":
+				    hasRight = BeWoApp.LoggedOnUser.HasRight(UserRightType.Employee_AllowArchiving);
+				    break;
+			}
+
+			return (bool)value && hasRight ? Visibility.Visible : Visibility.Collapsed;
+		}
+
+		public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}

BeWo/Converter/BoolEnabledToTabitemBackgroundConverter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolEnabledToTabitemBackgroundConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Application.Current.Resources["TabItemTextBrush"];
+            }
+
+            return (bool)value ? Application.Current.Resources["TabItemTextBrush"] : Application.Current.Resources["TabItemTextBrushDisabled"];
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/BoolReverseConverter.cs

@@ -8,9 +8,9 @@ namespace BeWo.Converter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            if (value is bool)
+            if (value is bool buhl)
             {
-                return !(bool) value;
+                return !buhl;
             }
 
             return false;

BeWo/Converter/BoolScaleTransformConverter.cs

@@ -4,9 +4,6 @@ using System.Globalization;
 using System.Linq;
 using System.Windows.Data;
 using System.Windows.Media;
-
-using BeWo.View;
-
 using BS.Shared;
 using BS.Shared.Core;
 
@@ -29,11 +26,15 @@ namespace BeWo.Converter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            var i = (value as IEnumerable<UserRightType>).ToList();
+            if(!(value is IEnumerable<UserRightType> iEnumerable))
+            {
+                return value;
+            }
 
-            i.Remove(UserRightType.None);
+            var userRights = iEnumerable.ToList();
+            userRights.Remove(UserRightType.None);
 
-            return (i != null) ? i.Select(r => EnumTranslations.UserRightType2Translations.Single(f => f.Key == r)).OrderBy(l => l.Value).ToDictionary(t => t.Key, t => t.Value) : value;
+            return userRights.Select(right => EnumTranslations.UserRightType2Translations.Single(right2Translation => right2Translation.Key == right)).OrderBy(right2Translation => right2Translation.Value).ToDictionary(right2Translation => right2Translation.Key, right2Translation => right2Translation.Value);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

BeWo/Converter/BoolToParameterReturnConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolToParameterReturnConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return null;
+            }
+
+            return (bool)value ? parameter : null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/BoolVisibilityCollapsedConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class BoolVisibilityCollapsedConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+            {
+                return Visibility.Visible;
+            }
+
+            if(value is bool b)
+            {
+                return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/BoolVisibilityConverter.cs

@@ -14,18 +14,24 @@ namespace BeWo.Converter
                 return Visibility.Visible;
             }
 
-            var lMode = true;
-            if (parameter is string s)
-	        {
-		        bool.TryParse(s, out lMode);
-	        }
-
-            if (lMode)
+            if(value is bool b)
             {
-                return !(bool)value ? Visibility.Collapsed : Visibility.Visible;
+                var lMode = true;
+                if (parameter is string s)
+                {
+                    bool.TryParse(s, out lMode);
+                }
+
+                if (lMode)
+                {
+                    return !(bool)value ? Visibility.Collapsed : Visibility.Visible;
+                }
+
+                return (bool)value ? Visibility.Collapsed : Visibility.Visible;
             }
 
-            return (bool)value ? Visibility.Collapsed : Visibility.Visible;
+            // Fange Fälle ab, wo noch nicht mit Command gearbeitet wird
+            return Visibility.Visible;
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

BeWo/Converter/BooleanAndVisibilityMultiConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    /// <summary>
+    /// https://stackoverflow.com/a/19210037
+    /// </summary>
+    public class BooleanAndVisibilityMultiConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            foreach (object value in values)
+            {
+                if ((value is bool) && (bool)value == false)
+                {
+                    return Visibility.Collapsed;
+                }
+            }
+            return Visibility.Visible;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/BooleanOrVisibilityMultiConverter.cs

@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    /// <summary>
+    /// https://stackoverflow.com/a/19210037
+    /// </summary>
+    public class BooleanOrVisibilityMultiConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            foreach (object value in values)
+            {
+                if ((value is bool) && (bool)value == true)
+                {
+                    return Visibility.Visible;
+                }
+            }
+            return Visibility.Collapsed;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/CellColorConverter.cs

@@ -5,7 +5,9 @@ using System.Linq;
 using System.Windows.Data;
 using System.Windows.Markup;
 using System.Windows.Media;
+using BeWo.View.Detail;
 using BeWo.ViewModel;
+using BS.Shared.DataContracts;
 using DevExpress.Xpf.Grid;
 
 namespace BeWo.Converter
@@ -23,9 +25,49 @@ namespace BeWo.Converter
             var viewTag = cellData.View.Tag as List<AdditionalServiceBookingVM>;
             var date = int.Parse(value[1].ToString().Split('.')[0], NumberStyles.Integer);
 
+            
+            if (viewTag != null && viewTag.Count > 0 && value.Length > 2 && value[2] is Teilnehmer)
+            {
+                var booking = viewTag[0];
+
+                if (date <= DateTime.DaysInMonth(booking.Date.Year, booking.Date.Month))
+                {
+
+                    var dt = new DateTime(booking.Date.Year, booking.Date.Month, date);
+
+                    if (dt.DayOfWeek == DayOfWeek.Saturday || dt.DayOfWeek == DayOfWeek.Sunday)
+                    {
+                        return Brushes.CornflowerBlue;
+                    }
+
+                    var t = (Teilnehmer) value[2];
+
+                    if (IsAbsence(dt, t.Customer.AbsenceTimes))
+                    {
+                        return Brushes.LightGray;
+                    }
+                }
+            }
             return viewTag.Any(v => v.Date.Day.Equals(date)) ? Brushes.White : b;
         }
 
+        private bool IsAbsence(DateTime dt, List<AbsenceTimeDC> absenceTimes)
+        {
+            if (absenceTimes == null)
+            {
+                return false;
+            }
+            foreach (var at in absenceTimes)
+            {
+                if ((!at.Start.HasValue || at.Start.Value <= dt) && (!at.End.HasValue || at.End.Value >= dt))
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+        
         public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) { throw new NotImplementedException(); }
 
         public override object ProvideValue(IServiceProvider serviceProvider) { return this; }

BeWo/Converter/EnumTranslationConverter.cs

@@ -0,0 +1,41 @@
+using BS.Shared.Core;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class EnumTranslationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is Enum e)
+            {
+                if(EnumTranslations.Wohnhilfe2Translation.TryGetValue(e, out string v))
+                {
+                    return v;
+                }
+                // RE:
+                // EnumTranslationConverter, aber betrachtet nicht alle?
+                // Brauche hier eig nur EnumTranslations.Gkv2Translation
+                if (EnumTranslations.AllTranslations.TryGetValue(e, out string vv))
+                {
+                    return vv;
+                }
+
+                return e;
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/GkvState2StringConverter.cs

@@ -0,0 +1,40 @@
+using BS.Shared;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class GkvState2StringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+			var state = value as GkvState?;
+
+			if (state is null)
+				return null;
+
+            switch (state.Value)
+            {
+                case GkvState.NoSend: return "Erstellt";
+                case GkvState.Waiting: return "Gesendet";
+                case GkvState.Waiting4Urbelege: return "Urbelege per Post";
+                case GkvState.Error: return "Fehler";
+                case GkvState.ErrorFatal: return "Fataler Fehler";
+                case GkvState.Paid: return "Bezahlt";
+                case GkvState.OldAndNoFeedback: return "Keine Antwort";
+            }
+
+            return state.ToString();
+		}
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/Object2ToStringConverter.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class Object2ToStringConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is object)
+                return value.ToString();
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/RadioBoolToIntConverter.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class RadioBoolToIntConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(int.Parse(parameter.ToString()));
+        }
+
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value?.Equals(true) == true ? int.Parse(parameter.ToString()) : Binding.DoNothing;
+        }
+	}
+}

BeWo/Converter/TestDebugConverter.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class TestDebugConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value;
+        }
+    }
+}

BeWo/Converter/UserRightType2BoolConverter.cs

@@ -0,0 +1,34 @@
+using BS.Shared;
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class UserRightType2BoolConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value is UserRightType type)
+            {
+                return BeWoApp.HasLoggedOnUserRight(type);
+            }
+
+            if (parameter is UserRightType type2)
+            {
+                return BeWoApp.HasLoggedOnUserRight(type2);
+            }
+
+            return false;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Converter/ValueConverterGroup.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace BeWo.Converter
+{
+    public class ValueConverterGroup : List<IValueConverter>, IValueConverter
+    {
+        #region IValueConverter Members
+
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return this.Aggregate(value, (current, converter) => converter.Convert(current, targetType, parameter, culture));
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        #endregion
+    }
+}

BeWo/Core/BeWoUtils.cs

@@ -45,9 +45,12 @@ using Image = System.Windows.Controls.Image;
 using MessageBox = System.Windows.MessageBox;
 using Panel = System.Windows.Controls.Panel;
 using System.Windows.Media;
+using System.Windows.Threading;
+using BeWo.Core.Service;
 using BeWo.ownChat;
 using BeWo.PasswortSecurity;
 using BeWo.Scheduler.Utils;
+using BeWo.ViewModel.ListViewModel;
 using DevExpress.Xpf.Bars;
 using DevExpress.Xpf.DocumentViewer;
 using DevExpress.Xpf.Printing.PreviewControl.Bars;
@@ -55,6 +58,11 @@ using DevExpress.XtraScheduler;
 using RestSharp;
 using Control = System.Windows.Controls.Control;
 using Utils = BS.Shared.Core.Utils;
+using Brush = System.Windows.Media.Brush;
+using BeWo.View.Detail.Zeiterfassung;
+using DevExpress.Xpf.Scheduling;
+using CommandBarStyle = DevExpress.Xpf.DocumentViewer.CommandBarStyle;
+using ImageSource = System.Windows.Media.ImageSource;
 
 namespace BeWo.Core
 {
@@ -102,10 +110,15 @@ namespace BeWo.Core
 
 		public static void NavigateToReportUri(string navigateUriString, string title)
 		{
-			NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null);
+            NavigateToReportUri(navigateUriString, title, null);
 		}
 
-		public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp)
+        public static void NavigateToReportUri(string navigateUriString, string title, Action callback)
+        {
+            NavigateToReportUriWithDocumentPreviewControl(navigateUriString, title, null, callback);
+        }
+
+        public static void NavigateToReportUriWithDocumentPreviewControl(string navigateUriString, string title, DocumentPreviewControl dp, Action callback)
         {
             var reportTemplates = ServiceFacade.DoOperationsServiceSync(x => x.GetReportTemplates(navigateUriString));
 
@@ -120,7 +133,7 @@ namespace BeWo.Core
                     WindowStartupLocation = WindowStartupLocation.CenterOwner,
                     GroupBoxContent = control,
                     Owner = BeWoApp.CurrentBeWo.MainWindow,
-                    rootGroupBox = { Header = "Layout speichern" }
+                    rootGroupBox = { Header = "Bericht auswählen" }
                 };
 
                 control.CancelButtonClicked += () => beWoWindow.Close();
@@ -148,6 +161,10 @@ namespace BeWo.Core
 
                     StartGetReportStreamAsync(GetReportStreamForWPFControl, newUri, ms => BeWoApp.MainControl.Dispatch(delegate
                     {
+                        if (callback != null)
+                        {
+                            callback();
+                        }
                         ShowReportWindow(ms, title, dp);
                     }));
                 };
@@ -160,6 +177,10 @@ namespace BeWo.Core
 
                 StartGetReportStreamAsync(GetReportStreamForWPFControl, navigateUriString, ms => BeWoApp.MainControl.Dispatch(delegate
                 {
+                    if (callback != null)
+                    {
+                        callback();
+                    }
                     ShowReportWindow(ms, title, dp);
                 }));
             }
@@ -231,7 +252,7 @@ namespace BeWo.Core
 						}
 						catch (Exception e)
 						{
-							BeWoApp.ShowError(null, e, true);
+							BeWoApp.ShowErrorMessage(e);
 							BeWoApp.MainControl.EndWaiting();
 						}
 					},
@@ -1305,7 +1326,7 @@ namespace BeWo.Core
                 }
 
                 var serv2 = serv as ServicesReportView;
-                if(serv != null)
+                if(serv2 != null)
                 {
                     if(serv2.Customer != null)
                     {
@@ -1626,9 +1647,12 @@ namespace BeWo.Core
         //    }
         //}
 
-        public static void OpenMailClient(string mailAddress, string subject = "")
+        public static void OpenMailClient(string mailAddress, string subject = "", string body = "")
         {
-            var mailCmd = string.Format(@"mailto:{0}?subject={1}", mailAddress, subject);
+            //mailAddress = "cb@ownsoft.de";
+            //subject = "Betreff";
+            
+            var mailCmd = string.Format(@"mailto:{0}?subject={1}&body={2}", mailAddress, subject, body);
 
             System.Diagnostics.Process.Start(mailCmd);
         }
@@ -1660,93 +1684,51 @@ namespace BeWo.Core
 				cbDc = node.SupportConceptTreeNodeDC.CostBearer;
 				relDc = node.SupportConceptTreeNodeDC.SupportConceptCostBearerRelDC;
 			}
-			
 
             var dc = vm.CommitToDataContract();
             dc.Employee = selectedEmployee ?? BeWoApp.LoggedOnUser.Employee;
             dc.SupportConcept = scDc;
 			dc.CostBearer = cbDc;
-
-            if(vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitMonatJahr && vm.Date.HasValue && vm.DateAndTime.HasValue && vm.StartDate.HasValue) {
-
-                dc.Start = new DateTime(vm.Date.Value.Year,
-                                        vm.Date.Value.Month,
-                                        vm.Date.Value.Day,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Hour : vm.StartDate.Value.Hour,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Minute : vm.StartDate.Value.Minute,
-                                        vm.StartTime == null ? vm.DateAndTime.Value.Second : vm.StartDate.Value.Second);
-                
-
-
-                if(vm.DurationInStunden == ZeiterfassungsDauer.Minuten)
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else
-                    {
-                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration));
-                    }
-                }
-                else
-                {
-                    if (vm.ServiceRecordFormat == ServiceRecordFormate.ZeiterfassungMitEndDatum)
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.DurationSTD));
-                    }
-                    else 
-                    {
-                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.Duration));
-                    }
-                }
-
+            
+            if (relDc != null)
+            {
+                dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
             }
             else
             {
-                var dates = DateTime.Parse("1." + vm.OnlyMonth + vm.OnlyYear);
-
-                var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0);
-         
-                dc.Start = StartDatetime;
-                dc.End = StartDatetime.AddHours((double)vm.DurationMonthYearGes);
+                dc.CostBearer2SupportConceptOid = null;
             }
-
-            
-            if (relDc != null)
-				dc.CostBearer2SupportConceptOid = relDc.CostBearer2SupportConceptOid;
-
-            var r = new List<ServiceRecordValidationResultDC>();
+            var validationResults = new List<ServiceRecordValidationResultDC>();
 
             var maxdays = BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed;
 
             if (withoutClient && BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed <= 0)
+            {
                 maxdays = -1;
+            }
 
             if (BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowEditAfterMaxDaysInNextMonth))
+            {
                 maxdays = -1;
+            }
 
-	        var test = dc.Start;
-	        var test2 = vm.DateAndTime;
+			ServiceFacade.DoOperationsServiceSync(o => validationResults = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
 
-			ServiceFacade.DoOperationsServiceSync(o => r = o.ValidateServiceRecord(dc, statistics, maxdays, employeeOids, cb2ScOids));
-
-
-            if (r.Count > 0)
+            if (validationResults.Count > 0)
             {
                 var exitLoop = false;
                 
-                foreach (var result in r)
+                foreach (var result in validationResults)
                 {
                     switch (result.ResultType)
                     {
                         case ServiceRecordValidationResult.OutsideOfSupportConcept:
-                            MessageBox.Show("Das gewählte Datum '" + vm.DateAndTime.Value.ToShortDateString() + "' liegt außerhalb des Zeitraums des gewählten Hilfeplans (" + relDc.DateRangeString + ").\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Das gewählte Datum '{vm.StartDate.ToShortDateString()}' liegt außerhalb des Zeitraums des gewählten Hilfeplans ({relDc.DateRangeString}).\nDas Speichern ist nicht möglich.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                             lValid = false;
                             exitLoop = true;
                             break;
                         case ServiceRecordValidationResult.OutOfEditLimit:
-                            MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da bereits der " + BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed + ". des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+                            MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da bereits der {BeWoApp.AppSettings.MaxDaysEditServiceRecordsAllowed}. des nachfolgenden Monats überschritten ist.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
                             lValid = false;
                             exitLoop = true;
                             break;
@@ -1755,11 +1737,11 @@ namespace BeWo.Core
 							{
 								if (BeWoApp.AppSettings.AnzTageZeiterfassErfolgt == 1)
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von einem Tag erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}
 								else
 								{
-									MessageBox.Show("Sie können keine neuen Leistungen für den " + vm.DateAndTime.Value.ToShortDateString() + " dokumentieren, da die Zeiterfassung innerhalb von " + BeWoApp.AppSettings.AnzTageZeiterfassErfolgt + " Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
+									MessageBox.Show($"Sie können keine neuen Leistungen für den {vm.StartDate.ToShortDateString()} dokumentieren, da die Zeiterfassung innerhalb von {BeWoApp.AppSettings.AnzTageZeiterfassErfolgt} Tagen erfolgen muss.", "Speichern", MessageBoxButton.OK, MessageBoxImage.Information);
 								}
 
 								lValid = false;
@@ -1775,10 +1757,10 @@ namespace BeWo.Core
                         case ServiceRecordValidationResult.ServiceRecordOverlapping:
 							if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLS))
                             {
-                                MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+                                MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ") .\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                 lValid = false;
                             }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag (" + result.Message + " bei Klient/in " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag ({result.Message} bei " + BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                             {
                                 lValid = false;
                                 exitLoop = true;
@@ -1788,49 +1770,47 @@ namespace BeWo.Core
 		                   
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateOverlappingFLSForEmployee))
                             {
-								MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                 lValid = false;
                             }
-							else if (MessageBox.Show("An dem gewählten Datum '" + vm.DateAndTime.Value.ToShortDateString() + " " + vm.DateAndTime.Value.ToShortTimeString() + "' existiert bereits ein Eintrag von " + result.EmployeeName + "\n(" + result.Message + ").\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show($"An dem gewählten Datum '{vm.StartDate.ToShortDateString()} {vm.StartDate.ToShortTimeString()}' existiert bereits ein Eintrag von {result.EmployeeName}\n({result.Message}).\n\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                             {
                                 lValid = false;
                                 exitLoop = true;
                             }
                             break;
                         case ServiceRecordValidationResult.ApprovedFLSOverspending:
-                            String klient = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                             {
-                                klient = "Klient/in " + result.CustomerName;
+                                klient = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                             }
-                            String msg =
-                                String.Format(
-                                    "Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag überschritten. ({1:N}).",
-                                    result.ApprovedHours, result.HoursNew, klient);
+
+                            var msg = string.Format("Die für {2} genehmigten FLS ({0:N}) werden mit diesem Eintrag ({1:N}) überschritten.", result.ApprovedHours, result.HoursNew, klient);
 
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.ServiceRecord_AllowCreateMoreFLSThanApproved))
                             {
-								MessageBox.Show(msg + ").\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
+								MessageBox.Show(msg + "\nSpeichern nicht möglich.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Information);
                                 lValid = false;
                             }
-							else if (MessageBox.Show(msg + ").\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
+							else if (MessageBox.Show(msg + "\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                             {
                                 lValid = false;
                                 exitLoop = true;
                             }
                             break;
                         case ServiceRecordValidationResult.SettlementInvoiceAlreadyExisting:
-                            String klient2 = "diesen Hilfeplan";
-                            if (!String.IsNullOrEmpty(result.CustomerName))
+                            var klient2 = "diesen Hilfeplan";
+                            if (!string.IsNullOrEmpty(result.CustomerName))
                             {
-                                klient2 = "Klient/in " + result.CustomerName;
+                                klient2 = BS.Shared.Translation.Translator.Translate("Klient/in") + " " + result.CustomerName;
                             }
                             if (!BeWoApp.LoggedOnUser.HasRight(UserRightType.BookServiceRecordAfterSettlementInvoice))
                             {
-                                MessageBox.Show(String.Format("Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {0} erstellt wurde.", klient2), "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+                                MessageBox.Show($"Sie können den Eintrag nicht bearbeiten, da bereits eine Spitzabrechnung für {klient2} erstellt wurde.", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
                                 lValid = false;
                             }
-							else if (MessageBox.Show(String.Format("Es existiert bereits eine Spitzabrechnung für {0}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", klient2), "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+							else if (MessageBox.Show($"Es existiert bereits eine Spitzabrechnung für {klient2}. Um diesen Eintrag zu berücksichtigen, muss eventuell eine neue Spitzabrechnung erstellt werden.\nMöchten Sie trotzdem speichern?", "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
                             {
                                 lValid = false;
                                 exitLoop = true;
@@ -1851,14 +1831,23 @@ namespace BeWo.Core
                                 lValid = false;
                                 exitLoop = true;
                             }
-							
 							break;
+                        case ServiceRecordValidationResult.SignatureExists:
+                            if(MessageBox.Show(result.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.No))
+                            {
+                                lValid = false;
+                                exitLoop = true;
+                            }
+                            break;
                     }
 
-                    if (exitLoop) break;
+                    if (exitLoop)
+                    {
+                        break;
+                    }
                 }
             }
-            
+
             return lValid;
         }
 
@@ -1911,7 +1900,7 @@ namespace BeWo.Core
             else
             {
                 var msg = vm.GroupOid != null
-                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne Klienten aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie dem gesamten Gruppeneintrag löschen möchten?"
+                    ? "ACHTUNG, wenn Sie fortfahren, löschen Sie die gesamte Gruppenbuchung.\nWenn Sie nur einzelne " + BS.Shared.Translation.Translator.Translate("Klienten") + " aus der Gruppe entfernen möchten,\neditieren Sie die Gruppe und entfernen den Klienten aus der Liste aller Hilfepläne.\nSind Sie sicher, dass Sie den gesamten Gruppeneintrag löschen möchten?"
                     : "Sind Sie sicher, dass Sie den gewählten Eintrag löschen möchten?";
 
                 if (MessageBox.Show(msg, "Eintrag löschen", MessageBoxButton.YesNo, MessageBoxImage.Warning) !=
@@ -1940,8 +1929,18 @@ namespace BeWo.Core
 					var employeeOid        = Convert.ToInt64(variablen["employeeOid"]);
 					var serienTermine      = (List<SchedulerAppointmentDC>)variablen["serienTermine"];
 					var mehrtaegigeTermine = (List<SchedulerAppointmentDC>)variablen["mehrtaegigeTermine"];
+                    var nullableAbsenceTimeOids = (List<long?>) variablen["absenceTimeOids"] ?? new List<long?>();
 
-					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReport(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));
+                    var absenceTimeOids = new List<long>();
+                    foreach(var absenceTimeOid in nullableAbsenceTimeOids)
+                    {
+                        if(absenceTimeOid.HasValue)
+                        {
+                            absenceTimeOids.AddIfNotIn(absenceTimeOid.Value);
+                        }
+                    }
+
+					ServiceFacade.DoReportServiceAsync(strom => strom.CreateKalenderReportWithAbsenceTimes(appointmentIds, employeeOid, serienTermine, selectedDays, mehrtaegigeTermine, absenceTimeOids), ms => BeWoApp.MainControl.Dispatch(() => ShowReportWindow(ms, title)));
 
 					break;
 				case ReportEnum.KassenbuchReportEnum:
@@ -1968,7 +1967,7 @@ namespace BeWo.Core
 
 	    public static void ShowReportWindow(MemoryStream ms, string title, DocumentPreviewControl documentPreviewControl = null)
 	    {
-			 var report = new XtraReport();
+	        var report = new XtraReport();
 
 			try
 			{
@@ -2070,25 +2069,26 @@ namespace BeWo.Core
             }
         }
 
-        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice, Appointment appointment, Action schedulerCallback)
+        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, string notice, Appointment appointment, Action<List<ServiceRecordDC>> schedulerCallback)
         {
             ChatDokumentationsView newView;
 
-            if (customer.Count == 0)
+            if(customer.Count == 0)
             {
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end, schedulerCallback, appointment);
+                newView = new ChatDokumentationsView(notice, null, start, end, null, schedulerCallback, appointment);
             }
-            else if (customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
             {
                 var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
 
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end, schedulerCallback, appointment);
+                
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null, schedulerCallback, appointment);
             }
             else
             {
-                if (employees.Count == 0)
+                if(employees.Count == 0)
                 {
                     employees.Add(BeWoApp.CompactLoggedOnEmployee);
                 }
@@ -2100,6 +2100,37 @@ namespace BeWo.Core
             newView.ShowDialog();
         }
 
+        // Zeiterfassungseintrag aus dem neuen Kalendermodul erstellen
+        public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice, AppointmentItem appointment, Action schedulerCallback)
+        {
+            ChatDokumentationsView newView;
+
+            if(customer.Count == 0)
+            {
+                // Normale Buchung
+                newView = new ChatDokumentationsView(notice, null, null, start, end, schedulerCallback, appointment);
+            }
+            else if(customer.Count == 1 && employees.Count < 2)
+            {
+                var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
+
+                // Normale Buchung
+                newView = new ChatDokumentationsView(notice, compactKlient, employees.Count == 1 ? employees[0] : null, start, end, schedulerCallback, appointment);
+            }
+            else
+            {
+                if(employees.Count == 0)
+                {
+                    employees.Add(BeWoApp.CompactLoggedOnEmployee);
+                }
+
+                // Gruppenbuchungen
+                newView = new ChatDokumentationsView(appointment, notice, start, end, customer, employees, schedulerCallback);
+            }
+
+            newView.ShowDialog();
+        }
+
         public static void CreateZeiterfassung(DateTime start, DateTime end, List<CompactCustomerDC> customer, List<CompactEmployeeDC> employees, String notice)
         {
             ChatDokumentationsView newView;
@@ -2107,14 +2138,14 @@ namespace BeWo.Core
             if(customer.Count == 0)
             {
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, null, start, end);
+                newView = new ChatDokumentationsView(notice, null, start, end, null);
             }
-            else if(customer.Count == 1 && employees.Count == 0)
+            else if(customer.Count == 1 && employees.Count < 2)
             {
                 var compactKlient = ServiceFacade.DoCustomerServiceSync(s => s.GetCompactCustomerDC(customer[0].CustomerOid));
 
                 // Normale Buchung
-                newView = new ChatDokumentationsView(notice, compactKlient, start, end);
+                newView = new ChatDokumentationsView(notice, compactKlient, start, end, employees.Count == 1 ? employees[0] : null);
             }
             else
             {
@@ -2131,7 +2162,7 @@ namespace BeWo.Core
         }
 
         public static void OwnChatSynchronisationVeranlassen()
-        {       
+        {
             if (!BeWoApp.Mandator.Apikey.IsNullOrEmpty())
             {
                 try
@@ -2167,11 +2198,11 @@ namespace BeWo.Core
                         
 //                        response.Close();
 //                        response.Dispose();
-                    //}
+
                 }
                 catch (Exception exception)
                 {
-                   // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);
+                    // MessageBox.Show("Die Verbindung konnte nicht aufgebaut werden.", "ownChat Fehler ", MessageBoxButton.OK);
 
                 }
             }
@@ -2187,11 +2218,169 @@ namespace BeWo.Core
             return BeWoApp.LoggedOnUser.HasRight(pUserRightType);
         }
         
-        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType)
+        public static bool CheckSchedulerRights(Appointment pAppointment, bool pIsNew, SchedulerRightsCheckType pCheckType, List<long> teamMemberCustomerOids, bool ignoreViewEditCreateAllRights)
         {
             var storage = pAppointment.GetCustomFieldStorage();
 
-            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser);
+            return Utils.CheckSchedulerRights(storage.CustomerList, storage.ResourceList, storage.EmployeeList.ToList(), storage.Originator, pIsNew, pCheckType, BeWoApp.LoggedOnUser, teamMemberCustomerOids, ignoreViewEditCreateAllRights);
+        }
+
+        public static void EditServiceRecord(ServiceRecordDC dc, DispatcherObject p)
+        {
+            
+            var record = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordById(dc.ServiceRecordOid.Value));
+
+
+            //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+            //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                //selectedRecord.AllGoalCategories, allgoalsCopy);
+
+            VMFactory.CreateServiceRecordVMAsync(
+                BeWoApp.LoggedOnUser.Employee.EmployeeOid,
+                vmList =>  p.Dispatch(
+                    delegate
+                    {
+                        vmList.DispatcherObject = p;
+
+                        if (record.Customer != null && record.SupportConcept != null)
+                        {
+                            vmList.InitPrototypeVM(record.Customer.CustomerOid, record.SupportConcept.SupportConceptOid, record.CostBearer2SupportConceptOid);
+                        }
+                        //var allgoalsCopy = GoalService.CopyGoals(selectedRecord.AllGoals, false);
+
+                        //var sr = new ServiceRecordVM(record, ViewModel.PrototypeVM.Category2Services,
+                        //    selectedRecord.AllGoalCategories, allgoalsCopy);
+                        
+                        var vm = new ServiceRecordVM(record, vmList.PrototypeVM.Category2Services, vmList.PrototypeVM.AllGoalCategories, vmList.PrototypeVM.AllGoals);
+
+                        EditServiceRecord(vmList, vm);
+                    }));
+        }
+        public static void EditServiceRecord(ServiceRecordListVM listvm, ServiceRecordVM vm)
+        {
+            if (vm == null)
+            {
+                return;
+            }
+
+            BeWoView serviceRecordEditView;
+
+            if (vm.GroupOid != null)
+            {
+                serviceRecordEditView = new ServiceRecordGroupEditView();
+            }
+            else
+            {
+                serviceRecordEditView = new ServiceRecordEditView();
+            }
+            double height = BeWoApp.MainControl.ActualHeight * 0.8;
+            double width = 710;
+
+            if (BeWoApp.AppSettings.ShowRtfTextfield)
+            {
+                height = BeWoApp.MainControl.ActualHeight - 120;
+                width = 1000;
+            }
+            if (BeWoApp.MainControl.ActualWidth < width)
+            {
+                width = BeWoApp.MainControl.ActualWidth;
+            }
+            if (height < 600)
+            {
+                height = 600;
+            }
+
+            var beWoWindow = new BeWoWindow
+            {
+                Height = height,
+                Width = width,
+                WindowStartupLocation = WindowStartupLocation.CenterOwner,
+                GroupBoxContent = serviceRecordEditView,
+                Owner = BeWoApp.CurrentBeWo.MainWindow
+            };
+
+            beWoWindow.rootGroupBox.Style = null;
+            beWoWindow.rootGroupBox.Visibility = Visibility.Visible;
+            beWoWindow.rootGroupBox.Margin = new Thickness(-10);
+            beWoWindow.rootGroupBox.Padding = new Thickness(0);
+
+            if (serviceRecordEditView.CommandBindings.Count == 0)
+            {
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Close,
+                        (s, e) =>
+                        {
+                            var result = ServiceRecordDialogResult.ClosedWithoutSaving;
+
+                            if (vm.EditAllowed)
+                            {
+                                if (serviceRecordEditView is ServiceRecordEditView view)
+                                {
+                                    result = view.CloseAndDoSaveCheck();
+                                }
+                                else
+                                {
+                                    result = ((ServiceRecordGroupEditView)serviceRecordEditView).CloseAndDoSaveCheck();
+                                }
+                            }
+
+                            beWoWindow.Close();
+                        }));
+                serviceRecordEditView.CommandBindings.Add(
+                    new CommandBinding(
+                        ApplicationCommands.Save,
+                        (s, e) =>
+                        {
+                            if (vm.EditAllowed)
+                            {
+                                bool save;
+                                if (serviceRecordEditView is ServiceRecordEditView)
+                                {
+                                    save = ((ServiceRecordEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordEditView)serviceRecordEditView).IsCustomerChangeAllowed();
+                                }
+                                else
+                                {
+                                    save = ((ServiceRecordGroupEditView)serviceRecordEditView).IsValid() &&
+                                           ((ServiceRecordGroupEditView)serviceRecordEditView)
+                                           .IsCustomerChangeAllowed();
+                                }
+
+                                if (!save)
+                                {
+                                    return;
+                                }
+
+                                serviceRecordEditView.SaveData();
+                            }
+                            beWoWindow.Close();
+                        }));
+            }
+
+            if (serviceRecordEditView is ServiceRecordEditView)
+            {
+                ((ServiceRecordEditView)serviceRecordEditView).InitView(listvm, vm, vm.SupportConcept == null);
+                
+            }
+            else
+            {
+                var group = ServiceFacade.DoOperationsServiceSync(s => s.GetServiceRecordGroup(vm.GroupOid.Value));
+
+                ((ServiceRecordGroupEditView)serviceRecordEditView).InitView(listvm, vm, group);
+
+                beWoWindow.Width += 190;
+            }
+
+            beWoWindow.ShowDialog();
+        }
+
+        public static bool CheckForExistingSignatures(ServiceRecordDC serviceRecord)
+        {
+            var validationResult = ServiceFacade.DoOperationsServiceSync(s => s.CheckForExistingSignature(serviceRecord));
+
+            return validationResult != null && MessageBox.Show(validationResult.Message, "Speichern", MessageBoxButton.YesNo, MessageBoxImage.Warning).Equals(MessageBoxResult.Yes) || validationResult == null;
         }
     }
 }

BeWo/Core/Config/AppSettings.cs

@@ -1,6 +1,9 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using BeWo.View.Navigation.Filter;
 using BS.Shared;
+using DevExpress.Xpf.Scheduling;
+using DevExpress.XtraScheduler;
 
 namespace BeWo.Core.Config
 {
@@ -16,21 +19,28 @@ namespace BeWo.Core.Config
 
         private bool misZeiterfassDateNormal = true;
 
-        private bool misZeiterfassungInStdMin = true;
+        private String einheitZeiterfassung = "0";
 
         private CustomerFilterEnum _CustomerFilterInZeiterfassung = CustomerFilterEnum.All;
         private CustomerFilterEnum _CustomerFilterSupportConcepts = CustomerFilterEnum.All;
         private CustomerFilterEnum _CustomerFilterCustomers = CustomerFilterEnum.All;
 
         private bool _showExpiredSupportConcepts = true;
-        private bool _showServiceRecordGridControl;
-        
+        private bool _showServiceRecordGridControl = true;
+        private bool _filterGroupServiceCategories = true;
+
         private WindowStateType mWindowStateType = WindowStateType.Default;
 
         private ServiceRecordTimeInterval mLastSelectedServiceRecordTimeInterval = ServiceRecordTimeInterval.All;
 
         private int mLastSelectedServiceRecordTimeIntervalDays = 7;
 
+        private int mServiceRecordAllowChangeHours = 24;
+
+        private DateTime mLastSelectedServiceRecordMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+
+        private int mLastKassenSortOrder = 1;
+
         private ZeiterfassungsDauer mLetzteZeiterfassungsDauer = ZeiterfassungsDauer.Minuten;
 
         public enum WindowStateType
@@ -38,7 +48,13 @@ namespace BeWo.Core.Config
             Default,
             Maximised
         }
-        
+
+        public AppSettings()
+        {
+            DienstplanungStandardZeilenAnzahl = 1;
+        }
+
+        public int MoKSessionTimeout { get; set; } = 20;
 
         public bool IsServiceRecordNoticeMandatory
         {
@@ -74,10 +90,10 @@ namespace BeWo.Core.Config
             set { misZeiterfassDateNormal = value; }
         }
 
-        public bool IsZeiterfassungInStdMin
+        public String EinheitZeiterfassung
         {
-            get { return misZeiterfassungInStdMin; }
-            set { misZeiterfassungInStdMin = value; }
+            get { return einheitZeiterfassung; }
+            set { einheitZeiterfassung = value; }
         }
 
         public ZeiterfassungsDauer LetzteZeiterfassungsDauer
@@ -181,7 +197,6 @@ namespace BeWo.Core.Config
 
         public bool ShowLargeCustomerNotice { get; set; }
 
-        
         public bool ZeigeNurMeineTermine
         {
             get { return mZeigeNurMeineTermine; }
@@ -309,12 +324,60 @@ namespace BeWo.Core.Config
             }
         }
 
+        public DateTime LastSelectedServiceRecordMonth
+        {
+            get { return mLastSelectedServiceRecordMonth; }
+
+            set
+            {
+                if (mLastSelectedServiceRecordMonth != value)
+                {
+                    mLastSelectedServiceRecordMonth = value;
+                    IsDirty = true;
+                }
+            }
+
+            
+        }
+
+        public int LastKassenSortOrder
+        {
+            get { return mLastKassenSortOrder; }
+
+            set
+            {
+                if (mLastKassenSortOrder != value)
+                {
+                    mLastKassenSortOrder = value;
+                    IsDirty = true;
+                }
+            }
+
+
+        }
+
+        public int ServiceRecordAllowChangeHours
+        {
+            get { return mServiceRecordAllowChangeHours; }
+
+            set
+            {
+                if (mServiceRecordAllowChangeHours != value)
+                {
+                    mServiceRecordAllowChangeHours = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
         public bool IsDirty { get; set; }
 
         public string TimeRecordingMenuName { get; set; }
 
 		public bool ShowDistanceFields { get; set; }
 
+        public bool ShowBetrag { get; set; }
+
         public bool ShowHilfeplanBezeichnung { get; set; }
 
         public bool ShowArbeitszeiten { get; set; }
@@ -341,7 +404,9 @@ namespace BeWo.Core.Config
 
 		public bool IsWohnheimAllowed { get; set; }
 
-        public bool IsChatAllowed { get; set; }
+        public bool ShowOwnChat { get; set; }
+
+        public bool ShowOwnChatSettings { get; set; }
 
         public bool IsMedicationAllowed { get; set; }
 
@@ -351,8 +416,110 @@ namespace BeWo.Core.Config
 
 		public bool PrinterSettingsUseMargins { get; set; }
 
+        public bool ShowMultipleResourceColors { get; set; }
+
         public bool ShowPivotGrid { get; set; }
 
         public string ExpandedAdministrationItems { get; set; }
+        public bool ShowUrlaubsplanung { get; set; }
+        public bool DontShowSpitzabrechnung { get; set; }
+        public bool ShowDienstplanung { get; set; }
+
+        public bool ShowWorktime { get; set; }
+        public bool EnableArbeitszeiterfassung { get; set; }
+        public bool EnableAutomaticPauses { get; set; }
+        public bool EnableRestTimeWarning { get; set; }
+        public int MaxWorkTimeHoursBeforeWarning { get; set; }
+
+        public int DienstplanungStandardZeilenAnzahl { get; set; }
+
+        public bool ShowInfoButtonInCalender{ get; set; }
+
+        public bool AllowStorno { get; set; }
+
+        public bool UseDistanceApi { get; set; }
+
+        public bool ShowEmployeeSignature { get; set; }
+
+        public bool SetStartTimeToEndTimeAfterSave { get; set; }
+
+        public bool ShowHilfeplanStatistikReport { get; set; }
+
+        public bool ShowAI { get; set; }
+
+        public bool ShowAIInternal { get; set; }
+
+        public bool AllowGkvAbrechnung { get; set; }
+
+        public bool ShowImportAbschlagszahlungen { get; set; }
+
+        public bool ShowPersehImport { get; set; }
+
+        public bool DontUpdateApprovalPeriodDates { get; set; }
+
+        private SchedulerViewType _SchedulerViewType;
+        public SchedulerViewType SchedulerViewType
+        {
+            get => _SchedulerViewType;
+            set
+            {
+                if(_SchedulerViewType != value)
+                {
+                    _SchedulerViewType = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private ViewType _SchedulingViewType;
+        public ViewType SchedulingViewType
+        {
+            get => _SchedulingViewType;
+            set
+            {
+                if(_SchedulingViewType != value)
+                {
+                    _SchedulingViewType = value;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerTimelineViewDayCount;
+        public int SchedulerTimelineViewDayCount
+        {
+            get => _SchedulerTimelineViewDayCount == 0 ? 10 : _SchedulerTimelineViewDayCount;
+            set
+            {
+                if(_SchedulerTimelineViewDayCount != value)
+                {
+                    _SchedulerTimelineViewDayCount = value > 0 ? value : 10;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        private int _SchedulerDayViewDayCount;
+        public int SchedulerDayViewDayCount
+        {
+            get => _SchedulerDayViewDayCount == 0 ? 5 : _SchedulerDayViewDayCount;
+            set
+            {
+                if(_SchedulerDayViewDayCount != value)
+                {
+                    _SchedulerDayViewDayCount = value > 0 ? value : 5;
+                    IsDirty = true;
+                }
+            }
+        }
+
+        public bool ShowKlientenBetreuungszeiten { get; set; }
+
+        public bool FilterGroupServiceCategories
+        {
+            get { return _filterGroupServiceCategories; }
+
+            set { _filterGroupServiceCategories = value; }
+        }
     }
 }

BeWo/Core/Service/Cache.cs

@@ -38,7 +38,9 @@ namespace BeWo.Core.Service
 
         private List<CompactEmployeeDC> mTeamMembers;
 
-		private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;
+        private List<RatingTypeDC> mRatingTypes;
+
+        private Dictionary<ValueListEntryDC, List<ResourceDC>> mCats2ResInDic;
 
         private Cache()
         {
@@ -63,6 +65,7 @@ namespace BeWo.Core.Service
 			this.ClearCustomers();
             this.ClearWohnheims();
 			ClearResources();
+            ClearRatingTypes();
         }
 
         public void ClearAllValueListEntries()
@@ -115,7 +118,12 @@ namespace BeWo.Core.Service
 		    mCats2ResInDic = null;
 	    }
 
-		public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
+        public void ClearRatingTypes()
+        {
+            mRatingTypes = null;
+        }
+
+        public void GetActiveSupportConceptCostbearer(Action<List<CompactSupportConceptDC>> callback)
         {
             if (this.mActiveSupportConceptCostbearerList == null)
             {
@@ -247,6 +255,16 @@ namespace BeWo.Core.Service
 			}
 		}
 
+        public List<RatingTypeDC> GetAllRatingTypeList()
+        {
+            if(mRatingTypes == null)
+            {
+                ServiceFacade.DoOperationsServiceSync(cs => mRatingTypes = cs.GetAllRatingTypes());
+            }
+
+            return mRatingTypes;
+        }
+
         public void GetServiceCategoryDescriptionDict(Action<Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>>> callback)
         {
             if (this.mServiceCategoryDescriptionDict == null)
@@ -329,11 +347,34 @@ namespace BeWo.Core.Service
             }
             if (ve == null)
             {
-                return new ValueListEntryDC {TypeDescription = "<Gelöscht>"};
+                return new ValueListEntryDC {TypeDescription = "<Gelöscht>", ValueListEntryOid = oid };
+                //return new ValueListEntryDC { TypeDescription = "<Gelöscht>" };
             }
             return ve;
         }
 
+        public void AddGoalEntry(ValueListEntryDC newdc)
+        {
+            if (newdc.ValueListEntryOid.HasValue)
+            {
+                var ve = GetGoalEntry(newdc.ValueListEntryOid.Value);
+                if (ve == null || !ve.ValueListEntryOid.HasValue)
+                {
+                    if (mValueListEntryDict != null)
+                    {
+                        if (!mValueListEntryDict.ContainsKey(newdc.Type))
+                        {
+                            mValueListEntryDict[newdc.Type] = new List<ValueListEntryDC>();
+                        }
+                        mValueListEntryDict[newdc.Type].Add(newdc);
+                        
+                    }
+                }
+            }
+            
+            
+        }
+
         public ValueListEntryDC GetValueListEntry(ValueListEntryType type, long oid)
         {
             if (mValueListEntryDict == null || !mValueListEntryDict.ContainsKey(type))
@@ -511,5 +552,90 @@ namespace BeWo.Core.Service
 
 		    return mAllCompactCustomers;
 	    }
+
+        public void GetSchedulerObjects(Action<List<CompactCustomerDC>, List<CompactEmployeeDC>, Dictionary<ValueListEntryDC, List<ResourceDC>>> callback)
+        {
+            GetAllActiveEmployeesCompact(allEmployees =>
+            {
+                GetAllActiveCustomersCompact(allCustomers =>
+                {
+                    GetCategories2ResourcesDictionary(resourceDictionary =>
+                    {
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderMitarbeitertermineAnsehen))
+                        {
+                            allEmployees = new List<CompactEmployeeDC> { BeWoApp.CompactLoggedOnEmployee };
+                        }
+
+                        var darfKlientenAnsichtSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View);
+                        var darfTermineAllerKlientenSehen = BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderKliententermineAlleAnsehen);
+
+                        if(darfKlientenAnsichtSehen)
+                        {
+                            if(!darfTermineAllerKlientenSehen || !BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
+                            {
+                                allCustomers = allCustomers.Where(w => w.IsRelatedToEmployee).ToList();
+                            }
+                        }
+                        else
+                        {
+                            allCustomers.Clear();
+                        }
+
+                        if(!BeWoApp.LoggedOnUser.HasRight(UserRightType.KalenderRessourcentermineAnsehen))
+                        {
+                            resourceDictionary.Clear();
+                        }
+
+                        callback(allCustomers, allEmployees, resourceDictionary);
+                    });
+                });
+            });
+        }
+
+
+        // Für neuen SchedulingView hinzugefügt
+        private List<CompactCustomerDC> _FilteredCustomers;
+        public void GetAllActiveCustomersCompactForEmployee(long employeeOid, bool forceReload, Action<List<CompactCustomerDC>> callback)
+        {
+            if(_FilteredCustomers is null || forceReload)
+            {
+                ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactCustomersForEmployee(employeeOid), customers =>
+                {
+                    customers.Sort((x, y) => $"{x.LastName}, {x.FirstName}".CompareTo($"{y.LastName}, {y.FirstName}"));
+                    _FilteredCustomers = customers;
+                    callback(customers);
+                });
+            }
+            else
+            {
+                callback(_FilteredCustomers);
+            }
+        }
+        public void ClearFilteredCustomers()
+        {
+            _FilteredCustomers = null;
+        }
+
+        private List<CompactEmployeeDC> _FilteredEmployees;
+        public void GetAllActiveCompactEmployeesForEmployee(long employeeOid, bool forceReload, Action<List<CompactEmployeeDC>> callback)
+        {
+            if(_FilteredEmployees is null || forceReload)
+            {
+                ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactEmployeesForEmployee(employeeOid), employees =>
+                {
+                    employees.Sort((x, y) => $"{x.LastName}, {x.FirstName}".CompareTo($"{y.LastName}, {y.FirstName}"));
+                    _FilteredEmployees = employees;
+                    callback(employees);
+                });
+            }
+            else
+            {
+                callback(_FilteredEmployees);
+            }
+        }
+        public void ClearFilteredEmployees()
+        {
+            _FilteredEmployees = null;
+        }
     }
 }

BeWo/Core/Service/GoalService.cs

@@ -41,8 +41,8 @@ namespace BeWo.Core.Service
 		        }
 	        }
 
-			var sortedCategories = allCategories.OrderBy(s => s.TypeDescription).ToList();
-            var sortedGoals      = pAllGoals.OrderBy(s => s.TypeDescription).ToList();
+			var sortedCategories = allCategories.OrderBy(s => s.DisplayName).ToList();
+            var sortedGoals      = pAllGoals.OrderBy(s => s.DisplayName).ToList();
 
             var allCatList      = new List<SupportConceptGoalDC>();
 			var allGoalList = new List<SupportConceptGoalDC>();
@@ -284,6 +284,7 @@ namespace BeWo.Core.Service
         public static void RecursiveSynchronousSCValueListEntrySave(SupportConceptGoalTreeItem treeItem)
         {
             var neuerDC = ServiceFacade.DoValueListServiceSync(s => s.InsertNewValueListEntry(treeItem.GoalEntryVM.CommitToDataContract()));
+            Cache.GetInstance().AddGoalEntry(neuerDC);
             InsertedGoals.Add(neuerDC);
             treeItem.GoalEntryVM = new ValueListEntryVM(neuerDC);
             treeItem.GoalEntryDC = neuerDC;
@@ -302,7 +303,7 @@ namespace BeWo.Core.Service
         {
             ValueListEntryDC copyVe = new ValueListEntryDC();
             copyVe.Abbreviation = ve.Abbreviation;
-            copyVe.Rating = copyRating ? ve.Rating : null;
+            copyVe.RatingTypeOid = copyRating ? ve.RatingTypeOid : null;
             copyVe.Notice = ve.Notice;
             copyVe.IsSystemEntry = ve.IsSystemEntry;
             copyVe.ParentOid = ve.ParentOid;
@@ -310,7 +311,9 @@ namespace BeWo.Core.Service
             copyVe.TypeDescription = ve.TypeDescription;
             copyVe.ValueListEntryOid = ve.ValueListEntryOid;
             copyVe.ValueListEntryVersion = ve.ValueListEntryVersion;
-            if (ve.Parent != null)
+			copyVe.CatalogOid = ve.CatalogOid;
+			copyVe.CatalogItem = ve.CatalogItem;
+			if (ve.Parent != null)
             {
                 copyVe.Parent = ve.Parent;
             }

BeWo/Core/Service/SupportConceptService.cs

@@ -17,6 +17,14 @@ namespace BeWo.Core.Service
 
             if (allGoalsAndCategories != null)
             {
+                foreach (var goal in allGoalsAndCategories)
+                {
+                    if (goal.CatalogOid.HasValue)
+                    {
+                        var catalogItem = Cache.GetInstance().GetValueListEntry(ValueListEntryType.MassnahmenKatalog, goal.CatalogOid.Value);
+                        goal.CatalogItem = catalogItem;
+                    }
+                }
                 var ziele            = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalCategoryType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalCategoryType)).OrderBy(s => s.DisplayName).ToList();
                 var massnahmen       = allGoalsAndCategories.Where(w => w.Type.Equals(ValueListEntryType.SupportConceptGoalType) || w.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType)).OrderBy(s => s.DisplayName).ToList();
                 var goalCategoryDict = new Dictionary<long, SupportConceptGoalDC>();
@@ -26,6 +34,7 @@ namespace BeWo.Core.Service
                 {
                     var treeItem = new SupportConceptGoalDC
                     {
+                        CheckRecursive = false,
                         GoalEntryDC = goalCat, 
                         IsExpanded  = allGoalsAndCategories.Count <= 30
                     };
@@ -57,16 +66,21 @@ namespace BeWo.Core.Service
 	                }
                 }
 
-				var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
-				foreach (var ziel in zieleOhneKinder)
-				{
-					CheckIfSelected(ziel, selectedGoals);
-				}
+                //var zieleOhneKinder = goalCategoryDict.Values.Where(w => w.Children.Count == 0).ToList();
+                //foreach (var ziel in zieleOhneKinder)
+                //{
+                //	CheckIfSelected(ziel, selectedGoals);
+                //}
+                var alleZiele = goalCategoryDict.Values.ToList();
+                foreach (var ziel in alleZiele)
+                {
+                    CheckIfSelected(ziel, selectedGoals);
+                }
 
                 foreach (var goal in massnahmen)
                 {
-                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal };
-
+                    var kind = new SupportConceptGoalDC { GoalEntryDC = goal, CheckRecursive = false };
+                    
 	                CheckIfSelected(kind, selectedGoals);
 
                     if (goal.ParentOid != null && goalCategoryDict.ContainsKey(goal.ParentOid.Value))
@@ -91,29 +105,38 @@ namespace BeWo.Core.Service
 					if (existingGoal.Equals(goal.GoalEntryDC))
 					{
 						goal.IsChecked = true;
-                        goal.GoalEntryDC.Rating = existingGoal.Rating;
+                        goal.GoalEntryDC.RatingTypeOid = existingGoal.RatingTypeOid;
+					    if (existingGoal.RatingTypeOid.HasValue)
+					    {
+					        var rdc = Cache.GetInstance().GetAllRatingTypeList()
+					            .FirstOrDefault(r => r.RatingTypeOid == existingGoal.RatingTypeOid);
+					        if (rdc != null)
+					        {
+					            goal.RatingName = rdc.DisplayName;
+					        }
+					    }
 					}
 				}
 
-				goal.PropertyChanged += (s, e) =>
-				{
-					var selectedGoal = s as SupportConceptGoalDC;
-					if (selectedGoal != null)
-					{
-						if (selectedGoal.IsChecked)
-						{
-						    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
-						    {
-						        selectedGoals.Add(selectedGoal.GoalEntryDC);
-						    }
+				//goal.PropertyChanged += (s, e) =>
+				//{
+				//	var selectedGoal = s as SupportConceptGoalDC;
+				//	if (selectedGoal != null)
+				//	{
+				//		if (selectedGoal.IsChecked)
+				//		{
+				//		    if (!selectedGoals.Contains(selectedGoal.GoalEntryDC))
+				//		    {
+				//		        selectedGoals.Add(selectedGoal.GoalEntryDC);
+				//		    }
                             
-						}
-						else
-						{
-							selectedGoals.Remove(selectedGoal.GoalEntryDC);
-						}
-					}
-				};
+				//		}
+				//		else
+				//		{
+				//			selectedGoals.Remove(selectedGoal.GoalEntryDC);
+				//		}
+				//	}
+				//};
 			}
 		}
 
@@ -321,6 +344,7 @@ namespace BeWo.Core.Service
 
         public static CompactSupportConceptDC HoleHilfeplanAusListe(List<CompactSupportConceptDC> scList, CompactCustomerDC customerCompact, DateTime firstTime, DateTime lastTime)
         {
+            CompactSupportConceptDC result = null; 
             foreach (var sc in scList)
             {
                 if (sc.Customer.Oid == customerCompact.Oid)
@@ -330,10 +354,14 @@ namespace BeWo.Core.Service
                     {
                         return sc;
                     }
+                    if (result == null || sc.EndDate.HasValue && sc.EndDate > result.EndDate)
+                    {
+                        result = sc;
+                    }
                 }
             }
 
-            return null;
+            return result;
         }
     }
 }

BeWo/Core/SupportConceptGoalTreeItem.cs

@@ -1,29 +1,81 @@
-using System.ComponentModel;
-
+using BeWo.ViewModel;
 using BS.Shared;
-
-using BeWo.ViewModel;
 using BS.Shared.DataContracts.ClientPartials;
-using BS.Shared.Extensions;
+using System.ComponentModel;
+using System.Diagnostics;
 
 namespace BeWo.Core
 {
+    [DebuggerDisplay("{GoalEntryVM.Abbreviation}: {GoalEntryVM.Description}")]
     public class SupportConceptGoalTreeItem : SupportConceptGoalDC
     {
         private ValueListEntryVM _GoalEntryVM;
         private BindingList<SupportConceptGoalTreeItem> _Children;
         private bool _ShowNotice;
 
+        public SupportConceptGoalTreeItem() { }
+
         public ValueListEntryVM GoalEntryVM
         {
             get => _GoalEntryVM;
             set => _GoalEntryVM = value;
         }
 
+        //CB Das ist doch genau falsch herum?
         public bool IsGoal => GoalEntryVM != null ?
                 GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
                 GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
 
+        public bool IsZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalCategoryType);
+            }
+        }
+
+        public bool IsIndZiel
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalCategoryType);
+            }
+        }
+
+        public bool IsMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptGoalType);
+            }
+        }
+
+        public bool IsIndMassnahme
+        {
+            get
+            {
+                return IsOfType(ValueListEntryType.SupportConceptIndividualGoalType);
+            }
+        }
+
+        public bool IsOfType(ValueListEntryType t)
+        {
+
+            if (GoalEntryVM != null)
+            {
+                return GoalEntryVM.Type == t;
+            }
+            else if (GoalEntryDC != null)
+            {
+                return GoalEntryDC.Type == t;
+            }
+
+            return false;
+        }
+        //public bool IsGoal => GoalEntryVM != null ?
+        //        GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryVM.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType) :
+        //        GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptGoalType) || GoalEntryDC.Type.Equals(ValueListEntryType.SupportConceptIndividualGoalType);
+
 
 
         public bool ShowNotice
@@ -36,6 +88,8 @@ namespace BeWo.Core
             }
         }
 
+        public bool IsHidden { get; set; }
+
         public BindingList<SupportConceptGoalTreeItem> Items
         {
             get => _Children ?? (_Children = new BindingList<SupportConceptGoalTreeItem>());

BeWo/CustomDXLocalizer.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using DevExpress.Xpf.Editors;
+using DevExpress.Xpf.Grid;
 using DevExpress.Xpf.Scheduler;
 
 namespace BeWo
@@ -17,6 +18,22 @@ namespace BeWo
         }
     }
 
+    //class CustomGridLocalizer : GridControlLocalizer
+    //{
+    //    protected override void PopulateStringTable()
+    //    {
+    //        base.PopulateStringTable();
+
+    //        for (int i = 0; i < 10000; i++)
+    //        {
+    //            var enumInt = (GridControlStringId)i;
+    //            AddString(enumInt, enumInt.ToString());
+    //        }
+    //        ;
+    //    }
+    //}
+
+
     //class CustomSchedulerResXLocalizer : SchedulerControlResXLocalizer
     //{
     //    public override string GetLocalizedString(SchedulerControlStringId id)
@@ -28,7 +45,7 @@ namespace BeWo
     //    {
     //        base.PopulateStringTable();
 
-            
+
     //    }
     //}
 

BeWo/DebugConfig.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BeWo
+{
+    public enum DebugConfigMode
+    {
+        SimpleAutoLogin,
+        FeatureCustomerWohnhilfe,
+        FeatureWohnheimWohneinheit,
+        FeatureAuswertungenQuittierungsbelege,
+        FeatureDokumentenVorlage,
+        FeatureDakota
+    }
+
+    public class DebugConfig
+    {
+        private static DebugConfig _CurrentConfig;
+        public static DebugConfig CurrentConfig 
+        { 
+            get
+            {
+                #if DEBUG
+
+                return _CurrentConfig ?? (_CurrentConfig = Feature_Dokumenten_Vorlage);
+
+                #endif
+
+                return null; 
+            } 
+        }
+
+
+        public DebugConfigMode DebugConfigMode { get; set; }
+
+        public bool AutoLogin { get; set; }
+        public UIContext? SelectView { get; set; }
+        /// <summary>
+        /// Beschreibt den Index der jeweils gewählten View (UIContext)
+        /// 
+        /// Z.b.:
+        /// Customer:
+        /// - Details: 0
+        /// - ...: 1
+        /// - ...: 2
+        /// - ...: 3
+        /// - VermittlungArbeit: 4
+        /// - Wohnhilfe: 5
+        /// </summary>
+        public int? SelectIndex { get; set; }
+
+        public static DebugConfig SimpleAutoLogin => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.SimpleAutoLogin,
+            AutoLogin = true
+        };
+
+        public static DebugConfig Feature_Customer_Wohnhilfe => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureCustomerWohnhilfe,
+            AutoLogin = true,
+            SelectView = UIContext.Customer,
+            SelectIndex = 5
+        };
+
+        public static DebugConfig Feature_Wohnheim_Wohneinheit => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureWohnheimWohneinheit,
+            AutoLogin = true,
+            SelectView = UIContext.Wohnheim
+        };
+
+        public static DebugConfig FeatureAuswertungenQuittierungsbelege => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureAuswertungenQuittierungsbelege,
+            AutoLogin = true,
+            SelectView = UIContext.Report
+        };
+
+        public static DebugConfig Feature_Dakota => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureDakota,
+            AutoLogin = true,
+            SelectView = UIContext.Finance,
+            SelectIndex = 8
+        };
+
+        public static DebugConfig Feature_Dokumenten_Vorlage => new DebugConfig()
+        {
+            DebugConfigMode = DebugConfigMode.FeatureDokumentenVorlage,
+            AutoLogin = true,
+            SelectView = UIContext.Dokumente
+        };
+    }
+}

BeWo/EnterTenantDialog.xaml

@@ -17,7 +17,7 @@
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
                 </Grid.RowDefinitions>
-                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                <Image Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                 <Grid Grid.Row="1">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="*" />

BeWo/LockedPage.xaml

@@ -4,6 +4,7 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
       mc:Ignorable="d" Width="Auto" Background="{StaticResource LoginBackground}" SnapsToDevicePixels="False" Focusable="True">
     <Page.Resources>
         <Storyboard x:Key="OnLoaded1">
@@ -43,20 +44,20 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png"  Height="45" Margin="7,7,0,0"/>
                         <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4" Grid.Column="0" FontSize="10" x:Name="LblVersion" />
                         <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,100,0,0" MaxWidth="330">
                             <Label x:Name="lblGesperrt" Content="Gesperrt" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" HorizontalAlignment="Center" />
                             <TextBlock Text="Bitte melden Sie sich an, um den BeWoPlaner zu entsperren." TextWrapping="Wrap" Foreground="#FF000000" FontSize="12" />
                         </StackPanel>
-                        <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
+                        <Label Grid.Column="1" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{markup:Translate Benutzername:}" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
                         <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="1" Margin="10,10,20,10" Height="24" x:Name="TextBoxUsername" HorizontalAlignment="Stretch" Text="" />
                         <PasswordBox Margin="10,0,20,0" Height="24" Grid.Column="2" Grid.Row="2" x:Name="PasswordBoxPassword" Password="" HorizontalAlignment="Stretch" TabIndex="1" />
                         <Button Margin="10,30,20,50" Height="30" x:Name="ButtonLogin" Grid.Column="2" Grid.Row="3" HorizontalAlignment="Stretch" Content="Anmelden" IsDefault="True" Foreground="White" TabIndex="2" />
-                        <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | beyondSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
+                        <Label VerticalAlignment="Bottom" HorizontalAlignment="Left" Content="Copyright 2010 | ownSoft GmbH" Foreground="#FF818181" Margin="5,0,0,3" Grid.Row="3" Grid.ColumnSpan="3" Grid.Column="0" FontSize="10" />
                         <TextBlock Grid.Row="3" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,0,12,10">
-							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de">www.beyondsoft.de</Hyperlink>
+							<Hyperlink TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de/">www.ownsoft.de</Hyperlink>
                         </TextBlock>
                     </Grid>
                 </Border>

BeWo/LockedPage.xaml.cs

@@ -10,7 +10,7 @@ namespace BeWo
             Loaded += LockedPage_Loaded;
 
             LblVersion.Content = BeWoApp.Version;
-            lblGesperrt.Content = $"Gesperrt von Benutzer {BeWoApp.LoggedOnUser.Employee.FirstName} {BeWoApp.LoggedOnUser.Employee.LastName}";
+            lblGesperrt.Content = $"Gesperrt von " + BS.Shared.Translation.Translator.Translate("BenutzerSingular") + " " + BeWoApp.LoggedOnUser.Employee.FirstName + " " + BeWoApp.LoggedOnUser.Employee.LastName;
         }
 
         private void LockedPage_Loaded(object sender, RoutedEventArgs e)

BeWo/LoginControl.xaml

@@ -3,6 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
              mc:Ignorable="d"
              Width="Auto" Background="{StaticResource LoginBackground}"
              d:DesignHeight="600" d:DesignWidth="800">
@@ -17,7 +18,7 @@
                         <TranslateTransform X="0" Y="0" />
                     </TransformGroup>
                 </Grid.RenderTransform>
-                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}">
+                <Border CornerRadius="7,7,7,7" BorderThickness="2,2,2,2" Padding="5,5,5,5" BorderBrush="#FF606060" Background="{DynamicResource LoginBackgroundColor}" KeyDown="UIElement_OnKeyDown">
                     <Grid Opacity="1">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="100" />
@@ -35,20 +36,20 @@
                             <RowDefinition Height="Auto" />
 							<RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
-                        
-                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_big.png"  Height="45" Margin="7,7,0,0"/>
+
+                        <Image Grid.Row="0" Grid.ColumnSpan="4" HorizontalAlignment="Left" VerticalAlignment="Top" Source="Ressources\Icons\bewoplaner_logo_small.png" Height="44" Margin="7,7,0,0"/>
                         <Label VerticalAlignment="Top" HorizontalAlignment="Right" Content="Version x.x.x" Foreground="#FF818181" Margin="5,7,3,0" Grid.Row="0" Grid.ColumnSpan="4"
                                Grid.Column="0" FontSize="10" x:Name="lblVersion" />
                         <StackPanel Grid.Column="1" Grid.Row="0" Grid.ColumnSpan="2" Margin="0,80,0,0">
                             <Label Content="Herzlich willkommen beim BeWoPlaner!" Foreground="#FF000000" FontSize="12" FontWeight="Bold" Margin="0,30,0,0" />
-                            <Label Content="Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein." Foreground="#FF000000" FontSize="12" />
+                            <Label Content="{markup:Translate Bitte geben Sie Ihren Benutzernamen und Ihr Passwort ein.}" Foreground="#FF000000" FontSize="12" />
                         </StackPanel>
 
 
-                        <Label Content="PIN:" Grid.Column="1" Grid.Row="1" Foreground="#FF000000" Background="#00000000" VerticalAlignment="Center" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
-                        <TextBox x:Name="PINTextBox" Grid.Column="2" Grid.Row="1" Margin="10,0,20,0" Height="24" SnapsToDevicePixels="True" HorizontalAlignment="Stretch" Visibility="{Binding Path=IsTechSupport, Converter={StaticResource BoolVisibilityConverter}}"/>
+                        <Label x:Name="lblPin" Content="PIN:" Grid.Column="1" Grid.Row="1" Foreground="#FF000000" Background="#00000000" VerticalAlignment="Center" Visibility="Collapsed"/>
+                        <TextBox x:Name="PINTextBox" Grid.Column="2" Grid.Row="1" Margin="10,0,20,0" Height="24" SnapsToDevicePixels="True" HorizontalAlignment="Stretch" Visibility="Collapsed"/>
 
-                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="Benutzername:" Foreground="#FF000000" Background="#00000000" />
+                        <Label Grid.Column="1" Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Right" Content="{markup:Translate Benutzername:}" Foreground="#FF000000" Background="#00000000" />
                         <Label Grid.Column="1" Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Left" Content="Passwort:" Foreground="#FF000000" Background="#00000000" />
 
                         <TextBox TabIndex="0" SnapsToDevicePixels="True" Grid.Column="2" Grid.Row="2" Margin="10,10,20,10" Height="24" x:Name="TextBox_Username" HorizontalAlignment="Stretch" Text="" GotFocus="TextBox_Username_OnGotFocus" />
@@ -163,10 +164,10 @@
 								</Hyperlink>
 							</TextBlock>
 						</StackPanel>
-                        <TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2017 | beyondSoft GmbH"  Foreground="#FF818181"/>
+                        <TextBlock x:Name="txtCopyright" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" FontSize="10" Margin="10,5,0,5" Text="Copyright 2022 | ownSoft GmbH"  Foreground="#FF818181"/>
                             
                         <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
-                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
+                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
                         </TextBlock>
                     </Grid>
                 </Border>

BeWo/MainControl.xaml.cs

@@ -21,6 +21,7 @@ using BeWo.SchulbegleitenderDienst;
 using BeWo.ServiceProxy;
 using BeWo.View;
 using BeWo.View.Detail;
+using BeWo.View.Detail.Zeiterfassung;
 using BeWo.View.Master;
 using BeWo.View.Navigation;
 using BeWo.ViewModel;
@@ -28,8 +29,7 @@ using BeWo.ViewModel;
 using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
-using DevExpress.Xpf.Editors;
-using DevExpress.Xpf.Scheduler;
+using BS.Shared.Translation;
 using Hyperlink = System.Windows.Documents.Hyperlink;
 
 namespace BeWo
@@ -42,14 +42,17 @@ namespace BeWo
 		Employee,
 		Organisation,
 		Team,
+		Dokumente,
 		User,
 		UserGroup,
 		Report,
 		Scheduler,
         Wohnheim,
         Vertretungen,
-        CustomerTeam
-    }
+        CustomerTeam,
+        Scheduling,
+		Finance
+	}
 
 	public partial class MainControl
 	{
@@ -76,8 +79,56 @@ namespace BeWo
 			KeyDown += MainControl_KeyDown;
 			NavigateToHomeView();
 
-			EditorLocalizer.Active = new CustomDXEditorLocalizer();
-			SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
+#if DEBUG
+			if (DebugConfig.CurrentConfig is object && DebugConfig.CurrentConfig.SelectView is UIContext context)
+			{
+				NavigateTo(GetViewForUIContext(context));
+			}
+#endif
+
+
+			// ToDo: Neuer Kalender nur im Debug-Modus!
+#if DEBUG
+			ButtonScheduling.Visibility = Visibility.Visible;
+#else
+            ButtonScheduling.Visibility = Visibility.Collapsed;
+#endif
+
+
+
+
+
+
+			//EditorLocalizer.Active = new CustomDXEditorLocalizer();
+			//SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
+			//GridControlLocalizer.Active = new CustomGridLocalizer();
+
+			// ToDo: Testen!
+			//         var bewoClientType = BeWoApp.Mandator.BeWoClientType;
+			//var hasKilometerauswertung = BeWoApp.AppSettings.ShowDistanceFields && (BeWoApp.LoggedOnUser.HasRight(UserRightType.Kilometerauswertung_View) || BeWoApp.LoggedOnUser.HasRight(UserRightType.KilometerauswertungEigene_View));
+			//var hideAuswertungen = !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_BerichteAnsehen) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_StundenuebersichtAnsehen) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Auswertungen_HilfeplanuebersichtAnsehen) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_ServiceOverview_View) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_Auslastung_View) &&
+			//                                (bewoClientType != 3 || !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_EmployeeOverviewAll_View)) &&
+			//                                (BeWoApp.Tenant == "3010479871" || (!BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewAll) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewSelf) && !BeWoApp.LoggedOnUser.HasRight(UserRightType.Mitarbeiterstundenkonto_ViewTeams))) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Jahresbericht) &&
+			//                                !BeWoApp.Mandator.AllowSbd &&
+			//                                !(BeWoApp.AppSettings.ShowPivotGrid && BeWoApp.LoggedOnUser.HasRight(UserRightType.PivotTabelleAnsehen)) &&
+			//                                !(BeWoApp.AppSettings.ShowDienstplanung && BeWoApp.LoggedOnUser.HasRight(UserRightType.DienstplanungAnsehen)) &&
+			//                                !(BeWoApp.AppSettings.ShowUrlaubsplanung && BeWoApp.LoggedOnUser.HasRight(UserRightType.AbwesenheitsPlanungAnsehen)) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.BewertungAuswertung_View) &&
+			//                                !BeWoApp.LoggedOnUser.HasRight(UserRightType.Analysis_ServiceOverview_View) &&
+			//                                !hasKilometerauswertung;
+
+
+
+
+			//if(hideAuswertungen)
+			//         {
+			//             button_Reports.Visibility = Visibility.Collapsed;
+			//         }
 
 			OpenedModalViewWindows = new List<ModalViewWindow>();
 
@@ -88,7 +139,9 @@ namespace BeWo
 
 		    BeWoApp.InitAutoUILocking();
 
-		    BeWoApp.InitBlubb();
+			AufOffeneTerminePruefen();
+
+			//BeWoApp.InitBlubb();
 
 #if !DEBUG
             if (this.button_Scheduler.Visibility == Visibility.Visible && !BeWoApp.AppSettings.IsSchedulerAllowed)
@@ -108,6 +161,11 @@ namespace BeWo
 		    {
 		        this.button_SchulbegleitenderDienst.Visibility = Visibility.Collapsed;
 		    }
+			this.button_Dokumente.Visibility = Visibility.Collapsed;
+#endif
+
+#if DEBUG
+			//DebugHelperViewButton.Visibility = Visibility.Visible;
 #endif
 		}
 
@@ -141,6 +199,8 @@ namespace BeWo
 
 		public bool IsMaximized { get; set; }
 
+		public bool IsModalPopupOpen => _CurrentModalPopup is object;
+
 	    private bool _HatNeueTermine;
 		public bool HatNeueTermine
 		{
@@ -165,7 +225,8 @@ namespace BeWo
 			            }
 			        }
 			        
-			    } else if(ActiveView?.GetType() == typeof(HomeView))
+			    }
+                else if(ActiveView?.GetType() == typeof(HomeView))
 			    {
 			        var homeDragPanelView = (HomeView) ActiveView;
 			        homeDragPanelView.UpdateRequestsHyperLink();
@@ -205,7 +266,10 @@ namespace BeWo
 					case UIContext.Team:
 						view = new TeamNavigationView();
 						break;
-					case UIContext.User:
+                    case UIContext.Dokumente:
+                        view = new DokumenteView();
+                        break;
+                    case UIContext.User:
 						view = new UserNavigationView();
 						break;
 					case UIContext.UserGroup:
@@ -229,6 +293,12 @@ namespace BeWo
                     case UIContext.CustomerTeam:
 				        view = new CustomerTeamNavigationView();
 				        break;
+					case UIContext.Scheduling:
+                        view = new SchedulingMasterView();
+                        break;
+					case UIContext.Finance:
+						view = new FinanceView();
+						break;
 				}
 				_Views[uiContext] = view;
 			}
@@ -657,7 +727,7 @@ namespace BeWo
 
 		public bool DoSaveCheck()
 		{
-			return _CurrentDetailView == null || _CurrentDetailView.DoSaveCheck();
+			return _CurrentDetailView is null || _CurrentDetailView.DoSaveCheck();
 		}
 
 		private void InitCommandBindings()
@@ -667,7 +737,7 @@ namespace BeWo
 					ApplicationCommands.Save,
 					(s, e) =>
 					{
-						if (_CurrentModalPopup == null)
+						if (_CurrentModalPopup is null)
 						{
 							_CurrentDetailView.SaveData();
 						}
@@ -678,13 +748,13 @@ namespace BeWo
 					},
 					(s, e) =>
 					{
-						if (_CurrentModalPopup == null)
+						if (_CurrentModalPopup is null)
 						{
-							e.CanExecute = _CurrentDetailView != null ? _CurrentDetailView.IsDirty : false;
+							e.CanExecute = _CurrentDetailView?.IsDirty ?? false;
 						}
 						else
 						{
-							e.CanExecute = _CurrentDetailView != null && (_CurrentModalPopup is BeWoView && ((BeWoView) _CurrentModalPopup).IsDirty);
+							e.CanExecute = _CurrentDetailView != null && (_CurrentModalPopup is BeWoView view && view.IsDirty);
 						}
 					}));
 
@@ -835,7 +905,7 @@ namespace BeWo
 		{
 			if (DoSaveCheck())
 			{
-				NavigateTo(new FinanceView());
+				NavigateTo(GetViewForUIContext(UIContext.Finance));
 			}
 		}
 
@@ -1025,7 +1095,15 @@ namespace BeWo
 			}
 		}
 
-        private void button_CustomerTeam_Click(object sender, RoutedEventArgs e)
+		private void button_Dokumente_Click(object sender, RoutedEventArgs e)
+		{
+			if (DoSaveCheck())
+			{
+				NavigateTo(GetViewForUIContext(UIContext.Dokumente));
+			}
+		}
+
+		private void button_CustomerTeam_Click(object sender, RoutedEventArgs e)
         {
             if (DoSaveCheck())
             {
@@ -1141,7 +1219,8 @@ namespace BeWo
 
 			var cancelButton = new Button {Content = "Schließen"};
 			cancelButton.Margin = new Thickness(5);
-
+			cancelButton.Width = 100;
+			cancelButton.HorizontalAlignment = HorizontalAlignment.Right;
 			var mailLabel = new Label
 			{
 				Content = "Support-Mail schreiben",
@@ -1171,7 +1250,7 @@ namespace BeWo
 			};
 			var phoneLabel = new Label
 			{
-				Content = "PIN für Support-Anruf erhalten",
+				Content = "PIN für Support erhalten",
 				FontWeight = FontWeights.Bold,
 				Margin = new Thickness(5),
 				HorizontalContentAlignment = HorizontalAlignment.Center,
@@ -1184,17 +1263,31 @@ namespace BeWo
 				Margin = new Thickness(45, 5, 5, 5),
 				Text = "Wenn Sie auf das PIN-Symbol klicken, wird Ihnen eine zufällige Support-PIN angezeigt.\n\n" +
 				       "Benötigen wir zur Lösung einer Support-Anfrage den Zugriff auf Ihre Datenbank,\n" +
-				       "werden Sie vom Support-Mitarbeiter gebeten, ihm eine solche Support-PIN zu übermitteln.\n" +
+				       "werden Sie " + Translator.Translate("vom Support-Mitarbeiter") + " gebeten, ihm eine solche Support-PIN zu übermitteln.\n" +
 				       "Diese PIN ist nur einmalig nutzbar/gültig. Sie wird nicht automatisch an den Support übermittelt.\n" +
-				       "Dies stellt sicher, dass ein Support-Mitarbeiter nicht ohne Ihre Einwilligung auf Ihre Datenbank zugreifen kann.\n" +
+				       "Dies stellt sicher, dass " + Translator.Translate("ein Support-Mitarbeiter") + " nicht ohne Ihre Einwilligung auf Ihre Datenbank zugreifen kann.\n" +
 				       "Jeder Support-Zugriff auf Ihre Datenbank wird zudem mit Hilfe der PIN protokolliert."
 			};
 
             /*
              * <TextBlock Grid.Row="7" Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="10" Margin="0,5,12,5">
-                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="http://www.beyondsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.beyondsoft.de</Hyperlink>
+                            <Hyperlink x:Name="hyperlink" TargetName="newWindow" Foreground="#FF818181" NavigateUri="https://www.ownsoft.de" RequestNavigate="Hyperlink_OnRequestNavigate">www.ownsoft.de</Hyperlink>
                         </TextBlock>
              */
+		    var tvLabel = new Label
+		    {
+		        Content = "Support per Fernwartung",
+		        FontWeight = FontWeights.Bold,
+		        Margin = new Thickness(40, 5, 5, 5)
+		    };
+
+		    var textBlockTeamViewer = new TextBlock
+		    {
+		        Foreground = Brushes.Black,
+		        Margin = new Thickness(45, 5, 5, 5),
+		        Text = "Wenn Sie in einem Telefonat mit " + Translator.Translate("einem unserer Support-Mitarbeiter") + " aufgefordert werden\nden Teamviewer zu installieren, so können Sie ihn hier herunterladen."
+            };
+
             var supportToolLink = new TextBlock
 		    {
 		        Foreground = Brushes.Black,
@@ -1275,21 +1368,24 @@ namespace BeWo
 			var centeredStackPanel = new StackPanel {Orientation = Orientation.Vertical, VerticalAlignment = VerticalAlignment.Center, HorizontalAlignment = HorizontalAlignment.Center};
 			var mailStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
 			var phoneStackPanel = new StackPanel {Orientation = Orientation.Horizontal};
+		    var tvStackPanel = new StackPanel { Orientation = Orientation.Horizontal };
 
 
-			mailStackPanel.Children.Add(mailButton);
+            mailStackPanel.Children.Add(mailButton);
 			mailStackPanel.Children.Add(mailLabel);
 
-
 			phoneStackPanel.Children.Add(phoneButton);
 			phoneStackPanel.Children.Add(phoneLabel);
 
 
+            
 			centeredStackPanel.Children.Add(mailStackPanel);
 			centeredStackPanel.Children.Add(textBlockMail);
 			centeredStackPanel.Children.Add(phoneStackPanel);
 			centeredStackPanel.Children.Add(textBlockPhone);
-		    centeredStackPanel.Children.Add(supportToolLink);
+		    centeredStackPanel.Children.Add(tvLabel);
+		    centeredStackPanel.Children.Add(textBlockTeamViewer);
+            centeredStackPanel.Children.Add(supportToolLink);
             centeredStackPanel.Children.Add(cancelButton);
 
 
@@ -1657,18 +1753,18 @@ namespace BeWo
 			}
 		}
 
-		private void UIElement_OnMouseEnter(object sender, MouseEventArgs e)
-		{
-			AufOffeneTerminePruefen();
-		}
+		//private void UIElement_OnMouseEnter(object sender, MouseEventArgs e)
+		//{
+		//	AufOffeneTerminePruefen();
+		//}
 
 		public void InitOffeneTermine()
 		{
-			if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null)
-			{
-				AufOffeneTerminePruefen();
-				_TermineInitialized = true;
-			}
+			//if (!_TermineInitialized && BeWoApp.LoggedOnEmployee != null)
+			//{
+			//	AufOffeneTerminePruefen();
+			//	_TermineInitialized = true;
+			//}
 		}
 
 		public void AufOffeneTerminePruefen()
@@ -1692,5 +1788,13 @@ namespace BeWo
                 NavigateTo(GetViewForUIContext(UIContext.Vertretungen));
             }
         }
-	}
+
+        private void Button_Scheduling_Click(object sender, RoutedEventArgs e)
+        {
+			if(DoSaveCheck())
+            {
+                NavigateTo(GetViewForUIContext(UIContext.Scheduling));
+            }
+		}
+    }
 }

BeWo/MainWindow.xaml

@@ -2,8 +2,8 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="BeWoPlaner" Height="768" Width="1024" WindowStartupLocation="CenterScreen" WindowState="Maximized"
-              BorderThickness="1" Closing="MainWindow_OnClosing">
+              BorderThickness="1" Closing="MainWindow_OnClosing" SizeChanged="Window_SizeChanged">
     <Grid x:Name="rootGrid">
-        
+        <ComboBox Width="100"></ComboBox>
     </Grid>
 </Window>

BeWo/MainWindow.xaml.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using System.Threading;
 using System.Windows;
 using BeWo.Core.Config;
 using BeWo.MultiLanguage;
@@ -18,7 +19,6 @@ namespace BeWo
             InitializeComponent();
 
             ApplicationThemeHelper.ApplicationThemeName = "Office2010Black";
-
             ShowLoginControl();
         }
 
@@ -105,5 +105,13 @@ namespace BeWo
 
             Application.Current.Shutdown();
         }
-    }
+
+		private void Window_SizeChanged(object sender, SizeChangedEventArgs e)
+		{
+#if DEBUG
+            // Setze den Titel auf die aktuelle Breite und Höhe
+            this.Title = $"BeWoPlaner ({e.NewSize.Width}x{e.NewSize.Height})";
+#endif
+        }
+	}
 }

BeWo/MultiLanguage/ServiceTranslator.cs

@@ -54,5 +54,25 @@ namespace BeWo.MultiLanguage
             }
             return String.Format(this.currentCulture, input, args);
         }
+
+        public String TranslateKey(String key, String defaultText)
+        {
+            if (key != null && this.dict != null && this.dict.TryGetValue(key, out var translation))
+            {
+                return translation;
+            }
+            
+            return defaultText;
+        }
+
+        public String TranslateKey(String key, String defaultText, params Object[] args)
+        {
+            String translation;
+            if (!String.IsNullOrEmpty(key) && this.dict.TryGetValue(key, out translation))
+            {
+                return String.Format(this.currentCulture, translation, args);
+            }
+            return String.Format(this.currentCulture, defaultText, args);
+        }
     }
 }

BeWo/PasswortSecurity/PasswortSicherheit.cs

@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -11,272 +8,424 @@ using BS.Shared.Extensions;
 
 namespace BeWo.PasswortSecurity
 {
-    class PasswortSicherheit
+    internal class PasswortSicherheit
     {
-        #region Variablen
+        #region Konstanten und Variablen
+        private const string Numbers = "0123456789";
+        private const string LowercaseLetters = "abcdefghijklmnopqrstuvwxyz";
+        private const string UppercaseLetters = "ABDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string LowercaseUmlauts = "äöüß";
+        private const string UppercaseUmlauts = "ÄÖÜ";
+        private const string SpecialCharacters = "\\\"\'µ@€!&/()=?+#*,.-;:_><|§$%'{[]}´`^°~²³";
 
-        private const string zahlen = "0123456789";
-        private const string grossBuchstaben = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
-        private const string kleinBuchstaben = "abcdefghijklmnopqrstuvwxyz";
 
-        private const string grossBuchstabenSonderLevel = "ÄÖÜ";
-        private const string kleinBuchstabenSonderLevel = "äöüß";
+        private const string numbers = "0123456789";
+        private const string uppercaseLetters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+        private const string lowercaseLetters = "abcdefghijklmnopqrstuvwxyz";
 
-        private const string sonderzeichenLevel1 = "\\\"\'µ@€!";
-        private const string sonderzeichenLevel2 = "&/()=?+#*";
-        private const string sonderzeichenLevel3 = ",.-;:_><|";
-        private const string sonderzeichenLevel4 = "§$%'{[]}´";
-        private const string sonderzeichenLevel5 = "`^°~²³";
+        private const string uppercaseUmlauts = "ÄÖÜ";
+        private const string lowercaseUmlauts = "äöüß";
 
-        private string letztespw = "";
-        private bool retschalter = false;
-        private int distanz = 0;
+        private const string specialCharacters1 = "\\\"\'µ@€!";
+        private const string specialCharacters2 = "&/()=?+#*";
+        private const string specialCharacters3 = ",.-;:_><|";
+        private const string specialCharacters4 = "§$%'{[]}´";
+        private const string specialCharacters5 = "`^°~²³";
 
-        int score = 0;
-        int letzterwert = 0;
-        bool schalter = false;
+        private string partialPassword = "";
+        private bool isPartial;
+        private int passwordLengthDifference;
+
+        int score;
+        int previousValue;
+        bool schalter;
         List<int> letztewerte = new List<int>();
 
         #endregion
-
+        /*
+         * Länge prüfen und welche Zeichen vorhanden sind
+         */
         #region Passwort Stärke Ermitteln und Anzeigen
-        public Label ErmittleUndZeigePasswortStaerke(string s,Label lblPwAnzeige)
+
+        //public static Label ShowPasswordStrengthLabel(string passwordToValidate, Label passwordStrengthLabel)
+        //{
+        //    var passwordStrength = CalculatePasswordStrength(passwordToValidate);
+
+        //    var visibility = Visibility.Visible;
+        //    var content = "Passwortstärke: ";
+        //    var foreground = new SolidColorBrush(Colors.Black);
+
+        //    switch(passwordStrength)
+        //    {
+        //        case 0:
+        //            content += "sehr schwach";
+        //            foreground = new SolidColorBrush(Colors.Red);
+        //            break;
+        //        case 1:
+        //            content += "schwach";
+        //            foreground = new SolidColorBrush(Colors.OrangeRed);
+        //            break;
+        //        case 2:
+        //            content += "mittel";
+        //            foreground = new SolidColorBrush(Colors.Yellow);
+        //            break;
+        //        case 3:
+        //            content += "stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        case 4:
+        //            content += "sehr stark";
+        //            foreground = new SolidColorBrush(Colors.Green);
+        //            break;
+        //        default:
+        //            visibility = Visibility.Hidden;
+        //            content = string.Empty;
+        //            break;
+        //    }
+
+        //    passwordStrengthLabel.Visibility = visibility;
+        //    passwordStrengthLabel.Foreground = foreground;
+        //    passwordStrengthLabel.Content = content;
+
+        //    return passwordStrengthLabel;
+        //}
+
+        //private static int CalculatePasswordStrength(string passwordToValidate)
+        //{
+        //    var length = passwordToValidate?.Length ?? 0;
+        //    if(string.IsNullOrEmpty(passwordToValidate) || length < 6)
+        //    {
+        //        return -1;
+        //    }
+
+        //    var score = 0;
+
+        //    if(length < 9)
+        //    {
+        //        score += 1;
+        //    }
+        //    else if(length < 12)
+        //    {
+        //        score += 2;
+        //    }
+        //    else if(length < 18)
+        //    {
+        //        score += 3;
+        //    }
+        //    else
+        //    {
+        //        score += 4;
+        //    }
+
+        //    var numberCount = passwordToValidate.Count(c => Numbers.Contains(c));
+        //    var lowercaseLetterCount = passwordToValidate.Count(c => LowercaseLetters.Contains(c));
+        //    var uppercaseLetterCount = passwordToValidate.Count(c => UppercaseLetters.Contains(c));
+        //    var lowercaseUmlautsCount = passwordToValidate.Count(c => LowercaseUmlauts.Contains(c));
+        //    var uppercaseUmlautsCount = passwordToValidate.Count(c => UppercaseUmlauts.Contains(c));
+        //    var specialCharacterCount = passwordToValidate.Count(c => SpecialCharacters.Contains(c));
+
+        //    score += numberCount * 3;
+        //    score += lowercaseLetterCount * 2;
+        //    score += uppercaseLetterCount * 3;
+        //    score += lowercaseUmlautsCount * 2;
+        //    score += uppercaseUmlautsCount * 2;
+        //    score += specialCharacterCount * 4;
+
+        //    if(score < 16)
+        //    {
+        //        return 0;
+        //    }
+
+        //    if(score < 56)
+        //    {
+        //        return 1;
+        //    }
+
+        //    if(score < 116)
+        //    {
+        //        return 2;
+        //    }
+
+        //    return score < 156 ? 3 : 4;
+        //}
+
+        // Score, PreivousValue, Schalter, und LetzteWerte werden im Objekt gepeichert.
+        public Label ErmittleUndZeigePasswortStaerke(string passwordToValidate, Label passwordLabel)
         {
-            if (!s.IsNullOrEmpty())
+            if (!passwordToValidate.IsNullOrEmpty())
             {
-                string sx = "";
-
-                int i = -1;
+                var sx = "";
+                var passwordStrength = -1;
                 
-                foreach (var item in s)
+                // Es wird durch jedes Zeichen des Passworts einzeln gegangen
+                foreach (var token in passwordToValidate)
                 {
-                    sx += item.ToString();
+                    sx += token.ToString();
 
-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                     {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                     }
 
-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                    {
+                        partialPassword = sx;
+                    }
 
-                    i = PasswortStaerkeErmittler(sx); 
+                    passwordStrength = PasswortStaerkeErmittler(sx); 
                 }
                 
-                return ZeigePwStaerke(i, lblPwAnzeige);
+                return ZeigePwStaerke(passwordStrength, passwordLabel);
             }
-            else
-            {             
-                score = 0;
-                letzterwert = 0;
+
+            score = 0;
+            previousValue = 0;
                 
-                return ZeigePwStaerke(-1, lblPwAnzeige);
-            }
+            return ZeigePwStaerke(-1, passwordLabel);
         }
 
-        private int PasswortStaerkeErmittler(string neuesPwBox)
+        private int PasswortStaerkeErmittler(string passwordToValidate)
         {
-            int i = 0;
-            letzterwert = 0;
-            //############### Score System  ############          
+            var passwordStrength = 0;
+            previousValue = 0;
 
-            if (retschalter == true)
+            // Es handelt sich nur um einen Teil des zu überprüfenden Passworts
+            if (isPartial)
             {
-                if (distanz == 1)
+                // Der zu überprüfende Teil ist nur ein Zeichen
+                if (passwordLengthDifference == 1)
                 {
                     score -= letztewerte.Last();
                     letztewerte.RemoveAt(letztewerte.Count - 1);
                 }
+                // Der zu überprüfende Teil ist mehr als ein Zeichen
                 else
                 {
-                    for (int s = 0; s < distanz; s++)
+                    for (int s = 0; s < passwordLengthDifference; s++)
                     {
                         score -= letztewerte.Last();
                         letztewerte.RemoveAt(letztewerte.Count - 1);
                     }
                 }
 
-                retschalter = false;
-
-                //letzterwert = 0;
+                isPartial = false;
             }
             else
             {
-                //Passwort Längen Bonus Punkte 
-                if (neuesPwBox.Length >= 6 && neuesPwBox.Length < 9)
+                //Passwortlängen Bonuspunkte 
+                if (passwordToValidate.Length >= 6 && passwordToValidate.Length < 9)
                 {
                     score += 1;
-                    letzterwert = 1;
+                    previousValue = 1;
                     schalter = true;
                 }
 
-                if (neuesPwBox.Length >= 9 && neuesPwBox.Length < 12)
+                if (passwordToValidate.Length >= 9 && passwordToValidate.Length < 12)
                 {
                     score += 2;
-                    letzterwert = 2;
+                    previousValue = 2;
                     schalter = true;
                 }
 
-                if (neuesPwBox.Length >= 12 && neuesPwBox.Length < 18)
+                if (passwordToValidate.Length >= 12 && passwordToValidate.Length < 18)
                 {
                     score += 3;
-                    letzterwert = 3;
+                    previousValue = 3;
                     schalter = true;
                 }
 
-                if (neuesPwBox.Length >= 18)
+                if (passwordToValidate.Length >= 18)
                 {
                     score += 4;
-                    letzterwert = 4;
+                    previousValue = 4;
                     schalter = true;
                 }
 
-                //Zahlen und Buchstaben 
-                if (neuesPwBox.Any(x => zahlen.Contains(x)))
+                //Zahlen 
+                if (passwordToValidate.Any(x => numbers.Contains(x)))
                 {
                     score += 3;
 
-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                     else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => grossBuchstaben.Contains(x)))
+                // Großbuchstaben
+                if (passwordToValidate.Any(x => uppercaseLetters.Contains(x)))
                 {
                     score += 3;
 
-                    if (schalter == true)
-                        letzterwert += 3;
+                    if (schalter)
+                    {
+                        previousValue += 3;
+                    }
                     else
-                        letzterwert = 3;
+                    {
+                        previousValue = 3;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => grossBuchstabenSonderLevel.Contains(x)))
+                // Großumlaute
+                if (passwordToValidate.Any(x => uppercaseUmlauts.Contains(x)))
                 {
                     score += 2;
 
-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                     else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => kleinBuchstaben.Contains(x)))
+                if (passwordToValidate.Any(x => lowercaseLetters.Contains(x)))
                 {
                     score += 2;
 
-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                     else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => kleinBuchstabenSonderLevel.Contains(x)))
+                // Kleinumlaute
+                if (passwordToValidate.Any(x => lowercaseUmlauts.Contains(x)))
                 {
                     score += 2;
 
-                    if (schalter == true)
-                        letzterwert += 2;
+                    if (schalter)
+                    {
+                        previousValue += 2;
+                    }
                     else
-                        letzterwert = 2;
+                    {
+                        previousValue = 2;
+                    }
                 }
 
                 // Sonderzeichen 
-
-                if (neuesPwBox.Any(x => sonderzeichenLevel1.Contains(x)))
+                if (passwordToValidate.Any(x => specialCharacters1.Contains(x)))
                 {
                     score += 4;
 
-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                     else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => sonderzeichenLevel2.Contains(x)))
+                // Sonderzeichen 2
+                if (passwordToValidate.Any(x => specialCharacters2.Contains(x)))
                 {
                     score += 4;
 
-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                        previousValue += 4;
                     else
-                        letzterwert = 4;
+                        previousValue = 4;
                 }
 
-                if (neuesPwBox.Any(x => sonderzeichenLevel3.Contains(x)))
+                // Sonderzeichen 3
+                if(passwordToValidate.Any(x => specialCharacters3.Contains(x)))
                 {
                     score += 4;
 
-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                     else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => sonderzeichenLevel4.Contains(x)))
+                // Sonderzeichen 4
+                if(passwordToValidate.Any(x => specialCharacters4.Contains(x)))
                 {
                     score += 4;
 
-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                     else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                 }
 
-                if (neuesPwBox.Any(x => sonderzeichenLevel5.Contains(x)))
+                // Sonderzeichen 5
+                if(passwordToValidate.Any(x => specialCharacters5.Contains(x)))
                 {
                     score += 4;
 
-                    if (schalter == true)
-                        letzterwert += 4;
+                    if (schalter)
+                    {
+                        previousValue += 4;
+                    }
                     else
-                        letzterwert = 4;
+                    {
+                        previousValue = 4;
+                    }
                 }
 
-                letztewerte.Add(letzterwert);
+                letztewerte.Add(previousValue);
             }
 
-            //#########################################
-
-            // ########################################### PasswortStärke Bereich ##########################       
             //Sehr Schwach
             if (score <= 15)
             {
-                i = 0;
+                passwordStrength = 0;
             }
 
             //Schwach
             if (score >= 16 && score <= 55)
             {
-                i = 1;
+                passwordStrength = 1;
             }
 
             //Mittelmäßig
             if (score >= 56 && score <= 115)
             {
-                i = 2;
+                passwordStrength = 2;
             }
 
             //Stark
             if (score >= 116 && score <= 155)
             {
-                i = 3;
+                passwordStrength = 3;
             }
 
             //Sehr Stark
             if (score >= 156)
             {
-                i = 4;
+                passwordStrength = 4;
             }
 
-            return i;
+            return passwordStrength;
         }
 
-        private Label ZeigePwStaerke(int i, Label passwortprüfer)
+        private Label ZeigePwStaerke(int passwordStrength, Label passwortprüfer)
         {
-            switch (i)
+            switch (passwordStrength)
             {
                 case -1:
                      passwortprüfer.Visibility = Visibility.Hidden; 
@@ -337,14 +486,14 @@ namespace BeWo.PasswortSecurity
                 {
                     sx += item.ToString();
 
-                    if (sx.Length < letztespw.Length)
+                    if (sx.Length < partialPassword.Length)
                     {
-                        retschalter = true;
-                        distanz = letztespw.Length - sx.Length;
+                        isPartial = true;
+                        passwordLengthDifference = partialPassword.Length - sx.Length;
                     }
 
-                    if (!letztespw.Equals(sx))
-                        letztespw = sx;
+                    if (!partialPassword.Equals(sx))
+                        partialPassword = sx;
 
                     i = PasswortStaerkeErmittler(sx);
                 }
@@ -354,7 +503,7 @@ namespace BeWo.PasswortSecurity
             else
             {
                 score = 0;
-                letzterwert = 0;
+                previousValue = 0;
 
                 return ZeigeSecutityStaerke(-1);
             }

BeWo/Properties/AssemblyInfo.cs

@@ -8,9 +8,9 @@ using System.Windows;
 [assembly: AssemblyTitle("BeWoPlaner")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("beyondSoft GmbH")]
+[assembly: AssemblyCompany("ownSoft GmbH")]
 [assembly: AssemblyProduct("BeWoPlaner")]
-[assembly: AssemblyCopyright("Copyright © 2013 beyondSoft GmbH")]
+[assembly: AssemblyCopyright("Copyright © 2022 ownSoft GmbH")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

BeWo/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace BeWo.Properties {
     // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
     // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
     // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

BeWo/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace BeWo.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.0.1.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

BeWo/Properties/licenses.licx

@@ -1 +1 @@
-DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

BeWo/ProxyLoginView.xaml

@@ -1,6 +1,7 @@
 <Window x:Class="BeWo.ProxyLoginView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         Title="Proxy Einstellungen" Height="200" Width="300">
     <Grid>
         <Button x:Name="proxyOK" Content="OK" HorizontalAlignment="Left" Margin="75,120,0,0" VerticalAlignment="Top" Width="100" Click="proxyOK_Click"/>
@@ -8,7 +9,7 @@
         
       
       <Label Content="Proxyname:" HorizontalAlignment="Left" Margin="10,15,0,0" VerticalAlignment="Top"  Width="100"/>
-      <Label Content="Benutzername:" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" Width="100"/>
+      <Label Content="{markup:Translate Benutzername:}" HorizontalAlignment="Left" Margin="10,45,0,0" VerticalAlignment="Top" Width="100"/>
       <Label Content="Passwort:" HorizontalAlignment="Left" Margin="10,75,0,0" VerticalAlignment="Top" Width="100"/>
         
       <TextBox x:Name="proxynametxt" HorizontalAlignment="Left" Height="23" Margin="120,15,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="160" SelectionOpacity="0.5" />

BeWo/ProxyLoginView.xaml.cs

@@ -1,36 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Reflection;
-using System.Security.Cryptography;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Shapes;
+using BeWo.Security;
 
 namespace BeWo
 {
-    /// <summary>
-    /// Interaktionslogik für ProxyLoginView.xaml
-    /// </summary>
-    public partial class ProxyLoginView : Window
+    public partial class ProxyLoginView
     {
         public ProxyLoginView()
         {
             InitializeComponent();
 
-
-            überprüfe();
+            CheckBeWoProfile();
         }
 
-
-        private void überprüfe() {
+        private void CheckBeWoProfile() {
 
             if (proxynametxt.Text.Equals("") && proxybenutzer.Text.Equals("") && proxypasswort.Password.Equals("")) {
 
@@ -41,24 +27,34 @@ namespace BeWo
 
                 try
                 {
-					var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+					var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 					if (!File.Exists(filePath))
 					{
-						filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+						filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 					}
 
-                    var file = new System.IO.StreamReader(filePath);
-                    while ((line = file.ReadLine()) != null)
-                    {
+                    var allLines = File.ReadAllLines(filePath);
 
-                        byte[] decbuff = Convert.FromBase64String(line);
-                        var x= System.Text.Encoding.UTF8.GetString(decbuff);
-                        datai[counter] = x;
+                    foreach(var linex in allLines)
+                    {
+                        var decryptedLine = EncryptionUtils.DecryptString(linex);
+                        datai[counter] = decryptedLine;
 
                         counter++;
                     }
 
-                    file.Close();
+                    //var file = new StreamReader(filePath);
+                    //while ((line = file.ReadLine()) != null)
+                    //{
+
+                    //    byte[] decbuff = Convert.FromBase64String(line);
+                    //    var x= System.Text.Encoding.UTF8.GetString(decbuff);
+                    //    datai[counter] = x;
+
+                    //    counter++;
+                    //}
+
+                    //file.Close();
 
                     proxynametxt.Text = datai[0];
                     proxybenutzer.Text = datai[1];
@@ -70,50 +66,53 @@ namespace BeWo
         
         }
 
+        // TODO: Verschlüsselung einbauen!
         private void proxyOK_Click(object sender, RoutedEventArgs e)
         {
-            string ptname = proxynametxt.Text;
-            string ptbenutzer = proxybenutzer.Text;
-			string ptpasswd = proxypasswort.Password;
-
-            string[] lines = { ptname, ptbenutzer, ptpasswd };
+            string[] lines = { proxynametxt.Text, proxybenutzer.Text, proxypasswort.Password };
+            var encryptedLines = new List<string>();
 
             try
             {
-				var filePath = System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
+				var filePath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + "\\proxy.dat";
 				if (!File.Exists(filePath))
 				{
-					filePath = System.IO.Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
+					filePath = Path.Combine(BeWoApp.GetAndCreateUserAppDataPath(), "proxy.dat");
 				}
 
-                using (System.IO.StreamWriter file =
-				new System.IO.StreamWriter(filePath))
+                foreach(var line in lines)
                 {
-                    foreach (string line in lines)
-                    {
-                        byte[] encData_byte = new byte[line.Length];
-                        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
-                        string encodedData = Convert.ToBase64String(encData_byte);
-
-                        file.WriteLine(encodedData);
-                    }
+                    encryptedLines.Add(EncryptionUtils.EncryptString(line));
                 }
 
-                ptname = "";
-                ptbenutzer = "";
-                ptpasswd = "";
+                File.WriteAllLines(filePath, encryptedLines);
 
-                this.Close();
 
-            }catch(IOException i){
+
+
+
+                //using (var file =  new StreamWriter(filePath))
+                //{
+                //    foreach (string line in lines)
+                //    {
+                //        byte[] encData_byte = new byte[line.Length];
+                //        encData_byte = System.Text.Encoding.UTF8.GetBytes(line);
+                //        string encodedData = Convert.ToBase64String(encData_byte);
+
+                //        file.WriteLine(encodedData);
+                //    }
+                //}
+
+                Close();
+
+            }catch(IOException){
                 //Fehlermeldung
             }
         }
 
-
         private void proxyAbbr_Click(object sender, RoutedEventArgs e)
         {
-            this.Close();
+            Close();
         }
     }
 }

BeWo/PwVergessenView.xaml

@@ -1,6 +1,7 @@
 <Window x:Class="BeWo.PwVergessenView"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
         Title="PwVergessenView" Height="135" Width="322" WindowStartupLocation="CenterScreen" WindowStyle="None" 
 		AllowsTransparency="True"
         Background="Transparent"
@@ -18,7 +19,7 @@
 					<ColumnDefinition Width="*" />
 				</Grid.ColumnDefinitions>
 				<TextBlock Grid.Column="0" Grid.Row="0" Grid.ColumnSpan="2" Height="20" VerticalAlignment="Center" HorizontalAlignment="Center" Foreground="Red" Margin="3,8,3,3"/>
-				<Label Grid.Row="1" Grid.Column="0" Margin="3" Content="Benutzername" />
+                <Label Grid.Row="1" Grid.Column="0" Margin="3" Content="{markup:Translate Benutzername}" />
 				<TextBox x:Name="BenutzernamenTextBox" Grid.Row="1" Grid.Column="1" MaxLines="1" Margin="3" />
 				<StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Stretch">
 					<Button Margin="3" Content="Neues Passwort anfordern" Width="150" Click="AnfordernClick" IsDefault="True" VerticalContentAlignment="Center" />

BeWo/PwVergessenView.xaml.cs

@@ -31,7 +31,7 @@ namespace BeWo
 			var benutzername = BenutzernamenTextBox.Text;
 			if (benutzername.Equals(""))
 			{
-				MessageBox.Show("Bitte geben Sie einen Benutzernamen an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Bitte geben Sie einen " + BS.Shared.Translation.Translator.Translate("Benutzernamen") + " an", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}
 
@@ -42,7 +42,7 @@ namespace BeWo
 		{
 			if(email.Equals("") || !hatEmail)
 			{
-				MessageBox.Show("Es konnte kein Benutzer mit diesem Namen gefunden werden oder der Benutzer hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an Ihren Systemadministrator", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
+				MessageBox.Show("Es konnte " + BS.Shared.Translation.Translator.Translate("kein Benutzer") + " mit diesem Namen gefunden werden oder " + BS.Shared.Translation.Translator.Translate("der Benutzer") + " hat keine E-Mail Adresse hinterlegt\nBitte wenden Sie sich an " + BS.Shared.Translation.Translator.Translate("Ihren Systemadministrator") + ".", "Passwort anfordern fehlgeschlagen", MessageBoxButton.OK, MessageBoxImage.Information);
 				return;
 			}
 

BeWo/Scheduler/Converter/AptToServRecsIconVisibilityConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using BeWo.Scheduler.ViewModel;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Scheduler.Converter
+{
+    public class AptToServRecsIconVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is CustomFieldStorage customFieldStorage)
+            {
+                return customFieldStorage.ServiceRecordList.Any() || customFieldStorage.HasServiceRecordEntry ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduler/Converter/BitmapToBitmapSourceConverter.cs

@@ -1,6 +1,6 @@
 using System;
+using System.Drawing;
 using System.Globalization;
-using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media;
 using System.IO;
@@ -10,20 +10,19 @@ namespace BeWo.Scheduler.Converter
 {
     public class BitmapToBitmapSourceConverter : IValueConverter
     {
-        
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             //return null;
-            System.Drawing.Bitmap source = value as System.Drawing.Bitmap;
-            if (source == null || targetType != typeof(ImageSource))
+            if (!(value is Bitmap source) || targetType != typeof(ImageSource))
+            {
                 return null;
-
+            }
             
-            MemoryStream stream = new MemoryStream();
+            var stream = new MemoryStream();
             source.Save(stream, System.Drawing.Imaging.ImageFormat.Png);
             stream.Position = 0;
 
-            BitmapImage result = new BitmapImage();
+            var result = new BitmapImage();
             result.BeginInit();
             result.StreamSource = stream;
             result.EndInit();
@@ -31,14 +30,9 @@ namespace BeWo.Scheduler.Converter
             return result;
         }
 
-            
-
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return null;
         }
     }
-
-
-
 }

BeWo/Scheduler/Converter/ToolTipTimeConverter.cs

@@ -0,0 +1,75 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using BeWo.Scheduler.ViewModel;
+using BS.Shared.Extensions;
+using DevExpress.Xpf.Scheduler.Drawing;
+using DevExpress.XtraScheduler;
+
+namespace BeWo.Scheduler.Converter
+{
+    public class ToolTipTimeConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(values is null || values.Length != 2)
+            {
+                return null;
+            }
+
+            if(values[0] is VisualAppointmentViewInfo visualAppointmentViewInfo && values[1] is TimeInterval timeInterval)
+            {
+                if(visualAppointmentViewInfo.CustomViewInfo is CustomFieldCollection customFieldCollection && customFieldCollection[nameof(CustomFieldStorage)] is CustomFieldStorage customFieldStorage)
+                {
+                    // ToDo: Bei Terminen einer Serie stimmen die Angaben nicht immer! Ist erst in DevExpress-Version 19.2.6 gefixt!
+                    var isAbsenceTime = customFieldStorage.IsAbsenceTime;
+                    var isTask = customFieldStorage.IsTask;
+
+                    // Bei Abwesenheit einen Tag abziehen
+                    var start = visualAppointmentViewInfo.AppointmentStart;
+                    var end = visualAppointmentViewInfo.AppointmentEnd; // Jahr ist 9999, wenn es in der Datenbank null ist
+
+                    var noEnd = end.Year == 9999;
+
+                    if(isAbsenceTime)
+                    {
+                        // Ende kann null sein
+                        // Selber Tag? Hat Ende?
+                        if(noEnd)
+                        {
+                            return start.GetIntervalDescription(end);
+                        }
+
+                        // Bei ganztägigen Abwesenheiten
+                        if(start.IsTimeZero() && end.IsTimeZero() && end.AddDays(-1) > start)
+                        {
+                            end = end.AddDays(-1);
+                        }
+
+                        return start.GetIntervalDescription(end);
+                    }
+                    
+                    if(isTask)
+                    {
+                        return noEnd ? string.Empty : $"bis {end:dd.MM.yyyy HH:mm}";
+                    }
+
+                    if(start.IsTimeZero() && end.IsTimeZero() && end.AddDays(-1) > start)
+                    {
+                        end = end.AddDays(-1);
+                    }
+
+                    return start.GetIntervalDescription(end).TrimStart();
+                }
+            }
+
+            return null;
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+}

BeWo/Scheduler/IBeWoAppointment.cs

@@ -11,8 +11,6 @@ namespace BeWo.Scheduler
 
         DateTime End { get; set;}
 
-        int LabelId { get; set;}
-        
         string Subject { get; set;}
 
 		string Description { get; set; }
@@ -26,5 +24,7 @@ namespace BeWo.Scheduler
         string RecurrenceInfo { get; set; }
 
         Dictionary<string, object> CustomFields { get; }
+
+        long? LabelKey { get; set; }
     }
 }

BeWo/Scheduler/Utils/AppointmentExtensions.cs

@@ -13,6 +13,8 @@ namespace BeWo.Scheduler.Utils
 {
     public static class AppointmentExtensions
     {
+        #region CustomField Getters
+
         public static CustomFieldStorage GetCustomFieldStorage(this Appointment appointment)
         {
             return appointment.CustomFields[nameof(CustomFieldStorage)] as CustomFieldStorage;
@@ -37,7 +39,6 @@ namespace BeWo.Scheduler.Utils
         {
             return appointment.GetCustomFieldStorage()?.IsAllDay ?? false;
         }
-
         
         public static ObservableCollection<Employee2SchedulerAppointmentDC> CF_EmployeeList(this Appointment appointment)
         {
@@ -95,8 +96,37 @@ namespace BeWo.Scheduler.Utils
             return appointment.GetCustomFieldStorage()?.HasServiceRecordEntry ?? false;
         }
 
-        
-        
+        public static bool CF_CanBeEdited(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.CanBeEdited ?? false;
+        }
+
+
+        public static long? CF_AbsenceTimeOid(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.AbsenceTimeOid;
+        }
+
+        public static bool CF_IsCustomerAbsenceTime(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.IsCustomerAbsenceTime ?? false;
+        }
+
+        public static List<ServiceRecordDC> CF_ServiceRecordList(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.ServiceRecordList ?? new List<ServiceRecordDC>();
+        }
+
+        public static string CF_CompletedUser(this Appointment appointment)
+        {
+            return appointment.GetCustomFieldStorage()?.CompletedUser;
+        }
+
+        #endregion
+
+
+        #region CustomField Setters
+
         public static void CF_IsTask(this Appointment appointment, bool pIsTask)
         {
             appointment.GetCustomFieldStorage().IsTask = pIsTask;
@@ -117,8 +147,15 @@ namespace BeWo.Scheduler.Utils
             appointment.GetCustomFieldStorage().IsAllDay = pIsAllDay;
         }
 
-        
-        
+        public static void CF_AbsenceTimeOid(this Appointment appointment, long? absenceTimeOid)
+        {
+            appointment.GetCustomFieldStorage().AbsenceTimeOid = absenceTimeOid;
+        }
+
+        public static void CF_IsCustomerAbsenceTime(this Appointment appointment, bool isCustomerAbsenceTime)
+        {
+            appointment.GetCustomFieldStorage().IsCustomerAbsenceTime = isCustomerAbsenceTime;
+        }
 
         public static void CF_EmployeeList(this Appointment appointment, ObservableCollection<Employee2SchedulerAppointmentDC> pEmployeeList)
         {
@@ -140,15 +177,11 @@ namespace BeWo.Scheduler.Utils
             appointment.GetCustomFieldStorage().SupportConceptList = pSupportConceptList;
         }
 
-
         public static void CF_Originator(this Appointment appointment, CompactEmployeeDC pOriginator)
         {
             appointment.GetCustomFieldStorage().Originator = pOriginator;
         }
         
-        
-        
-        
         public static void CF_DueDate(this Appointment appointment, DateTime? pDueDate)
         {
             appointment.GetCustomFieldStorage().DueDate = pDueDate;
@@ -173,5 +206,17 @@ namespace BeWo.Scheduler.Utils
         {
             appointment.GetCustomFieldStorage().HasServiceRecordEntry = hasServiceRecordEntry;
         }
+
+        public static void CF_ServiceRecordList(this Appointment appointment, List<ServiceRecordDC> serviceRecords)
+        {
+            appointment.GetCustomFieldStorage().ServiceRecordList = serviceRecords;
+        }
+
+        public static void CF_CompletedUser(this Appointment appointment, string completedUser)
+        {
+            appointment.GetCustomFieldStorage().CompletedUser = completedUser;
+        }
+
+        #endregion
     }
 }

BeWo/Scheduler/Utils/Utils.cs

@@ -4,19 +4,19 @@ namespace BeWo.Scheduler.Utils
 {
     public static 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})");
+        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 string ExtractIdFromRecurrenceInfo(string pRecurrenceInfo)
         {
-            return pRecurrenceInfo != null ? idRegex.Match(pRecurrenceInfo).Groups[1].Value : null;
+            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 indexString = _IndexRegex.Match(pRecurrenceInfo).Groups[1].Value;
 
                 var index = !string.IsNullOrEmpty(indexString) ? int.Parse(indexString) : 0;
 

BeWo/Scheduler/View/AbstractAppointmentEditForm.cs

@@ -40,7 +40,7 @@ namespace BeWo.Scheduler.View
 	    public string TimeEditMask => CultureInfo.CurrentCulture.DateTimeFormat.LongTimePattern;
 	    public RecurrenceVisualController RecurrenceVisualController { get; }
 
-	    protected internal bool IsNewAppointment => Controller == null || Controller.IsNewAppointment;
+	    protected internal bool IsNewAppointment => Controller is null || Controller.IsNewAppointment;
 
 	    protected bool ShouldShowRecurrence => !Appointment.IsOccurrence && Controller.ShouldShowRecurrenceButton;
 
@@ -51,8 +51,11 @@ namespace BeWo.Scheduler.View
                 return false;
             }
 
+            // TODO: Endzeit und Startzeit werden als Dauer auf das Start-Objekt addiert
             if (ShouldShowRecurrence)
             {
+                var rvcStart = RecurrenceVisualController.Start;
+                
                 RecurrenceVisualController.ApplyRecurrence();
             }
 

BeWo/Scheduler/View/MitarbeiterverfuegbarkeitsinfoView.xaml

@@ -6,11 +6,13 @@
       xmlns:view="clr-namespace:BeWo.View"
       xmlns:dxg="http://schemas.devexpress.com/winfx/2008/xaml/grid"
       xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+      xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+      xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
       mc:Ignorable="d" 
       Height="Auto" Width="Auto" HorizontalAlignment="Stretch"  VerticalAlignment="Stretch" Focusable="True">
 
 	<Grid Width="Auto" Height="Auto" x:Name="root">
-		<GroupBox x:Name="rootGroupBox" Style="{StaticResource PopUpWindowStyle}" Header="Mitarbeiterverfügbarkeit">
+        <GroupBox x:Name="rootGroupBox" Style="{StaticResource PopUpWindowStyle}" Header="{markup:Translate Mitarbeiterverfügbarkeit}">
 			<Grid Margin="0,3,0,0" Background="{StaticResource ObjectEditBackgroundBrush}">
 				<Grid.RowDefinitions>
 					<RowDefinition Height="*" />
@@ -18,7 +20,7 @@
 				</Grid.RowDefinitions>
 				<dxg:GridControl DataSource="{Binding Verfuegbarkeiten}">
 					<dxg:GridControl.Columns>
-						<dxg:GridColumn FieldName="Mitarbeiter" Header="Mitarbeiter" AllowEditing="False" />
+                        <dxg:GridColumn FieldName="Mitarbeiter" Header="{t:Translate MitarbeiterSingular}" AllowEditing="False" />
 						<dxg:GridColumn FieldName="Ueberstunden" Header="Überstunden" AllowEditing="False">
 							<dxg:GridColumn.EditSettings>
 								<dxe:TextEditSettings MaskUseAsDisplayFormat="True" Mask="########0.00" MaskType="Numeric" />

BeWo/Scheduler/View/NewSchedulerView.xaml

@@ -1,21 +1,21 @@
 <localView:BeWoView x:Class="BeWo.Scheduler.View.NewSchedulerView"
-					          xmlns:localView="clr-namespace:BeWo.View"
+					xmlns:localView="clr-namespace:BeWo.View"
                     xmlns:localSchConv="clr-namespace:BeWo.Scheduler.Converter"
-					          xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-					          xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-					          xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+				    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+				    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+				    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
                     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                     xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
                     xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-					          xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
+					xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
                     xmlns:view="clr-namespace:BeWo.Scheduler.View"
-                    xmlns:converter="clr-namespace:BeWo.Converter"
                     xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
-                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+                    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup" xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup" 
+					Loaded="NewSchedulerView_OnLoaded"
                     Height="Auto" Width="Auto" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Focusable="True">
-	<localView:BeWoView.Resources>
-		<ResourceDictionary>
-			<dxschint:ToolTipVisibilityToVisibilityConverter x:Key="ToolTipVisibilityConverter" />
+    <localView:BeWoView.Resources>
+        <ResourceDictionary>
+            <dxschint:ToolTipVisibilityToVisibilityConverter x:Key="ToolTipVisibilityConverter" />
 			<dx:BooleanToVisibilityConverter x:Key="boolToVisibilityConverter" />
 			<localSchConv:CheckBoxConverter x:Key="CheckBoxConverter" />
 			<localSchConv:NewCalendarBackgroundConverter x:Key="NewCalendarBackgroundConverter" />
@@ -23,16 +23,17 @@
 			<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" />
-			
-		  <!-- Region Appointment Templates -->
+            <view:InformationButtonVisibilityConverter x:Key="InformationButtonVisibilityConverter" />
+			<localSchConv:AptToServRecsIconVisibilityConverter x:Key="AptToServRecsIconVisibilityConverter" />
+			<localSchConv:ToolTipTimeConverter x:Key="ToolTipTimeConverter" />
+            <!-- Region Appointment Templates -->
 
             <!-- Region VerticalAppointmentTemplate -->
+			<!-- Wird für alle nicht-ganztäglichen Termine benutzt außer in der Monatsansicht -->
 		    <ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=VerticalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualVerticalAppointmentControl}">
-            <!--<dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" ControlColor="{TemplateBinding ViewInfo, Converter={StaticResource AppointmentBackgroundConverter}}" SnapsToDevicePixels="True">-->
-			<!-- TODO: ändern! -->
                 <dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" ControlColor="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor.GradientStops[0].Color, RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
 					<VisualStateManager.VisualStateGroups>
 						<VisualStateGroup x:Name="DraggedStates">
@@ -66,11 +67,12 @@
 					<Grid x:Name="PART_ToolTipContainer" dxsch:SchedulerControl.HitTestType="AppointmentContent" dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}" Tag="{TemplateBinding ViewInfo}">
 						<!-- Region AppointmentToolTip -->
 						<ToolTipService.ToolTip>
-							<ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+							<ToolTip Content="{TemplateBinding ViewInfo}" 
+                                     ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
 									 Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
 							</ToolTip>
 						</ToolTipService.ToolTip>
-            <!-- Endregion -->
+						<!-- Endregion -->
 						<dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
                             <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="2" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" BorderThickness="1" DefaultBorderThickness="1">
 								<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
@@ -106,9 +108,9 @@
 							<ContentPresenter x:Name="PART_Content" Grid.Column="0" Margin="5,4,5,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
 						</Grid>
 						<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-												                DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
-													              BorderBrush="Black"
-												                Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
+												    DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
+													BorderBrush="Black"
+												    Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
 						<!--ResizingHitTest Obere und untere Kanten-->
 						<Rectangle Fill="Transparent" Height="5" VerticalAlignment="Top" HorizontalAlignment="Stretch"
 								   Visibility="{Binding Path=ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent},Converter={StaticResource boolToVisibilityConverter}}"
@@ -145,16 +147,17 @@
                         <TextBlock Grid.Row="0" Text="{Binding Subject}" TextWrapping="NoWrap" Margin="6,0,0,3" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
                         <TextBlock Grid.Row="1" Text="{Binding Location}" TextWrapping="Wrap" Margin="6,0,0,3" Foreground="{Binding Path=CustomViewInfo[CustomFieldStorage].ForegroundColor}" />
 					</Grid>
-					<dxschint:AppointmentImagesControl Grid.Column="1" ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
-					<Image Grid.Row="0" Grid.Column="2" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].HasServiceRecordEntry, Converter={StaticResource BoolVisibilityConverter}}"  Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
+					<dxschint:AppointmentImagesControl Grid.Column="1" Margin="0,0,4,0"  ViewInfo="{Binding}" Orientation="Vertical" SnapsToDevicePixels="True" />
+                    <Image Grid.Row="0" Grid.Column="2" Margin="-4,-2,6,0"
+                           Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" 
+                           SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
                 </Grid>
 			</DataTemplate>
 			<!--Endregion-->
 
-			<!-- Region Horizontal -->
+			<!-- Region Horizontal (Monatsanzeige, etc.) -->
             <!-- HorizontalAppointmentTemplate -->
-			<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentTemplate, IsThemeIndependent=true}" 
-							         TargetType="{x:Type dxschint:VisualHorizontalAppointmentControl}">
+			<ControlTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentTemplate, IsThemeIndependent=true}" TargetType="{x:Type dxschint:VisualHorizontalAppointmentControl}">
                 <dxschint:AppointmentColorConvertControl x:Name="clrConvCtrl" SnapsToDevicePixels="True" ControlColor="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor.GradientStops[0].Color, RelativeSource={RelativeSource TemplatedParent}}">
 					<VisualStateManager.VisualStateGroups>
 						<VisualStateGroup x:Name="DraggedStates">
@@ -187,61 +190,64 @@
 					</dxschint:AppointmentColorConvertControl.BaseBrushColors>
 					<Grid x:Name="PART_ToolTipContainer" dxsch:SchedulerControl.HitTestType="AppointmentContent" dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}">
                         <ToolTipService.ToolTip>
-                            <ToolTip Content="{TemplateBinding ViewInfo}" ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-									                   Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
+                            <ToolTip Content="{TemplateBinding ViewInfo}"
+                                     ContentTemplate="{Binding ViewInfo.View.AppointmentToolTipContentTemplate, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                     Visibility="{Binding ViewInfo.View.AppointmentToolTipVisibility, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ToolTipVisibilityConverter}}">
                             </ToolTip>
                         </ToolTipService.ToolTip>
                         <dxschint:AppointmentBorder x:Name="back" DefaultCornerRadius="4" Opacity="1" ViewInfo="{TemplateBinding ViewInfo}"
-													                          Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
-                        <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" DefaultBorderThickness="1">
-								<dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
-                  <Grid>
-                      <Grid.ColumnDefinitions>
-                          <ColumnDefinition Width="Auto" />
-                          <ColumnDefinition Width="*" />
-                          <ColumnDefinition Width="Auto" />
-                      </Grid.ColumnDefinitions>
-                      <Border Width="10" CornerRadius="4,0,0,4" HorizontalAlignment="Left" SnapsToDevicePixels="True">
-                          <Border.Background>
-                              <MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
-                                  <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
-                                  <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
-                                  <Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
-                              </MultiBinding>
-                          </Border.Background>
-                      </Border>
-                      <Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
-                      <Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
-                          <Border.Background>
-                              <MultiBinding Converter="{StaticResource DickbuttConverter}">
-                                  <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
-                                  <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
-                              </MultiBinding>
-                          </Border.Background>
-                      </Border>
-                  </Grid>
-              </dxschint:AppointmentBorder>
+													Background="{Binding Path=ViewInfo.CustomViewInfo, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource AppointmentBorderZusageConverter}}">
+                            <dxschint:AppointmentBorder DefaultCornerRadius="3" DefaultMargin="1" ViewInfo="{TemplateBinding ViewInfo}" Background="{Binding Path=ViewInfo.CustomViewInfo[CustomFieldStorage].BackgroundColor, RelativeSource={RelativeSource TemplatedParent}}" DefaultBorderThickness="1">
+						        <dxschint:AppointmentBorder x:Name="AppointmentBorder" DefaultCornerRadius="2" DefaultMargin="0" ViewInfo="{TemplateBinding ViewInfo}" Background="Transparent">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <Border Width="10" CornerRadius="4,0,0,4" HorizontalAlignment="Left" SnapsToDevicePixels="True">
+                                            <Border.Background>
+                                                <MultiBinding Converter="{StaticResource EmployeeBrushConverter}">
+                                                    <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
+                                                    <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
+                                                    <Binding Path="IsEmployeeBrushVisible" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
+                                                </MultiBinding>
+                                            </Border.Background>
+                                        </Border>
+                                        <Border SnapsToDevicePixels="True" Background="Transparent" Grid.Column="1" />
+                                        <!-- TODO: Mehrere Farben für Ressourcen anzeigen -->
+                                        <Border Width="10" CornerRadius="0,4,4,0" HorizontalAlignment="Right" SnapsToDevicePixels="True" Grid.Column="2">
+                                            <Border.Background>
+                                                <MultiBinding Converter="{StaticResource DickbuttConverter}">
+                                                    <Binding Path="AllItems" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" UpdateSourceTrigger="PropertyChanged" />
+                                                    <Binding Path="ViewInfo.CustomViewInfo" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type dxschint:AppointmentBorder}}" />
+                                                </MultiBinding>
+                                            </Border.Background>
+                                        </Border>
+                                    </Grid>
+                                </dxschint:AppointmentBorder>
 							</dxschint:AppointmentBorder>
 						</dxschint:AppointmentBorder>
 						<Grid x:Name="ContentContainer" Margin="0,0,0,3">
 							<ContentPresenter x:Name="PART_Content" Grid.Row="0" Margin="3,0,3,0" Content="{TemplateBinding ViewInfo}" ContentTemplate="{TemplateBinding ContentTemplate}" />
 						</Grid>
+						<!-- Rahmen bei ausgewähltem Termin -->
 						<dxschint:AppointmentBorder x:Name="Selection" DefaultCornerRadius="4" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-												                DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
-													              BorderBrush="Black"
-												                Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
+												    DefaultBorderThickness="2" ViewInfo="{TemplateBinding ViewInfo}"
+                                                    BorderBrush="Black"
+												    Visibility="{Binding ViewInfo.Selected, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}" />
 						<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Left"
-								       Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
-								       IsHitTestVisible="True"
-								       dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
-								       dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
-								       Cursor="SizeWE">
+								   Visibility="{Binding ViewInfo.CanResizeStart, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
+								   IsHitTestVisible="True"
+								   dxsch:SchedulerControl.HitTestType="AppointmentResizingLeftEdge"
+								   dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+								   Cursor="SizeWE">
 						</Rectangle>
 						<Rectangle Fill="Transparent" Width="5" HorizontalAlignment="Right" IsHitTestVisible="True"
-								       Visibility="{Binding Path=ViewInfo.CanResizeEnd, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
-								       dxsch:SchedulerControl.HitTestType="AppointmentResizingRightEdge"
-							         dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
-								       Cursor="SizeWE">
+                                   Visibility="{Binding Path=ViewInfo.CanResizeEnd, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource boolToVisibilityConverter}}"
+								   dxsch:SchedulerControl.HitTestType="AppointmentResizingRightEdge"
+							       dxsch:SchedulerControl.SelectableIntervalViewInfo="{TemplateBinding ViewInfo}"
+								   Cursor="SizeWE">
 						</Rectangle>
 					</Grid>
 				</dxschint:AppointmentColorConvertControl>
@@ -257,6 +263,7 @@
                             <ColumnDefinition Width="Auto" />
                             <ColumnDefinition Width="*" />
                             <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
@@ -270,18 +277,23 @@
 			                       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" />
+                        <dxschint:AppointmentImagesControl Grid.Row="0" Grid.Column="4" Margin="0,4,10,0" ViewInfo="{Binding}" 
+                                                           Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" />
+                        <Image Grid.Row="0" Grid.Column="5" Margin="0,4,10,0"
+                               Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" 
+                               Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="20" Width="20" VerticalAlignment="Top" />
                     </Grid>
                 </dxschint:HorizontalAppointmentContentPanel>
 			</DataTemplate>
 
-			<!-- HorizontalAppointmentContentTemplate wird auf ganztägige Termine angewandt -->
+			<!-- HorizontalAppointmentContentTemplate wird auf ganztägige Termine und Abwesenheiten angewandt -->
 			<DataTemplate x:Key="{dxscht:SchedulerViewThemeKey ResourceKey=HorizontalAppointmentLongerThanADayContentTemplate, IsThemeIndependent=true}">
 				<Grid SnapsToDevicePixels="True" HorizontalAlignment="Stretch" VerticalAlignment="Center">
 					<Grid.ColumnDefinitions>
 						<ColumnDefinition Width="Auto" />
 						<ColumnDefinition Width="*" />
 						<ColumnDefinition Width="Auto" />
+						<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" />
@@ -290,12 +302,15 @@
 					<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" />
-					</dxschint:HorizontalAppointmentContentPanel>
+                        </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" />
 					</StackPanel>
-				</Grid>
+                    <Image Grid.Column="3" Grid.Row="0" Margin="0,0,4,0"
+                        Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage], Converter={StaticResource AptToServRecsIconVisibilityConverter}}" 
+                        Source="/BeWoPlaner;component/Ressources/Icons/HistoryDisabled.png" SnapsToDevicePixels="True" Height="17" Width="17" VerticalAlignment="Center" />
+                </Grid>
 			</DataTemplate>
 			<!-- Endregion-->
 
@@ -309,34 +324,44 @@
 						<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 Grid.Row="1" 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 Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}">
-						    <TextBlock Text="{Binding Path=StartTimeText}" />
-                            <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}" />
+						<StackPanel Grid.Column="0" 
+                                    Orientation="Horizontal" 
+                                    Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTimeVisibility}">
+                            <TextBlock Margin="0,0,4,0">
+								<TextBlock.Text>
+                                    <MultiBinding Converter="{StaticResource ToolTipTimeConverter}">
+                                        <Binding />
+                                        <Binding Path="FetchingInterval" RelativeSource="{RelativeSource AncestorType={x:Type view:NewSchedulerView}}" />
+                                    </MultiBinding>
+                                </TextBlock.Text>
+                            </TextBlock>
+                        </StackPanel>
+                        <TextBlock Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTip}" 
+                                   TextWrapping="Wrap" 
+                                   MaxWidth="{Binding Path=ActualWidth, Source={x:Reference Scheduler}}" />
 					</Grid>
-					<Separator Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="2" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipTrennstrichVisibility}" />
+					<Separator Grid.Row="2" 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}"
+					<TextBlock Margin="0,0,3,0" Grid.Row="3" Grid.Column="0" Text="Ressourcen:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipResourcesVisibility}" />
+					<TextBlock Grid.Row="3" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Ressourcen}"
 							   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}" />
+					<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{t:Translate MitarbeiterPlural:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" />
 
-					<ListView Margin="-6,-3,0,0" Grid.Row="3" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo[CustomFieldStorage].EmployeeList}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
+					<ListView Margin="-6,-3,0,0" Grid.Row="4" Background="Transparent" BorderThickness="0" ItemsSource="{Binding Path=CustomViewInfo[CustomFieldStorage].EmployeeList}" Grid.Column="1" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipEmployeesVisibility}" Name="ToolTipEmployeeList">
 						<ListView.ItemsPanel>
 							<ItemsPanelTemplate>
 								<WrapPanel Width="{Binding (FrameworkElement.ActualWidth), RelativeSource={RelativeSource AncestorType=ScrollContentPresenter}}"
@@ -352,7 +377,6 @@
 										<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" />-->
 									<Border Grid.Column="0" Background="{Binding Converter={StaticResource NichtNochEinConverter}}" BorderThickness="1" BorderBrush="DimGray" Width="5" Margin="0,0,3,0" Visibility="{Binding Path=DataContext.CustomViewInfo[CustomFieldStorage].ToolTipZusageVisibility, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type ListView}}}" />
 									<TextBlock Grid.Column="1" Foreground="DimGray" Text="{Binding Converter={StaticResource NichtNochEinConverter}, ConverterParameter=GibName}" />
 								</Grid>
@@ -360,10 +384,14 @@
 						</ListView.ItemTemplate>
 					</ListView>
 					
-					<TextBlock Margin="0,0,3,0" Grid.Row="4" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
-					<TextBlock Grid.Row="4" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
+					<TextBlock Margin="0,0,3,0" Grid.Row="5" Grid.Column="0" Text="{markup:Translate Klienten:}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
+					<TextBlock Grid.Row="5" Grid.Column="1" Text="{Binding Path=CustomViewInfo, Converter={StaticResource AppointmentToolTipConverter}, ConverterParameter=Klienten}"
 							       Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].ToolTipCustomersVisibility}" />
-				</Grid>
+                    <!-- Separator und "Angelegt von: " mit dem Namen des Originators -->
+                    <Separator Grid.Row="6" Grid.ColumnSpan="2" Grid.Column="0" Height="1" Background="DimGray" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="7" Grid.Column="0" Text="Angelegt von:" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                    <TextBlock Margin="0,0,3,0" Grid.Row="7" Grid.Column="1" Text="{Binding Path=CustomViewInfo[CustomFieldStorage].Originator}" Visibility="{Binding Path=CustomViewInfo[CustomFieldStorage].CanBeEdited, Converter={StaticResource BoolVisibilityConverter}}" />
+                </Grid>
 			</DataTemplate>
 
 			<!-- DragDropHoverTimeCellsStyle -->
@@ -451,7 +479,6 @@
 					</Setter.Value>
 				</Setter>
 			</Style>
-
 			<Style x:Key="MitarbeiterTabItemStyle" TargetType="{x:Type TabItem}">
 				<Setter Property="Template">
 					<Setter.Value>
@@ -557,11 +584,11 @@
                 </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" LostFocus="SpinEditDayViewDayCount_OnLostFocus" 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" LostFocus="SpinEditTimelineViewDayCount_OnLostFocus" 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>
@@ -578,14 +605,15 @@
 						</ControlTemplate>
 					</Button.Template>
 				</Button>
+        <Button Click="ExportButton_OnClick" Margin="5,1,1,1" ToolTip="Exportieren" Width="24" Height="24" Visibility="Collapsed"/>
 			</StackPanel>
 			<Grid Grid.Column="2" Grid.Row="0" Margin="6,0,0,0" VerticalAlignment="Center">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="Auto" />
                     <ColumnDefinition Width="Auto" />
+				    <ColumnDefinition Width="Auto" />
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
-					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<CheckBox Grid.Column="0" Content="{markup:Translate Mitarbeiterfarben}" x:Name="MitarbeiterfarbenEinAusCheckBox" Checked="MitarbeiterfarbenEinAusCheckBox_OnChecked" 
 							Unchecked="MitarbeiterfarbenEinAusCheckBox_OnChecked"
@@ -593,13 +621,13 @@
 				<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">
+                <CheckBox Grid.Column="2" VerticalAlignment="Center" Margin="10,0,0,0" Content="Aufgaben" x:Name="ShowTasksCheckBox" Click="ShowTasksCheckBox_OnClick" />
+                <TextBlock IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}" Grid.Column="3" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="10,0,0,0">
 					<Hyperlink RequestNavigate="ShowAppointmentRequests" NavigateUri="#" IsEnabled="{Binding Enabled, UpdateSourceTrigger=PropertyChanged}">
 						<TextBlock Text="{Binding Requests, UpdateSourceTrigger=PropertyChanged}" />
 					</Hyperlink>
 				</TextBlock>
-                <CheckBox Grid.Column="3" HorizontalAlignment="Right" VerticalAlignment="Center" Content="Nur private Termine anzeigen" x:Name="ShowPrivateAppointmentsCheckBox" Click="ShowPrivateAppointmentsCheckBox_OnClick" />
+                <CheckBox Grid.Column="4" 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}" />
 			<Border Grid.Row="0" Grid.Column="4" Width="{Binding ElementName=DateNavigator, Path=ActualWidth}">
@@ -626,9 +654,10 @@
                 <CheckBox x:Name="ZeigeNurMeineTermineCheckBox" Grid.Row="0" Content="Nur meine Termine anzeigen" Margin="3, 3, 3, 3" IsChecked="{Binding Path=ZeigeNurMeineTermine, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Checked="NurMeineTermineEinAusCheckBox_OnChecked" Unchecked="NurMeineTermineEinAusCheckBox_OnChecked" />
                 <UniformGrid Grid.Column="0" x:Name="AuswahlGrid" Rows="2" Columns="1" Width="270" Grid.Row="1">
                     <TabControl SelectionChanged="Selector_OnSelectionChanged" x:Name="TabControl">
-                        <TabItem Header="{markup:Translate Mitarbeiter}" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbeiterTabItem">
+                        <TabItem Header="{t:Translate MitarbeiterPlural}" Style="{StaticResource MitarbeiterTabItemStyle}" x:Name="MitarbeiterTabItem">
                             <Grid x:Name="MitarbeiterTabGrid">
                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
@@ -638,8 +667,9 @@
                                     <RowDefinition Height="*" />
                                 </Grid.RowDefinitions>
                                 <CheckBox Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleMitarbeiterCB" Click="AlleMitarbeiterCB_OnClick" />
-                                <ToggleButton Margin="3" Grid.Row="0" Grid.Column="1" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB" Checked="MeinTB_OnChecked" Unchecked="MeinTB_OnChecked" />
-                                <Grid x:Name="MitarbeiterSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="2" Background="Black" Grid.Row="1" Visibility="Collapsed">
+                                <CheckBox Grid.Column="1" Grid.Row="0" Content="Meine Teams" Click="MyTeamsCheckBox_OnClick" Margin="3" x:Name="TeamMembersCheckBox" HorizontalAlignment="Left" />
+                                <ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB" Checked="MeinTB_OnChecked" Unchecked="MeinTB_OnChecked" />
+                                <Grid x:Name="MitarbeiterSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="*" />
@@ -647,7 +677,7 @@
                                     <Label Content="Suche:" Grid.Column="0" Foreground="White" />
                                     <TextBox x:Name="MitarbeiterSuchTextBox" Grid.Column="1" TextChanged="TextBoxEmployees_OnTextChanged" Margin="3" VerticalContentAlignment="Center" />
                                 </Grid>
-                                <ListView Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="2" Margin="0" ItemsSource="{Binding Path=GefilterteMitarbeiter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Background="Transparent" BorderThickness="0">
+                                <ListView Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="2" Margin="0" ItemsSource="{Binding Path=GefilterteMitarbeiter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" Background="Transparent" BorderThickness="0" PreviewMouseRightButtonDown="ListView_PreviewMouseRightButtonDown">
                                     <ListView.ItemContainerStyle>
                                         <Style TargetType="{x:Type ListViewItem}">
                                             <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -671,16 +701,20 @@
                                                                     <Grid.ColumnDefinitions>
                                                                         <ColumnDefinition Width="*" />
                                                                         <ColumnDefinition Width="Auto" />
+                                                                        <ColumnDefinition Width="Auto" />
                                                                     </Grid.ColumnDefinitions>
-                                                                    <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseDown="MitarbeiterListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
+                                                                    <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseLeftButtonDown="MitarbeiterListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="11" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
                                                                         <CheckBox.IsChecked>
                                                                             <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Mitarbeiter">
                                                                                 <Binding Path="EmployeeOid" Mode="OneWay" />
-                                                                                <Binding Path="SelectedEmployees" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
+                                                                                <Binding Path="SelectedEmployees" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" 
+                                                                                    RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
                                                                             </MultiBinding>
                                                                         </CheckBox.IsChecked>
+
                                                                     </CheckBox>
                                                                     <Border Width="15" Height="15" Grid.Column="1" Background="{Binding Path=FilterableBrush}" CornerRadius="3" />
+                                                                    <Button x:Name="btn_showEmployeeInformation" Width="15" Height="15" Grid.Column="2" Margin="5 0 5 0" Click="btn_showEmployeeInformation_Click" FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -736,8 +770,8 @@
                                 </Grid.RowDefinitions>
                                 <Grid Grid.Row="0">
                                     <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
+                                        <ColumnDefinition Width="*" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
                                     <Grid.RowDefinitions>
@@ -745,7 +779,7 @@
                                         <RowDefinition Height="*" />
                                     </Grid.RowDefinitions>
                                     <CheckBox Grid.Row="0" Grid.Column="0" Content="Alle auswählen" Margin="3" x:Name="AlleKlientenCB" Click="AlleKlientennCB_OnClick" HorizontalAlignment="Left" HorizontalContentAlignment="Center" />
-                                    <CheckBox Grid.Row="0" Grid.Column="1" Content="{markup:Translate Nur meine Klienten}" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Right" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" />
+                                    <CheckBox Grid.Row="0" Grid.Column="1" Content="{markup:Translate Nur meine Klienten}" Margin="3" x:Name="NurMeineKlientenCB" HorizontalAlignment="Left" Click="NurEigeneKlientenAnzeigen" IsThreeState="False" HorizontalContentAlignment="Center" />
                                     <ToggleButton Margin="3" Grid.Row="0" Grid.Column="2" Height="17" Width="36" Style="{StaticResource LupenToggleButtonStyle}" x:Name="MeinTB2" Checked="MeinTB2_OnChecked" Unchecked="MeinTB2_OnChecked" />
                                     <Grid x:Name="KlientenSuchGrid" Margin="0,1,0,3" Grid.Column="0" Grid.ColumnSpan="3" Background="Black" Grid.Row="1" Visibility="Collapsed">
                                         <Grid.ColumnDefinitions>
@@ -777,6 +811,10 @@
                                                             </Border>
                                                             <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25">
                                                                 <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
+                                                                    <Grid.ColumnDefinitions>
+                                                                        <ColumnDefinition Width="*" />
+                                                                        <ColumnDefinition Width="Auto" />
+                                                                    </Grid.ColumnDefinitions>
                                                                     <CheckBox Content="{Binding Path=DetailDescription}" PreviewMouseDown="KlientenListe_OnClick" Checked="ListItemCheckedEvent" Unchecked="ListItemCheckedEvent" VerticalAlignment="Center" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif">
                                                                         <CheckBox.IsChecked>
                                                                             <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Klienten">
@@ -785,6 +823,8 @@
                                                                             </MultiBinding>
                                                                         </CheckBox.IsChecked>
                                                                     </CheckBox>
+
+                                                                    <Button x:Name="btn_showCustomerInformation" Width="15" Height="15" Grid.Column="1" Margin="5 0 5 0" Click="btn_showCustomerInformation_Click"  FontFamily="Microsoft Sans Serif" Content="i" Visibility="{Binding Converter={StaticResource InformationButtonVisibilityConverter}}"/>
                                                                 </Grid>
                                                             </Border>
                                                         </Grid>
@@ -853,7 +893,8 @@
                                                                 <CheckBox.IsChecked>
                                                                     <MultiBinding Converter="{StaticResource CheckBoxConverter}" ConverterParameter="Ressourcen" UpdateSourceTrigger="PropertyChanged" NotifyOnSourceUpdated="True">
                                                                         <Binding Path="ResourceOid" Mode="OneWay" />
-                                                                        <Binding Path="SelectedResources" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
+                                                                        <Binding Path="SelectedResources" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" 
+                                                                            RelativeSource="{RelativeSource FindAncestor, AncestorType={x:Type view:NewSchedulerView}}" />
                                                                     </MultiBinding>
                                                                 </CheckBox.IsChecked>
                                                             </CheckBox>
@@ -916,7 +957,9 @@
 			<dxsch:SchedulerControl Grid.Column="2" x:Name="Scheduler" dx:ThemeManager.ThemeName="Office2010Black"
                                     FormCustomizationUsingMVVMLocal="False"
                                     InplaceEditorShowing="Scheduler_OnInplaceEditorShowing"
-							        GroupType="None" AppointmentDrag="Scheduler_OnAppointmentDrag"
+							        GroupType="None" 
+                                    AppointmentDrag="Scheduler_OnAppointmentDrag" 
+                                    AppointmentDrop="Scheduler_OnAppointmentDrop" 
                                     VerticalAlignment="Stretch"
 							        EditAppointmentFormShowing="Scheduler_EditAppointmentFormShowing"
 							        EditRecurrentAppointmentFormShowing="SchedulerControl_EditRecurrentAppointmentFormShowing"
@@ -929,8 +972,7 @@
                                     AllowAppointmentCreate="AllowAppointmentCreateEvent"
 							        AllowAppointmentDragBetweenResources="AllowAppointmentAenderung"
 							        AllowAppointmentDelete="AllowAppointmentAenderung" 
-                                    ActiveViewType="WorkWeek"
-                                    >
+                                    ActiveViewType="WorkWeek">
 				        <dxsch:SchedulerControl.DayView>
 					        <dxsch:DayView AppointmentToolTipContentTemplate="{StaticResource {dxscht:SchedulerViewThemeKey ResourceKey=AppointmentToolTipContentTemplate}}" />
 				        </dxsch:SchedulerControl.DayView>
@@ -960,7 +1002,7 @@
 															          End="End"
 															          Subject="Subject"
 															          Description="Description"
-															          Label="LabelId"
+															          Label="LabelKey"
 															          AllDay="AllDay"
 															          ResourceId="ResourceId"
 															          RecurrenceInfo="RecurrenceInfo"
@@ -985,9 +1027,9 @@
 					<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.NewRecurringAppointment}" />
 					<dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.NewRecurringEvent}" />
 
-                    <dxb:AddBarItemAction>
+                    <!--<dxb:AddBarItemAction>
                         <dxb:BarButtonItem Name="AufgabeAnlegenButtonItem" Content="{markup:Translate Neue Aufgabe}" ItemClick="AufgabeAnlegen_OnItemClick" />
-                    </dxb:AddBarItemAction>
+                    </dxb:AddBarItemAction>-->
 
 					<dxb:AddBarItemAction>
 						<dxb:BarButtonItem Name="MitarbeiterVerfuegbarkeitPruefenButtonItem" 
@@ -1000,19 +1042,19 @@
 				<dxsch:SchedulerControl.AppointmentMenuCustomizations>
 				    <dxb:RemoveBarItemAndLinkAction ItemName="{x:Static dxsch:SchedulerMenuItemName.RestoreOccurrence}" />
 				    <dxb:AddBarItemAction>
-				    <dxb:BarButtonItem Name="RestoreAppointmentButtonItem" Content="Serientermin wiederherstellen" ItemClick="RestoreAppointmentButtonItem_OnItemClick" />
+				        <dxb:BarButtonItem Name="RestoreAppointmentButtonItem" Content="Serientermin wiederherstellen" ItemClick="RestoreAppointmentButtonItem_OnItemClick" />
 				    </dxb:AddBarItemAction>
 				    <dxb:BarItemSeparator Name="ZusagenStackSeperatorTop"></dxb:BarItemSeparator>
 					<dxb:AddBarItemAction>
-					<dxb:BarButtonItem Name="ZusagenButtonItem" Content="Zusagen" ItemClick="ZusagenButtonItem_OnItemClick" />
+					    <dxb:BarButtonItem Name="ZusagenButtonItem" Content="Zusagen" ItemClick="ZusagenButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
 					<dxb:AddBarItemAction>
-					<dxb:BarButtonItem Name="MitVorbehaltButtonItem" Content="Mit Vorbehalt zusagen" ItemClick="MitVorbehaltButtonItem_OnItemClick" />
+					    <dxb:BarButtonItem Name="MitVorbehaltButtonItem" Content="Mit Vorbehalt zusagen" ItemClick="MitVorbehaltButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
 					<dxb:AddBarItemAction>
-					  <dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
+                        <dxb:BarButtonItem Name="AbsagenButtonItem" Content="Absagen" ItemClick="AbsagenButtonItem_OnItemClick" />
 					</dxb:AddBarItemAction>
-				  <dxb:BarItemSeparator Name="ZusagenStackSeperatorBottom"></dxb:BarItemSeparator>
+                    <dxb:BarItemSeparator Name="ZusagenStackSeperatorBottom"></dxb:BarItemSeparator>
           <dxb:AddBarItemAction>
             <dxb:BarButtonItem Name="ZeiterfassungButtonItem" Content="{markup:Translate In Zeiterfassung übertragen}" ItemClick="ZeiterfassungButtonItem_OnItemClick" />
           </dxb:AddBarItemAction>
@@ -1039,7 +1081,7 @@
 			</dxe:DateNavigator>
 		</Grid>
 	    
-		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" />
+		<Border Grid.Row="0" Grid.RowSpan="2" x:Name="PopupContent" Margin="0,-10,0,10" />
     <Popup Grid.Row="0" StaysOpen="True" Placement="MousePoint" Width="290" Height="80" Closed="popup_Closed" Opened="popup_Opened" x:Name="DeleteAppointmentsPopup">
       <Grid Background="{StaticResource ControlBackground}" Margin="2,2,2,2">
           <Grid.ColumnDefinitions>

BeWo/Scheduler/View/RequestAnswerView.xaml

@@ -147,14 +147,25 @@
 				<Label Grid.Column="0" Grid.Row="7" Margin="3" Content="Notiz"/>
 				<TextBox Grid.Column="1" Grid.Row="7" Grid.ColumnSpan="3" AcceptsReturn="True" VerticalScrollBarVisibility="Auto" VerticalAlignment="Stretch" HorizontalScrollBarVisibility="Disabled" Margin="3" TextWrapping="Wrap" Text="{Binding Path=SelektierterTermin.Description}" IsReadOnly="True" />
 
-				<StackPanel x:Name="ZusagenStack" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Orientation="Horizontal" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=ZusagenStack}">
-					<Button Margin="3" Content="Zusagen" Click="Zusagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-					<Button Margin="3" Content="Mit Vorbehalt" Click="MitVorbehalt_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-					<Button Margin="3" Content="Absagen" Click="Absagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
-				</StackPanel>
-				<Button x:Name="OkButton" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Margin="3" Content="OK" Click="OK_OnClick" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=OKBtn}" />
+                <Grid Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Button x:Name="AlleBestaetigen" Grid.Column="0" Content="Alle bestätigen" Margin="3" Click="ButtonBase_OnClick" Width="100" />
+                    <StackPanel x:Name="ZusagenStack" Grid.Column="1" HorizontalAlignment="Right" Orientation="Horizontal" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=ZusagenStack}">
+                        <StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
+                            <Button Margin="3" Content="Zusagen" Click="Zusagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                            <Button Margin="3" Content="Mit Vorbehalt" Click="MitVorbehalt_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                            <Button Margin="3" Content="Absagen" Click="Absagen_OnClick" IsEnabled="{Binding SelektierterTermin, Converter={StaticResource ObjectBoolConverter}}" />
+                        </StackPanel>
+
+                    </StackPanel>
+                </Grid>
+				
+				<Button x:Name="OkButton" Grid.Row="8" Grid.Column="0" Grid.ColumnSpan="4" HorizontalAlignment="Right" Margin="3" Width="100" Content="OK" Click="OK_OnClick" Visibility="{Binding Path=SelektierterTermin, Converter={StaticResource Int2VisibilityConverter}, ConverterParameter=OKBtn}" />
 			</Grid>
 		</Grid>
-		<Button Grid.Row="1" x:Name="CloseBtn" Content="Schließen" HorizontalAlignment="Right" Margin="3" Click="CloseButton_Click" />
+		<Button Grid.Row="1" x:Name="CloseBtn" Content="Schließen" HorizontalAlignment="Right" Margin="3" Width="100" Click="CloseButton_Click" />
     </Grid>
 </dx:DXWindow>

BeWo/Scheduler/View/RequestAnswerView.xaml.cs

@@ -9,12 +9,12 @@ using System.Windows.Controls;
 using System.Windows.Data;
 
 using BeWo.Annotations;
+using BeWo.Core.Service;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
 
 using BS.Shared;
 using BS.Shared.DataContracts;
-using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
 
 using DevExpress.Xpf.Editors;
@@ -25,6 +25,8 @@ namespace BeWo.Scheduler.View
 {
 	public partial class RequestAnswerView : INotifyPropertyChanged
 	{
+	    private bool raiseChangeEvent = true;
+
 		public static readonly RoutedEvent ParticipationChangedEvent = EventManager.RegisterRoutedEvent(nameof(ParticipationChanged), RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(RequestAnswerView));
 		public event RoutedEventHandler ParticipationChanged
 		{
@@ -48,51 +50,59 @@ namespace BeWo.Scheduler.View
 
 		public ObservableCollection<IBeWoAppointment> OffeneTermine { get; set; }
 
-		private IBeWoAppointment _selektierterTermin;
+		private IBeWoAppointment _SelektierterTermin;
 		public IBeWoAppointment SelektierterTermin
 		{
-			get => _selektierterTermin;
+			get => _SelektierterTermin;
 		    set
 			{
-				_selektierterTermin = value;
+				_SelektierterTermin = value;
 				OnPropertyChanged(nameof(SelektierterTermin));
 			}
 		}
 
 		public RequestAnswerView(IEnumerable<IBeWoAppointment> appointments, IEnumerable<IBeWoAppointment> statusUpdates)
 		{
-			var statusUpdatesAsAppointments = new List<IBeWoAppointment>();
-
-		    foreach(var beWoAppointment in statusUpdates)
-		    {
-			    var item = (SchedulerAppointmentVM) beWoAppointment;
-			    foreach(var relation in item.EmployeeList.Where(emp => emp.IsPChanged && emp.ParticipationAnswer != ParticipationAnswer.Offen && emp.ParticipationAnswer != ParticipationAnswer.Verstrichen && !emp.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)))
-		        {
-		            if(statusUpdatesAsAppointments.All(a => a.LabelId != relation.Employee2SchedulerAppointmentOid))
-		            {
-		                if(relation.Employee2SchedulerAppointmentOid != null)
-		                {
-		                    statusUpdatesAsAppointments.Add(BuildNewVMFromOldVM(item, relation.Employee2SchedulerAppointmentOid.Value));
-		                }
-		            }
-		        }
-		    }
-
-			OffeneTermine = appointments.ToObservableCollection();
-			OffeneTermine.AddRange(new List<IBeWoAppointment>(statusUpdatesAsAppointments));
+            InitViewModel(appointments, statusUpdates);
 
 			DataContext = this;
 			InitializeComponent();
         }
-	    
+
+        private void InitViewModel(IEnumerable<IBeWoAppointment> appointments, IEnumerable<IBeWoAppointment> statusUpdates)
+        {
+            var statusUpdatesAsAppointments = new List<IBeWoAppointment>();
+
+            foreach(var beWoAppointment in statusUpdates)
+            {
+                var item = (SchedulerAppointmentVM) beWoAppointment;
+                foreach(var relation in item.EmployeeList.Where(emp => emp.IsPChanged && emp.ParticipationAnswer != ParticipationAnswer.Offen && emp.ParticipationAnswer != ParticipationAnswer.Verstrichen && !emp.Employee.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid)))
+                {
+                    if(statusUpdatesAsAppointments.Any(a => a.LabelKey == relation.Employee2SchedulerAppointmentOid))
+                    {
+                        continue;
+                    }
+
+                    if(relation.Employee2SchedulerAppointmentOid != null)
+                    {
+                        statusUpdatesAsAppointments.Add(BuildNewVMFromOldVM(item, relation.Employee2SchedulerAppointmentOid.Value));
+                    }
+                }
+            }
+
+            OffeneTermine = appointments.ToObservableCollection();
+            OffeneTermine.AddRange(new List<IBeWoAppointment>(statusUpdatesAsAppointments));
+            OnPropertyChanged(nameof(OffeneTermine));
+        }
+
 	    private static SchedulerAppointmentVM BuildNewVMFromOldVM(SchedulerAppointmentVM item, long emp2AppOid)
 	    {
 	        var customFieldStorage = (CustomFieldStorage) item.CustomFields[nameof(CustomFieldStorage)];
-	        
+	        var dc = item.CommitToDataContract();
             return new SchedulerAppointmentVM(new SchedulerAppointmentDC
             {
-                SchedulerAppointmentOid        = item.CommitToDataContract().SchedulerAppointmentOid,
-                NewSchedulerAppointmentVersion = item.CommitToDataContract().NewSchedulerAppointmentVersion,
+                SchedulerAppointmentOid        = dc.SchedulerAppointmentOid,
+                NewSchedulerAppointmentVersion = dc.NewSchedulerAppointmentVersion,
                 IsPrivate                      = item.IsPrivate,
                 RecurrenceInfo                 = item.RecurrenceInfo,
                 Type                           = item.EventType,
@@ -108,9 +118,13 @@ namespace BeWo.Scheduler.View
                 Status                         = 1,
                 Originator                     = customFieldStorage.Originator,
                 IsTeilnahmeBestaetigung        = true,
-                SupportConceptList             = customFieldStorage.SupportConceptList
+                SupportConceptList             = customFieldStorage.SupportConceptList,
+                ActivationType                 = dc.ActivationType,
+                ServiceRecordList              = customFieldStorage.ServiceRecordList
             })
-            { CustomFields                     = item.CustomFields, LabelId = Convert.ToInt32(emp2AppOid)};
+            {
+                CustomFields = item.CustomFields, LabelKey = emp2AppOid
+            };
 	    }
 
 		private void CloseButton_Click(object sender, RoutedEventArgs e)
@@ -153,79 +167,62 @@ namespace BeWo.Scheduler.View
 			});
 
 		    ToggleControls();
+		    raiseChangeEvent = true;
             ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { termin.CommitToDataContract() }), UpdateView);
 		}
 
 		private void UpdateView(List<SchedulerAppointmentDC> aktualisierteTermine)
 		{
-			foreach (var dc in aktualisierteTermine)
-			{
-				foreach (var ivm in OffeneTermine)
-				{
-					var vm = ivm as SchedulerAppointmentVM;
-				    if (vm == null || !vm.DataContract.Equals(dc))
-				    {
-				        continue;
-				    }
+            if(BeWoApp.LoggedOnEmployeeOid is null)
+            {
+                return;
+            }
 
-					var found = vm;
-					found.DataContract = dc;
+            ServiceFacade.DoResourceServiceAsync(s => s.GetAllOpenAppointmentsForEmployee(BeWoApp.LoggedOnEmployeeOid.Value), offeneTermine =>
+            {
+                Cache.GetInstance().GetSchedulerObjects((customers, employees, categoriesToResources) =>
+                {
+                    this.Dispatch(() =>
+                    {
+                        var listVm = new SchedulerAppointmentListVM(offeneTermine, customers, employees, categoriesToResources);
 
-					UpdateViewModel(dc, (SchedulerAppointmentVM) ivm);
+                        var appointmentsToAnswer = NewSchedulerView.InitAppointmentsToAnswer(listVm);
+                        var appointmentStatusUpdates = NewSchedulerView.InitAppointmentStatusUpdates(listVm);
 
-					vm.UpdateCustomFields();
-                    
-				    if (vm.LabelId == 0)
-				    {
-				        this.Dispatch(() =>
-				        {
-				            OffeneTermine = OffeneTermine.Where(w => !w.Equals(vm)).ToObservableCollection();
-				            OnPropertyChanged(nameof(OffeneTermine));
+                        InitViewModel(appointmentsToAnswer, appointmentStatusUpdates);
 
-				            RaiseParticipationChangedEventEvent();
-				        });
-				    }
-				    else
-				    {
-                        var test = (SchedulerAppointmentVM) OffeneTermine.FirstOrDefault(f => dc.EmployeeList.Any(a => a.Employee2SchedulerAppointmentOid.HasValue && a.Employee2SchedulerAppointmentOid.Value == f.LabelId));
-                        this.Dispatch(() =>
+                        RaiseParticipationChangedEventEvent();
+
+                        ToggleControls();
+
+                        if(!raiseChangeEvent)
                         {
-                            OffeneTermine = OffeneTermine.Where(w => !w.Equals(test)).ToObservableCollection();
-                            OnPropertyChanged(nameof(OffeneTermine));
+                            return;
+                        }
 
-                            RaiseParticipationChangedEventEvent();
-                        });
-                    }
-				}
-			}
-			
-			this.Dispatch(() =>
-			{
-				RaiseParticipationChangedEventEvent();
-
-			    ToggleControls();
-
-                if (OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
-				{
-				    Close();
-				}
-				else
-				{
-				    OTListView.SelectedIndex = 0;
-				}
-			});
-		}
+                        if(OffeneTermine.Count == 0 && OTListView.Items.Count == 0)
+                        {
+                            Close();
+                        }
+                        else
+                        {
+                            OTListView.SelectedIndex = 0;
+                        }
+                    });
+                });
+            });
+        }
 
 		private void OK_OnClick(object sender, RoutedEventArgs e)
 		{
 			SelektierterTermin = OTListView.SelectedItem as IBeWoAppointment;
-            if(_selektierterTermin != null && _selektierterTermin.Start < DateTime.Now && _selektierterTermin.End < DateTime.Now)
+            if(_SelektierterTermin != null && _SelektierterTermin.Start < DateTime.Now && _SelektierterTermin.End < DateTime.Now)
             {
                 if(SelektierterTermin != null && BeWoApp.LoggedOnEmployee.EmployeeOid.HasValue)
                 {
                     var customFieldStorage = (CustomFieldStorage) SelektierterTermin.CustomFields[nameof(CustomFieldStorage)];
                     
-                    var emp2App = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId) ??
+                    var emp2App = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey) ??
                                   customFieldStorage.EmployeeList.ToList().Find(f => f.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value);
 
                     if(emp2App.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid.Value)
@@ -238,36 +235,35 @@ namespace BeWo.Scheduler.View
                 }
 
                 ToggleControls();
+                raiseChangeEvent = true;
                 ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> { ((SchedulerAppointmentVM)SelektierterTermin).DataContract }), UpdateView);
 
                 return;
             }
 
-            if(SelektierterTermin == null || SelektierterTermin.LabelId <= 0)
+            if(SelektierterTermin?.LabelKey is null)
 		    {
 		        return;
 		    }
 
 		    var customFieldStorage2 = (CustomFieldStorage)SelektierterTermin.CustomFields[nameof(CustomFieldStorage)];
 
-		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId).IsPC_CheckedTs = DateTime.Now;
-		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelId).IsPChanged = false;
+		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey).IsPC_CheckedTs = DateTime.Now;
+		    customFieldStorage2.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == SelektierterTermin.LabelKey).IsPChanged = false;
 
 		    ToggleControls();
+		    raiseChangeEvent = true;
             ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(new List<SchedulerAppointmentDC> {((SchedulerAppointmentVM) SelektierterTermin).DataContract}), UpdateView);
 		}
 
-		private static void UpdateViewModel(SchedulerAppointmentDC dc, SchedulerAppointmentVM vm)
-		{
-			vm.EmployeeList = new ObservableCollection<Employee2SchedulerAppointmentDC>(dc.EmployeeList);
-		}
-
 	    private void ToggleControls()
 	    {
-	        ZusagenStack.IsEnabled = !ZusagenStack.IsEnabled;
-	        OkButton.IsEnabled = !OkButton.IsEnabled;
-	        CloseBtn.IsEnabled = !CloseBtn.IsEnabled;
-        }
+	        ZusagenStack.IsEnabled    = !ZusagenStack.IsEnabled;
+	        OkButton.IsEnabled        = !OkButton.IsEnabled;
+	        CloseBtn.IsEnabled        = !CloseBtn.IsEnabled;
+	        AlleBestaetigen.IsEnabled = !AlleBestaetigen.IsEnabled;
+
+	    }
 
 	    private void PopupBaseEdit_OnPopupOpening(object sender, OpenPopupEventArgs e)
 	    {
@@ -279,7 +275,57 @@ namespace BeWo.Scheduler.View
 	    {
 	        BeWoApp.MainControl.AufOffeneTerminePruefen();
 	    }
-	}
+
+        private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
+        {
+            var appointmentsToUpdate = new List<SchedulerAppointmentDC>();
+
+            foreach(var appointment in OffeneTermine)
+            {
+                if(appointment.CustomFields["CustomFieldStorage"] is CustomFieldStorage customFieldStorage)
+                {
+                    var employeeList = customFieldStorage.EmployeeList ?? new ObservableCollection<Employee2SchedulerAppointmentDC>();
+
+                    foreach(var e2Sa in employeeList)
+                    {
+                        e2Sa.IsPC_CheckedTs = DateTime.Now;
+                        
+                        if (e2Sa.Employee.EmployeeOid == BeWoApp.LoggedOnEmployee.EmployeeOid)
+                        {
+                            if(appointment.Start < DateTime.Now && appointment.End < DateTime.Now)
+                            {
+                                e2Sa.ParticipationAnswer = ParticipationAnswer.Verstrichen;
+                                e2Sa.IsPC_CheckedTs = DateTime.Now;
+                                e2Sa.IsPChanged = false;
+                            }
+                            else
+                            {
+                                e2Sa.IsPChanged = true;
+                                e2Sa.ParticipationAnswer = ParticipationAnswer.Zusage;
+                            }
+                        }
+                        else
+                        {
+                            e2Sa.IsPChanged = false;
+                        }
+
+                    }
+
+                    if (employeeList.Any())
+                    {
+                        if(appointment is SchedulerAppointmentVM vm)
+                        {
+                            appointmentsToUpdate.AddIfNotIn(vm.CommitToDataContract());
+                        }
+                    }
+                }
+            }
+            ToggleControls();
+            raiseChangeEvent = false;
+            ServiceFacade.DoResourceServiceAsync(s => s.UpdateSchedulerAppointments(appointmentsToUpdate), UpdateView);
+            Close();
+        }
+    }
 
 	public class LVItemConverter : IValueConverter
 	{
@@ -292,7 +338,7 @@ namespace BeWo.Scheduler.View
 		        return string.Empty;
 		    }
 
-			if(app.LabelId <= 0)
+			if(app.LabelKey is null)
 			{
                 return $"{app.Start.ToShortDateString()}: {app.Subject}";
 			}
@@ -301,7 +347,7 @@ namespace BeWo.Scheduler.View
 
 		    var customFieldStorage = (CustomFieldStorage) app.CustomFields[nameof(CustomFieldStorage)];
 		    
-			var l = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == app.LabelId);
+			var l = customFieldStorage.EmployeeList.ToList().Find(f => f.Employee2SchedulerAppointmentOid == app.LabelKey);
 
 			switch(l.ParticipationAnswer)
 			{

BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml

@@ -1,17 +1,19 @@
 <localSchView:AbstractAppointmentEditForm x:Class="BeWo.Scheduler.View.SchedulerAppointmentEditForm"
-										                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-										                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-										                      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-										                      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-										                      xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-                                          xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-                                          xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
-                                          xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
-                                          xmlns:converter="clr-namespace:BeWo.Scheduler.Converter"
-										                      xmlns:bewoConverter="clr-namespace:BeWo.Converter"
-										                      xmlns:localSchView="clr-namespace:BeWo.Scheduler.View"
-										                      xmlns:search="clr-namespace:BeWo.View.Search"
-                                          mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Width="420">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+    xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
+    xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
+    xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+    xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
+    xmlns:converter="clr-namespace:BeWo.Scheduler.Converter"
+    xmlns:bewoConverter="clr-namespace:BeWo.Converter"
+    xmlns:localSchView="clr-namespace:BeWo.Scheduler.View"
+    xmlns:markup="clr-namespace:BeWo.MultiLanguage.Markup"
+    xmlns:search="clr-namespace:BeWo.View.Search"
+    xmlns:t="clr-namespace:BeWo.MultiLanguage.Markup"
+    mc:Ignorable="d" d:DesignHeight="300" d:DesignWidth="300" Width="420">
 	<localSchView:AbstractAppointmentEditForm.Resources>
 		<dxschint:TimeSpanToDateTimeConverter x:Key="TimeSpanToDateTimeConverter"/>
 		<converter:Recurrence2GermanConverter x:Key="Recurrence2GermanConverter"/>
@@ -19,42 +21,42 @@
 		<converter:NewCalendarBackgroundConverter x:Key="NewCalendarBackgroundConverter" />
 		<bewoConverter:BoolVisibilityConverter x:Key="BoolVisibilityConverter" />
 		<bewoConverter:ParticipationBrushConverter x:Key="ParticipationBrushConverter" />
-    <localSchView:RemoveElementVisibilityConverter x:Key="RemoveElementVisibilityConverter" />
+        <localSchView:RemoveElementVisibilityConverter x:Key="RemoveElementVisibilityConverter" />
+        <localSchView:InformationVisibilityConverter x:Key="InformationVisibilityConverter" />
 	    
-	  <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="2,2,2,0" />
-          <Setter Property="Template">
-              <Setter.Value>
-                  <ControlTemplate>
-                      <Grid>
-                          <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="25" Background="#FF000000">
-                              <Border.OpacityMask>
-                                  <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                      <GradientStop Color="#19000000" Offset="0" />
-                                      <GradientStop Color="#26000000" Offset="1" />
-                                  </LinearGradientBrush>
-                              </Border.OpacityMask>
+        <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="2,2,2,0" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate>
+                        <Grid>
+                            <Border x:Name="ItemBorder" CornerRadius="5" MinHeight="25" Background="#FF000000">
+                                <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>
 
-                          </Border>
+                            <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25" Background="{StaticResource SupportConceptContentBrush}">
+                                <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
 
-                          <Border x:Name="ItemContent" CornerRadius="5" MinHeight="25" Background="{StaticResource SupportConceptContentBrush}">
-                              <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Margin="5,3,5,3" OpacityMask="{x:Null}" SnapsToDevicePixels="True">
-                                  <Grid.ColumnDefinitions>
-                                      <ColumnDefinition Width="*" />
-                                      <ColumnDefinition Width="Auto" />
-                                  </Grid.ColumnDefinitions>
-                                  <Grid.RowDefinitions>
-                                      <RowDefinition Height="Auto" />
-                                      <RowDefinition Height="Auto" />
-                                  </Grid.RowDefinitions>
-
-                                  <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="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>
+                                    <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="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>
 
                       <ControlTemplate.Triggers>
@@ -101,8 +103,8 @@
                       </ControlTemplate.Triggers>
                   </ControlTemplate>
               </Setter.Value>
-          </Setter>
-      </Style>
+            </Setter>
+        </Style>
 
 		<Style x:Key="MultiElementSelectionControlStyle" TargetType="{x:Type ListBoxItem}">
 			<Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorLevel=1, AncestorType={x:Type ItemsControl}, Mode=FindAncestor}}" />
@@ -127,10 +129,12 @@
 										<ColumnDefinition Width="Auto" />
 										<ColumnDefinition Width="*" />
 										<ColumnDefinition Width="Auto" />
+										<ColumnDefinition Width="Auto" />
 									</Grid.ColumnDefinitions>
 									<Border Grid.Column="0" CornerRadius="2" Width="5" Height="15" Background="{Binding Converter={StaticResource ParticipationBrushConverter}}" BorderThickness="1" BorderBrush="{Binding Converter={StaticResource ParticipationBrushConverter}, ConverterParameter=Border}" />
 									<TextBlock VerticalAlignment="Center" Grid.Column="1" Text="{Binding Converter={StaticResource TextFromIDataContractConverter}}" Margin="3,0,0,0" FontSize="12" Foreground="#FFD2D2D2" FontFamily="Microsoft Sans Serif" />
-									<Button x:Name="btnRemoveElement" Grid.Column="2" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Element aus der Liste entfernen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource RemoveElementVisibilityConverter}}" Style="{DynamicResource CloseButtonStyleSmall}" Click="BtnRemoveElement_Click" Margin="3,0,0,0" />
+                                    <Button x:Name="btnInformation" Grid.Column="2" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Informationen zur Auslastung anzeigen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource InformationVisibilityConverter}}" Content="i" Click="btnInformation_Click" Margin="3,0,0,0" />
+                                    <Button x:Name="btnRemoveElement" Grid.Column="3" Grid.RowSpan="2" Width="15" Height="15" ToolTip="Element aus der Liste entfernen" Tag="{Binding}" Visibility="{Binding Converter={StaticResource RemoveElementVisibilityConverter}}" Style="{DynamicResource CloseButtonStyleSmall}" Click="BtnRemoveElement_Click" Margin="3,0,0,0" />
 								</Grid>
 							</Border>
 						</Grid>
@@ -248,7 +252,7 @@
 			</Setter>
 		</Style>
 	</localSchView:AbstractAppointmentEditForm.Resources>
-    <Grid>
+    <Grid x:Name="FormContainer">
 		<Grid HorizontalAlignment="Stretch" Background="#0C000000">
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto"/> <!-- 0 -->
@@ -290,33 +294,44 @@
 			<!-- Endregion -->
 				
 			<!-- Region 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" />
+            <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="StartDateDateEdit"
+                          EditValueChanged="StartDate_OnChange" />
+            <dxe:TextEdit Grid.Column="2" Grid.Row="2" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}" 
+                          MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValueChanged="StartTimeTextEdit_OnEditValueChanged"
+                          EditValue ="{Binding Controller.DisplayStartTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="StartTimeTextEdit"/>
+            <dxe:CheckEdit x:Name="AllDay" Grid.Column="3" Grid.Row="2" Content="Ganztägig" EditValueChanged="AllDay_OnEditValueChanged" EditValue ="{Binding Controller.AllDay}" HorizontalAlignment="Right" Margin="3" />
 			<!-- Endregion -->
 
 			<!-- Region Ende -->
 			<Label x:Name="EndLabel" Grid.Column="0" Grid.Row="3" VerticalAlignment="Center" Content="Ende"/>
-			<dxe:DateEdit Grid.Column="1" Grid.Row="3" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate"/>
-			<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"/>
+			<dxe:DateEdit Grid.Column="1" Grid.Row="3" MaskType="DateTimeAdvancingCaret" Background="White" Height="23" MinWidth="80" 
+                          Margin="3" EditValue="{Binding Controller.DisplayEndDate}" x:Name="EndDate"
+                          EditValueChanged="EndDate_OnChange" />
+            <dxe:TextEdit Grid.Column="2" Grid.Row="3" IsEnabled="{Binding Path=Controller.AllDay, Converter={StaticResource BoolReverseConverter}}" 
+                          MaskType="DateTime" Mask="t" MaskUseAsDisplayFormat="True" Margin="3" Height="23" EditValueChanged="EndTimeTextEdit_OnEditValueChanged"
+                          EditValue ="{Binding Controller.DisplayEndTime, Converter={StaticResource TimeSpanToDateTimeConverter}}" x:Name="EndTime"/>
 			<!-- Endregion -->
 
-	        <!-- Region Zu erledigen bis -->
+            <!-- Region Zu erledigen bis (Aufgabe) -->
             <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}" />
+            <dxe:DateEdit Visibility="Collapsed" Grid.Column="1" Grid.ColumnSpan="2" Grid.Row="4" AllowNullInput="True" x:Name="DueDate" 
+						  EditValueChanged="DueDate_OnEditValueChanged"
+                          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 -->
-			<Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="Mitarbeiter"/>
+            <Label Grid.Row="5" Grid.Column="0" VerticalAlignment="Center" Content="{t:Translate MitarbeiterPlural}"/>
 			<Grid Grid.Column="1" Grid.Row="5" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedEmployees, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" Margin="0" />
-				<ToggleButton Grid.Column="1" x:Name="MitarbeiterToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Mitarbeiter anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
+                <ToggleButton Grid.Column="1" x:Name="MitarbeiterToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="{markup:Translate Ausgewählte Mitarbeiter anzeigen}" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
 			<Popup Grid.Column="1" Grid.Row="5" Margin="10" Name="PopupEmployee" StaysOpen="False" Placement="MousePoint" Width="450" Height="300" >
 				<search:MultiEmployeeSearch x:Name="MultiEmployeeSearch" ResultListBackground="{StaticResource EmployeeListBrush}" SelectionChanged="MultiEmployeeSearch_OnSelectionChanged" SelectedEmployees="{Binding Controller.EmployeeList, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}" />
@@ -344,14 +359,14 @@
 			<!-- Endregion -->
 				
 			<!-- Region Klienten -->
-			<Label x:Name="CustomersLabel" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="Klienten"/>
+            <Label x:Name="CustomersLabel" Grid.Column="0" Grid.Row="7" VerticalAlignment="Center" Content="{markup:Translate 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" />
 				</Grid.ColumnDefinitions>
 				<TextBox IsReadOnly="True" Grid.Column="0" Grid.ColumnSpan="2" Text="{Binding CountSelectedCustomers, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}" />
-				<ToggleButton Grid.Column="1" x:Name="KlientenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="Ausgewählte Klienten anzeigen" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
+                <ToggleButton Grid.Column="1" x:Name="KlientenToggleButton" IsThreeState="False" Margin="0,0,2,0" Height="19" Width="19" ToolTip="{markup:Translate Ausgewählte Klienten anzeigen}" Style="{StaticResource ExpanderLookAlikeToggleBotton}"/>
 			</Grid>
 			<Button x:Name="KlientenPopUpOeffnenBtn" Grid.Column="4" Grid.Row="7" Width="20" Height="20" Margin="3,0,3,0" VerticalAlignment="Center" Click="CustomerPopUpEditClick">
 				<Grid Width="18" HorizontalAlignment="Center" VerticalAlignment="Center">
@@ -375,12 +390,17 @@
 						</Border>
 					</ControlTemplate>
 				</ListBox.Template>
+                <!--<ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <Button Content="i"></Button>
+                    </DataTemplate>
+                </ListBox.ItemTemplate>-->
 			</ListBox>
 			<!-- Endregion -->
 				
 			<!-- Region Ressourcen -->
-			<Label Grid.Column="0" Grid.Row="9" VerticalAlignment="Center" Content="Ressourcen"/>
-			<Grid Grid.Column="1" Grid.Row="9" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3">
+			<Label Grid.Column="0" Grid.Row="9" VerticalAlignment="Center" Content="Ressourcen" x:Name="ResourceLabel" />
+			<Grid Grid.Column="1" Grid.Row="9" Height="23" Margin="3,3,0,3" Grid.ColumnSpan="3" x:Name="ResourceToggleButtonGrid" >
 				<Grid.ColumnDefinitions>
 					<ColumnDefinition Width="*" />
 					<ColumnDefinition Width="Auto" />
@@ -397,7 +417,7 @@
 			<Popup Grid.Column="1" Grid.Row="9" Margin="10" Name="PopupResource" StaysOpen="False" Placement="MousePoint" Width="450" Height="300">
 				<search:ResourcesTreeSearchView x:Name="ResourcesTreeSearchView" ResultListBackground="{StaticResource ResourceContentBrush}" SelectionChanged="ResourcesTreeSearchView_OnSelectionChanged" SelectedResources="{Binding Controller.ResourceList}" />
 			</Popup>
-			<ListBox Grid.Column="1" Grid.Row="10" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedResources}" IsSynchronizedWithCurrentItem="True"
+			<ListBox x:Name="ResourceListBox" Grid.Column="1" Grid.Row="10" Background="{StaticResource ObjectEditBackgroundBrush}" Margin="4,0,1,4" ItemsSource="{Binding Path=SelectedResources}" IsSynchronizedWithCurrentItem="True"
 						HorizontalAlignment="Stretch" VerticalAlignment="Stretch" HorizontalContentAlignment="Stretch" Grid.ColumnSpan="3" 
 						ItemContainerStyle="{StaticResource MultiResourceSelectionControlStyle}" MaxHeight="70" Height="70"
 						Visibility="{Binding IsChecked, ElementName=RessourcenToggleButton, Converter={StaticResource BoolVisibilityConverter}}">
@@ -413,7 +433,7 @@
 			</ListBox>
 			<!-- Endregion -->
 
-            <!-- Region Hilfeplan -->
+            <!-- Region Hilfeplan (Aufgabe) -->
             <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">
@@ -439,32 +459,31 @@
             </ListBox>
 	        <!-- Endregion -->
 
-            <!-- 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"
-		        Text="{Binding Path=Controller.TaskDescription, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
+            <!-- Region Beschreibung (Aufgabe) -->
+            <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"
+		            Text="{Binding Path=Controller.TaskDescription, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
+            <!-- Endregion -->
 
-		  <!-- Endregion -->
-
-		    <!-- 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 Erledigt am (Aufgabe) -->
+            <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 -->
 			<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"
 						Text="{Binding Path=Controller.Description, UpdateSourceTrigger=PropertyChanged}" MaxLength="1024" />
-				
 			<!-- Endregion -->
 				
 			<!-- Region Serienmuster -->
-      <Label x:Name="SerienLabel" Grid.Column="0" Grid.Row="16" Content="Wiederholung" Margin="3" />
-      <dxe:ComboBoxEdit Grid.Column="1" Grid.Row="16" Grid.ColumnSpan="4" x:Name="EdtRecurrenceType" Margin="3"
-								ItemsSource="{Binding RecurrenceVisualController.RecurrenceElements}" 
-								EditValue="{Binding RecurrenceVisualController.RecurrenceElement, UpdateSourceTrigger=PropertyChanged}" IsTextEditable="False">
+            <Label x:Name="SerienLabel" Grid.Column="0" Grid.Row="16" Content="Wiederholung" Margin="3" />
+            <dxe:ComboBoxEdit Grid.Column="1" Grid.Row="16" Grid.ColumnSpan="4" x:Name="EdtRecurrenceType" Margin="3"
+							ItemsSource="{Binding RecurrenceVisualController.RecurrenceElements}" 
+							EditValue="{Binding RecurrenceVisualController.RecurrenceElement, UpdateSourceTrigger=PropertyChanged}" IsTextEditable="False">
 				<dxe:ComboBoxEdit.ItemTemplate>
 					<DataTemplate>
 						<TextBlock Text="{Binding Description, Converter={StaticResource Recurrence2GermanConverter}}" />
@@ -472,20 +491,20 @@
 				</dxe:ComboBoxEdit.ItemTemplate>
 			</dxe:ComboBoxEdit>
 
-      <Grid x:Name="SerienGrid" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="5" Visibility="{Binding RecurrenceVisualController.EnableRecurrence, Converter={StaticResource BoolVisibilityConverter}}" >
+            <Grid x:Name="SerienGrid" Grid.Column="0" Grid.Row="17" Grid.ColumnSpan="5" Visibility="{Binding RecurrenceVisualController.EnableRecurrence, Converter={StaticResource BoolVisibilityConverter}}" >
 				<StackPanel>
 					<dx:GroupFrame Header="Serienmuster" Margin="3">
 						<StackPanel>
 							<dxsch:DailyRecurrenceControl Visibility="{Binding RecurrenceVisualController.IsDailyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
+														  RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 							<dxsch:WeeklyRecurrenceControl Visibility="{Binding RecurrenceVisualController.IsWeeklyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" x:Name="WeeklyRecurrenceControl" />
+														   RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" x:Name="WeeklyRecurrenceControl" />
 							<dxsch:MonthlyRecurrenceControl x:Name="MonthlyRecurrenceControl" 
 															Visibility="{Binding RecurrenceVisualController.IsMonthlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
 															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 							<dxsch:YearlyRecurrenceControl x:Name="YearlyRecurrenceControl" 
-															Visibility="{Binding RecurrenceVisualController.IsYearlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
-															RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
+                                                           Visibility="{Binding RecurrenceVisualController.IsYearlyRecurrence, Converter={dxschint:BoolToVisibilityConverter}}" 
+                                                           RecurrenceInfo="{Binding RecurrenceVisualController.RecurrenceInfo}" />
 						</StackPanel>
 					</dx:GroupFrame>
 					<dx:GroupFrame  Header="Seriendauer" Margin="3" >

BeWo/Scheduler/View/SchedulerAppointmentEditForm.xaml.cs

@@ -9,13 +9,13 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-
 using BeWo.Annotations;
 using BeWo.Core;
-using BeWo.Core.Service;
 using BeWo.Scheduler.Utils;
 using BeWo.Scheduler.ViewModel;
 using BeWo.ServiceProxy;
+using BeWo.View;
+using BeWo.View.Detail;
 using BeWo.View.Search;
 
 using BS.Shared;
@@ -23,7 +23,6 @@ using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
-using DevExpress.Mvvm.Native;
 using DevExpress.Xpf.Editors;
 using DevExpress.Xpf.Scheduler.UI;
 using DevExpress.XtraScheduler;
@@ -36,7 +35,7 @@ namespace BeWo.Scheduler.View
 	{
 		public bool IsInCustomerViewMode { get; set; }
 
-	    private readonly bool IsInTaskViewMode;
+	    private readonly bool _IsInTaskViewMode;
 
 		private List<ValueListEntryDC> _Categories;
 		public List<ValueListEntryDC> Categories
@@ -135,6 +134,9 @@ namespace BeWo.Scheduler.View
 	    public static bool IsOwnAppointment { get; set; }
 	    public static bool IsAllowedToChange { get; set; }
 	    
+		public InformationView InformationView { get; set; }
+		public CompactCustomerDC Customer { get; set; }
+
 		public SchedulerAppointmentEditForm(SchedulerAppointmentListVM vm, SchedulerControl schedulerControl, Appointment appointment, IEnumerable<CompactEmployeeDC> employees, IEnumerable<CompactCustomerDC> customers, Dictionary<ValueListEntryDC, List<ResourceDC>> categoriesToResources, bool pIsInTaskViewMode) : base(schedulerControl, appointment)
 		{
 			ViewModel = vm;
@@ -144,7 +146,7 @@ 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;
+            _IsInTaskViewMode = pIsInTaskViewMode;
 
             InitializeComponent();
 
@@ -181,18 +183,18 @@ namespace BeWo.Scheduler.View
 
 			EdtRecurrenceType.CustomDisplayText += EdtRecurrenceType_CustomDisplayText;
 
-		    if(IsInTaskViewMode && !SelectedEmployees.Any(a => a.Employee.Equals(BeWoApp.CompactLoggedOnEmployee)))
+		    if(_IsInTaskViewMode && !SelectedEmployees.Any(a => a.Employee.Equals(BeWoApp.CompactLoggedOnEmployee)))
 		    {
 		        SelectedEmployees.Add(new Employee2SchedulerAppointmentDC { Employee = BeWoApp.CompactLoggedOnEmployee });
 		        MitarbeiterToggleButton.IsChecked = true;
 		    }
-		    
+
 			InitRights();
 		}
 
 		private void InitRights()
 		{
-		    var darfKlientermineAnsehen = BeWoUtils.HasRight(UserRightType.CustomerView_View);
+		    var darfKlientenAnsehen = BeWoUtils.HasRight(UserRightType.CustomerView_View) || BeWoUtils.HasRight(UserRightType.Customer_ViewMyTeams) || BeWoUtils.HasRight(UserRightType.Customer_ViewMyCustomers);
             var darfKliententermineAnlegen = BeWoUtils.HasRight(UserRightType.KalenderKliententermineAnlegen);
 		    var darfKliententermineAendern = BeWoUtils.HasRight(UserRightType.KalenderKliententermineAendern);
 
@@ -202,13 +204,14 @@ namespace BeWo.Scheduler.View
 		    var darfRessourcentermineAnlegen = BeWoUtils.HasRight(UserRightType.KalenderRessourcentermineAnlegen);
 		    var darfRessourcentermineAendern = BeWoUtils.HasRight(UserRightType.KalenderRessourcentermineAendern);
 
+
             if(IsNew && !darfKliententermineAnlegen)
 		    {
 		        KlientenPopUpOeffnenBtn.Visibility = Visibility.Hidden;
 		        SelectedCustomers.Clear();
             }
 
-		    if(!IsNew && (!darfKliententermineAendern || !darfKlientermineAnsehen) || !darfKlientermineAnsehen)
+		    if(!IsNew && (!darfKliententermineAendern || !darfKlientenAnsehen) || !darfKlientenAnsehen)
 		    {
 		        KlientenPopUpOeffnenBtn.Visibility = Visibility.Hidden;
             }
@@ -241,18 +244,24 @@ 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);
+            var customerOids = new List<long>();
+			ServiceFacade.DoEmployeeServiceSync(s => customerOids = s.LoadTeamsRelatedCustomerOids(BeWoApp.CompactLoggedOnEmployee.EmployeeOid));
 
-		    if(IsInTaskViewMode)
+		    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, customerOids, true);
+
+		    if(_IsInTaskViewMode)
 		    {
                 BetreffLabel.Content = "Titel";
                 StartLabel.Content = "Beginn";
 
-		        EndDate.Visibility              = Visibility.Collapsed;
-		        EndTime.Visibility              = Visibility.Collapsed;
-		        EndLabel.Visibility             = Visibility.Collapsed;
-		        AllDay.Visibility               = Visibility.Collapsed;
+                EndDate.Visibility  = Visibility.Collapsed;
+                EndTime.Visibility  = Visibility.Collapsed;
+                EndLabel.Visibility = Visibility.Collapsed;
+
+                StartTimeTextEdit.Visibility = Visibility.Collapsed;
+
+                AllDay.Visibility               = Visibility.Collapsed;
 		        OrtLabel.Visibility             = Visibility.Collapsed;
 		        Ort.Visibility                  = Visibility.Collapsed;
 		        SerienLabel.Visibility          = Visibility.Collapsed;
@@ -272,13 +281,32 @@ namespace BeWo.Scheduler.View
 		        SupportConceptsPopUpOeffnenBtn.Visibility = Visibility.Visible;
                 SelectedSupportConceptsListBox.Visibility = Visibility.Visible;
 
-                CustomersLabel.Visibility = Visibility.Collapsed;
-                CustomersGrid.Visibility = Visibility.Collapsed;
-                CustomerSearchViewPopup.Visibility = Visibility.Collapsed;
+                CustomersLabel.Visibility           = Visibility.Collapsed;
+                CustomersGrid.Visibility            = Visibility.Collapsed;
+                CustomerSearchViewPopup.Visibility  = Visibility.Collapsed;
                 SelectedCustomersListBox.Visibility = Visibility.Collapsed;
-                KlientenPopUpOeffnenBtn.Visibility = Visibility.Collapsed;
+                KlientenPopUpOeffnenBtn.Visibility  = Visibility.Collapsed;
 
-                SelectedCustomers.Clear();
+                ResourceLabel.Visibility             = Visibility.Collapsed;
+                ResourceToggleButtonGrid.Visibility  = Visibility.Collapsed;
+                RessourcenPopUpOeffnenBtn.Visibility = Visibility.Collapsed;
+                PopupResource.Visibility             = Visibility.Collapsed;
+                ResourceListBox.Visibility           = Visibility.Collapsed;
+
+                StartDateDateEdit.IsEnabled              = false;
+                BetreffEditText.IsEnabled                = false;
+                DueDate.IsEnabled                        = false;
+                DueDateTime.IsEnabled                    = false;
+                SupportConceptBtn.IsEnabled              = false;
+                SupportConceptsPopUpOeffnenBtn.IsEnabled = false;
+                Notice.IsEnabled                         = false;
+                TaskDescription.IsEnabled                = false;
+                CompletedDate.IsEnabled                  = false;
+                MitarbeiterPopUpOeffnenBtn.IsEnabled     = false;
+
+				DeleteButton.Visibility = Visibility.Collapsed;
+
+				SelectedCustomers.Clear();
 
                 if (!Controller.IsNewAppointment)
 		        {
@@ -288,9 +316,9 @@ namespace BeWo.Scheduler.View
                     CompletedDateLabel.Visibility = Visibility.Visible;
 		            CompletedDate.Visibility      = Visibility.Visible;
                 }
-            }
+			}
 
-		    NewSchedulerAppointmentFormController.DisplayDueDateTime = NewSchedulerAppointmentFormController.DueDate;
+            NewSchedulerAppointmentFormController.DisplayDueDateTime = NewSchedulerAppointmentFormController.DueDate;
 
 		    IsAllowedToChange = allowedToChange;
 
@@ -301,8 +329,8 @@ namespace BeWo.Scheduler.View
 
 		    BetreffEditText.IsReadOnly   = true;
 		    Ort.IsReadOnly               = true;
-		    StartDate.IsReadOnly         = true;
-            StartTime.IsReadOnly         = true;
+            StartDateDateEdit.IsReadOnly = true;
+            StartTimeTextEdit.IsReadOnly = true;
 		    AllDay.IsReadOnly            = true;
             EndDate.IsReadOnly           = true;
             EndTime.IsReadOnly           = true;
@@ -331,9 +359,9 @@ namespace BeWo.Scheduler.View
 			e.Handled = true;
 		}
 
-		public string CountSelectedEmployees => $"{SelectedEmployees.Count} Mitarbeiter ausgewählt";
-		public string CountSelectedResources => $"{SelectedResources.Count} Resourcen ausgewählt";
-		public string CountSelectedCustomers => $"{SelectedCustomers.Count} Klienten ausgewählt";
+		public string CountSelectedEmployees => $"{SelectedEmployees.Count} " + BS.Shared.Translation.Translator.Translate("MitarbeiterPlural") + " ausgewählt";
+		public string CountSelectedResources => $"{SelectedResources.Count} Ressourcen ausgewählt";
+		public string CountSelectedCustomers => $"{SelectedCustomers.Count} " + BS.Shared.Translation.Translator.Translate("Klienten") + " ausgewählt";
 		public string CountSelectedSupportConcepts => $"{SelectedSupportConcepts.Count} Hilfepläne ausgewählt";
 
 		public override AppointmentFormController CreateFormController(SchedulerControl schedulerControl, Appointment appointment)
@@ -392,6 +420,13 @@ namespace BeWo.Scheduler.View
 		{
 		    try
 		    {
+                if(NewSchedulerAppointmentFormController.IsTask)
+                {
+                    MessageBox.Show("Aufgaben können nur im Hilfeplan angelegt und geändert werden", "Speichern nicht möglich", MessageBoxButton.OK, MessageBoxImage.Warning);
+
+                    return;
+                }
+
 		        var isWeeklyRecurrence = RecurrenceVisualController.IsWeeklyRecurrence;
 		        var weekDays = WeeklyRecurrenceControl.WeekDays;
 
@@ -401,10 +436,10 @@ namespace BeWo.Scheduler.View
 
 		            return;
 		        }
-
-		        Controller.Storage.BeginUpdate();
-
-		        var employees          = NewSchedulerAppointmentFormController.EmployeeList;
+				
+				Controller.Storage.BeginUpdate();
+                
+				var employees          = NewSchedulerAppointmentFormController.EmployeeList;
 		        var customers          = NewSchedulerAppointmentFormController.CustomerList;
 		        var resources          = NewSchedulerAppointmentFormController.ResourceList;
 		        var originator         = NewSchedulerAppointmentFormController.Originator;
@@ -419,8 +454,7 @@ namespace BeWo.Scheduler.View
 		        var start              = NewSchedulerAppointmentFormController.Start;
 		        var end                = NewSchedulerAppointmentFormController.End;
 
-
-                ViewModel.NewVM.AllDay             = !Appointment.AllDay;
+                ViewModel.NewVM.AllDay             = NewSchedulerAppointmentFormController.AllDay;
 		        ViewModel.NewVM.IsPrivate          = isPrivate;
 		        ViewModel.NewVM.ResourceList       = resources;
 		        ViewModel.NewVM.CustomerList       = customers;
@@ -436,11 +470,15 @@ namespace BeWo.Scheduler.View
                 ViewModel.NewVM.Start              = start;
 		        ViewModel.NewVM.End                = end;
 
+				if (isTask && dueDate.HasValue)
+                {
+                    ViewModel.NewVM.End = dueDate.Value.GetShortDateTime().AddDays(1);
+                }
+
                 // Änderung an den CustomFields lösen das NewSchedulerStorage_AppointmentsChanged-Event aus
 
                 var employeeOids = new List<long>();
 		        var customerOids = new List<long>();
-		        var overlaps = false;
 
 		        foreach (var emp in employees)
 		        {
@@ -452,44 +490,29 @@ namespace BeWo.Scheduler.View
 		            customerOids.AddIfNotIn(customer.CustomerOid);
 		        }
 
-		        var item = (SchedulerAppointmentVM) Appointment.GetSourceObject(Control.GetCoreStorage());
+		        var item = Appointment.GetSourceObject(Control.GetCoreStorage());
 
-		        if(!IsInTaskViewMode){
-		            ServiceFacade.DoResourceServiceSync(definedBelow => overlaps = definedBelow.OverlappingAppointmentsExist(Appointment.Start, Appointment.End, employeeOids, customerOids, resources.Select(res => res.ResourceOid.Value).ToList(), ViewModel.NewVM.Originator.EmployeeOid, item?.CommitToDataContract().SchedulerAppointmentOid, string.Empty, Appointment.RecurrenceIndex));
-
-		            if (overlaps)
-		            {
-		                var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\n Möchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-
-		                if (erg.Equals(MessageBoxResult.No))
-		                {
-		                    Controller.Storage.EndUpdate();
-                            return;
-		                }
-		            }
-		        }
-
-                ViewModel.ShouldLockOverlappingAppointmentCheck = true;
+				ViewModel.ShouldLockOverlappingAppointmentCheck = Appointment.Type == AppointmentType.ChangedOccurrence;
 
 		        if (Appointment.RecurrenceInfo != null)
-		        {
-		            ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay);
-		        }
+                {
+                    var customFieldStorage = Appointment.GetCustomFieldStorage();
+                    var serviceRecords = customFieldStorage?.ServiceRecordList ?? new List<ServiceRecordDC>();
 
-                //if(Appointment.IsOccurrence && item == null)
-                //{
-                //    Appointment.GetCustomFieldStorage().EmployeeList.ForEach(each =>
-                //    {
-                //        each.Employee2SchedulerAppointmentOid = null;
-                //        each.Employee2SchedulerAppointmentVersion = null;
-                //        each.SchedulerAppointmentOid = null;
-                //        each.IsPChanged = false;
-                //        each.IsPC_CheckedTs = null;
-                //    });
-                //}
+                    var oldRecurrenceInfo = Appointment.RecurrenceInfo.ToXml();
+                    var newRecurrenceInfo = ViewModel.NewVM.RecurrenceInfo;
+
+					ViewModel.ApplyChangesToChangedOccurencyCustomFields(employees, customers, resources, originator, isPrivate, Appointment.RecurrenceIndex.ToString(), new Guid(Appointment.RecurrenceInfo.Id.ToString()), isTask, taskDescription, completedDate, dueDate, completedNotice, supportConceptList, Appointment.Subject, Appointment.AllDay, serviceRecords, start, end);
+
+                    if(!Equals(oldRecurrenceInfo, newRecurrenceInfo))
+                    {
+                        // Damit wird verhindert, dass beim Ändern von Zeitangaben bei Serienterminen die Ausnahmen gelöscht werden.
+                        SaveFlagToInternInfo();
+                    }
+                }
 
                 ApplyChanges();
-		    }
+			}
 		    catch (Exception exception)
 		    {
 		        MessageBox.Show(exception.Message + "\n" + exception.StackTrace);
@@ -519,12 +542,12 @@ namespace BeWo.Scheduler.View
 
 	        if(y.Count == 0)
 	        {
-	            MessageBox.Show("Bitte wählen Sie mindestens einen Klienten aus!");
+	            MessageBox.Show("Bitte wählen Sie mindestens " + BS.Shared.Translation.Translator.Translate("einen Klienten") +  " aus!");
 	        }
 	        else
 	        {
-                var startDate = StartDate.DateTime;
-                var startTime = DateTime.Parse(StartTime.Text);
+                var startDate = StartDateDateEdit.DateTime;
+                var startTime = DateTime.Parse(StartTimeTextEdit.Text);
 
                 var endDate = EndDate.DateTime;
                 var endTime = DateTime.Parse(EndTime.Text);
@@ -542,6 +565,11 @@ namespace BeWo.Scheduler.View
 
         private void BtnRemoveElement_Click(object sender, RoutedEventArgs e)
 		{
+            if(_IsInTaskViewMode)
+            {
+                return;
+            }
+
 			var obj = ((Button) sender).Tag;
 
 		    switch(obj)
@@ -569,6 +597,49 @@ namespace BeWo.Scheduler.View
 			SelectedEmployees.Remove(emp);
 			OnPropertyChanged(nameof(CountSelectedEmployees));
 		}
+		private void btnInformation_Click(object sender, RoutedEventArgs e)
+		{
+			var obj = ((Button)sender).Tag;
+
+			if (obj == null || !(obj is CompactCustomerDC))
+				return;
+
+			Customer = (CompactCustomerDC)obj;
+
+			InformationView = new InformationView();
+			//ServiceFacade.DoOperationsServiceAsync(s => s.GetXAMLInformationStringForScheduler(Customer.CustomerOid), OpenWindow);
+
+			InformationView.SetXaml(ServiceFacade.DoOperationsServiceSync(s => s.GetXAMLInformationStringForScheduler(Customer.CustomerOid)));
+
+			var beWoWindow = new BeWoWindow();
+			InformationView.ButtonCloseClicked += () => beWoWindow.Close();
+
+			beWoWindow.Height = 200;
+			beWoWindow.Width = 600;
+			beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+			beWoWindow.GroupBoxContent = InformationView;
+			beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+			//beWoWindow.rootGroupBox.Header = "Auslastung von " + Customer.FirstName + " " + Customer.LastName;
+			beWoWindow.ShowDialog();
+		}
+
+		public void OpenWindow(string xaml)
+        {
+			this.Dispatch(() =>
+			{
+				InformationView.SetXaml(xaml);
+
+				var beWoWindow = new BeWoWindow();
+
+				beWoWindow.Height = 200;
+				beWoWindow.Width = 500;
+				beWoWindow.WindowStartupLocation = WindowStartupLocation.CenterOwner;
+				beWoWindow.GroupBoxContent = Control;
+				beWoWindow.Owner = BeWoApp.CurrentBeWo.MainWindow;
+				beWoWindow.rootGroupBox.Header = "Auslastung von " + Customer.FirstName + " " + Customer.LastName;
+				beWoWindow.ShowDialog();
+			});
+		}
 
 		private void ResourcesTreeSearchView_OnSelectionChanged(object sender, RoutedEventArgs e)
 		{
@@ -636,11 +707,146 @@ namespace BeWo.Scheduler.View
 	            OnPropertyChanged(nameof(CountSelectedSupportConcepts));
 	        }
 	    }
-	}
-	
-	public class NewSchedulerAppointmentFormController : AppointmentFormController
+
+        private void DueDate_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+   //         if(e.NewValue != null && e.NewValue is DateTime dueDate)
+   //         {
+   //             var newEnd = dueDate.GetShortDateTime().AddDays(1);
+
+			//	NewSchedulerAppointmentFormController.End = newEnd;
+   //             NewSchedulerAppointmentFormController.DisplayEnd = newEnd;
+   //             NewSchedulerAppointmentFormController.DisplayEndDate = newEnd;
+			//}
+		}
+
+		/* 
+		 * Appointment.End:
+		 * ======================================================================================================
+		 * The End property is usually specified by the Appointment.Start and Appointment.
+		 * Duration properties, and is always calculated as End = Start + Duration.
+		 * When setting the End property, the Appointment. Start property retains its value, and the Appointment.
+		 * Duration is changed according to the new value of the End property.
+		 * If the new Appointment. End property's value is less than the Appointment.
+		 * Start property's value, an exception is raised.
+		 *
+		 * Ende = Start + Vorherige Dauer
+		 */
+
+        private DateTime? _PreviousEndDate;
+        private DateTime? _PreviousEndDate2;
+
+        private bool _EndTimeHasBeenChangedByStartTime;
+        private bool _EndDateHasBeenChangedByStartDate;
+
+		// TODO: Bei jeder Änderung darauf achten, dass keinn anderer Wert manipuliert wird!
+
+		private void StartDate_OnChange(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("StartDate changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_EndTimeHasBeenChangedByStartTime = false;
+
+            //         _PreviousEndDate2 = NewSchedulerAppointmentFormController.End;
+
+            //_EndDateHasBeenChangedByStartDate = true;
+        }
+
+		private void EndDate_OnChange(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("EndDate changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_EndTimeHasBeenChangedByStartTime = false;
+
+
+            //         if(_EndDateHasBeenChangedByStartDate && _PreviousEndDate2.HasValue)
+            //         {
+            //             var start = NewSchedulerAppointmentFormController.Start;
+
+            //             if(_PreviousEndDate2 > start)
+            //             {
+            //		var neuesEnddatum = NewSchedulerAppointmentFormController.End.MergeDatesByDateReversed(_PreviousEndDate2.Value);
+
+            //		//NewSchedulerAppointmentFormController.End = neuesEnddatum;
+            //             }
+            //         }
+
+            //         _EndDateHasBeenChangedByStartDate = true;
+        }
+
+        private void StartTimeTextEdit_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("StartTime changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //_PreviousEndDate = NewSchedulerAppointmentFormController.End;
+
+            //         _EndTimeHasBeenChangedByStartTime = true;
+        }
+
+        private void EndTimeTextEdit_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //         BeWoApp.LogMessage("EndTime changed", Colors.DarkTurquoise);
+            //         LogAllDates();
+
+            //if (_EndTimeHasBeenChangedByStartTime && _PreviousEndDate.HasValue)
+            //         {
+            //             var start = NewSchedulerAppointmentFormController.Start;
+
+            //             if (_PreviousEndDate > start)
+            //             {
+            //                 //NewSchedulerAppointmentFormController.End = NewSchedulerAppointmentFormController.End.MergeDatesByDate(_PreviousEndDate.Value);
+            //             }
+            //         }
+
+            //         _EndTimeHasBeenChangedByStartTime = false;
+        }
+
+		// Was beeinflusst was? Startzeit -> Endzeit
+		// Ganztag -> DisplayEndDate
+		// 
+
+        private void AllDay_OnEditValueChanged(object sender, EditValueChangedEventArgs e)
+        {
+            //BeWoApp.LogMessage("AllDay changed", Colors.DarkTurquoise);
+            //LogAllDates();
+        }
+
+        private static void SaveFlagToInternInfo()
+        {
+            if (CurrentAppointment.IsRecurring)
+            {
+                var internalInfo = CurrentAppointment.GetCustomFieldStorage().InternalInfo ?? new InternalInfo();
+                internalInfo.IsTimeChangedRecurringAppointment = true;
+
+                CurrentAppointment.GetCustomFieldStorage().InternalInfo = internalInfo;
+            }
+        }
+
+        private void LogAllDates()
+        {
+            var initialStartValue = NewSchedulerAppointmentFormController.Start;
+            var initialEndValue = NewSchedulerAppointmentFormController.End;
+            var isAllDay = NewSchedulerAppointmentFormController.AllDay;
+            var initialDisplayStart = NewSchedulerAppointmentFormController.DisplayStart;
+            var initialDisplayEnd = NewSchedulerAppointmentFormController.DisplayEnd;
+
+            BeWoApp.LogMessage("\n" +
+                               $"\t\t\tIs AllDay:    {isAllDay}\n" +
+                               $"\t\t\tStart:        {initialStartValue:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tEnd:          {initialEndValue:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tDisplayStart: {initialDisplayStart:dd.MM.yy HH:mm}\n" +
+                               $"\t\t\tDisplayEnd:   {initialDisplayEnd:dd.MM.yy HH:mm}");
+		}
+
+        
+    }
+
+    public class NewSchedulerAppointmentFormController : AppointmentFormController
 	{
-	    private List<ResourceDC> SourceResourceList
+		private List<ResourceDC> SourceResourceList
 		{
 			get => SourceAppointment.CF_ResourceList();
 		    set => SourceAppointment.CF_ResourceList(value);
@@ -862,7 +1068,10 @@ namespace BeWo.Scheduler.View
 			return resourceListsAreEqual || employeeListsAreEqual || customerListsAreEqual || originatorsAreEqual || isPrivatesAreEqual || dueDatesAreEqal || completedDatesAreEqal || taskDescriptionsAreEqual || supportConceptListsAreEqual;
 		}
 
-		public NewSchedulerAppointmentFormController(SchedulerControl control, Appointment apt) : base(control, apt) { }
+        public NewSchedulerAppointmentFormController(SchedulerControl control, Appointment apt) : base(control, apt)
+        {
+			
+        }
 
 		protected override void ApplyCustomFieldsValues()
 		{
@@ -892,12 +1101,14 @@ namespace BeWo.Scheduler.View
             {
                 return Visibility.Visible;
             }
-            
-            var isNew = SchedulerAppointmentEditForm.IsNew;
 
-            var isAllowedToChange = BeWoUtils.CheckSchedulerRights(SchedulerAppointmentEditForm.CurrentAppointment, isNew, SchedulerRightsCheckType.Edit);
+			var customerOids = new List<long>();
+            ServiceFacade.DoEmployeeServiceSync(s => customerOids = s.LoadTeamsRelatedCustomerOids(BeWoApp.CompactLoggedOnEmployee.EmployeeOid));
+
+			var isNew = SchedulerAppointmentEditForm.IsNew;
+
+            var isAllowedToChange = BeWoUtils.CheckSchedulerRights(SchedulerAppointmentEditForm.CurrentAppointment, isNew, SchedulerRightsCheckType.Edit, customerOids, true);
 
-            
             return isAllowedToChange ? Visibility.Visible : Visibility.Hidden;
         }
 
@@ -906,4 +1117,15 @@ namespace BeWo.Scheduler.View
             throw new NotImplementedException();
         }
     }
+	public class InformationVisibilityConverter : IValueConverter
+	{
+		public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return value is CompactCustomerDC ? Visibility.Visible : Visibility.Collapsed;
+        }
+		public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+		{
+			throw new NotImplementedException();
+		}
+	}
 }

BeWo/Scheduler/View/SchedulerView.xaml

@@ -7,8 +7,8 @@
                     xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
                     xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
                     xmlns:dxschint="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/internal"
-                    xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v17.1.Core"
-                    xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
+                    xmlns:dxschcore="clr-namespace:DevExpress.XtraScheduler;assembly=DevExpress.XtraScheduler.v23.2.Core"
+                    xmlns:dxschui="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
 					xmlns:dxscht="http://schemas.devexpress.com/winfx/2008/xaml/scheduler/themekeys"
                     xmlns:controls="clr-namespace:BeWo.Controls;assembly=BeWo.Controls"
                     xmlns:search="clr-namespace:BeWo.View.Search"

BeWo/Scheduler/View/ServiceRecordScheduler.xaml

@@ -6,7 +6,7 @@
              xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
              xmlns:dxsch="http://schemas.devexpress.com/winfx/2008/xaml/scheduler"
              xmlns:dxe="http://schemas.devexpress.com/winfx/2008/xaml/editors"
-             xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v17.1"
+             xmlns:dxschd="clr-namespace:DevExpress.Xpf.Scheduler.Drawing;assembly=DevExpress.Xpf.Scheduler.v23.2"
              mc:Ignorable="d" 
              d:DesignHeight="300" d:DesignWidth="600" dx:ThemeManager.ThemeName="Office2010Black">
     <UserControl.Resources>

BeWo/Scheduler/ViewModel/CustomFieldStorage.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.Extensions;
@@ -18,25 +18,50 @@ namespace BeWo.Scheduler.ViewModel
             {
                 var result = Subject;
 
+                // Man darf den Betreff nicht sehen, wenn man der Originator ist und nicht in der nicht leeren EmployeeList ist oder man weder Originator noch in der EmployeeList ist
+
+                var isInEmployeeList = EmployeeList.Any(e2A => e2A.Employee.Equals(BeWoApp.CompactLoggedOnEmployee));
+                var isOriginator = Originator.Equals(BeWoApp.CompactLoggedOnEmployee);
+
+                if(IsPrivate && (!isOriginator && !isInEmployeeList || !isInEmployeeList))
+                {
+                    result = "Privat";
+                }
+
                 if(IsTask)
                 {
-                    result = result ?? "";
+                    result = result ?? string.Empty;
                     
                     if(CompletedDate.HasValue)
                     {
                         result += " erledigt am " + CompletedDate.Value.ToShortDateString();
-                    } else if(DueDate.HasValue)
+                    }
+                    else if(DueDate.HasValue)
                     {
-                        result += " bis " + DueDate.Value.ToString("dd.MM.yyyy HH:mm");
+                        result += $" bis {DueDate.Value:dd.MM.yyyy HH:mm}";
                     }
                 }
 
-                if (IsAbsenceTime && _AbsenceTimeStart.HasValue)
+                if(!IsAbsenceTime || !_AbsenceTimeStart.HasValue)
                 {
-                    result += _AbsenceTimeStart.Value.GetIntervalDescription(_AbsenceTimeEnd);
+                    return result;
                 }
 
-                return result;
+                var absenceTimeEnd = _AbsenceTimeEnd;
+
+                if(!absenceTimeEnd.HasValue)
+                {
+                    return $"{result}{_AbsenceTimeStart.Value.GetIntervalDescription(absenceTimeEnd)}";
+                }
+
+                var absenceTimeStart = _AbsenceTimeStart.Value;
+
+                if(absenceTimeStart.IsTimeZero() && absenceTimeEnd.Value.IsTimeZero() && absenceTimeEnd.Value.AddDays(-1) > absenceTimeStart)
+                {
+                    absenceTimeEnd = absenceTimeEnd.Value.AddDays(-1);
+                }
+
+                return $"{result}{_AbsenceTimeStart.Value.GetIntervalDescription(absenceTimeEnd)}";
             }
         }
 
@@ -58,19 +83,28 @@ namespace BeWo.Scheduler.ViewModel
         public DateTime? DueDate { get; set; }
         public DateTime? CompletedDate { get; set; }
         public string CompletedNotice { get; set; }
+        public string CompletedUser { 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; }
 
         private DateTime? _AbsenceTimeStart;
 
         private DateTime? _AbsenceTimeEnd;
 
+        public InternalInfo InternalInfo { get; set; }
+
+        public bool CanBeEdited { get; set; }
+
+        public long? AbsenceTimeOid { get; set; }
+
+        public bool IsCustomerAbsenceTime { get; set; }
+
         public CustomFieldStorage()
         {
             
@@ -98,15 +132,24 @@ namespace BeWo.Scheduler.ViewModel
 
             SchedulerAppointmentOid = pAppointment.DataContract?.SchedulerAppointmentOid;
 
-            RecurrenceId = pAppointment.DataContract?.RecurrenceId;
-            RecurrenceIndex = pAppointment.DataContract?.RecurrenceIndex ?? 0;
+            RecurrenceId = pAppointment.DataContract?.RecurrenceIdReference;
+            RecurrenceIndex = pAppointment.DataContract?.RecurrenceIndexReference ?? 0;
 
             _AbsenceTimeStart = pAppointment.AbsenceTimeStart;
             _AbsenceTimeEnd = pAppointment.AbsenceTimeEnd;
 
             HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
+            CanBeEdited = pAppointment.CanBeEdited;
+
+            AbsenceTimeOid = pAppointment.AbsenceTimeOid;
+            IsCustomerAbsenceTime = pAppointment.IsCustomerAbsenceTime;
+            ServiceRecordList = pAppointment.ServiceRecordList;
         }
 
+        /// <summary>
+        /// Erzeugt ein CustomFieldStorage-Objekt aus einem SchedulerAppointmentDC. Wird nur für veränderte Serientermine benutzt.
+        /// </summary>
+        /// <param name="pAppointment">Der veränderte Serientermin als SchedulerAppointmentDC</param>
         public CustomFieldStorage(SchedulerAppointmentDC pAppointment)
         {
             IsTask        = pAppointment.IsTask;
@@ -118,6 +161,7 @@ namespace BeWo.Scheduler.ViewModel
             CustomerList       = pAppointment.CustomerList;
             ResourceList       = pAppointment.ResourceList;
             SupportConceptList = pAppointment.SupportConceptList;
+            ServiceRecordList  = pAppointment.ServiceRecordList;
 
             DueDate         = pAppointment.DueDate;
             CompletedDate   = pAppointment.CompletedDate;
@@ -129,13 +173,15 @@ namespace BeWo.Scheduler.ViewModel
 
             SchedulerAppointmentOid = pAppointment.SchedulerAppointmentOid;
 
-            RecurrenceId = pAppointment.RecurrenceId;
-            RecurrenceIndex = pAppointment.RecurrenceIndex;
+            RecurrenceId = pAppointment.RecurrenceIdReference;
+            RecurrenceIndex = pAppointment.RecurrenceIndexReference ?? 0;
 
             HasServiceRecordEntry = pAppointment.HasServiceRecordEntry;
+
+            CanBeEdited = pAppointment.CanBeEdited;
         }
 
-        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)
+        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, List<ServiceRecordDC> serviceRecords)
         {
             IsTask    = pIsTask;
             IsPrivate = pIsPrivate;
@@ -144,7 +190,9 @@ namespace BeWo.Scheduler.ViewModel
             EmployeeList       = pEmployees;
             CustomerList       = pCustomers;
             ResourceList       = pResources;
+            
             SupportConceptList = pSupportConcepts;
+            ServiceRecordList  = serviceRecords;
 
             DueDate         = pDueDate;
             CompletedDate   = pCompletedDate;
@@ -155,7 +203,7 @@ namespace BeWo.Scheduler.ViewModel
             Subject    = pSubject;
         }
 
-        public Visibility ToolTipTimeVisibility => IsTask || IsAbsenceTime || IsAllDay ? Visibility.Collapsed : Visibility.Visible;
+        public Visibility ToolTipTimeVisibility => IsTask || IsAbsenceTime ? Visibility.Collapsed : Visibility.Visible;
 
         public Visibility ToolTipResourcesVisibility => ResourceList?.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
 
@@ -168,5 +216,12 @@ namespace BeWo.Scheduler.ViewModel
         public Visibility ToolTipZusageVisibility => IsTask ? Visibility.Collapsed : Visibility.Visible;
 
         public bool HasServiceRecordEntry { get; set; }
+
+        public List<ServiceRecordDC> ServiceRecordList { get; set; } = new List<ServiceRecordDC>();
+    }
+
+    public class InternalInfo
+    {
+        public bool IsTimeChangedRecurringAppointment { get; set; }
     }
 }

BeWo/Scheduler/ViewModel/NewSchedulerViewModel.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 
 using BeWo.Scheduler.View;
-
+using BeWo.ServiceProxy;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
@@ -14,6 +14,7 @@ namespace BeWo.Scheduler.ViewModel
 {
 	public class NewSchedulerViewModel
 	{
+
 		public event EventHandler<EventArgs<ISchedulerViewModel>> ViewModelChanged;
 
 		private ISchedulerViewModel _ActiveAppointmentViewModel;
@@ -23,14 +24,16 @@ namespace BeWo.Scheduler.ViewModel
 		    get => _ActiveAppointmentViewModel;
 
             set
-			{
-                if(value != null)
+            {
+                if(value is null)
                 {
-                    _ActiveAppointmentViewModel = value;
-
-                    ViewModelChanged?.Invoke(this, new EventArgs<ISchedulerViewModel>(value));
+                    return;
                 }
-			}
+
+                _ActiveAppointmentViewModel = value;
+
+                ViewModelChanged?.Invoke(this, new EventArgs<ISchedulerViewModel>(value));
+            }
 		}
 
         public AbstractAppointmentEditForm GetEditAppointmentForm(DevExpress.Xpf.Scheduler.SchedulerControl control, Appointment appointment)
@@ -52,25 +55,78 @@ namespace BeWo.Scheduler.ViewModel
 
 		public SchedulerSettings GetActiveSettings()
 		{
-			return ActiveAppointmentViewModel == null ? null : SchedulerSettings ?? ActiveAppointmentViewModel.GetDefaultSchedulerSettings();
+			return ActiveAppointmentViewModel is null ? null : SchedulerSettings ?? ActiveAppointmentViewModel.GetDefaultSchedulerSettings();
 		}
 
-		public IEnumerable<SchedulerAppointmentVM> ConvertAbsenceTimesToAppointments(IEnumerable<AbsenceTimeDC> pAbsenceTimes, DateTime pIntervalEnd, List<CompactEmployeeDC> allEmployees)
+		public IEnumerable<SchedulerAppointmentVM> ConvertAbsenceTimesToAppointments(IEnumerable<AbsenceTimeDC> pAbsenceTimes, DateTime pIntervalEnd, List<CompactEmployeeDC> allEmployees, List<CompactCustomerDC> allCustomers)
 		{
 		    return pAbsenceTimes.Where(w => w.AbsenceTimeOid.HasValue && w.Start.HasValue).Select(abwesenheit =>
-		    {
+            {
+                var isEmployeeAbsenceTime = abwesenheit.EmployeeOid.HasValue;
+
 		        var subject = $"{abwesenheit.Reason.Description}";
-		        var employee = abwesenheit.EmployeeOid != null ? allEmployees.FirstOrDefault(f => f.EmployeeOid == abwesenheit.EmployeeOid.Value) : null;
+		        var employee = abwesenheit.EmployeeOid.HasValue ? allEmployees.FirstOrDefault(f => f.EmployeeOid == abwesenheit.EmployeeOid.Value) : null;
+                var customer = abwesenheit.CustomerOid.HasValue ? allCustomers.FirstOrDefault(f => f.CustomerOid == abwesenheit.CustomerOid.Value) : null;
 
-		        if(employee != null)
-		        {
-		            subject += $" ({employee.SimpleDescription})";
-		        }
+                IFilterableDC dc = employee;
+                var originator = employee;
+                if(!isEmployeeAbsenceTime)
+                {
+                    dc = customer;
+                    ServiceFacade.DoEmployeeServiceSync(s => originator = s.FindCompactEmployeeByFullname(abwesenheit.InsUser));
+                }
 
-                var absenceTimeEnd = abwesenheit.End?.AddTicks(1);
+		        if(!(dc is null))
+                {
+                    subject += $" ({dc.SimpleDescription})";
+                }
 
-		        return new SchedulerAppointmentVM(true, subject, abwesenheit.Start.Value, abwesenheit.End ?? pIntervalEnd, employee, abwesenheit.Start, absenceTimeEnd);
-		    }).ToList();
+                var absenceTimeEnd = abwesenheit.End;
+
+                // Ist nicht genau
+                if(abwesenheit.End.HasValue)
+                {
+                    var allDay = abwesenheit.Start.Value.Hour == 0 && abwesenheit.Start.Value.Minute == 0 && abwesenheit.Start.Value.Second == 0 &&
+                                 abwesenheit.End.Value.Hour == 0 && abwesenheit.End.Value.Minute == 0 && abwesenheit.End.Value.Second == 0;
+
+                    var end = abwesenheit.End.Value;
+                    var isMultipleDayAbsenceTime = abwesenheit.End is null || abwesenheit.Start.Value.Date != abwesenheit.End.Value.Date;
+
+                    if(isMultipleDayAbsenceTime && allDay)
+                    {
+                        absenceTimeEnd = end.AddDays(1);
+                    }
+
+                    // Wenn die Abwesenheit über mehrere Tage geht, muss ein Tag draufaddiert werden
+
+
+
+                    //if(end.Hour == 0 && end.Minute == 0 && end.Second == 0)
+                    //{
+                    //    absenceTimeEnd = end.AddSeconds(1);
+                    //}
+                    //else
+                    //{
+                    //    absenceTimeEnd = end.AddTicks(1);
+                    //}
+                }
+
+                if(originator is null)
+                {
+                    originator = BeWoApp.CompactLoggedOnEmployee;
+                }
+
+				return new SchedulerAppointmentVM(
+                    true, 
+                    subject, 
+                    abwesenheit.Start.Value,
+                    absenceTimeEnd ?? pIntervalEnd, 
+                    originator, 
+                    abwesenheit.Start, 
+                    absenceTimeEnd, 
+                    abwesenheit.AbsenceTimeOid.Value, 
+                    !isEmployeeAbsenceTime);
+			}).ToList();
 		}
 	}
 }

BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs

@@ -29,7 +29,21 @@ namespace BeWo.Scheduler.ViewModel
 	{
 		public bool ShouldLockOverlappingAppointmentCheck { get; set; }
 
-		public SchedulerSettings GetDefaultSchedulerSettings()
+	    //protected override SchedulerAppointmentVM CreateVM(SchedulerAppointmentDC pDC)
+	    //{
+	    //    var vm = base.CreateVM(pDC);
+	    //    if (!pDC.SchedulerAppointmentOid.HasValue && vm.EmployeeList.Count == 0)
+	    //    {
+	    //        var e2sVm = new Employee2SchedulerAppointmentDC();
+	    //        e2sVm.Employee = BeWoApp.LoggedOnUser.Employee;
+                
+     //           vm.EmployeeList.Add(e2sVm);
+	    //    }
+
+	    //    return vm;
+	    //}
+
+        public SchedulerSettings GetDefaultSchedulerSettings()
 		{
 			var settings = new SchedulerSettings(AppointmentKind.General, AppointmentViewType.WorkWeek);
 			return settings;
@@ -57,18 +71,16 @@ namespace BeWo.Scheduler.ViewModel
 			}
 		}
 
-		private readonly List<CompactCustomerDC> _AllCustomers;
-		private readonly List<CompactEmployeeDC> _AllEmployees;
-		private readonly Dictionary<ValueListEntryDC, List<ResourceDC>> _Categories2Resources;
-
-		private static void AppointmentListAddingNew(object sender, AddingNewEventArgs e)
+        private static void AppointmentListAddingNew(object sender, AddingNewEventArgs e)
 		{
 			var dc = new SchedulerAppointmentDC
 			{
-				EmployeeList = new List<Employee2SchedulerAppointmentDC>(),
-				CustomerList = new List<CompactCustomerDC>(),
-				ResourceList = new List<ResourceDC>(),
-				Status       = 0
+				EmployeeList       = new List<Employee2SchedulerAppointmentDC>(),
+				CustomerList       = new List<CompactCustomerDC>(),
+				ResourceList       = new List<ResourceDC>(),
+                ServiceRecordList  = new List<ServiceRecordDC>(),
+                SupportConceptList = new List<CompactSupportConceptDC>(),
+				Status             = 0
 			};
 			
 			var neu = new SchedulerAppointmentVM(dc);
@@ -79,19 +91,19 @@ namespace BeWo.Scheduler.ViewModel
         private Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> _ChangedOccurenceCustomFields;
         public Dictionary<Guid, Dictionary<string, Dictionary<string, object>>> ChangedOccurenceCustomFields { get; }
 
-		public List<CompactCustomerDC> AllCustomers => _AllCustomers;
+		public List<CompactCustomerDC> AllCustomers { get; }
 
-	    public List<CompactEmployeeDC> AllEmployees => _AllEmployees;
+        public List<CompactEmployeeDC> AllEmployees { get; }
 
-	    public Dictionary<ValueListEntryDC, List<ResourceDC>> Categories2Resources => _Categories2Resources;
+        public Dictionary<ValueListEntryDC, List<ResourceDC>> Categories2Resources { get; }
 
-	    private Appointment _GeoeffneterTermin;
+        private Appointment _GeoeffneterTermin;
 		
 		public SchedulerAppointmentListVM(List<SchedulerAppointmentDC> appList, List<CompactCustomerDC> allCustomers, List<CompactEmployeeDC> allEmployees, Dictionary<ValueListEntryDC, List<ResourceDC>> lCategoriesToResources) : base(appList)
 		{
-			_Categories2Resources = lCategoriesToResources;
-			_AllCustomers         = allCustomers;
-			_AllEmployees         = allEmployees;
+			Categories2Resources = lCategoriesToResources;
+			AllCustomers         = allCustomers;
+			AllEmployees         = allEmployees;
 		    
 		    // TODO: Hier Rechte beachten!
 
@@ -150,37 +162,55 @@ namespace BeWo.Scheduler.ViewModel
 
 				UpdateSchedulerAppointment(item, vm);
 
-                if(vm.ResourceList.Any())
+				// Wird ein Serientermin bearbeitet, erfolgt ein Insert und ein Update. Beim Insert erfolgt bereits die Überschneidungsprüfung und muss hier nicht wiederholt werden.
+                var shouldSkipResourceAvailablityCheck = false;
+
+                if(_RecurrenceInfoId != null && item.RecurrenceInfo?.Id is Guid recurrenceId)
                 {
-                    if(!CheckForUnavailableResources(vm))
-                    {
-                        return;
-                    }
+                    shouldSkipResourceAvailablityCheck = recurrenceId.Equals(_RecurrenceInfoId);
                 }
 
-				if (!ShouldLockOverlappingAppointmentCheck && vm.EventType != 3 && !vm.IsTask)
-				{
-					var isOverlapping = false;
 
-                    ServiceFacade.DoResourceServiceSync(s => isOverlapping = s.OverlappingAppointmentsExist(
-                        vm.Start,
-                        vm.End,
-                        vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList(),
-                        vm.CustomerList.Select(cc => cc.CustomerOid).ToList(),
-                        vm.ResourceList.Select(r => r.ResourceOid.Value).ToList(),
-                        vm.Originator.EmployeeOid,
-                        vm.DataContract.SchedulerAppointmentOid,
-                        item.RecurrenceInfo?.Id.ToString() ?? string.Empty, item.RecurrenceIndex));
+                /*
+                 * EventTypes:
+                 * 0: Normal
+                 * 1: Pattern
+                 * 2: Occurrence
+                 * 3: ChangedOccurrence
+                 * 4: DeletedOccurrence
+                 *
+                 *
+                 *
+                 * Wozu ist das gut?
+                 * !ShouldLockOverlappingAppointmentCheck && 
+                 */
 
-					if (isOverlapping)
-					{
-                        var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\nMöchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+				if(!shouldSkipResourceAvailablityCheck && !vm.IsTask && vm.EventType != 4 && !(vm.EventType == 3 && vm.DataContract?.SchedulerAppointmentOid == null))
+                {
+                    var start = vm.Start;
+                    var end = vm.End;
+                    var employeeOids = vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList();
+                    var customerOids = vm.CustomerList.Select(cc => cc.CustomerOid).ToList();
+                    var resourceOids = vm.ResourceList.Where(r => r.ResourceOid.HasValue).Select(r => r.ResourceOid.Value).ToList();
+                    var originatorOid = vm.Originator.EmployeeOid;
+                    var schedulerAppointmentOid = vm.DataContract?.SchedulerAppointmentOid;
+                    var recurrenceInfoId = vm.RecurrenceId;
+                    var recurrenceIndex = vm.RecurrenceIndex;
 
-						if (erg.Equals(MessageBoxResult.No))
-						{
-						    return;
-						}
-					}
+                    var message = string.Empty;
+
+					
+                    ServiceFacade.DoResourceServiceSync( s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, shouldSkipResourceAvailablityCheck));
+
+                    if(!string.IsNullOrWhiteSpace(message))
+                    {
+                        var messageBoxResult = MessageBox.Show(message, "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+
+                        if(messageBoxResult.Equals(MessageBoxResult.No))
+                        {
+                            return;
+                        }
+                    }
 				}
 
 				if (item.Type.Equals(AppointmentType.ChangedOccurrence) && _GeoeffneterTermin != null)
@@ -203,11 +233,13 @@ namespace BeWo.Scheduler.ViewModel
 			var mostRecentAppointments = new List<SchedulerAppointmentDC>();
 			ServiceFacade.DoResourceServiceSync(sync => mostRecentAppointments = sync.UpdateSchedulerAppointments(dcList));
 			UpdateViewModel(mostRecentAppointments);
+            _RecurrenceInfoId = null;
 			control.ActiveView.LayoutChanged();
 			NewSchedulerView.IgnoreChangeEvents = false;
 		}
 
-		public void InsertAppointments(SchedulerControl control, IEnumerable<Appointment> list)
+		private Guid? _RecurrenceInfoId;
+        public void InsertAppointments(SchedulerControl control, IEnumerable<Appointment> list)
 		{
 			var dcList = new List<SchedulerAppointmentDC>();
 			foreach (var item in list)
@@ -218,25 +250,26 @@ namespace BeWo.Scheduler.ViewModel
                     {
                         var dc = new SchedulerAppointmentDC
                         {
-                            IsPrivate = item.CF_IsPrivate(),
-                            Subject = item.Subject,
-                            Description = item.Description,
-                            StartDate = item.Start,
-                            EndDate = item.End,
-                            Originator = item.CF_Originator(),
-                            LabelId = item.LabelId,
-                            AllDay = item.AllDay,
-                            Status = item.StatusId,
-                            Type = (int) item.Type,
-                            Location = item.Location,
-                            RecurrenceInfo = item.RecurrenceInfo.ToXml(),
-                            ReminderInfo = item.Reminder?.ToXml(),
-                            CustomerList = item.CF_CustomerList(),
-                            EmployeeList = item.CF_EmployeeList().ToList(),
-                            ResourceList = item.CF_ResourceList(),
-                            SupportConceptList = item.CF_SupportConceptList(),
-                            RecurrenceIndex = item.RecurrenceIndex,
-                            RecurrenceId = item.RecurrenceInfo.Id.ToString(),
+                            IsPrivate             = item.CF_IsPrivate(),
+                            Subject               = item.Subject,
+                            Description           = item.Description,
+                            StartDate             = item.Start,
+                            EndDate               = item.End,
+                            Originator            = item.CF_Originator(),
+                            LabelKey              = (long?) item.LabelKey,
+                            AllDay                = item.AllDay,
+                            Status                = item.StatusId,
+                            Type                  = (int) item.Type,
+                            Location              = item.Location,
+                            RecurrenceInfo        = item.RecurrenceInfo.ToXml(),
+                            ReminderInfo          = item.Reminder?.ToXml(),
+                            CustomerList          = item.CF_CustomerList(),
+                            EmployeeList          = item.CF_EmployeeList().ToList(),
+                            ResourceList          = item.CF_ResourceList(),
+                            SupportConceptList    = item.CF_SupportConceptList(),
+                            ServiceRecordList     = item.CF_ServiceRecordList(),
+                            RecurrenceIndex       = item.RecurrenceIndex,
+                            RecurrenceId          = item.RecurrenceInfo.Id.ToString(),
                             HasServiceRecordEntry = item.CF_HasServiceRecordEntry()
                         };
 
@@ -247,42 +280,43 @@ namespace BeWo.Scheduler.ViewModel
                         continue;
 					}
 				}
-
+				
+                if(item.RecurrenceInfo != null)
+                {
+                    _RecurrenceInfoId = (Guid) item.RecurrenceInfo.Id;
+                }
+                
 				UpdateSchedulerAppointment(item, vm);
 
-                if(vm.ResourceList.Any())
+                if(!vm.IsTask && vm.EventType != 4 && !ShouldLockOverlappingAppointmentCheck)
                 {
-                    if(!CheckForUnavailableResources(vm))
+                    var start                   = vm.Start;
+                    var end                     = vm.End;
+                    var employeeOids            = vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList();
+                    var customerOids            = vm.CustomerList.Select(cc => cc.CustomerOid).ToList();
+                    var resourceOids            = vm.ResourceList.Where(r => r.ResourceOid.HasValue).Select(r => r.ResourceOid.Value).ToList();
+                    var originatorOid           = vm.Originator.EmployeeOid;
+                    var schedulerAppointmentOid = vm.DataContract?.SchedulerAppointmentOid;
+                    var recurrenceInfoId        = vm.RecurrenceId;
+                    var recurrenceIndex         = vm.RecurrenceIndex;
+
+                    var message = string.Empty;
+					
+					ServiceFacade.DoResourceServiceSync(s => message = s.ValidateSchedulerAppointment(start, end, employeeOids, customerOids, resourceOids, originatorOid, schedulerAppointmentOid, recurrenceInfoId, recurrenceIndex, false));
+
+                    if(!string.IsNullOrWhiteSpace(message))
                     {
-                        return;
+                        var messageBoxResult = MessageBox.Show(message, "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
+
+                        if(messageBoxResult.Equals(MessageBoxResult.No))
+                        {
+                            return;
+                        }
                     }
-				}
+                }
 
-				if (!ShouldLockOverlappingAppointmentCheck && !vm.IsTask)
-				{
-					var isOverlapping = false;
-                    ServiceFacade.DoResourceServiceSync(s => isOverlapping = s.OverlappingAppointmentsExist(
-                        vm.Start,
-                        vm.End,
-                        vm.EmployeeList.Select(emp => emp.Employee.EmployeeOid).ToList(),
-                        vm.CustomerList.Select(cc => cc.CustomerOid).ToList(),
-                        vm.ResourceList.Select(r => r.ResourceOid.Value).ToList(),
-                        vm.Originator.EmployeeOid,
-                        vm.DataContract.SchedulerAppointmentOid,
-                        item.RecurrenceInfo?.Id.ToString() ?? string.Empty, item.RecurrenceIndex));
 
-					if (isOverlapping)
-					{
-						var erg = MessageBox.Show("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.\nMöchten Sie ihn wirklich speichern?", "Überschneidung", MessageBoxButton.YesNo, MessageBoxImage.Exclamation);
-
-						if (erg.Equals(MessageBoxResult.No))
-						{
-						    return;
-						}
-					}
-				}
-
-				dcList.Add(vm.CommitToDataContract());
+                dcList.Add(vm.CommitToDataContract());
 			}
 
 			if (dcList.Count <= 0)
@@ -300,30 +334,26 @@ namespace BeWo.Scheduler.ViewModel
 
 		private void UpdateSchedulerAppointment(Appointment app, SchedulerAppointmentVM vm)
 		{
-		    vm.EmployeeList = app.CF_EmployeeList();
-		    vm.CustomerList = app.CF_CustomerList();
-		    vm.ResourceList = app.CF_ResourceList();
-		    vm.Originator = app.CF_Originator();
-		    vm.IsPrivate = app.CF_IsPrivate();
-		    vm.IsTask = app.CF_IsTask();
-		    vm.DueDate = app.CF_DueDate();
-		    vm.CompletedDate = app.CF_CompletedDate();
-		    vm.CompletedNotice = app.CF_CompletedNotice();
-		    vm.TaskDescription = app.CF_TaskDescription();
-		    vm.SupportConceptList = app.CF_SupportConceptList();
+		    vm.EmployeeList          = app.CF_EmployeeList();
+		    vm.CustomerList          = app.CF_CustomerList();
+		    vm.ResourceList          = app.CF_ResourceList();
+		    vm.Originator            = app.CF_Originator();
+		    vm.IsPrivate             = app.CF_IsPrivate();
+		    vm.IsTask                = app.CF_IsTask();
+		    vm.DueDate               = app.CF_DueDate();
+		    vm.CompletedDate         = app.CF_CompletedDate();
+		    vm.CompletedNotice       = app.CF_CompletedNotice();
+		    vm.TaskDescription       = app.CF_TaskDescription();
+		    vm.SupportConceptList    = app.CF_SupportConceptList();
             vm.HasServiceRecordEntry = app.CF_HasServiceRecordEntry();
+            vm.ServiceRecordList     = app.CF_ServiceRecordList();
 
-		    if(vm.IsTask)
-		    {
-		        vm.AllDay = true;
-		        if(vm.DueDate.HasValue)
-		        {
-		            vm.DueDate = vm.Start.MergeDatesByDate(vm.DueDate.Value);
-		            vm.DueTime = vm.DueDate;
-		        }
-		    }
-		    
-		    if(!vm.CustomFields.ContainsKey(nameof(CustomFieldStorage)))
+            if(vm.IsTask)
+            {
+                vm.AllDay = true;
+            }
+
+            if(!vm.CustomFields.ContainsKey(nameof(CustomFieldStorage)))
 		    {
 		        vm.CustomFields.Add(nameof(CustomFieldStorage), new CustomFieldStorage(vm));
 		    }
@@ -364,8 +394,8 @@ namespace BeWo.Scheduler.ViewModel
 				}
 			}
 
-			app.LabelId = vm.LabelId;
-		}
+            app.LabelKey = vm.LabelKey;
+        }
 
 		AbstractAppointmentEditForm ISchedulerViewModel.GetEditAppointmentForm(SchedulerControl control, Appointment appointment)
 		{
@@ -384,7 +414,7 @@ namespace BeWo.Scheduler.ViewModel
 
             if (!appointment.Type.Equals(AppointmentType.ChangedOccurrence))
 			{
-			    return new SchedulerAppointmentEditForm(this, control, appointment, _AllEmployees, _AllCustomers, _Categories2Resources, isTask);
+			    return new SchedulerAppointmentEditForm(this, control, appointment, AllEmployees, AllCustomers, Categories2Resources, isTask);
 			}
 
 			var index = appointment.RecurrenceIndex;
@@ -402,17 +432,17 @@ namespace BeWo.Scheduler.ViewModel
 				}
 			}
 
-			return new SchedulerAppointmentEditForm(this, control, appointment, _AllEmployees, _AllCustomers, _Categories2Resources, isTask);
+			return new SchedulerAppointmentEditForm(this, control, appointment, AllEmployees, AllCustomers, Categories2Resources, isTask);
 		}
 
-		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay)
+		public void ApplyChangesToChangedOccurencyCustomFields(ObservableCollection<Employee2SchedulerAppointmentDC> employees, List<CompactCustomerDC> customers, List<ResourceDC> resources, CompactEmployeeDC originator, bool isPrivate, string index, Guid id, bool isTask, string taskDescription, DateTime? completedDate, DateTime? dueDate, string completedNotice, List<CompactSupportConceptDC> supportConcepts, string subject, bool isAllDay, List<ServiceRecordDC> serviceRecords, DateTime? start, DateTime? end)
 		{
 			if (!_ChangedOccurenceCustomFields.ContainsKey(id) || !_ChangedOccurenceCustomFields[id].ContainsKey(index))
 			{
 			    return;
 			}
 
-		    _ChangedOccurenceCustomFields[id][index][nameof(CustomFieldStorage)] = new CustomFieldStorage(employees, customers, resources, originator, isPrivate, isTask, taskDescription, dueDate, completedDate, completedNotice, supportConcepts, subject, isAllDay);
+		    _ChangedOccurenceCustomFields[id][index][nameof(CustomFieldStorage)] = new CustomFieldStorage(employees, customers, resources, originator, isPrivate, isTask, taskDescription, dueDate, completedDate, completedNotice, supportConcepts, subject, isAllDay, serviceRecords);
 		}
 
 		public void AddCustomFieldsMapping(SchedulerStorage schedulerStorage)
@@ -524,8 +554,8 @@ namespace BeWo.Scheduler.ViewModel
 
                     var istEigen = ersteller.EmployeeOid.Equals(BeWoApp.LoggedOnEmployee.EmployeeOid);
 
-                    var mVorhanden = appEList.Any(a2app => _AllEmployees.Contains(a2app.Employee));
-                    var kVorhanden = customerList.Any(_AllCustomers.Contains);
+                    var mVorhanden = appEList.Any(a2app => AllEmployees.Contains(a2app.Employee));
+                    var kVorhanden = customerList.Any(AllCustomers.Contains);
 
                     wirdAngezeigt = liste[0] && mVorhanden || liste[1] && resourceList.Any() || liste[2] && kVorhanden;
 
@@ -640,39 +670,6 @@ namespace BeWo.Scheduler.ViewModel
 
             return areEqual;
         }
-
-        private static bool CheckForUnavailableResources(SchedulerAppointmentVM vm)
-        {
-            var unavailableResources = new List<ResourceDC>();
-
-            ServiceFacade.DoResourceServiceSync(s => unavailableResources = s.CheckResourceAvailability(vm.Start, vm.End, vm.ResourceList.Select(resource => resource.ResourceOid.Value).ToList(), null));
-
-            if(unavailableResources.Any())
-            {
-                var names = string.Empty;
-
-                unavailableResources.DoForEach(resource => names += resource.Name + ", ");
-
-                names = names.TrimEnd(' ').TrimEnd(',');
-
-                var resourceCount = vm.ResourceList.Count;
-
-                var warningMessage = unavailableResources.Count > 1 ?
-                    $"Ein{(resourceCount > 1 ? "ige" : "e")} der ausgewählten Ressourcen ({names}) sind" :
-                    $"{(resourceCount > 1 ? "Eine der" : "Die")} ausgewählte{(resourceCount > 1 ? "n" : string.Empty)} Ressource{(resourceCount > 1 ? "n" : string.Empty)} ({names}) ist";
-
-                warningMessage += $" zum gewählten Zeitpunkt ({vm.Start.GetIntervalDescription(vm.End).TrimStart(' ')}) nicht verfügbar.\n\nMöchten Sie trotzdem speichern?";
-
-                var erg = MessageBox.Show(warningMessage, "Überschneidung", MessageBoxButton.YesNo);
-
-                if(erg.Equals(MessageBoxResult.No))
-                {
-                    return false;
-                }
-            }
-
-            return true;
-        }
 	}
 }
 

BeWo/Scheduler/ViewModel/SchedulerAppointmentVM.cs

@@ -2,13 +2,14 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-
+using BeWo.Scheduler.Utils;
 using BeWo.ViewModel;
-
+using BS.Shared;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 
 using BS.Shared.Extensions;
+using DevExpress.XtraScheduler;
 
 namespace BeWo.Scheduler.ViewModel
 {
@@ -33,34 +34,40 @@ namespace BeWo.Scheduler.ViewModel
 	    public static string PropertyName_DueDate         = nameof(DueDate);
 	    public static string PropertyName_CompletedDate   = nameof(CompletedDate);
 	    public static string PropertyName_CompletedNotice = nameof(CompletedNotice);
-	    public static string PropertyName_TaskDescription = nameof(TaskDescription);
+		public static string PropertyName_CompletedUser = nameof(CompletedUser);
+		public static string PropertyName_TaskDescription = nameof(TaskDescription);
 
-		private bool _AllDay;
-		private string _Description;
-		private DateTime _End;
-		private string _Location;
-		private string _RecurrenceInfo;
-		private DateTime _Start;
-		private int _Status;
-		private string _Subject;
-		private int _Type;
-		private Dictionary<string, object> _CustomFields;
-		private bool _IsPrivate;
+		private bool                                                  _AllDay;
+		private string                                                _Description;
+		private DateTime                                              _End;
+		private string                                                _Location;
+		private string                                                _RecurrenceInfo;
+		private DateTime                                              _Start;
+		private int                                                   _Status;
+		private string                                                _Subject;
+		private int                                                   _Type;
+		private Dictionary<string, object>                            _CustomFields;
+		private bool                                                  _IsPrivate;
 		private ObservableCollection<Employee2SchedulerAppointmentDC> _EmployeeList;
-		private List<CompactCustomerDC> _CustomerList;
-		private List<ResourceDC> _ResourceList;
-		private List<CompactSupportConceptDC> _SupportConceptList;
-		private CompactEmployeeDC _Originator;
-	    private bool _IsTask;
-	    private string _TaskDescription;
-	    private string _CompletedNotice;
-	    private DateTime? _CompletedDate;
-	    private DateTime? _DueDate;
-	    private DateTime? _DueTime;
-        private bool _HasServiceRecordEntry;
+		private List<CompactCustomerDC>                               _CustomerList;
+		private List<ResourceDC>                                      _ResourceList;
+		private List<CompactSupportConceptDC>                         _SupportConceptList;
+		private CompactEmployeeDC                                     _Originator;
+	    private bool                                                  _IsTask;
+	    private string                                                _TaskDescription;
+	    private string                                                _CompletedNotice;
+		private string _CompletedUser;
+		private DateTime?                                             _CompletedDate;
+	    private DateTime?                                             _DueDate;
+	    private DateTime?                                             _DueTime;
+        private bool                                                  _HasServiceRecordEntry;
+        private bool                                                  _IsArchived;
+        private long?                                                 _AbsenceTimeOid;
+        private bool                                                  _IsCustomerAbsenceTime;
+        private List<ServiceRecordDC>                                 _ServiceRecordList;
 
 
-        public bool HasServiceRecordEntry
+		public bool HasServiceRecordEntry
         {
             get => _HasServiceRecordEntry;
             set
@@ -75,11 +82,30 @@ namespace BeWo.Scheduler.ViewModel
             }
         }
 
+        public bool IsArchived
+        {
+            get => _IsArchived;
+
+            set
+            {
+                if(AreDifferent(_IsArchived, value))
+                {
+                    _IsArchived = value;
+                    StoreDirtyInformation((value && DataContract.ActivationType == ActivationTypeId.Active) || (!value && DataContract.ActivationType == ActivationTypeId.Archived), nameof(IsArchived));
+                    FirePropertyChanged(nameof(IsArchived));
+                }
+            }
+        }
+
 		public DateTime? AbsenceTimeStart { get; set; }
         public DateTime? AbsenceTimeEnd { get; set; }
 
+		public long? AbsenceTimeOid { get; set; }
+
+		public bool IsCustomerAbsenceTime { get; set; }
+
 		public object Id { get; set; }
-		public int LabelId { get; set; }
+		
 		public Dictionary<string, object> CustomFields
 		{
 			get => _CustomFields ?? (_CustomFields = new Dictionary<string, object>());
@@ -94,20 +120,23 @@ namespace BeWo.Scheduler.ViewModel
 
 			    var customFieldStorage = (CustomFieldStorage) value[nameof(CustomFieldStorage)];
 			    
-				EmployeeList       = customFieldStorage.EmployeeList;
-				CustomerList       = customFieldStorage.CustomerList;
-				ResourceList       = customFieldStorage.ResourceList;
-				Originator         = customFieldStorage.Originator;
-				IsPrivate          = customFieldStorage.IsPrivate;
-			    IsTask             = customFieldStorage.IsTask;
-			    DueDate            = customFieldStorage.DueDate;
-			    TaskDescription    = customFieldStorage.TaskDescription;
-			    CompletedDate      = customFieldStorage.CompletedDate;
-			    CompletedNotice    = customFieldStorage.CompletedNotice;
-			    SupportConceptList = customFieldStorage.SupportConceptList;
-			}
+				EmployeeList          = customFieldStorage.EmployeeList;
+				CustomerList          = customFieldStorage.CustomerList;
+				ResourceList          = customFieldStorage.ResourceList;
+				Originator            = customFieldStorage.Originator;
+				IsPrivate             = customFieldStorage.IsPrivate;
+			    IsTask                = customFieldStorage.IsTask;
+			    DueDate               = customFieldStorage.DueDate;
+			    TaskDescription       = customFieldStorage.TaskDescription;
+			    CompletedDate         = customFieldStorage.CompletedDate;
+			    CompletedNotice       = customFieldStorage.CompletedNotice;
+				CompletedUser         = customFieldStorage.CompletedUser;
+				SupportConceptList    = customFieldStorage.SupportConceptList;
+                AbsenceTimeOid        = customFieldStorage.AbsenceTimeOid;
+                IsCustomerAbsenceTime = customFieldStorage.IsCustomerAbsenceTime;
+            }
 		}
-
+		
 		public int EventType
 		{
 			get => _Type;
@@ -473,7 +502,28 @@ namespace BeWo.Scheduler.ViewModel
 	        }
 	    }
 
-	    public DateTime? CompletedDate
+		public string CompletedUser
+		{
+			get => _CompletedUser;
+
+			set
+			{
+				if (AreDifferent(_CompletedUser, value))
+				{
+					_CompletedUser = value;
+
+					if (IsAbsenceTime)
+					{
+						return;
+					}
+
+					StoreDirtyInformation(AreDifferent(DataContract.CompletedUser, value), nameof(CompletedUser));
+					FirePropertyChanged(nameof(CompletedUser));
+				}
+			}
+		}
+
+		public DateTime? CompletedDate
 	    {
 	        get => _CompletedDate;
 
@@ -530,24 +580,59 @@ namespace BeWo.Scheduler.ViewModel
 	        }
 	    }
 
-        public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
+        public Guid? RecurrenceId => BS.Shared.Core.Utils.GetRecurrenceIdFromRecurrenceInfo(RecurrenceInfo);
+
+        public int RecurrenceIndex => BS.Shared.Core.Utils.GetRecurrenceIndexFromRecurrenceInfo(RecurrenceInfo);
+
+		public bool CanBeEdited { get; set; } = true;
+
+
+		public SchedulerAppointmentVM(SchedulerAppointmentDC pDC) : base(pDC, pDC.SchedulerAppointmentOid == null)
 	    {
 	        IsTeilnahmeBestaetigung = pDC.IsTeilnahmeBestaetigung;
-	    }
+			CanBeEdited = pDC.CanBeEdited;
+		}
+
+		// Wird für die Druckfunktion von Serienterminen benutzt:
+        public SchedulerAppointmentVM(Appointment appointment) : base(new SchedulerAppointmentDC(), true)
+        {
+            _AllDay = appointment.AllDay;
+            _Start = appointment.Start;
+            _End = appointment.End;
+            _Location = appointment.Location;
+            _Description = appointment.Description;
+            _Subject = appointment.Subject;
+            _Type = (int) appointment.Type;
+            _IsPrivate = appointment.CF_IsPrivate();
+            _EmployeeList = appointment.CF_EmployeeList();
+            _CustomerList = appointment.CF_CustomerList();
+            _ResourceList = appointment.CF_ResourceList();
+            _Originator = appointment.CF_Originator();
+            _AbsenceTimeOid = appointment.CF_AbsenceTimeOid();
+            _IsCustomerAbsenceTime = appointment.CF_IsCustomerAbsenceTime();
+
+
+			if(!(appointment.RecurrenceInfo is null) && appointment.Type == AppointmentType.Occurrence)
+            {
+                _RecurrenceInfo = $"<RecurrenceInfo Id=\"{appointment.RecurrenceInfo.Id}\" Index=\"{appointment.RecurrenceIndex}\" />";
+            }
+        }
 
 		// Wird für Abwesenheiten genutzt
-		public SchedulerAppointmentVM(bool pAllDay, string pSubject, DateTime pStart, DateTime pEnd, CompactEmployeeDC pOriginator, DateTime? absenceTimeStart, DateTime? absenceTimeEnd)
+		public SchedulerAppointmentVM(bool pAllDay, string pSubject, DateTime pStart, DateTime pEnd, CompactEmployeeDC pOriginator, DateTime? absenceTimeStart, DateTime? absenceTimeEnd, long absenceTimeOid, bool isCustomerAbsenceTime)
 		{
-			_AllDay = pAllDay;
-			_Subject = pSubject;
-			_Start = pStart;
-			_End = pEnd;
+			_AllDay     = pAllDay;
+			_Subject    = pSubject;
+			_Start      = pStart;
+			_End        = pEnd;
 			_Originator = pOriginator;
 
             AbsenceTimeStart = absenceTimeStart;
-            AbsenceTimeEnd = absenceTimeEnd;
+            AbsenceTimeEnd   = absenceTimeEnd;
+			IsAbsenceTime    = true;
+			AbsenceTimeOid   = absenceTimeOid;
 
-			IsAbsenceTime = true;
+            IsCustomerAbsenceTime = isCustomerAbsenceTime;
 
 			UpdateCustomFields();
 		}
@@ -579,9 +664,14 @@ namespace BeWo.Scheduler.ViewModel
 		    _IsTask                = pDataContract.IsTask;
 		    _TaskDescription       = pDataContract.TaskDescription;
 		    _CompletedNotice       = pDataContract.CompletedNotice;
-		    _CompletedDate         = pDataContract.CompletedDate;
+			_CompletedUser         = pDataContract.CompletedUser;
+			_CompletedDate         = pDataContract.CompletedDate;
 		    _SupportConceptList    = pDataContract.SupportConceptList ?? new List<CompactSupportConceptDC>();
             _HasServiceRecordEntry = pDataContract.HasServiceRecordEntry;
+            _ServiceRecordList     = pDataContract.ServiceRecordList ?? new List<ServiceRecordDC>();
+
+            _IsArchived = pDataContract.ActivationType == ActivationTypeId.Archived;
+			CanBeEdited = pDataContract.CanBeEdited;
 
 
 			if(pDataContract.DueDate.HasValue)
@@ -610,10 +700,12 @@ namespace BeWo.Scheduler.ViewModel
 		    pDataContract.IsTask                = _IsTask;
 		    pDataContract.TaskDescription       = _TaskDescription;
 		    pDataContract.CompletedNotice       = _CompletedNotice;
-		    pDataContract.CompletedDate         = _CompletedDate;
+			pDataContract.CompletedUser         = _CompletedUser;
+			pDataContract.CompletedDate         = _CompletedDate;
 		    pDataContract.SupportConceptList    = _SupportConceptList;
             pDataContract.HasServiceRecordEntry = _HasServiceRecordEntry;
-
+            pDataContract.ActivationType        = _IsArchived ? ActivationTypeId.Archived : ActivationTypeId.Active;
+            pDataContract.ServiceRecordList     = _ServiceRecordList;
 
 			if(_DueDate.HasValue && _DueTime.HasValue)
             {
@@ -624,6 +716,8 @@ namespace BeWo.Scheduler.ViewModel
                 pDataContract.DueDate = _DueDate;
             }
 
+			pDataContract.CanBeEdited = CanBeEdited;
+
             return pDataContract;
 		}
 
@@ -660,7 +754,7 @@ namespace BeWo.Scheduler.ViewModel
 
 	        var areEqual =
 	            Equals(Subject, obj.Subject) &&
-                LabelId   == obj.LabelId &&
+				LabelKey == obj.LabelKey &&
 	            AllDay    == obj.AllDay &&
 	            IsPrivate == obj.IsPrivate &&
                 IsDirty   == obj.IsDirty &&
@@ -670,7 +764,8 @@ namespace BeWo.Scheduler.ViewModel
                 Equals(CompletedDate, obj.CompletedDate) &&
                 Equals(DueDate, obj.DueDate) &&
                 Equals(CompletedNotice, obj.CompletedNotice) &&
-                customFieldsAreEqual &&
+				Equals(CompletedUser, obj.CompletedUser) &&
+				customFieldsAreEqual &&
                 CustomerList.AreEqual(obj.CustomerList) &&
 	            Equals(Description, obj.Description) &&
                 EmployeeList.AreEqual(obj.EmployeeList) &&
@@ -679,7 +774,8 @@ namespace BeWo.Scheduler.ViewModel
                 Equals(Location, obj.Location) &&
                 ResourceList.AreEqual(obj.ResourceList) &&
                 Equals(RecurrenceInfo, obj.RecurrenceInfo) &&
-                HasServiceRecordEntry == obj.HasServiceRecordEntry;
+                HasServiceRecordEntry == obj.HasServiceRecordEntry
+                ;
 
 	        return areEqual;
 	    }
@@ -691,13 +787,58 @@ namespace BeWo.Scheduler.ViewModel
                 : base.GetHashCode();
         }
 
-		public override bool IsDirty => !IsAbsenceTime && base.IsDirty;
+		
+		public override bool IsDirty
+		{
+			get
+			{
 
-	    public new bool IsNew
+				return (!IsAbsenceTime && base.IsDirty) || EmployeesChanged();
+			}
+		}
+
+		private bool EmployeesChanged()
+		{
+			if (_EmployeeList != null && this.DataContract.EmployeeList != null && _EmployeeList.Count != this.DataContract.EmployeeList.Count)
+			{
+				return true;
+			}
+			return false;
+		}
+
+		public new bool IsNew
 		{
 			get => !IsAbsenceTime && base.IsNew;
 
 	        set => base.IsNew = value;
 	    }
+
+		/// <summary>
+		/// Wird im RequestAnswerView benutzt, um ein VM-Objekt pro Zusage/Absage/Vorbehalt zu erzeugen
+		/// </summary>
+        public long? LabelKey { get; set; }
+		
+        public List<ServiceRecordDC> ServiceRecordList
+        {
+            get => _ServiceRecordList ?? (ServiceRecordList = new List<ServiceRecordDC>());
+
+            set
+            {
+                if(!AreDifferent(_ServiceRecordList, value))
+                {
+                    return;
+                }
+
+                _ServiceRecordList = value;
+
+                if(IsAbsenceTime)
+                {
+                    return;
+                }
+
+				StoreDirtyInformation(AreDifferent(DataContract.ServiceRecordList, value), nameof(ServiceRecordList));
+				FirePropertyChanged(nameof(ServiceRecordList));
+            }
+        }
 	}
 }

BeWo/Scheduling/Converter/AppointmentBorderThicknessConverter.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class AppointmentBorderThicknessConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var defaultThickness = new Thickness(0);
+
+            if(value is SolidColorBrush solidColorBrush)
+            {
+                return solidColorBrush.Color == Colors.Transparent ? defaultThickness : new Thickness(2);
+            }
+
+            return defaultThickness;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/CustomerAndResourceBackgroundConverter.cs

@@ -0,0 +1,148 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Media;
+using BeWo.Scheduler.ViewModel;
+using BS.Shared.DataContracts;
+using DevExpress.XtraScheduler;
+using ColorConverter = System.Windows.Media.ColorConverter;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class CustomerAndResourceBackgroundConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            var farbe = Color.FromRgb(192, 255, 208);
+
+            try
+            {
+                if(!(values[0] is List<IDataContract> selectedItems) || !selectedItems.Any())
+                {
+                    return new LinearGradientBrush(new GradientStopCollection { new GradientStop(farbe, 1) }, new Point(.5, 0), new Point(.5, 1));
+                }
+
+                if(!(values[1] is CustomFieldCollection customViewInfo))
+                {
+                    return new LinearGradientBrush(new GradientStopCollection { new GradientStop(farbe, 1) }, new Point(.5, 0), new Point(.5, 1));
+                }
+
+                var customFieldStorage = (CustomFieldStorage) customViewInfo[nameof(CustomFieldStorage)];
+
+                var isTask = customFieldStorage.IsTask;
+
+                if(isTask)
+                {
+                    farbe = Color.FromRgb(153, 59, 59);
+                }
+
+                var aptCustomers = customFieldStorage.CustomerList;
+                var aptResources = customFieldStorage.ResourceList;
+
+                var gradientCollection = new GradientStopCollection();
+                var farbKollektion = new List<Color>();
+
+                if(selectedItems.Any(aptCustomers.Contains))
+                {
+                    farbKollektion.Add(Color.FromRgb(59, 119, 153));
+                }
+
+                if(selectedItems.Any(aptResources.Contains))
+                {
+                    farbKollektion.Add(Color.FromRgb(4, 180, 208));
+                }
+
+                switch(farbKollektion.Count)
+                {
+                    case 1:
+                        if(BeWoApp.AppSettings.ShowMultipleResourceColors)
+                        {
+                            AddResourceColors(gradientCollection, aptResources, false);
+                        }
+                        else
+                        {
+                            var first = aptResources.FirstOrDefault();
+
+                            gradientCollection.Add(first != null ? new GradientStop((Color) (ColorConverter.ConvertFromString(first.Color) ?? Color.FromRgb(4, 180, 208)), 1) : new GradientStop(farbKollektion[0], 1));
+                        }
+
+                        break;
+                    case 2:
+                        // 1. Klientenfarbe
+                        gradientCollection.Add(new GradientStop(farbKollektion[0], 0.5));
+
+                        // 2. Resourcenfarben
+                        if(BeWoApp.AppSettings.ShowMultipleResourceColors)
+                        {
+                            AddResourceColors(gradientCollection, aptResources, true);
+                        }
+                        else
+                        {
+                            var first2 = aptResources.FirstOrDefault();
+
+                            if(first2 != null)
+                            {
+                                gradientCollection.Add(new GradientStop((Color) (ColorConverter.ConvertFromString(first2.Color) ?? Color.FromRgb(4, 180, 208)), 0.5));
+                            }
+                        }
+
+                        break;
+                    default:
+                        gradientCollection.Add(new GradientStop(farbe, 1));
+                        break;
+                }
+
+                return new LinearGradientBrush(gradientCollection, new Point(.5, 0), new Point(.5, 1));
+            }
+            catch(Exception)
+            {
+                return new LinearGradientBrush(new GradientStopCollection { new GradientStop(farbe, 1) }, new Point(.5, 0), new Point(.5, 1));
+            }
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        private static void AddResourceColors(GradientStopCollection gradientCollection, IReadOnlyList<ResourceDC> resourceList, bool hasCustomers)
+        {
+            var previousOffset = hasCustomers ? 0.5 : 0;
+
+            var numberOfResources = resourceList.Count;
+
+            if(numberOfResources == 0)
+            {
+                return;
+            }
+
+            if(numberOfResources > 4)
+            {
+                numberOfResources = 4;
+            }
+
+            var iterator = hasCustomers == false ? 1d / numberOfResources : previousOffset / numberOfResources;
+
+            for(var i = 0; i < numberOfResources; i++)
+            {
+                var resource = resourceList[i];
+
+                var currentOffset = previousOffset;
+                var nextOffset = currentOffset + iterator;
+
+                if(nextOffset > 1)
+                {
+                    nextOffset = 1;
+                }
+
+                previousOffset = nextOffset;
+
+                gradientCollection.Add(new GradientStop((Color) (ColorConverter.ConvertFromString(resource.Color) ?? Color.FromRgb(4, 180, 208)), currentOffset));
+                gradientCollection.Add(new GradientStop((Color) (ColorConverter.ConvertFromString(resource.Color) ?? Color.FromRgb(4, 180, 208)), nextOffset));
+            }
+        }
+    }
+}

BeWo/Scheduling/Converter/DayViewDayCountVisibilityConverter.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class DayViewDayCountVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is DevExpress.Xpf.Scheduling.ViewType.DayView && parameter is string stringParameter && stringParameter == "DayCount")
+            {
+                return Visibility.Visible;
+            }
+            else if(value is DevExpress.Xpf.Scheduling.ViewType.TimelineView && parameter is string strParameter && strParameter == "IntervalCount")
+            {
+                return Visibility.Visible;
+            }
+
+            return Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/EmployeeBackgroundColorConverter.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class EmployeeBackgroundColorConverter : IMultiValueConverter
+    {
+        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(values.Length == 3 && values[0] is bool showEmployeeBackgroundColor && values[1] is LinearGradientBrush backgroundBrush && values[2] is SolidColorBrush defaultBackgroundColor)
+            {
+                return showEmployeeBackgroundColor ? new SolidColorBrush(backgroundBrush.GradientStops[0].Color) : defaultBackgroundColor;
+            }
+
+            return new SolidColorBrush(Color.FromRgb(192, 255, 208));
+        }
+
+        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/EmployeeListConfirmationToolTipConverter.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+using BS.Shared;
+using BS.Shared.DataContracts;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class EmployeeListConfirmationToolTipConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is Employee2SchedulerAppointmentDC e2s)
+            {
+                if(parameter?.Equals("EmployeeName") ?? false)
+                {
+                    return e2s.Employee?.DetailDescription;
+                }
+
+                var color = Color.FromRgb(255, 255, 255);
+
+                switch(e2s.ParticipationAnswer)
+                {
+                    case ParticipationAnswer.Vorbehalt:
+                        color = Color.FromRgb(185, 39, 217);
+                        break;
+                    case ParticipationAnswer.Zusage:
+                        color = Color.FromRgb(72, 212, 78);
+                        break;
+                    case ParticipationAnswer.Absage:
+                        color = Color.FromRgb(171, 0, 48);
+                        break;
+                }
+
+                return new SolidColorBrush(color);
+            }
+
+            return null;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/InfoButtonVisibilityConverter.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class InfoButtonVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            return BeWoApp.AppSettings.ShowInfoButtonInCalender ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/ParticipationRequestListViewConverter.cs

@@ -0,0 +1,49 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Windows.Data;
+using BeWo.Scheduling.ViewModel;
+using BS.Shared;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class ParticipationRequestListViewConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is SchedulingAppointmentVM appointment)
+            {
+                if(appointment.LabelKey is null)
+                {
+                    return $"{appointment.Start.ToShortDateString()}; {appointment.Subject}";
+                }
+
+                var participationAnswer = string.Empty;
+
+                var correspondingRelation = appointment.EmployeeList.ToList().Find(e2a => e2a.Employee2SchedulerAppointmentOid == appointment.LabelKey);
+
+                switch(correspondingRelation.ParticipationAnswer)
+                {
+                    case ParticipationAnswer.Zusage:
+                        participationAnswer = "zugesagt";
+                        break;
+                    case ParticipationAnswer.Vorbehalt:
+                        participationAnswer = "mit Vorbehalt zugesagt";
+                        break;
+                    case ParticipationAnswer.Absage:
+                        participationAnswer = "abgesagt";
+                        break;
+                }
+
+                return $"{appointment.Start.ToShortDateString()}: {correspondingRelation.Employee.FirstNameLastName} hat {participationAnswer}";
+            }
+
+            return string.Empty;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/RecurringAppointmentDurationConverter.cs

@@ -0,0 +1,208 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using BeWo.Scheduling.ViewModel;
+using DevExpress.XtraScheduler;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class RecurringAppointmentDurationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is null)
+            {
+                return null;
+            }
+
+            var appointment = (SchedulingAppointmentVM) value;
+
+            if(appointment.RecurrenceInfo is null)
+            {
+                return string.Empty;
+            }
+
+            IRecurrenceInfo recurrenceInfo = new RecurrenceInfo();
+            recurrenceInfo.FromXml(appointment.RecurrenceInfo);
+
+            var rangeString = string.Empty;
+            var suffix = string.Empty;
+            var periodicity = recurrenceInfo.Periodicity;
+            var intervalPlural = string.Empty;
+            var weekDays = string.Empty;
+            string weekOfMonth;
+
+            switch(recurrenceInfo.Range)
+            {
+                case RecurrenceRange.EndByDate:
+                    rangeString += $"bis zum {recurrenceInfo.End.ToShortDateString()} ";
+                    break;
+                case RecurrenceRange.OccurrenceCount:
+                    rangeString += $"{recurrenceInfo.OccurrenceCount} mal ";
+                    break;
+            }
+
+            switch(recurrenceInfo.Type)
+            {
+                case RecurrenceType.Daily:
+                    if(periodicity == 1)
+                    {
+                        suffix = recurrenceInfo.WeekDays.Equals(WeekDays.WorkDays) ? "jeden Arbeitstag " : "täglich ";
+                    }
+
+                    intervalPlural = " Tage ";
+
+                    break;
+                case RecurrenceType.Weekly:
+                    if(periodicity == 1)
+                    {
+                        suffix = "wöchentlich ";
+                    }
+
+                    intervalPlural = " Wochen ";
+
+                    weekDays = TranslateWorkDays(recurrenceInfo.WeekDays.ToString(), true);
+
+                    break;
+                case RecurrenceType.Yearly:
+                    weekDays = TranslateWorkDays(recurrenceInfo.WeekDays.ToString(), false);
+                    weekOfMonth = TranslateWeekOfMonth(recurrenceInfo.WeekOfMonth);
+                    var tag = recurrenceInfo.DayNumber;
+
+                    suffix = "jährlich ";
+
+                    if(recurrenceInfo.WeekOfMonth != WeekOfMonth.None)
+                    {
+                        suffix += $"jeden {weekOfMonth}{weekDays}im {GetMonthByInt(recurrenceInfo.Month)}";
+                    }
+                    else
+                    {
+                        suffix += $"am {tag}. {GetMonthByInt(recurrenceInfo.Month)}";
+                    }
+
+                    weekDays = string.Empty;
+
+                    break;
+                case RecurrenceType.Monthly:
+                    string monatlichesInterval;
+
+                    if(recurrenceInfo.WeekOfMonth != WeekOfMonth.None)
+                    {
+                        weekOfMonth = TranslateWeekOfMonth(recurrenceInfo.WeekOfMonth);
+                        weekDays = TranslateWorkDays(recurrenceInfo.WeekDays.ToString(), false);
+
+                        suffix = $"jeden {weekOfMonth}{weekDays}";
+
+                        monatlichesInterval = periodicity == 1 ? "jedes Monats " : $"jedes {periodicity}. Monats ";
+
+                        suffix += monatlichesInterval;
+                        weekDays = "";
+                    }
+                    else
+                    {
+                        monatlichesInterval = periodicity == 1 ? "jedes Monats " : $"jedes {periodicity}. Monats ";
+
+                        suffix = $"am {recurrenceInfo.DayNumber}. {monatlichesInterval}";
+                        weekDays = string.Empty;
+                    }
+
+                    break;
+            }
+
+            if(periodicity > 1 && recurrenceInfo.Type != RecurrenceType.Monthly)
+            {
+                suffix = $"alle {periodicity}{intervalPlural}";
+            }
+
+            return $"Dieser Termin wird {rangeString}{suffix}{weekDays}wiederholt";
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+
+        private static string TranslateWorkDays(string weekDays, bool mitGenitivS)
+        {
+            weekDays = weekDays.Replace("Monday", mitGenitivS ? "Montags" : "Montag");
+            weekDays = weekDays.Replace("Tuesday", mitGenitivS ? "Dienstags" : "Dienstag");
+            weekDays = weekDays.Replace("Wednesday", mitGenitivS ? "Mittwochs" : "Mittwoch");
+            weekDays = weekDays.Replace("Thursday", mitGenitivS ? "Donnerstags" : "Donnerstag");
+            weekDays = weekDays.Replace("Friday", mitGenitivS ? "Freitags" : "Freitag");
+            weekDays = weekDays.Replace("Saturday", mitGenitivS ? "Samstags" : "Samstag");
+            weekDays = weekDays.Replace("Sunday", mitGenitivS ? "Sonntags" : "Sonntag");
+            weekDays = weekDays.Replace("EveryDay", "jeden Tag");
+
+            var lastComma = weekDays.LastIndexOf(',');
+            if(lastComma != -1)
+            {
+                weekDays = weekDays.Remove(lastComma, 1).Insert(lastComma, " und");
+            }
+
+            return weekDays + " ";
+        }
+
+        private static string TranslateWeekOfMonth(WeekOfMonth weekOfMonth)
+        {
+            var result = " ";
+
+            switch(weekOfMonth)
+            {
+                case WeekOfMonth.First:
+                    result = "ersten ";
+                    break;
+                case WeekOfMonth.Second:
+                    result = "zweiten ";
+                    break;
+                case WeekOfMonth.Third:
+                    result = "dritten ";
+                    break;
+                case WeekOfMonth.Fourth:
+                    result = "vierten ";
+                    break;
+                case WeekOfMonth.Last:
+                    result = "letzten ";
+                    break;
+                case WeekOfMonth.None:
+                    return result;
+                default:
+                    return result;
+            }
+
+            return result;
+        }
+
+        private static string GetMonthByInt(int month)
+        {
+            switch(month)
+            {
+                case 1:
+                    return "Januar ";
+                case 2:
+                    return "Februar ";
+                case 3:
+                    return "März ";
+                case 4:
+                    return "April ";
+                case 5:
+                    return "Mai ";
+                case 6:
+                    return "Juni ";
+                case 7:
+                    return "Juli ";
+                case 8:
+                    return "August ";
+                case 9:
+                    return "September ";
+                case 10:
+                    return "Oktober ";
+                case 11:
+                    return "November ";
+                case 12:
+                    return "Dezember ";
+                default:
+                    return " ";
+            }
+        }
+    }
+}

BeWo/Scheduling/Converter/RequestVisibilityConverter.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Data;
+using BeWo.Scheduling.ViewModel;
+using DevExpress.XtraScheduler;
+
+namespace BeWo.Scheduling.Converter
+{
+    public class RequestVisibilityConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if(value is null)
+            {
+                return Visibility.Collapsed;
+            }
+
+            var appointment = (SchedulingAppointmentVM) value;
+
+            var hasNoEnd = false;
+            var liesInPast = appointment.Start < DateTime.Now && appointment.End < DateTime.Now;
+
+            if(!(appointment.RecurrenceInfo is null))
+            {
+                IRecurrenceInfo recurrenceInfo = new RecurrenceInfo();
+                recurrenceInfo.FromXml(appointment.RecurrenceInfo);
+
+                hasNoEnd = recurrenceInfo.Range == RecurrenceRange.NoEndDate;
+                liesInPast = recurrenceInfo.Start < DateTime.Now && recurrenceInfo.End < DateTime.Now;
+            }
+
+            if(parameter?.Equals("ZusagenStack") ?? false)
+            {
+                if(appointment.LabelKey.HasValue)
+                {
+                    return Visibility.Collapsed;
+                }
+
+                var shouldBeVisible = !liesInPast;
+
+                if(!(appointment.RecurrenceInfo is null))
+                {
+                    shouldBeVisible = !liesInPast || hasNoEnd;
+                }
+
+                return shouldBeVisible ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            if(parameter?.Equals("OKBtn") ?? false)
+            {
+                return (appointment.LabelKey.HasValue || liesInPast) && !hasNoEnd ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            if(parameter?.Equals("TerminVerstrichen") ?? false)
+            {
+                return liesInPast && !hasNoEnd ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            if(parameter?.Equals("SerienterminLabel") ?? false)
+            {
+                return !(appointment.RecurrenceInfo is null) ? Visibility.Visible : Visibility.Collapsed;
+            }
+
+            return appointment.LabelKey.HasValue || liesInPast ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

BeWo/Scheduling/Converter/SchedulingBackgroundConverter.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Globalization;
+using System.Windows.Data;
+using System.Windows.Media;
+using BS.Shared.DataContracts;
+using BS.Shared.DataContracts.Compact;
+
+namespace BeWo.Scheduling.Converter
+{
+	public class SchedulingBackgroundConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            var employeeBrush = new SolidColorBrush(Color.FromArgb(255, 69, 153, 59));
+            var customerBrush = new SolidColorBrush(Color.FromArgb(255, 59, 119, 153));
+            var resourceBrush = new SolidColorBrush(Color.FromArgb(255, 4, 180, 208));
+            var supportConceptBrush = new SolidColorBrush(Color.FromArgb(255, 153, 59, 59));
+
+            if(value is CompactEmployeeDC || value is Employee2SchedulerAppointmentDC)
+            {
+                return employeeBrush;
+            }
+
+            if(value is CompactCustomerDC)
+            {
+                return customerBrush;
+            }
+
+            if(value is CompactSupportConceptDC)
+            {
+                return supportConceptBrush;
+            }
+
+            return resourceBrush;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}