From 9c7a99b5a106c50fc24cbce12bcd79cdd79c73a5 Mon Sep 17 00:00:00 2001
From: Rene Evertz <rene.evertz@ownsoft.de>
Date: Tue, 11 Jun 2024 14:31:17 +0200
Subject: [PATCH] brrrrrrrrrrrrrrrrrr

---
 .../Accounting/GkvAbrechnungOverview.xaml     |  47 +-
 .../Accounting/GkvAbrechnungOverview.xaml.cs  |  62 +-
 .../NewGkvAbrechnungPopUpView.xaml.cs         |   4 -
 BeWo/ViewModel/GkvAbrechnungVM.cs             | 241 +-----
 Dakota/DakotaValidator.cs                     |   2 +-
 Dakota/Logic/DakotaInfoCreator.cs             |   4 +-
 Dakota/Logic/DakotaManager.cs                 |   4 +-
 Dakota/Models/DakotaException.cs              |   6 +
 Data/Access/SearchDAO.cs                      | 777 +++++++++---------
 Data/Entities/GkvAbrechnung.cs                |  26 +-
 Data/Entities/GkvTransferprotokoll.cs         |  28 +-
 Data/Mappings/GkvAbrechnung.hbm.xml           |  65 +-
 Data/Mappings/GkvTransferProtokoll.hbm.xml    |  24 +-
 Host/GkvAbrechnungView.aspx.cs                |  52 +-
 .../Changes_2024_05_15 ALLE GKV TABELLEN.txt  |  32 +-
 .../GkvAbrechnungDC_GkvAbrechnung.cs          |  29 +-
 ...ransferProtokollDC_GkvTransferprotokoll.cs |  48 +-
 .../ServiceContracts/IAccountingService.cs    |   4 -
 .../AccountingServiceImp.cs                   | 556 +++++++------
 Shared/BeWoEntityEnums.cs                     |  17 +
 .../GkvAbrechnung/GkvAbrechnungDC.cs          |  33 +-
 .../GkvAbrechnungSendRequestDC.cs             |   2 +-
 .../GkvAbrechnungSendResponseDC.cs            |   3 +
 .../GkvAbrechnung/GkvApp8SendNewRequest.cs    |   3 +
 .../GkvAbrechnung/GkvApp8SendNewResponse.cs   |   5 +
 .../GkvAbrechnung/GkvTransferProtokollDC.cs   |  45 +-
 Shared/Extensions/GkvAbrechnungExtensions.cs  |  97 +--
 27 files changed, 1059 insertions(+), 1157 deletions(-)

diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
index 46582714f..8748bb13b 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml
@@ -26,8 +26,8 @@
 
 				<localView:YearMonthFilter Margin="3 0 0 3" VerticalAlignment="Bottom" HorizontalAlignment="Left" Grid.Column="0" x:Name="yearMonthFilter" FilterSpanChanged="YearMonthFilter_FilterSpanChanged" />
                 <StackPanel Orientation="Vertical" Grid.Column="1" Margin="12,5,0,0" VerticalAlignment="Center" HorizontalAlignment="Left">
-                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Erstelldatum filtern" IsChecked="True" Click="radioFilterByInvoiceDate_Click"/>
-                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" Click="radioFilterByInvoiceDate_Click"/>
+                    <RadioButton x:Name="radioFilterByInvoiceDate" Content="Nach Erstelldatum filtern" IsChecked="True" Click="radioFilterByInvoiceDate_Click" ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Erstelldatum"/>
+                    <RadioButton x:Name="radioFilterByAccountingDate" Content="Nach Abrechnungszeitraum filtern" Click="radioFilterByInvoiceDate_Click" ToolTip="Filtert die angezeigten GKV-Abrechnungen nach ihrem Abrechnungszeitraum. Es werden alle Abrechnungen angezeigt, die den ausgewählten Monat bzw. Jahr beinhalten."/>
                 </StackPanel>
                 <Grid Grid.Column="2">
                     <Grid.ColumnDefinitions>
@@ -35,11 +35,11 @@
                         <ColumnDefinition Width="auto"/>
                         <ColumnDefinition Width="auto"/>
                     </Grid.ColumnDefinitions>
-                    <Button x:Name="button_new" Grid.Column="2" Content="Neue Abrechnung" Margin="3" Click="NewButton_OnClick" Height="24" VerticalAlignment="Bottom"  />
-                    <Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="3" Click="ReloadButton_OnClick" Height="24" VerticalAlignment="Bottom" Width="80" />
+                    <Button x:Name="button_new" Grid.Column="2" Content="Neue Abrechnung" Margin="3" Click="NewButton_OnClick" Height="24" VerticalAlignment="Bottom" ToolTip="Neue GKV-Abrechnung erstellen" />
+                    <Button x:Name="button_reload" Grid.Column="1" Content="Aktualisieren" Margin="3" Click="ReloadButton_OnClick" Height="24" VerticalAlignment="Bottom" Width="80" ToolTip="Aktualisiere die Liste aller GKV-Abrechnungen"/>
                 </Grid>
 
-                <dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_gkvAbrechnungen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                <dxg:GridControl Margin="3" Grid.ColumnSpan="3" Grid.Row="1" DataSource="{Binding VMList}" x:Name="datagrid_gkvAbrechnungen" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Visibility="Collapsed">
                     <dxg:GridControl.Columns>
                         <dxg:GridColumn x:Name="ColumnChecked" FieldName="IsChecked" Header=" " MinWidth="30" Width="120" Visible="False"></dxg:GridColumn>
                         <dxg:GridColumn x:Name="ColumnButtons"  AllowEditing="False" Width="70"  FieldName="ReportLink" Header=" ">
@@ -56,54 +56,33 @@
                             </dxg:GridColumn.DisplayTemplate>
                         </dxg:GridColumn>
                         <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="RecipientString" Width="177" Header="{markup:Translate EmpfängerSingular}" />
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumStart" Header="Abrechnungsbeginn" Width="116">
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Rechnungsnummer" Header="Rechnungsnummer" Width="Auto"/>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraum" Header="Abrechnungszeitraum" Width="Auto"/>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstelldatum" Width="Auto">
                             <dxg:GridColumn.EditSettings>
                                 <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="AbrechnungsZeitraumEnde" Header="Abrechnungsende" Width="107" >
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:DateEditSettings DisplayFormat="d" HorizontalContentAlignment="Right"/>
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Transfername" Header="Transfername" Width="84" >
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Datenaustauschreferenz" Header="Referenz" Width="58" >
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="DateigrößeDisplayname" Header="Dateigröße" Width="100" >
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
-                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="ErstelltAm" Header="Erstelldatum" Width="120">
-                            <dxg:GridColumn.EditSettings>
-                                <dxe:TextEditSettings HorizontalContentAlignment="Right"/>
-                            </dxg:GridColumn.EditSettings>
-                        </dxg:GridColumn>
+                        <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="GkvState" Header="Status" Width="Auto"/>
                         <dxg:GridColumn ReadOnly="True" AllowEditing="False" FieldName="Betrag" Header="Betrag" MinWidth="74">
                             <dxg:GridColumn.EditSettings>
                                 <dxe:TextEditSettings DisplayFormat="c" Mask="c" MaskType="Numeric" HorizontalContentAlignment="Right"></dxe:TextEditSettings>
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn FieldName="Notice" Header="Bemerkung" MinWidth="200" >
+                        <dxg:GridColumn x:Name="PaidColumn" FieldName="Bezahlt" Header="Bezahlt" Width="50"></dxg:GridColumn>
+                        <dxg:GridColumn FieldName="Notice" Header="Bemerkung" MinWidth="200" Width="*" Tag="1024">
                             <dxg:GridColumn.EditSettings>
                                 <dxe:TextEditSettings TextWrapping="Wrap" />
                             </dxg:GridColumn.EditSettings>
                         </dxg:GridColumn>
-                        <dxg:GridColumn x:Name="PaidColumn" FieldName="Bezahlt" Header="Bezahlt" Width="50"></dxg:GridColumn>
                     </dxg:GridControl.Columns>
                     <dxg:GridControl.View>
                         <dxg:TableView NavigationStyle="Cell" Loaded="gridView_Loaded" x:Name="gridView" BestFitMode="Smart" 
                                        AllowBestFit="True" ShowGroupPanel="False" ScrollingMode="Smart" SnapsToDevicePixels="True"  ShownEditor="gridView_ShownEditor"
                                        CellValueChanging="gridView_CellValueChanged" 
                                        CustomRowAppearance="TableView_OnCustomRowAppearance"
-                                       Margin="3,22,3,3" CellValueChanged="gridView_CellValueChanged_1" RowMinHeight="24"/>
+                                       Margin="3,22,3,3" CellValueChanged="gridView_CellValueChanged_1" RowMinHeight="24"
+                                       />
                     </dxg:GridControl.View>
                 </dxg:GridControl>
             </Grid>
diff --git a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
index 54c14534f..9c8d5cf02 100644
--- a/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
+++ b/BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs
@@ -119,6 +119,9 @@ namespace BeWo.View.Detail.Accounting
                 {
                     _Viewmodel.UpdateList(dcList);
                     UpdateDataGridFilter();
+
+                    if (datagrid_gkvAbrechnungen.Visibility != Visibility.Visible)
+                        datagrid_gkvAbrechnungen.Visibility = Visibility.Visible;
                 });
         }
 
@@ -200,31 +203,40 @@ namespace BeWo.View.Detail.Accounting
         {
             var vm = datagrid_gkvAbrechnungen.GetCurrentValue<GkvAbrechnungVM>();
 
-            string text = "Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung senden möchten?";
+            var dc = vm.CommitToDataContract();
 
+            var state = dc.GetState();
 
+            var can_send = state == GkvState.NoSend || state == GkvState.Error;
 
-            if (vm.TransferProtokolle != null && vm.TransferProtokolle.Any())
+            if (!can_send)
             {
-                var last = vm.TransferProtokolle.Last();
-
-                var state = last.GetState();
-
-                if(state == 6)
-                {
-                    text = "Die gewählte GKV-Abrechnung wurde bereits erfolgreich gesendet. Möchten Sie sie erneut senden?";
-                }
+                string error;
+                if (state == GkvState.Waiting)
+                    error = "Es wurde bereits übertragen ohne direkte Fehler.";
+                else if (state == GkvState.ErrorFatal)
+                    error = "GKV-Abrechnung enthält schwere Fehler. Erstellen Sie die Rechnung erneut.";
+                else if (state == GkvState.Paid)
+                    error = "GKV-Abrechnung ist bereits als bezahlt markiert.";
+                else if (state == GkvState.OldAndNoFeedback)
+                    error = "GKV-Abrechnung ist älter als 28 Tage und als nicht bezahlt markiert. Wenden Sie sich bitte an Ihre Krankenkasse";
                 else
-                {
-                    text = "Die gewählte GKV-Abrechnung wurde nicht erfolgreich gesendet. Möchten Sie sie erneut senden?";
-                }
+                    error = "def";
+
+                MessageBox.Show(error, "Übertragung nicht möglich");
+                return;
             }
 
+            string text = "Sind Sie sicher, dass Sie die gewählte GKV-Abrechnung senden möchten?";
+
+            if (state == GkvState.Error)
+                text = "Die gewählte GKV-Abrechnung wurde nicht erfolgreich an die Krankenkasse übertragen. Möchten Sie sie erneut senden?";
+            
             if (MessageBox.Show(text, "GKV-Abrechnung senden", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.Yes)
             {
                 var req = new GkvAbrechnungSendRequestDC();
 
-                req.GkvAbrechnungDC = vm.CommitToDataContract();
+                req.GkvAbrechnungOid = vm.GkvAbrechnungOid.Value;
 
                 ServiceFacade.DoAccountingServiceAsync(s => s.SendNewGkvAbrechnung(req),
                     cb =>
@@ -233,10 +245,11 @@ namespace BeWo.View.Detail.Accounting
                         {
                             if (cb.Successful)
                             {
-                                var dc = cb.GkvAbrechnungDC;
+                                var dc2 = cb.GkvAbrechnungDC;
 
-                                vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
-                                vm.UpdateGkvTransferProtokoll(dc.TransferProtokolle.ToList());
+                                vm.GkvAbrechnungVersion = dc2.GkvAbrechnungVersion;
+                                vm.TransferProtokolle = dc2.TransferProtokolle.ToList();
+                                vm.GkvState = dc2.GetState();
                             }
                             else
                             {
@@ -285,6 +298,10 @@ namespace BeWo.View.Detail.Accounting
                 var ed = (CheckEdit)e.Editor;
                 ed.Tag = e.Row;
             }
+            else if (int.TryParse(datagrid_gkvAbrechnungen.CurrentColumn.Tag.ToString(), out int tag) && gridView.ActiveEditor is TextEdit)
+            {
+                ((TextEdit)gridView.ActiveEditor).SetPropertyValue("MaxLength", tag);
+            }
         }
         private void gridView_CellValueChanged(object sender, CellValueChangedEventArgs e)
         {
@@ -301,13 +318,15 @@ namespace BeWo.View.Detail.Accounting
             if (e.Property != null && e.Property.Name == "Background")
             {
                 var gkvAbrechnungVM = datagrid_gkvAbrechnungen.GetRow(e.RowHandle) as GkvAbrechnungVM;
-                /*
-                if (gkvAbrechnungVM != null && !String.IsNullOrEmpty(gkvAbrechnungVM.BackgroundColor))
+
+                if (gkvAbrechnungVM is null)
+                    return;
+
+                if (!gkvAbrechnungVM.Bezahlt && DateTime.Now - gkvAbrechnungVM.ErstelltAm > TimeSpan.FromDays(28))
                 {
-                    e.Result = new SolidColorBrush((Color)ColorConverter.ConvertFromString(gkvAbrechnungVM.BackgroundColor));
+                    e.Result = Brushes.Orange;
                     e.Handled = true;
                 }
-                */
             }
         }
 
@@ -326,6 +345,7 @@ namespace BeWo.View.Detail.Accounting
 
             vm.GkvAbrechnungVersion = dc.GkvAbrechnungVersion;
             vm.Bezahlt = dc.Bezahlt;
+            vm.GkvState = dc.GetState();
         }
 
         private void SaveNoticeChange(GkvAbrechnungVM vm, string notice)
diff --git a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
index fc342fd1d..b058d74d6 100644
--- a/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
+++ b/BeWo/View/Detail/Accounting/NewGkvAbrechnungPopUpView.xaml.cs
@@ -136,10 +136,6 @@ namespace BeWo.View.Detail.Accounting
             popup_organisation.IsOpen = false;
             gkvsearchview.ItemSelected -= gkvsearchview_OrganisationSelected;
 
-            ViewModel.IKKostenträger = e.Data.IKKostentrager;
-            ViewModel.IKVersichertenKarte = e.Data.IKKrankenkasse;
-            ViewModel.IKDatenannahmestelle = e.Data.IKDatenannahmestelle;
-
             popupedit_GkvSearch.Text = e.Data.ToString();
             popupedit_GkvSearch.Focus();
 
diff --git a/BeWo/ViewModel/GkvAbrechnungVM.cs b/BeWo/ViewModel/GkvAbrechnungVM.cs
index f383485ac..2bf0e7ad0 100644
--- a/BeWo/ViewModel/GkvAbrechnungVM.cs
+++ b/BeWo/ViewModel/GkvAbrechnungVM.cs
@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using BeWo.Validation;
+using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.DataContracts.GkvAbrechnung;
+using BS.Shared.Extensions;
 using DevExpress.Xpf.Core;
 
 namespace BeWo.ViewModel
@@ -32,10 +34,6 @@ AntwortEntschluesseltAm
         public static string PropertyName_AbrechnungsZeitraumStart = "AbrechnungsZeitraumStart";
         public static string PropertyName_AbrechnungsZeitraumEnde = "AbrechnungsZeitraumEnde";
 
-        public static string PropertyName_Nutzdatendatei = "Nutzdatendatei";
-        public static string PropertyName_Auftragsdatei = "Auftragsdatei";
-        public static string PropertyName_Transfername = "Transfername";
-
         public static string PropertyName_ErstelltAm = "ErstelltAm";
 
         private long? _GkvAbrechnungOid;
@@ -50,20 +48,14 @@ AntwortEntschluesseltAm
         private DateTime? _AbrechnungsZeitraumStart;
         private DateTime? _AbrechnungsZeitraumEnde;
 
-        private string _Nutzdatendatei;
-        private string _Auftragsdatei;
-        private string _Transfername;
-        private int _Dateigröße;
-        private int _Datenaustauschreferenz;
-
-        private DateTime? _ErstelltAm;
+        private DateTime _ErstelltAm;
 
         private decimal _Betrag;
         private bool _Bezahlt;
 
+        private GkvState _GkvState;
+
         internal bool _IsChecked;
-        internal bool _IsSendingRequestCurrently;
-        internal bool _SendAndFailed;
 
         private List<InvoiceBaseVM> _InvoiceBases2;
         private BindingList<InvoiceBaseVM> _InvoiceBases;
@@ -77,69 +69,7 @@ AntwortEntschluesseltAm
         }
 
         #region
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string IKVersichertenKarte
-        {
-            get { return this._IKVersichertenKarte; }
-
-            set
-            {
-                if (this.AreDifferent(this._IKVersichertenKarte, value))
-                {
-                    this._IKVersichertenKarte = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKVersichertenKarte, value), nameof(IKVersichertenKarte));
-                    this.FirePropertyChanged(nameof(IKVersichertenKarte));
-                }
-            }
-        }
-
-        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string IKKostenträger
-        {
-            get { return this._IKKostenträger; }
-
-            set
-            {
-                if (this.AreDifferent(this._IKKostenträger, value))
-                {
-                    this._IKKostenträger = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKKostenträger, value), nameof(IKKostenträger));
-                    this.FirePropertyChanged(nameof(IKKostenträger));
-                }
-            }
-        }
-
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string IKDatenannahmestelle
-        {
-            get { return this._IKDatenannahmestelle; }
-
-            set
-            {
-                if (this.AreDifferent(this._IKDatenannahmestelle, value))
-                {
-                    this._IKDatenannahmestelle = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKDatenannahmestelle, value), nameof(IKDatenannahmestelle));
-                    this.FirePropertyChanged(nameof(IKDatenannahmestelle));
-                }
-            }
-        }
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string IKLeistungserbringer
-        {
-            get { return this._IKLeistungserbringer; }
-
-            set
-            {
-                if (this.AreDifferent(this._IKLeistungserbringer, value))
-                {
-                    this._IKLeistungserbringer = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.IKLeistungserbringer, value), nameof(IKLeistungserbringer));
-                    this.FirePropertyChanged(nameof(IKLeistungserbringer));
-                }
-            }
-        }
-
+        
         public string AbrechnungsZeitraum => $"{AbrechnungsZeitraumStart.Value.ToShortDateString()} - {AbrechnungsZeitraumEnde.Value.ToShortDateString()}";
 
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
@@ -178,99 +108,8 @@ AntwortEntschluesseltAm
             }
         }
 
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string Nutzdatendatei
-        {
-            get { return this._Nutzdatendatei; }
-
-            set
-            {
-                if (this.AreDifferent(this._Nutzdatendatei, value))
-                {
-                    this._Nutzdatendatei = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Nutzdatendatei, value), PropertyName_Nutzdatendatei);
-                    this.FirePropertyChanged(PropertyName_Nutzdatendatei);
-                }
-            }
-        }
-
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string Auftragsdatei
-        {
-            get { return this._Auftragsdatei; }
-
-            set
-            {
-                if (this.AreDifferent(this._Auftragsdatei, value))
-                {
-                    this._Auftragsdatei = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Auftragsdatei, value), PropertyName_Auftragsdatei);
-                    this.FirePropertyChanged(PropertyName_Auftragsdatei);
-                }
-            }
-        }
-
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public string Transfername
-        {
-            get { return this._Transfername; }
-
-            set
-            {
-                if (this.AreDifferent(this._Transfername, value))
-                {
-                    this._Transfername = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Transfername, value), PropertyName_Transfername);
-                    this.FirePropertyChanged(PropertyName_Transfername);
-                }
-            }
-        }
-
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public int Datenaustauschreferenz
-        {
-            get { return this._Datenaustauschreferenz; }
-
-            set
-            {
-                if (this.AreDifferent(this._Datenaustauschreferenz, value))
-                {
-                    this._Datenaustauschreferenz = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Datenaustauschreferenz, value), nameof(Datenaustauschreferenz));
-                    this.FirePropertyChanged(nameof(Datenaustauschreferenz));
-                }
-            }
-        }
-        [ValidationAttribute(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public int Dateigröße
-        {
-            get { return this._Dateigröße; }
-
-            set
-            {
-                if (this.AreDifferent(this._Dateigröße, value))
-                {
-                    this._Dateigröße = value;
-                    this.StoreDirtyInformation(this.AreDifferent(this.DataContract.Dateigröße, value), nameof(Dateigröße));
-                    this.FirePropertyChanged(nameof(Dateigröße));
-                    FirePropertyChanged(nameof(DateigrößeDisplayname));
-                }
-            }
-        }
-
-        public string DateigrößeDisplayname {
-            get 
-            {
-                return Utils.SizeSuffix(Dateigröße, 0);
-            }
-            set
-            {
-
-            }
-        }
-
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
-        public DateTime? ErstelltAm
+        public DateTime ErstelltAm
         {
             get { return this._ErstelltAm; }
 
@@ -285,24 +124,6 @@ AntwortEntschluesseltAm
             }
         }
 
-
-        //public string GesendetDisplay
-        //{
-        //    get
-        //    {
-        //        if (IsSendingRequestCurrently)
-        //            return "Sendet";
-
-        //        if (SendAndFailed)
-        //            return "Fehlgeschlagen";
-
-        //        if (GesendetAm.HasValue)
-        //            return GesendetAm.Value.ToString();
-        //        else
-        //            return "-";
-        //    }
-        //}
-
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
         public long? GkvAbrechnungOid
         {
@@ -382,6 +203,21 @@ AntwortEntschluesseltAm
             }
         }
 
+        [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
+        public GkvState GkvState
+        {
+            get { return this._GkvState; }
+
+            set
+            {
+                if (this.AreDifferent(this._GkvState, value))
+                {
+                    this._GkvState = value;
+                    this.FirePropertyChanged(nameof(GkvState));
+                }
+            }
+        }
+
         public bool IsChecked
         {
             get { return _IsChecked; }
@@ -411,13 +247,10 @@ AntwortEntschluesseltAm
         public List<GkvTransferProtokollDC> TransferProtokolle
         {
             get { return _TransferProtokolle; }
-            set { _TransferProtokolle = value; }
-        }
-
-        public void UpdateGkvTransferProtokoll(List<GkvTransferProtokollDC> list)
-        {
-            _TransferProtokolle = list;
-            FirePropertyChanged(nameof(TransferProtokolle));
+            set { 
+                _TransferProtokolle = value; 
+                FirePropertyChanged(nameof(TransferProtokolle));
+            }
         }
 
         [Validation(ValidationRule = ValidationRules.NotNullOrStringEmpty)]
@@ -452,21 +285,14 @@ AntwortEntschluesseltAm
 
         protected override void InitByDataContract(GkvAbrechnungDC pDataContract)
         {
-            _IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
-            _IKKostenträger = pDataContract.IKKostenträger;
-            _IKLeistungserbringer = pDataContract.IKLeistungserbringer;
-            _IKVersichertenKarte = pDataContract.IKVersichertenKarte;
             _AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
             _AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
-            _Nutzdatendatei = pDataContract.Nutzdatendatei;
-            _Auftragsdatei = pDataContract.Auftragsdatei;
-            _Transfername = pDataContract.Transfername;
+
             _ErstelltAm = pDataContract.ErstelltAm;
-            _Datenaustauschreferenz = pDataContract.Datenaustauschreferenz;
-            _Dateigröße = pDataContract.Dateigröße;
 
             _GkvAbrechnungOid = pDataContract.GkvAbrechnungOid;
             _GkvAbrechnungVersion = pDataContract.GkvAbrechnungVersion;
+
             _Notice = pDataContract.Notice;
 
             _Betrag = pDataContract.Betrag;
@@ -484,29 +310,22 @@ AntwortEntschluesseltAm
             }
 
             _Organisation = pDataContract.Organisation;
+
+            _GkvState = pDataContract.GetState();
         }
         protected override GkvAbrechnungDC MapToDataContract(GkvAbrechnungDC pDataContract, bool doCommit)
         {
-            pDataContract.IKDatenannahmestelle = _IKDatenannahmestelle;
-            pDataContract.IKVersichertenKarte = _IKVersichertenKarte;
-            pDataContract.IKKostenträger = _IKKostenträger;
-            pDataContract.IKLeistungserbringer = _IKLeistungserbringer;
             pDataContract.AbrechnungsZeitraumStart = _AbrechnungsZeitraumStart;
             pDataContract.AbrechnungsZeitraumEnde = _AbrechnungsZeitraumEnde;
-            pDataContract.Nutzdatendatei = _Nutzdatendatei;
-            pDataContract.Auftragsdatei = _Auftragsdatei;
-            pDataContract.Transfername = _Transfername;
 
             pDataContract.ErstelltAm = _ErstelltAm;
 
             pDataContract.GkvAbrechnungOid = _GkvAbrechnungOid;
             pDataContract.GkvAbrechnungVersion = _GkvAbrechnungVersion;
-            pDataContract.Dateigröße = _Dateigröße;
 
             pDataContract.Notice = _Notice;
             pDataContract.Betrag = _Betrag;
             pDataContract.Bezahlt = _Bezahlt;
-            pDataContract.Datenaustauschreferenz = _Datenaustauschreferenz;
 
             if (_InvoiceBases != null && _InvoiceBases.Any())
                 pDataContract.InvoiceBases = _InvoiceBases.Where(x => x.IsChecked).Select(vm => vm.CommitToDataContract()).ToList();
diff --git a/Dakota/DakotaValidator.cs b/Dakota/DakotaValidator.cs
index d28f5671b..5c5c4348a 100644
--- a/Dakota/DakotaValidator.cs
+++ b/Dakota/DakotaValidator.cs
@@ -22,7 +22,7 @@ namespace Dakota
         /// <summary>
         /// Validiert in erster Phase die Daten. Bei Fehler wird eine DakotaException geworfen.
         /// </summary>
-        public static void ValidateFirstStep(MandatorDC mandatordc, GkvAbrechnungRequestDC request)
+        public static void ValidateFirstStep(MandatorDC mandatordc)
         {
             if (mandatordc == null)
                 throw new DakotaException("Mandator ist null");
diff --git a/Dakota/Logic/DakotaInfoCreator.cs b/Dakota/Logic/DakotaInfoCreator.cs
index a77115ced..f9ebb9469 100644
--- a/Dakota/Logic/DakotaInfoCreator.cs
+++ b/Dakota/Logic/DakotaInfoCreator.cs
@@ -61,10 +61,8 @@ namespace Dakota.Logic
 
             return info;
         }
-        internal InfoDateiAuftrags GetEmptyInfoAuftragsdatei(string empfang, string logischerDateiname, string verfahrenkennung, int datenaustauschreferenz)
+        internal InfoDateiAuftrags GetEmptyInfoAuftragsdatei(string empfang, string logischerDateiname, string verfahrenkennung, int transfernummer)
         {
-            var transfernummer = datenaustauschreferenz % 1000;
-
             var info = new InfoDateiAuftrags();
 
             info.Identifikator = 500000;
diff --git a/Dakota/Logic/DakotaManager.cs b/Dakota/Logic/DakotaManager.cs
index 0e5fc8f05..439494fd2 100644
--- a/Dakota/Logic/DakotaManager.cs
+++ b/Dakota/Logic/DakotaManager.cs
@@ -40,7 +40,7 @@ namespace Dakota.Logic
             IsSammelrechnung = isSammelrechnung;
         }
 
-        public void Add(ServiceInvoiceDC serviceInvoice, OrganisationDC organisation, CustomerDC customer, MandatorDC mandator, int datenaustauschreferenz)
+        public void Add(ServiceInvoiceDC serviceInvoice, OrganisationDC organisation, CustomerDC customer, MandatorDC mandator, int datenaustauschreferenz, int transfernummer)
         {
             try
             {
@@ -58,7 +58,7 @@ namespace Dakota.Logic
                     var logischer_dateiname = DakotaConfig.GetLogischerDateiname(Month).Trim();
 
                     var info_nutz_add = DakotaInfoCreator.GetEmptyInfoNutzdatendatei(DakotaConfig.IKAbsender, organisation.IKDatenannahmestelle, logischer_dateiname, datenaustauschreferenz);
-                    var info_auf_add = DakotaInfoCreator.GetEmptyInfoAuftragsdatei(organisation.IKDatenannahmestelle, logischer_dateiname, verfahrenkennung, datenaustauschreferenz);
+                    var info_auf_add = DakotaInfoCreator.GetEmptyInfoAuftragsdatei(organisation.IKDatenannahmestelle, logischer_dateiname, verfahrenkennung, transfernummer);
 
                     DakotaInfoNutzDict.Add(ik_datenannahmestelle, info_nutz_add);
                     DakotaInfoAufDict.Add(ik_datenannahmestelle, info_auf_add);
diff --git a/Dakota/Models/DakotaException.cs b/Dakota/Models/DakotaException.cs
index e335fbbee..6203fa942 100644
--- a/Dakota/Models/DakotaException.cs
+++ b/Dakota/Models/DakotaException.cs
@@ -9,8 +9,14 @@ namespace Dakota.Models
 {
     public class DakotaException : ArgumentException
     {
+        public string Title { get; set; }
         public string Message { get; set; }
 
+        public DakotaException(string message, string title) : this(message)
+        {
+            Title = title;
+        }
+
         public DakotaException(string message) : this()
         {
             Message = message;
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index 04dee7656..b1d0c688b 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -108,7 +108,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq("IsActive", ActivationTypeId.Active));
 
             return c.List<DienstEintrag>();
-        } 
+        }
         public virtual IList<Employee> GetEmployeeForWohnheim(long wOid)
         {
             var c = CreateCriteria<Wohnheim>()
@@ -122,9 +122,9 @@ namespace BeWo.Data.Access
             var lCriteria = CreateCriteria<Person>()
                 .Add(Restrictions.Like(Person.PropertyName_FirstName, pFirstName, MatchMode.Anywhere))
                 .Add(Restrictions.Like(Person.PropertyName_LastName, pLastName, MatchMode.Anywhere));
-            if(pDateOfBirth != null)
+            if (pDateOfBirth != null)
                 lCriteria.Add(Restrictions.Eq(Person.PropertyName_DateOfBirth, pDateOfBirth));
-            if(pPersonType != null)
+            if (pPersonType != null)
                 lCriteria.Add(Restrictions.Eq(Person.PropertyName_Type, pPersonType));
 
             return lCriteria.List<Person>();
@@ -135,7 +135,7 @@ namespace BeWo.Data.Access
             var lCriteria = CreateCriteria<Organisation>()
                 .Add(Restrictions.Like(Organisation.PropertyName_Name, pName, MatchMode.Anywhere));
 
-            if(pOnlyCostBearer)
+            if (pOnlyCostBearer)
                 lCriteria.Add(Restrictions.IsNotNull(Organisation.PropertyName_CostBearer));
 
             return lCriteria.List<Organisation>();
@@ -236,15 +236,15 @@ namespace BeWo.Data.Access
             var c = CreateCriteria<ServiceRecord>()
                 .CreateAlias(ServiceRecord.PropertyName_Employee, "e", JoinType.InnerJoin);
 
-            if(pCostBearer2SupportConceptOid.HasValue)
+            if (pCostBearer2SupportConceptOid.HasValue)
             {
                 c = c.CreateAlias(ServiceRecord.PropertyName_SupportConcept, "sc", JoinType.InnerJoin)
                     .CreateAlias("sc." + SupportConcept.PropertyName_CostBearer2SupportConceptList, "c2s", JoinType.InnerJoin);
             }
 
-            if(pEmployeeOid.HasValue)
+            if (pEmployeeOid.HasValue)
                 c = c.Add(Restrictions.Eq("e." + BeWoEntityBase.PropertyName_Oid, pEmployeeOid));
-            if(pCostBearer2SupportConceptOid.HasValue)
+            if (pCostBearer2SupportConceptOid.HasValue)
                 c = c.Add(Restrictions.Eq("c2s." + BeWoEntityBase.PropertyName_Oid, pCostBearer2SupportConceptOid));
 
             return c.List<ServiceRecord>().ToList();
@@ -264,33 +264,33 @@ namespace BeWo.Data.Access
             var c = CreateCriteria<ServiceRecord>()
                 .CreateAlias(ServiceRecord.PropertyName_Employee, "e", JoinType.InnerJoin);
 
-            if(supportConceptOid.HasValue)
+            if (supportConceptOid.HasValue)
             {
                 c = c.CreateAlias(ServiceRecord.PropertyName_SupportConcept, "sc", JoinType.InnerJoin);
             }
 
-            if(serviceCategoryOid.HasValue)
+            if (serviceCategoryOid.HasValue)
             {
                 c = c.CreateAlias(ServiceRecord.PropertyName_ServiceDescription, "sd", JoinType.InnerJoin)
                     .CreateAlias("sd." + ServiceDescription.PropertyName_ServiceCategory, "cat", JoinType.InnerJoin);
             }
 
-            if(supportConceptOid.HasValue)
+            if (supportConceptOid.HasValue)
             {
                 c = c.Add(Restrictions.Eq("sc." + BeWoEntityBase.PropertyName_Oid, supportConceptOid));
             }
 
-            if(costBearer2SupportConceptOid.HasValue)
+            if (costBearer2SupportConceptOid.HasValue)
             {
                 c = c.Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costBearer2SupportConceptOid));
             }
 
-            if(serviceCategoryOid.HasValue)
+            if (serviceCategoryOid.HasValue)
             {
                 c = c.Add(Restrictions.Eq("cat." + BeWoEntityBase.PropertyName_Oid, serviceCategoryOid));
             }
 
-            if(start.HasValue && end.HasValue)
+            if (start.HasValue && end.HasValue)
             {
                 c.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, start, end));
             }
@@ -325,7 +325,7 @@ namespace BeWo.Data.Access
             var criteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, pCostBearer2SupportConceptOid));
 
-            if(period != null)
+            if (period != null)
                 criteria =
                     criteria.Add(
                         Restrictions.Or(
@@ -351,7 +351,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, pEmployeeOid))
                 .Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
 
-            if(days.HasValue)
+            if (days.HasValue)
             {
                 var minDate = DateTime.Now.Date.AddDays(-1 * days.Value);
                 c.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, minDate));
@@ -366,7 +366,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, pEmployeeOid))
                 .Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
 
-            if(period != null)
+            if (period != null)
             {
                 criteria =
                     criteria.Add(
@@ -399,11 +399,11 @@ namespace BeWo.Data.Access
             var lCriteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, pEmployeeOid));
 
-            if(pSpan != null)
+            if (pSpan != null)
                 lCriteria.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime));
-            if(customerOid != null)
+            if (customerOid != null)
                 lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid.Value));
-            if(srTypeFilter.HasValue)
+            if (srTypeFilter.HasValue)
             {
                 lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_ServiceRecordType, srTypeFilter.Value));
             }
@@ -427,7 +427,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_CustomerOid, customerOid));
 
 
-            if(includeEndDateInSearch)
+            if (includeEndDateInSearch)
             {
                 var orCriteria = Restrictions.Or(
                     Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime),
@@ -448,9 +448,9 @@ namespace BeWo.Data.Access
 
 
 
-            if(employeeOid != null)
+            if (employeeOid != null)
                 lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, employeeOid.Value));
-            if(srTypeFilter.HasValue)
+            if (srTypeFilter.HasValue)
             {
                 lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_ServiceRecordType, srTypeFilter.Value));
             }
@@ -462,7 +462,7 @@ namespace BeWo.Data.Access
         {
             var lCriteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.Between(ServiceRecord.PropertyName_Start, pSpan.StartDateTime, pSpan.EndDateTime));
-            if(srTypeFilter.HasValue)
+            if (srTypeFilter.HasValue)
             {
                 lCriteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_ServiceRecordType, srTypeFilter.Value));
             }
@@ -493,10 +493,10 @@ namespace BeWo.Data.Access
 
             lCriteria = lCriteria.CreateCriteria(SupportConcept.PropertyName_Customer, JoinType.InnerJoin);
 
-            if(!IsNullOrEmpty(pCustomerReferenceNumber))
+            if (!IsNullOrEmpty(pCustomerReferenceNumber))
                 lCriteria.Add(Restrictions.Eq(Customer.PropertyName_ReferenceNumber, pCustomerReferenceNumber));
 
-            if(!BS.Shared.Core.Utils.AreAllNullOrEmpty(pCustomerFirstName, pCustomerLastName))
+            if (!BS.Shared.Core.Utils.AreAllNullOrEmpty(pCustomerFirstName, pCustomerLastName))
                 lCriteria.CreateCriteria(Customer.PropertyName_Person)
                     .Add(Restrictions.Like(Person.PropertyName_FirstName, pCustomerFirstName, MatchMode.Anywhere))
                     .Add(Restrictions.Like(Person.PropertyName_LastName, pCustomerLastName, MatchMode.Anywhere));
@@ -528,7 +528,7 @@ namespace BeWo.Data.Access
         public IEnumerable<SupportConcept> FindExpiringSupportConcepts(long? employeeOid, DateTime minDate, DateTime expiredUntil)
         {
             var c = CreateCriteriaIsActive<SupportConcept>();
-            if(employeeOid == null)
+            if (employeeOid == null)
             {
                 return c
                     .CreateCriteria(SupportConcept.PropertyName_CostBearer2SupportConceptList, JoinType.InnerJoin)
@@ -551,7 +551,7 @@ namespace BeWo.Data.Access
         public IEnumerable<SupportConcept> FindSupportConceptsWithConferenceDate(long? employeeOid, DateTime conferenceDateUntil)
         {
             var c = CreateCriteriaIsActive<SupportConcept>();
-            if(employeeOid == null)
+            if (employeeOid == null)
             {
                 return c
                     .Add(Restrictions.Between(SupportConcept.PropertyName_ConferenceDate, DateTime.Now, conferenceDateUntil))
@@ -602,7 +602,7 @@ namespace BeWo.Data.Access
         {
             var lCriteria = CreateCriteriaIsActive<AccountingTransaction>();
 
-            if(pSpan != null)
+            if (pSpan != null)
                 lCriteria.Add(Restrictions.Between(AccountingTransaction.PropertyName_BookingDate, pSpan.StartDateTime, pSpan.EndDateTime));
 
             var test = lCriteria.List<AccountingTransaction>();
@@ -615,13 +615,13 @@ namespace BeWo.Data.Access
             var lCriteria = CreateCriteriaIsActive<AccountingTransaction>()
                 .CreateAlias(AccountingTransaction.PropertyName_CostBearer2SupportConcept, "cb2sc", JoinType.LeftOuterJoin);
 
-            if(pSpan != null)
+            if (pSpan != null)
                 lCriteria.Add(Restrictions.Between(AccountingTransaction.PropertyName_BookingDate, pSpan.StartDateTime, pSpan.EndDateTime));
 
-            if(pSupportConceptCostBearerRelOid != null)
+            if (pSupportConceptCostBearerRelOid != null)
                 lCriteria.Add(Restrictions.Eq("cb2sc." + BeWoEntityBase.PropertyName_Oid, pSupportConceptCostBearerRelOid));
 
-            if(pSupportConceptOid != null)
+            if (pSupportConceptOid != null)
             {
                 lCriteria.CreateCriteria("cb2sc." + CostBearer2SupportConcept.PropertyName_SupportConcept)
                     .Add(Restrictions.Eq(BeWoEntityBase.PropertyName_Oid, pSupportConceptOid));
@@ -661,7 +661,7 @@ namespace BeWo.Data.Access
             var c = CreateCriteriaIsActive<BeWoFolder>()
                 .Add(Restrictions.Eq(BeWoFolder.PropertyName_ObjectTid, pObjTid));
 
-            if(pObjOid > 0)
+            if (pObjOid > 0)
             {
                 c.Add(Restrictions.Eq(BeWoFolder.PropertyName_ObjectOid, pObjOid));
             }
@@ -691,7 +691,7 @@ namespace BeWo.Data.Access
         public Employee FindEmployeeWithPersonOid(long pPersonOid)
         {
             var person = DAOFactory.GenericDAO.LoadByID<Person>(pPersonOid);
-            if(person != null)
+            if (person != null)
             {
                 return CreateCriteria<Employee>()
                     .Add(Restrictions.Eq(Employee.PropertyName_Person, person)).UniqueResult<Employee>();
@@ -703,7 +703,7 @@ namespace BeWo.Data.Access
         public Customer FindCustomerWithPersonOid(long pPersonOid)
         {
             var person = DAOFactory.GenericDAO.LoadByID<Person>(pPersonOid);
-            if(person != null)
+            if (person != null)
             {
                 return CreateCriteria<Customer>()
                     .Add(Restrictions.Eq(Customer.PropertyName_Person, person)).UniqueResult<Customer>();
@@ -762,7 +762,7 @@ namespace BeWo.Data.Access
             var c = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costbearer2SupportConcept));
 
-            if(days.HasValue)
+            if (days.HasValue)
             {
 
                 var minDate = DateTime.Now.Date.AddDays(-1 * days.Value);
@@ -1033,11 +1033,11 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq("ib." + InvoiceBase.PropertyName_RecipientCostBearerOid, costBearerOid))
                 .Add(Restrictions.Eq("ib." + BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active));
 
-            if(supportConceptOid.HasValue)
+            if (supportConceptOid.HasValue)
                 criteria = criteria
                     .Add(Restrictions.Eq("ib." + InvoiceBase.PropertyName_SupportConceptOid, supportConceptOid.Value));
 
-            if(period != null)
+            if (period != null)
                 criteria = criteria
                     .Add(Restrictions.Or(
                         Restrictions.Or(
@@ -1056,13 +1056,13 @@ namespace BeWo.Data.Access
                 .CreateAlias(ServiceInvoice.PropertyName_InvoiceBase, "ib", JoinType.InnerJoin)
                 .Add(Restrictions.Eq("ib." + BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active));
 
-            if(costbearer2SupportConceptOid.HasValue)
+            if (costbearer2SupportConceptOid.HasValue)
                 criteria = criteria
                     .Add(Restrictions.Eq("ib." + InvoiceBase.PropertyName_CostBearer2SupportConceptOid, costbearer2SupportConceptOid.Value));
 
 
 
-            if(period != null)
+            if (period != null)
                 criteria = criteria
                     .Add(Restrictions.Or(
                         Restrictions.Or(
@@ -1089,10 +1089,10 @@ namespace BeWo.Data.Access
         {
             var criteria = CreateCriteriaIsActive<AbsenceTime>();
 
-            if(!fetchEmployees)
+            if (!fetchEmployees)
                 criteria = criteria
                     .Add(Restrictions.IsNull(AbsenceTime.PropertyName_EmployeeOid));
-            else if(!fetchCustomers)
+            else if (!fetchCustomers)
                 criteria = criteria
                     .Add(Restrictions.IsNull(AbsenceTime.PropertyName_CustomerOid));
 
@@ -1175,12 +1175,12 @@ namespace BeWo.Data.Access
         {
             var criteria = CreateCriteriaIsActive<Appointment>();
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 criteria = criteria.Add(Restrictions.Eq(AbsenceTime.PropertyName_EmployeeOid, employeeOid));
             }
 
-            if(customerOid.HasValue)
+            if (customerOid.HasValue)
             {
                 criteria = criteria.Add(Restrictions.Eq(AbsenceTime.PropertyName_CustomerOid, customerOid));
             }
@@ -1231,7 +1231,7 @@ namespace BeWo.Data.Access
             var criteria = CreateCriteriaIsActive<AdditionalServiceBooking>()
                 .Add(Restrictions.Between("Datum", start, end));
 
-            if(regionOid.HasValue)
+            if (regionOid.HasValue)
                 criteria = criteria.CreateAlias(AdditionalServiceBooking.PropertyName_AdditionalServiceRegion, "asr", JoinType.InnerJoin)
                     .Add(Restrictions.Eq("asr." + BeWoEntityBase.PropertyName_Oid, regionOid));
 
@@ -1382,17 +1382,17 @@ namespace BeWo.Data.Access
 
         public bool OverlappingAppointmentsExist(DateTime start, DateTime end, IEnumerable<long> employees, IEnumerable<long> customers, IEnumerable<long> resources, long originator, long? appointmentOid, string recurrenceId = "", int occurrenceIndex = 0)
         {
-            if(employees is null)
+            if (employees is null)
             {
                 employees = new List<long>();
             }
 
-            if(customers is null)
+            if (customers is null)
             {
                 customers = new List<long>();
             }
 
-            if(resources is null)
+            if (resources is null)
             {
                 resources = new List<long>();
             }
@@ -1401,13 +1401,13 @@ namespace BeWo.Data.Access
             var isBeingUpdatedToNormalAppointment = false;
             Guid? recurrenceIdToIgnore = null;
 
-            if(appointmentOid != null)
+            if (appointmentOid != null)
             {
                 // Das Pattern wird geladen, bzw. mit der Ausnahme mit Index 0 verglichen
                 // Wird die Serie in einen Einzeltermin geändert und es existiert eine Ausnahme mit Index 0, sollte die Ausnahme behalten werden und nicht der Root-Termin
                 var original = DAOFactory.GenericDAO.LoadByID<SchedulerAppointment>(appointmentOid.Value);
                 var ri = original?.GetRecurrenceId();
-                if(ri != null && IsNullOrWhiteSpace(recurrenceId))
+                if (ri != null && IsNullOrWhiteSpace(recurrenceId))
                 {
                     isBeingUpdatedToNormalAppointment = true;
                     recurrenceIdToIgnore = ri;
@@ -1416,7 +1416,7 @@ namespace BeWo.Data.Access
 
             Guid? recurrenceGuid = null;
 
-            if(Guid.TryParse(recurrenceId, out var parsedGuid))
+            if (Guid.TryParse(recurrenceId, out var parsedGuid))
             {
                 recurrenceGuid = parsedGuid;
             }
@@ -1428,7 +1428,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq(nameof(SchedulerAppointment.IsTask), false))
                 .Add(betweenDateTimesCriterion);
 
-            if(isRecurrenceException == false)
+            if (isRecurrenceException == false)
             {
                 criteria.Add(Restrictions.Not(Restrictions.Eq(BeWoEntityBase.PropertyName_Oid, appointmentOid)));
             }
@@ -1437,7 +1437,7 @@ namespace BeWo.Data.Access
 
             var appointments = appTmp.Where(a =>
             {
-                if(a.RecurrenceInfo is null)
+                if (a.RecurrenceInfo is null)
                 {
                     return true;
                 }
@@ -1457,13 +1457,13 @@ namespace BeWo.Data.Access
 
             var recurringAppointments = recurringAppointmentsCriteria.List<SchedulerAppointment>().ToList();
 
-            if(isBeingUpdatedToNormalAppointment)
+            if (isBeingUpdatedToNormalAppointment)
             {
                 recurringAppointments = recurringAppointments.Where(root =>
                 {
                     var recId = root.GetRecurrenceId();
 
-                    if(recId is null || recurrenceIdToIgnore is null)
+                    if (recId is null || recurrenceIdToIgnore is null)
                     {
                         return true;
                     }
@@ -1475,7 +1475,7 @@ namespace BeWo.Data.Access
                 {
                     var recId = root.GetRecurrenceId();
 
-                    if(recId is null || recurrenceIdToIgnore is null)
+                    if (recId is null || recurrenceIdToIgnore is null)
                     {
                         return true;
                     }
@@ -1484,7 +1484,7 @@ namespace BeWo.Data.Access
                 }).ToList();
             }
 
-            foreach(var appointment in recurringAppointments)
+            foreach (var appointment in recurringAppointments)
             {
                 var recurrenceInfo = new RecurrenceInfo();
                 recurrenceInfo.FromXml(appointment.RecurrenceInfo);
@@ -1494,7 +1494,7 @@ namespace BeWo.Data.Access
                 // Das Muster für die Terminserie wird berechnet
                 var pattern = StaticAppointmentFactory.CreateAppointment(AppointmentType.Pattern);
 
-                if(pattern is null)
+                if (pattern is null)
                 {
                     continue;
                 }
@@ -1511,9 +1511,9 @@ namespace BeWo.Data.Access
                 // Die Serientermine werden berechnet (ausnahmslos, d.h. es werden auch bearbeitete und gelöschte Termine erstellt, die herausgefiltert werden müssen).
                 var occurrences = occurenceCalculator.CalcOccurrences(interval, pattern);
 
-                foreach(var occurrence in occurrences.GetAppointments(interval))
+                foreach (var occurrence in occurrences.GetAppointments(interval))
                 {
-                    if(appointment.EndDate is null || appointment.StartDate is null)
+                    if (appointment.EndDate is null || appointment.StartDate is null)
                     {
                         continue;
                     }
@@ -1531,7 +1531,7 @@ namespace BeWo.Data.Access
 
                     var isInIntervalTest = start.IsInInterval(end, occurrence.Start, occurrence.Start.AddMinutes(duration));
 
-                    if(!isInIntervalTest ||
+                    if (!isInIntervalTest ||
                        changedOccurences != null && changedOccurences.Any(changedOccurence => changedOccurence.PatternId.Equals(patternId) && changedOccurence.Index == index) ||
                        deletedOccurences != null && deletedOccurences.Any(deletedOccurence => deletedOccurence.PatternId.Equals(patternId) && deletedOccurence.Index == index) ||
                        index == occurrenceIndex && guidParsingSuccessful && recurrenceGuid != null && recurrenceGuid.Equals(occurrenceGuid))
@@ -1540,10 +1540,10 @@ namespace BeWo.Data.Access
                     }
 
                     // Prüfen, ob es eine Ausnahme an dem Tag gibt, die zu dem Pattern gehört, um das Pattern auszuschließen
-                    var relatedAppointments = FindAppointmentsByRecurrenceId(new List<string> {recurrenceInfo.Id.ToString()}, true);
+                    var relatedAppointments = FindAppointmentsByRecurrenceId(new List<string> { recurrenceInfo.Id.ToString() }, true);
                     var relatedAppointmentsInInterval = relatedAppointments.Where(a =>
                     {
-                        if(a.StartDate == null || a.EndDate == null)
+                        if (a.StartDate == null || a.EndDate == null)
                         {
                             return false;
                         }
@@ -1560,23 +1560,23 @@ namespace BeWo.Data.Access
 
                     // Prüfen, ob es sich bei dem Termin für den Überschneidungen gesucht werden, um zu unterscheiden, ob ein Serientermin in einen normalen geändert wird.
                     var root = FindRootAppointmentByRecurrenceId(recurrenceInfo.Id.ToString());
-                    if(root.Oid != null && appointmentOid != null && root.Oid == appointmentOid && root.RecurrenceInfo != null && IsNullOrWhiteSpace(recurrenceId))
+                    if (root.Oid != null && appointmentOid != null && root.Oid == appointmentOid && root.RecurrenceInfo != null && IsNullOrWhiteSpace(recurrenceId))
                     {
                         hasToStop = true;
                     }
 
                     // Indices und Ids der RecurrenceInfo vergleichen. Stimmen sie überein, dann wird das generiert Serienelement ignoriert.
-                    if(occurrence.RecurrenceInfo?.Id != null && !hasToStop)
+                    if (occurrence.RecurrenceInfo?.Id != null && !hasToStop)
                     {
-                        if(Guid.TryParse(occurrence.RecurrenceInfo.Id.ToString(), out var guid))
+                        if (Guid.TryParse(occurrence.RecurrenceInfo.Id.ToString(), out var guid))
                         {
-                            foreach(var relatedAppointment in relatedAppointmentsInInterval)
+                            foreach (var relatedAppointment in relatedAppointmentsInInterval)
                             {
                                 var relatedAppointmentRecurrenceId = relatedAppointment.GetRecurrenceIdAndIndex(out var relatedAppointmentRecurrenceIndex);
 
-                                if(relatedAppointmentRecurrenceId != null)
+                                if (relatedAppointmentRecurrenceId != null)
                                 {
-                                    if(guid.Equals(relatedAppointmentRecurrenceId) && relatedAppointmentRecurrenceIndex.Equals(occurrence.RecurrenceIndex))
+                                    if (guid.Equals(relatedAppointmentRecurrenceId) && relatedAppointmentRecurrenceIndex.Equals(occurrence.RecurrenceIndex))
                                     {
                                         hasToStop = true;
                                         break;
@@ -1586,28 +1586,28 @@ namespace BeWo.Data.Access
                         }
                     }
 
-                    if(hasToStop)
+                    if (hasToStop)
                     {
                         continue;
                     }
 
                     var recurringAppointment = new SchedulerAppointment
                     {
-                        AllDay                   = occurrence.AllDay,
-                        CustomerList             = appointment.CustomerList,
-                        Notice                   = appointment.Notice,
-                        EmployeeList             = appointment.EmployeeList,
-                        EndDate                  = occurrence.Start.AddMinutes(duration),
+                        AllDay = occurrence.AllDay,
+                        CustomerList = appointment.CustomerList,
+                        Notice = appointment.Notice,
+                        EmployeeList = appointment.EmployeeList,
+                        EndDate = occurrence.Start.AddMinutes(duration),
                         FormerBookingSequenceOid = appointment.FormerBookingSequenceOid,
-                        IsPrivate                = appointment.IsPrivate,
-                        Location                 = appointment.Location,
-                        Originator               = appointment.Originator,
-                        RecurrenceInfo           = occurrence.RecurrenceInfo.ToXml(),
-                        ReminderInfo             = appointment.ReminderInfo,
-                        ResourceList             = appointment.ResourceList,
-                        StartDate                = occurrence.Start,
-                        Subject                  = appointment.Subject ?? "",
-                        Type                     = appointment.Type
+                        IsPrivate = appointment.IsPrivate,
+                        Location = appointment.Location,
+                        Originator = appointment.Originator,
+                        RecurrenceInfo = occurrence.RecurrenceInfo.ToXml(),
+                        ReminderInfo = appointment.ReminderInfo,
+                        ResourceList = appointment.ResourceList,
+                        StartDate = occurrence.Start,
+                        Subject = appointment.Subject ?? "",
+                        Type = appointment.Type
                     };
 
                     schedulerAppointments.AddIfNotIn(recurringAppointment);
@@ -1617,9 +1617,9 @@ namespace BeWo.Data.Access
 
             // Falls es sich um eine Ausnahme einer Serie handelt, muss die Serie ignoriert werden
             var shouldIgnoreAppointment = false;
-            if(isRecurrenceException && recurrenceId != null)
+            if (isRecurrenceException && recurrenceId != null)
             {
-                if(recurrenceGuid.HasValue)
+                if (recurrenceGuid.HasValue)
                 {
                     shouldIgnoreAppointment = true;
                 }
@@ -1629,11 +1629,11 @@ namespace BeWo.Data.Access
 
             schedulerAppointments = schedulerAppointments.Where(appointment => appointment.Type != 4).ToList();
 
-            foreach(var appointment in schedulerAppointments)
+            foreach (var appointment in schedulerAppointments)
             {
-                if(shouldIgnoreAppointment)
+                if (shouldIgnoreAppointment)
                 {
-                    if(!ShouldDoAppointmentOverlappingCheck(appointment, recurrenceGuid.Value))
+                    if (!ShouldDoAppointmentOverlappingCheck(appointment, recurrenceGuid.Value))
                     {
                         continue;
                     }
@@ -1649,7 +1649,7 @@ namespace BeWo.Data.Access
 
             var hasOverlappingOriginatorAppointments = schedulerAppointments.Any(appointment =>
             {
-                if(!ShouldDoAppointmentOverlappingCheck(appointment, recurrenceGuid))
+                if (!ShouldDoAppointmentOverlappingCheck(appointment, recurrenceGuid))
                 {
                     return false;
                 }
@@ -1661,17 +1661,17 @@ namespace BeWo.Data.Access
 
             return hasOverlappingEmployeeAppointments || hasOverlappingCustomerAppointments || hasOverlappingResourceAppointments || hasOverlappingOriginatorAppointments;
         }
-        
+
         private static bool ShouldDoAppointmentOverlappingCheck(SchedulerAppointment appointment, Guid? recurrenceId)
         {
-            if(!appointment.Oid.HasValue || !recurrenceId.HasValue)
+            if (!appointment.Oid.HasValue || !recurrenceId.HasValue)
             {
                 return true;
             }
 
             var recId = appointment.GetRecurrenceIdAndIndex(out var recIndex);
 
-            if(appointment.RecurrenceInfo is null || recId is null)
+            if (appointment.RecurrenceInfo is null || recId is null)
             {
                 return true;
             }
@@ -1717,18 +1717,18 @@ namespace BeWo.Data.Access
         public IEnumerable<InvoiceBase> GetInvoiceBases(DateTime? startDate, DateTime? endDate, bool useInvoiceDate = true)
         {
             var lCriteria = CreateCriteriaIsActive<InvoiceBase>();
-            if(useInvoiceDate)
+            if (useInvoiceDate)
             {
-                if(startDate.HasValue)
+                if (startDate.HasValue)
                     lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_InvoiceDate, startDate));
-                if(endDate.HasValue)
+                if (endDate.HasValue)
                     lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_InvoiceDate, endDate));
             }
             else
             {
-                if(startDate.HasValue)
+                if (startDate.HasValue)
                     lCriteria.Add(Restrictions.Ge(InvoiceBase.PropertyName_AccountingPeriodEnd, startDate));
-                if(endDate.HasValue)
+                if (endDate.HasValue)
                     lCriteria.Add(Restrictions.Le(InvoiceBase.PropertyName_AccountingPeriodStart, endDate));
             }
 
@@ -1786,7 +1786,7 @@ namespace BeWo.Data.Access
                 .CreateAlias(SupportConcept.PropertyName_Customer, "c")
                 .Add(Restrictions.In("c." + BeWoEntityBase.PropertyName_Oid, customerOids));
 
-            if(expiredOnesToo)
+            if (expiredOnesToo)
             {
 
             }
@@ -1799,7 +1799,7 @@ namespace BeWo.Data.Access
             var minStart = DateTime.Now.GetShortDateTime().AddDays(-dayCount);
             var c = CreateCriteriaIsActive<ServiceRecord>();
 
-            if(costBearer2SupportConceptOid.HasValue)
+            if (costBearer2SupportConceptOid.HasValue)
             {
                 c.Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costBearer2SupportConceptOid));
             }
@@ -1809,7 +1809,7 @@ namespace BeWo.Data.Access
                     .Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
             }
 
-            if(dayCount > 0)
+            if (dayCount > 0)
             {
                 c.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, minStart));
             }
@@ -1856,18 +1856,18 @@ namespace BeWo.Data.Access
             var exceptionIds = new List<long>();
             var regex = new Regex("(Id=\\\"[a-z0-9-]+\\\")");
 
-            foreach(var appointment in exceptionalRecurrenceInfos)
+            foreach (var appointment in exceptionalRecurrenceInfos)
             {
                 var match = regex.Match(appointment.RecurrenceInfo);
-                if(match.Success)
+                if (match.Success)
                 {
                     var value = match.Value;
                     var actualId = value.Split("\"");
-                    if(actualId.Count > 1)
+                    if (actualId.Count > 1)
                     {
                         var id = actualId[1];
 
-                        if(!appointments.Any(w => w.RecurrenceInfo != null && w.RecurrenceInfo.Contains(id) && w.Type == 1))
+                        if (!appointments.Any(w => w.RecurrenceInfo != null && w.RecurrenceInfo.Contains(id) && w.Type == 1))
                         {
                             exceptionIds.Add(appointment.Oid.Value);
                         }
@@ -1877,7 +1877,7 @@ namespace BeWo.Data.Access
 
             var exceptionsToModify = appointments.Where(w => w.Oid.HasValue && exceptionIds.Contains(w.Oid.Value)).ToList();
 
-            foreach(var exception in exceptionsToModify)
+            foreach (var exception in exceptionsToModify)
             {
                 var replacingAppointment = new SchedulerAppointment
                 {
@@ -1900,14 +1900,14 @@ namespace BeWo.Data.Access
             var recurrenceIds = new List<string>();
 
             var allExceptionalRecurrenceInfos = appointments.Where(w => w.RecurrenceInfo != null);
-            foreach(var appointment in allExceptionalRecurrenceInfos)
+            foreach (var appointment in allExceptionalRecurrenceInfos)
             {
                 var match = regex.Match(appointment.RecurrenceInfo);
-                if(match.Success)
+                if (match.Success)
                 {
                     var value = match.Value;
                     var actualId = value.Split("\"");
-                    if(actualId.Count > 1)
+                    if (actualId.Count > 1)
                     {
                         recurrenceIds.AddIfNotIn(actualId[1]);
                     }
@@ -1923,34 +1923,34 @@ namespace BeWo.Data.Access
 
         public IEnumerable<long> FilterEmployeesWithAppointments(List<long> pEmployeeOids, DateTime pStartTime, DateTime pEndTime)
         {
-            if(pEmployeeOids == null)
+            if (pEmployeeOids == null)
             {
                 pEmployeeOids = new List<long>();
             }
 
             var result = new List<long>();
             var appointments = GetAllActiveAppointmentsForEmployeeInInterval2(pStartTime, pEndTime, pEmployeeOids) ?? new List<SchedulerAppointment>();
-            var gefilterteTermine = 
+            var gefilterteTermine =
                 appointments.Where(w => w.EmployeeList != null && w.EmployeeList
                                 .Select(s => s.Employee.Oid.Value)
                                 .Intersect(pEmployeeOids).Any() || !w.EmployeeList.Select(s => s.Employee.Oid.Value)
                                 .Intersect(pEmployeeOids).Any() && pEmployeeOids.Contains(w.Originator.Oid.Value)).ToList();
 
             var employee2SchedulerAppointmentsList = gefilterteTermine.Select(s => s.EmployeeList).ToList();
-            foreach(var employee2SchedulerAppointments in employee2SchedulerAppointmentsList)
+            foreach (var employee2SchedulerAppointments in employee2SchedulerAppointmentsList)
             {
-                foreach(var employee2SchedulerAppointment in employee2SchedulerAppointments)
+                foreach (var employee2SchedulerAppointment in employee2SchedulerAppointments)
                 {
-                    if(employee2SchedulerAppointment.Employee.Oid.HasValue && !result.Contains(employee2SchedulerAppointment.Employee.Oid.Value))
+                    if (employee2SchedulerAppointment.Employee.Oid.HasValue && !result.Contains(employee2SchedulerAppointment.Employee.Oid.Value))
                     {
                         result.Add(employee2SchedulerAppointment.Employee.Oid.Value);
                     }
                 }
             }
 
-            foreach(var originator in gefilterteTermine.Select(s => s.Originator))
+            foreach (var originator in gefilterteTermine.Select(s => s.Originator))
             {
-                if(originator.Oid.HasValue && !result.Contains(originator.Oid.Value))
+                if (originator.Oid.HasValue && !result.Contains(originator.Oid.Value))
                 {
                     result.Add(originator.Oid.Value);
                 }
@@ -1978,7 +1978,7 @@ namespace BeWo.Data.Access
 
             var abwesenheiten = c.List<AbsenceTime>();
 
-            foreach(var abwesenheit in abwesenheiten)
+            foreach (var abwesenheit in abwesenheiten)
             {
                 result.AddIfNotIn(abwesenheit.EmployeeOid.Value);
             }
@@ -2020,13 +2020,13 @@ namespace BeWo.Data.Access
 
             var c = CreateCriteriaIsActive<RightRelation>()
                 .Add(Restrictions.Not(Restrictions.In(RightRelation.PropertyName_UserGroupOid, pUserGroupOids)))
-                .Add(Restrictions.In(RightRelation.PropertyName_RightType, new[] {UserRightType.UserGroupView_View, UserRightType.UserGroupView_Edit, UserRightType.ViewAll, UserRightType.EditAll}))
+                .Add(Restrictions.In(RightRelation.PropertyName_RightType, new[] { UserRightType.UserGroupView_View, UserRightType.UserGroupView_Edit, UserRightType.ViewAll, UserRightType.EditAll }))
                 .Add(Subqueries.PropertyIn(RightRelation.PropertyName_UserGroupOid, dc));
 
             var result = c.List<RightRelation>();
             var nachUserGroupOidSortiert = new Dictionary<long, List<UserRightType>>();
 
-            foreach(var relation in result)
+            foreach (var relation in result)
             {
                 nachUserGroupOidSortiert.AddOrUpdateValueInDictionary(relation.UserGroupOid.Value, relation.RightType);
             }
@@ -2066,14 +2066,14 @@ namespace BeWo.Data.Access
             var c = CreateCriteriaIsActive<Arbeitszeit>();
 
             if (objectTid == TableID.Employee)
-            { 
+            {
                 c.Add(Restrictions.Eq(Arbeitszeit.PropertyName_EmployeeOid, objectOid));
             }
             else
             {
                 c.Add(Restrictions.Eq("Customer", DAOFactory.GenericDAO.GetByID<Customer>(objectOid)));
             }
-                
+
 
             return c.List<Arbeitszeit>().ToList();
         }
@@ -2138,7 +2138,7 @@ namespace BeWo.Data.Access
         public IEnumerable<ChatMessage> FindNextChatMessages(long senderOid, long empfaengerOid, int messlateZahl, List<string> list, bool isteam)
         {
             var c = CreateCriteriaIsActive<ChatMessage>();
-            if(!isteam)
+            if (!isteam)
             {
                 c.Add(
                     Restrictions.Or(
@@ -2167,7 +2167,7 @@ namespace BeWo.Data.Access
         {
             //Zähle hier alle ChatMessages
             int xc;
-            if(!isTeam)
+            if (!isTeam)
             {
                 xc =
                     Session.QueryOver<ChatMessage>()
@@ -2190,7 +2190,7 @@ namespace BeWo.Data.Access
 
             int ergebnis = xc - aktuelleZahl;
 
-            if(ergebnis < 0)
+            if (ergebnis < 0)
                 ergebnis = 0;
 
             return ergebnis;
@@ -2295,7 +2295,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Not(Restrictions.In(ChatMessage.PropertyName_MessageId, pExceptions)))
                 .Add(Restrictions.IsNull(ChatMessage.PropertyName_TeamOid));
 
-            if(pForTeam)
+            if (pForTeam)
             {
                 c = CreateCriteriaIsActive<ChatMessage>()
                     .Add(Restrictions.Eq(ChatMessage.PropertyName_TeamOid, pRecipientOid))
@@ -2404,17 +2404,17 @@ namespace BeWo.Data.Access
 
         public static string ToSql(ICriteria criteria)
         {
-            var criteriaImpl = (CriteriaImpl) criteria;
-            var sessionImpl = (SessionImpl) criteriaImpl.Session;
-            var factory = (ISessionFactoryImplementor) sessionImpl.SessionFactory;
+            var criteriaImpl = (CriteriaImpl)criteria;
+            var sessionImpl = (SessionImpl)criteriaImpl.Session;
+            var factory = (ISessionFactoryImplementor)sessionImpl.SessionFactory;
             var implementors = factory.GetImplementors(criteriaImpl.EntityOrClassName);
 
-            if(implementors.Length == 0)
+            if (implementors.Length == 0)
             {
                 return "No entity or class name found!";
             }
 
-            var loader = new CriteriaLoader((IOuterJoinLoadable) factory.GetEntityPersister(implementors[0]), factory, criteriaImpl, implementors[0], sessionImpl.EnabledFilters);
+            var loader = new CriteriaLoader((IOuterJoinLoadable)factory.GetEntityPersister(implementors[0]), factory, criteriaImpl, implementors[0], sessionImpl.EnabledFilters);
 
             return loader.SqlString.ToString();
         }
@@ -2442,26 +2442,26 @@ namespace BeWo.Data.Access
 
             c.Add(Restrictions.IsNull(ChatMessage.PropertyName_TeamOid));
 
-            if(pForTeam)
+            if (pForTeam)
             {
                 c = CreateCriteriaIsActive<ChatMessage>()
                     .Add(Restrictions.Eq(ChatMessage.PropertyName_TeamOid, pRecipientOid));
             }
 
-            if(!IsNullOrEmpty(pMessageId))
+            if (!IsNullOrEmpty(pMessageId))
             {
                 var c1 = CreateCriteriaIsActive<ChatMessage>()
                     .Add(Restrictions.Eq(ChatMessage.PropertyName_MessageId, pMessageId))
                     .AddOrder(Order.Desc(BeWoEntityBase.PropertyName_InsTs));
 
                 var list = c1.List<ChatMessage>();
-                if(list.Count > 0)
+                if (list.Count > 0)
                 {
                     var lastLoadedChatMessage = c1.List<ChatMessage>().First();
 
                     c.Add(Restrictions.Not(Restrictions.In(ChatMessage.PropertyName_MessageId, pExceptions)));
 
-                    if(pIsInitialCall)
+                    if (pIsInitialCall)
                     {
                         c.Add(Restrictions.Gt(BeWoEntityBase.PropertyName_InsTs, lastLoadedChatMessage.InsTs));
                     }
@@ -2490,10 +2490,10 @@ namespace BeWo.Data.Access
         {
             var teams = new List<long>();
 
-            if(pIsTeam)
+            if (pIsTeam)
             {
                 var employee = FindEmployeeWithPersonOid(pSenderPersonOid);
-                if(employee != null)
+                if (employee != null)
                 {
                     teams.AddRange(FindTeamsOfEmployee(employee.Oid.Value).Select(s => s.Oid.Value));
                 }
@@ -2501,7 +2501,7 @@ namespace BeWo.Data.Access
 
             var c = CreateCriteria<NewestChatMessage>();
 
-            if(pIsTeam)
+            if (pIsTeam)
             {
                 c.Add(Restrictions.And(Restrictions.Eq(NewestChatMessage.PropertyName_IsTeam, true),
                     Restrictions.Eq(NewestChatMessage.PropertyName_RecipientPersonOid, pRecipientPersonOid)));
@@ -2555,7 +2555,7 @@ namespace BeWo.Data.Access
             List<long> nAr = new List<long>();
 
 
-            foreach(var item in c.List<Arbeitszeit>())
+            foreach (var item in c.List<Arbeitszeit>())
             {
                 nAr.Add(item.Oid.Value);
             }
@@ -2563,7 +2563,7 @@ namespace BeWo.Data.Access
             ArbeitszeitListe a = new ArbeitszeitListe();
             a.Arbeitszeit = c.List<Arbeitszeit>().ToList();
 
-            if(nAr.Count != 0)
+            if (nAr.Count != 0)
             {
                 var cEintrag =
                     CreateCriteria<ArbeitszeitEintrag>()
@@ -2602,7 +2602,7 @@ namespace BeWo.Data.Access
             {
                 c = CreateCriteriaIsActive<SupportConcept>();
             }
-            
+
 
             return c
                 .CreateAlias(SupportConcept.PropertyName_CostBearer2SupportConceptList, "cb2sc", JoinType.InnerJoin)
@@ -2682,7 +2682,7 @@ namespace BeWo.Data.Access
                     ), Restrictions.And(Restrictions.Lt(AbsenceTime.PropertyName_Start, start), Restrictions.Gt(AbsenceTime.PropertyName_End, start)))
                 );
 
-            if(!pHasRightToSeeAllEmployeeAppointments)
+            if (!pHasRightToSeeAllEmployeeAppointments)
             {
                 criteria.Add(Restrictions.Eq(AbsenceTime.PropertyName_EmployeeOid, pEmployeeOid));
             }
@@ -2694,11 +2694,11 @@ namespace BeWo.Data.Access
         {
             var criteria = CreateCriteriaIsActive<TextModule>();
 
-            if(pIsInAdministrationView)
+            if (pIsInAdministrationView)
             {
                 criteria.Add(Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), false));
             }
-            else if(!pHasRightToSeeAll)
+            else if (!pHasRightToSeeAll)
             {
                 criteria.Add(Restrictions.Eq(nameof(TextModule.IsOnlyForEmployee), true))
                     .Add(Restrictions.Eq(nameof(TextModule.Employee) + "." + nameof(BeWoEntityBase.Oid), pEmployeeOid));
@@ -2749,7 +2749,7 @@ namespace BeWo.Data.Access
 
             var criteria = CreateCriteria<SchedulerAppointment>();
 
-            if(!pIncludeInactiveOnes)
+            if (!pIncludeInactiveOnes)
             {
                 criteria.Add(Restrictions.Eq(BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active));
             }
@@ -2763,31 +2763,31 @@ namespace BeWo.Data.Access
                         Restrictions.And(Restrictions.IsNotNull(SchedulerAppointment.PropertyName_RecurrenceInfo), Expression.Sql(new SqlString(recurrenceBetween)))),
                     Restrictions.And(Restrictions.Eq(SchedulerAppointment.PropertyName_Type, 3), Expression.Sql(new SqlString(recurrenceBetween))))));
 
-            if(pPrivateAppointmentsOnly)
+            if (pPrivateAppointmentsOnly)
             {
                 criteria.Add(Restrictions.Eq(SchedulerAppointment.PropertyName_IsPrivate, true));
             }
             else
             {
-                if(pEmployeesOnly)
+                if (pEmployeesOnly)
                 {
                     var hasEmployees = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM employee2newschapp)";
                     criteria.Add(Expression.Sql(hasEmployees));
                 }
 
-                if(pCustomersOnly)
+                if (pCustomersOnly)
                 {
                     var hasCustomers = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM customer2newschapp)";
                     criteria.Add(Expression.Sql(hasCustomers));
                 }
 
-                if(pResourcesOnly)
+                if (pResourcesOnly)
                 {
                     var hasResources = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM resource2newschapp)";
                     criteria.Add(Expression.Sql(hasResources));
                 }
 
-                if(pSelectedEmployees.Any())
+                if (pSelectedEmployees.Any())
                 {
                     var detachedCriteria1 = DetachedCriteria.For<Employee2SchedulerAppointment>()
                         .Add(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", pSelectedEmployees))
@@ -2795,12 +2795,12 @@ namespace BeWo.Data.Access
                     criteria.Add(Subqueries.PropertyIn(BeWoEntityBase.PropertyName_Oid, detachedCriteria1));
                 }
 
-                if(pSelectedCustomers.Any())
+                if (pSelectedCustomers.Any())
                 {
                     var list = "";
-                    for(var i = 0; i < pSelectedCustomers.Count; i++)
+                    for (var i = 0; i < pSelectedCustomers.Count; i++)
                     {
-                        if(i != pSelectedCustomers.Count - 1)
+                        if (i != pSelectedCustomers.Count - 1)
                         {
                             list += "" + pSelectedCustomers[i] + ",";
                         }
@@ -2815,12 +2815,12 @@ namespace BeWo.Data.Access
                     criteria.Add(Expression.Sql(blah));
                 }
 
-                if(pSelectedResources.Any())
+                if (pSelectedResources.Any())
                 {
                     var list = "";
-                    for(var i = 0; i < pSelectedResources.Count; i++)
+                    for (var i = 0; i < pSelectedResources.Count; i++)
                     {
-                        if(i != pSelectedResources.Count - 1)
+                        if (i != pSelectedResources.Count - 1)
                         {
                             list += "" + pSelectedResources[i] + ",";
                         }
@@ -2852,35 +2852,35 @@ namespace BeWo.Data.Access
             ICriterion customerCriterion = null;
             ICriterion resourceCriterion = null;
 
-            if(pEmployeeOid.HasValue)
+            if (pEmployeeOid.HasValue)
             {
                 ownAppointmentCriterion = CreateOwnAppointmentsCriteria(pEmployeeOid.Value);
             }
 
-            if(pPrivateAppointmentsOnly)
+            if (pPrivateAppointmentsOnly)
             {
                 mainCriteria.Add(Restrictions.Eq(SchedulerAppointment.PropertyName_IsPrivate, true));
             }
 
-            if(pEmployeesOnly)
+            if (pEmployeesOnly)
             {
                 var hasEmployees = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM employee2newschapp)";
                 mainCriteria.Add(Expression.Sql(hasEmployees));
             }
 
-            if(pCustomersOnly)
+            if (pCustomersOnly)
             {
                 var hasCustomers = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM customer2newschapp)";
                 mainCriteria.Add(Expression.Sql(hasCustomers));
             }
 
-            if(pResourcesOnly)
+            if (pResourcesOnly)
             {
                 var hasResources = $"{BeWoEntityBase.PropertyName_Oid} IN (SELECT newschappoid FROM resource2newschapp)";
                 mainCriteria.Add(Expression.Sql(hasResources));
             }
 
-            if(pSelectedEmployees.Any())
+            if (pSelectedEmployees.Any())
             {
                 var detachedCriteria1 = DetachedCriteria.For<Employee2SchedulerAppointment>()
                     .Add(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", pSelectedEmployees))
@@ -2888,7 +2888,7 @@ namespace BeWo.Data.Access
                 var employee2SchedCrit = Subqueries.PropertyIn(BeWoEntityBase.PropertyName_Oid, detachedCriteria1);
 
                 var originatorCrit = Restrictions.In(SchedulerAppointment.PropertyName_Originator, pSelectedEmployees);
-                
+
                 var detachedCriteria2 = DetachedCriteria.For<Employee2SchedulerAppointment>("e2s2")
                     .SetProjection(Projections.Property(BeWoEntityBase.PropertyName_Oid))
                     .Add(Restrictions.EqProperty("e2s2." + Employee2SchedulerAppointment.PropertyName_SchedulerAppointment, "sa.Oid"));
@@ -2900,12 +2900,12 @@ namespace BeWo.Data.Access
                 employeeCriterion = Restrictions.Or(employee2SchedCrit, and);
             }
 
-            if(pSelectedCustomers.Any())
+            if (pSelectedCustomers.Any())
             {
                 var list = "";
-                for(var i = 0; i < pSelectedCustomers.Count; i++)
+                for (var i = 0; i < pSelectedCustomers.Count; i++)
                 {
-                    if(i != pSelectedCustomers.Count - 1)
+                    if (i != pSelectedCustomers.Count - 1)
                     {
                         list += "" + pSelectedCustomers[i] + ",";
                     }
@@ -2919,12 +2919,12 @@ namespace BeWo.Data.Access
                 customerCriterion = Expression.Sql(blah);
             }
 
-            if(pSelectedResources.Any())
+            if (pSelectedResources.Any())
             {
                 var list = "";
-                for(var i = 0; i < pSelectedResources.Count; i++)
+                for (var i = 0; i < pSelectedResources.Count; i++)
                 {
-                    if(i != pSelectedResources.Count - 1)
+                    if (i != pSelectedResources.Count - 1)
                     {
                         list += "" + pSelectedResources[i] + ",";
                     }
@@ -2945,9 +2945,9 @@ namespace BeWo.Data.Access
                 resourceCriterion
             };
 
-            if(pSelectedResources.Count == 0)
+            if (pSelectedResources.Count == 0)
             {
-                if(!pHasRightToSeeAllEmployeeAppointments && pSelectedEmployees.Count == 0)
+                if (!pHasRightToSeeAllEmployeeAppointments && pSelectedEmployees.Count == 0)
                 {
                     mainCriteria.Add(ownAppointmentCriterion);
                 }
@@ -2959,7 +2959,7 @@ namespace BeWo.Data.Access
 
             var orCriteria = CreateOrCriteria(listOfCriterias);
 
-            if(orCriteria != null)
+            if (orCriteria != null)
             {
                 mainCriteria.Add(orCriteria);
             }
@@ -2972,18 +2972,18 @@ namespace BeWo.Data.Access
 
             var exceptionIds = new List<long>();
 
-            foreach(var appointment in exceptionalRecurrenceInfos)
+            foreach (var appointment in exceptionalRecurrenceInfos)
             {
                 var match = RecurrenceIdRegex.Match(appointment.RecurrenceInfo);
-                if(match.Success)
+                if (match.Success)
                 {
                     var value = match.Value;
                     var actualId = value.Split("\"");
-                    if(actualId.Count > 1)
+                    if (actualId.Count > 1)
                     {
                         var id = actualId[1];
 
-                        if(!appointments.Any(w => w.RecurrenceInfo != null && w.RecurrenceInfo.Contains(id) && w.Type == 1))
+                        if (!appointments.Any(w => w.RecurrenceInfo != null && w.RecurrenceInfo.Contains(id) && w.Type == 1))
                         {
                             exceptionIds.Add(appointment.Oid.Value);
                         }
@@ -2995,7 +2995,7 @@ namespace BeWo.Data.Access
             // Der Type wird auf "normal" gesetzt, damit nicht die ganze Serie angezeigt werden muss, die unter Umständen nichts mit den Filterkriterien zu tun hat.
             var exceptionsToModify = appointments.Where(w => w.Oid.HasValue && exceptionIds.Contains(w.Oid.Value)).ToList();
 
-            foreach(var exception in exceptionsToModify)
+            foreach (var exception in exceptionsToModify)
             {
                 var replacingAppointment = new SchedulerAppointment
                 {
@@ -3034,11 +3034,11 @@ namespace BeWo.Data.Access
         {
             ICriterion orCriterion = null;
 
-            if(criterionList != null && criterionList.Count > 0)
+            if (criterionList != null && criterionList.Count > 0)
             {
-                foreach(var c in criterionList)
+                foreach (var c in criterionList)
                 {
-                    if(c != null)
+                    if (c != null)
                     {
                         orCriterion = orCriterion == null ? c : Restrictions.Or(orCriterion, c);
                     }
@@ -3076,12 +3076,12 @@ namespace BeWo.Data.Access
 
             var criteria = CreateCriteria<SchedulerAppointment>("sa");
 
-            if(!excludeTasks)
+            if (!excludeTasks)
             {
                 criteria.Add(Restrictions.Not(Restrictions.Eq(nameof(SchedulerAppointment.IsTask), true)));
             }
 
-            if(!pIncludeInactiveOnes)
+            if (!pIncludeInactiveOnes)
             {
                 criteria.Add(Restrictions.Eq(BeWoEntityBase.PropertyName_IsActive, ActivationTypeId.Active));
             }
@@ -3118,7 +3118,7 @@ namespace BeWo.Data.Access
 
         public IList<SchedulerAppointment> FindAppointmentsByRecurrenecInfo(List<string> pRecurrenceInfos, bool pExcludeRootAppointments = false)
         {
-            if(pRecurrenceInfos == null || pRecurrenceInfos.Count == 0)
+            if (pRecurrenceInfos == null || pRecurrenceInfos.Count == 0)
             {
                 return new List<SchedulerAppointment>();
             }
@@ -3128,7 +3128,7 @@ namespace BeWo.Data.Access
 
         public IList<SchedulerAppointment> FindAppointmentsByRecurrenceId(List<string> pRecurrenceIds, bool pExcludeRootAppointments = false)
         {
-            if(pRecurrenceIds == null || pRecurrenceIds.Count == 0)
+            if (pRecurrenceIds == null || pRecurrenceIds.Count == 0)
             {
                 return new List<SchedulerAppointment>();
             }
@@ -3138,7 +3138,7 @@ namespace BeWo.Data.Access
             pRecurrenceIds.DoForEach(id => { criterionList.AddIfNotIn(Restrictions.Like(SchedulerAppointment.PropertyName_RecurrenceInfo, id, MatchMode.Anywhere)); });
 
             var recurrenceIdOr = CreateOrCriteria(criterionList);
-            if(recurrenceIdOr == null)
+            if (recurrenceIdOr == null)
             {
                 return new List<SchedulerAppointment>();
                 ;
@@ -3149,9 +3149,9 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.IsNotNull(SchedulerAppointment.PropertyName_RecurrenceInfo))
                 .Add(recurrenceIdOr);
 
-            if(pExcludeRootAppointments)
+            if (pExcludeRootAppointments)
             {
-                c.Add(Restrictions.In(nameof(Appointment.Type), new[] {2, 3, 4}));
+                c.Add(Restrictions.In(nameof(Appointment.Type), new[] { 2, 3, 4 }));
             }
 
             return c.List<SchedulerAppointment>();
@@ -3159,7 +3159,7 @@ namespace BeWo.Data.Access
 
         public SchedulerAppointment FindRootAppointmentByRecurrenceId(string recurrenceId)
         {
-            if(Guid.TryParse(recurrenceId, out var guid))
+            if (Guid.TryParse(recurrenceId, out var guid))
             {
                 var criteria = CreateCriteria<SchedulerAppointment>()
                     .Add(Restrictions.Like(nameof(SchedulerAppointment.RecurrenceInfo), recurrenceId, MatchMode.Anywhere))
@@ -3220,17 +3220,17 @@ namespace BeWo.Data.Access
 
         public SchedulerAppointment FindRootAppointmentForException(SchedulerAppointmentDC pAppointment)
         {
-            if(pAppointment?.RecurrenceInfo == null)
+            if (pAppointment?.RecurrenceInfo == null)
             {
                 return null;
             }
 
             var match = RecurrenceIdRegex.Match(pAppointment.RecurrenceInfo);
-            if(match.Success)
+            if (match.Success)
             {
                 var value = match.Value;
                 var actualId = value.Split("\"");
-                if(actualId.Count > 1)
+                if (actualId.Count > 1)
                 {
                     var id = actualId[1];
 
@@ -3241,7 +3241,7 @@ namespace BeWo.Data.Access
 
                     var resultList = criteria.List<SchedulerAppointment>();
 
-                    if(resultList == null || resultList.Count == 0)
+                    if (resultList == null || resultList.Count == 0)
                     {
                         return null;
                     }
@@ -3255,17 +3255,17 @@ namespace BeWo.Data.Access
 
         public SchedulerAppointment FindRootAppointmentForException(SchedulerAppointment pAppointment)
         {
-            if(pAppointment?.RecurrenceInfo == null)
+            if (pAppointment?.RecurrenceInfo == null)
             {
                 return null;
             }
 
             var match = RecurrenceIdRegex.Match(pAppointment.RecurrenceInfo);
-            if(match.Success)
+            if (match.Success)
             {
                 var value = match.Value;
                 var actualId = value.Split("\"");
-                if(actualId.Count > 1)
+                if (actualId.Count > 1)
                 {
                     var id = actualId[1];
 
@@ -3276,7 +3276,7 @@ namespace BeWo.Data.Access
 
                     var resultList = criteria.List<SchedulerAppointment>();
 
-                    if(resultList == null || resultList.Count == 0)
+                    if (resultList == null || resultList.Count == 0)
                     {
                         return null;
                     }
@@ -3292,14 +3292,14 @@ namespace BeWo.Data.Access
         {
             var recurrenceIds = new List<string>();
 
-            foreach(var info in pRecurrenceInfos)
+            foreach (var info in pRecurrenceInfos)
             {
                 var match = RecurrenceIdRegex.Match(info);
-                if(match.Success)
+                if (match.Success)
                 {
                     var value = match.Value;
                     var actualId = value.Split("\"");
-                    if(actualId.Count > 1)
+                    if (actualId.Count > 1)
                     {
                         recurrenceIds.AddIfNotIn(actualId[1]);
                     }
@@ -3331,13 +3331,13 @@ namespace BeWo.Data.Access
             var c = CreateCriteriaIsActive<SchedulerAppointment>()
                 .Add(Restrictions.Eq(nameof(SchedulerAppointment.IsTask), true));
 
-            if(hideCompletedTasks)
+            if (hideCompletedTasks)
             {
                 c.Add(Restrictions.IsNull(nameof(SchedulerAppointment.CompletedDate)));
             }
 
             var employeeListRelationCriteria = DetachedCriteria.For<Employee2SchedulerAppointment>()
-                .Add(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", new List<long> {pEmployee}))
+                .Add(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", new List<long> { pEmployee }))
                 .SetProjection(Projections.Property(Employee2SchedulerAppointment.PropertyName_SchedulerAppointment));
 
             var employee2SchedCrit = Subqueries.PropertyIn(BeWoEntityBase.PropertyName_Oid, employeeListRelationCriteria);
@@ -3354,7 +3354,7 @@ namespace BeWo.Data.Access
             var c = CreateCriteriaIsActive<SchedulerAppointment>();
 
             var employeeListRelationCriteria = DetachedCriteria.For<Employee2SchedulerAppointment>()
-                .Add(Restrictions.In(nameof(Employee2SchedulerAppointment.Employee) + ".Oid", new List<long> {pEmployeeOid}))
+                .Add(Restrictions.In(nameof(Employee2SchedulerAppointment.Employee) + ".Oid", new List<long> { pEmployeeOid }))
                 .SetProjection(Projections.Property(nameof(Employee2SchedulerAppointment.SchedulerAppointmentOid)));
 
             var employee2SchedCrit = Subqueries.PropertyIn(nameof(BeWoEntityBase.Oid), employeeListRelationCriteria);
@@ -3418,9 +3418,9 @@ namespace BeWo.Data.Access
             var c = CreateCriteria<SchedulerAppointment>();
 
             var list = "";
-            for(var i = 0; i < pSupportConceptOids.Count; i++)
+            for (var i = 0; i < pSupportConceptOids.Count; i++)
             {
-                if(i != pSupportConceptOids.Count - 1)
+                if (i != pSupportConceptOids.Count - 1)
                 {
                     list += "" + pSupportConceptOids[i] + ",";
                 }
@@ -3567,9 +3567,9 @@ namespace BeWo.Data.Access
 
             var result = new Dictionary<Customer, List<ArbeitszeitEintrag>>();
 
-            foreach(var assistanceTimeEntry in assistanceTimes)
+            foreach (var assistanceTimeEntry in assistanceTimes)
             {
-                if(assistanceTimeEntry.Customer != null)
+                if (assistanceTimeEntry.Customer != null)
                 {
                     result.AddOrUpdateValueInDictionary(assistanceTimeEntry.Customer, assistanceTimeEntry.ArbeitszeitEintraege.ToList());
                 }
@@ -3624,16 +3624,16 @@ namespace BeWo.Data.Access
 
             var members = new List<Employee>();
 
-            foreach(var team in teams)
+            foreach (var team in teams)
             {
                 members.AddRangeIfElementsNotIn(team.MemberList);
             }
 
-            foreach(var member in members)
+            foreach (var member in members)
             {
-                foreach(var employee2customer in member.Employee2CustomerList)
+                foreach (var employee2customer in member.Employee2CustomerList)
                 {
-                    if(employee2customer.CustomerOid.HasValue)
+                    if (employee2customer.CustomerOid.HasValue)
                     {
                         result.AddIfNotIn(employee2customer.CustomerOid.Value);
                     }
@@ -3735,7 +3735,7 @@ namespace BeWo.Data.Access
 
             var appointments = new List<SchedulerAppointment>();
 
-            if(selectedAppointmentOid.HasValue)
+            if (selectedAppointmentOid.HasValue)
             {
                 changedOccurrencesCriteria.Add(Restrictions.Not(Restrictions.Eq(nameof(BeWoEntityBase.Oid), selectedAppointmentOid.Value)));
                 deletedOccurrencesCriteria.Add(Restrictions.Not(Restrictions.Eq(nameof(BeWoEntityBase.Oid), selectedAppointmentOid.Value)));
@@ -3747,7 +3747,7 @@ namespace BeWo.Data.Access
             recurringAppointments.DoForEach(appointment => recurrenceIds += $"'{appointment.GetRecurrenceId()}',");
             recurrenceIds = recurrenceIds.Trim(',');
 
-            if(recurrenceIds.Any())
+            if (recurrenceIds.Any())
             {
                 var changedCriteria = CreateCriteriaIsActive<SchedulerAppointment>()
                     .Add(Restrictions.Eq(nameof(SchedulerAppointment.Type), 3))
@@ -3761,7 +3761,7 @@ namespace BeWo.Data.Access
 
             // Sich wiederholende Termine erzeugen und dabei die Ausnahmen und gelöschten Ausnahmen ignorieren
             var interval = new TimeInterval(start, end);
-            foreach(var recurringAppointment in recurringAppointments)
+            foreach (var recurringAppointment in recurringAppointments)
             {
                 var recurrenceInfo = new RecurrenceInfo();
                 recurrenceInfo.FromXml(recurringAppointment.RecurrenceInfo);
@@ -3774,7 +3774,7 @@ namespace BeWo.Data.Access
                 pattern.Start = pattern.RecurrenceInfo.Start;
                 pattern.End = pattern.RecurrenceInfo.End;
 
-                if(!Guid.TryParse(pattern.RecurrenceInfo.Id.ToString(), out var patternId))
+                if (!Guid.TryParse(pattern.RecurrenceInfo.Id.ToString(), out var patternId))
                 {
                     continue;
                 }
@@ -3784,9 +3784,9 @@ namespace BeWo.Data.Access
 
                 var occurrenceAppointments = occurrences.GetAppointments(interval);
 
-                foreach(var occurrence in occurrenceAppointments)
+                foreach (var occurrence in occurrenceAppointments)
                 {
-                    if(recurringAppointment.EndDate is null || recurringAppointment.StartDate is null)
+                    if (recurringAppointment.EndDate is null || recurringAppointment.StartDate is null)
                     {
                         continue;
                     }
@@ -3798,12 +3798,12 @@ namespace BeWo.Data.Access
                     {
                         var guid = a.GetRecurrenceIdAndIndex(out var i);
 
-                        if(guid is null)
+                        if (guid is null)
                         {
                             return false;
                         }
 
-                        if(guid.Value.Equals(patternId) && index == i)
+                        if (guid.Value.Equals(patternId) && index == i)
                         {
                             return true;
                         }
@@ -3813,12 +3813,12 @@ namespace BeWo.Data.Access
                     {
                         var guid = a.GetRecurrenceIdAndIndex(out var i);
 
-                        if(guid is null)
+                        if (guid is null)
                         {
                             return false;
                         }
 
-                        if(guid.Value.Equals(patternId) && index == i)
+                        if (guid.Value.Equals(patternId) && index == i)
                         {
                             return true;
                         }
@@ -3826,7 +3826,7 @@ namespace BeWo.Data.Access
                         return false;
                     });
 
-                    if(isDeletedOrChanged)
+                    if (isDeletedOrChanged)
                     {
                         continue;
                     }
@@ -3834,35 +3834,35 @@ namespace BeWo.Data.Access
                     var duration = (recurringAppointment.EndDate.Value - recurringAppointment.StartDate.Value).TotalMinutes;
                     var isInIntervalTest = start.IsInInterval(end, occurrence.Start, occurrence.Start.AddMinutes(duration));
 
-                    if(!isInIntervalTest)
+                    if (!isInIntervalTest)
                     {
                         continue;
                     }
 
                     var occurrenceAppointment = new SchedulerAppointment
                     {
-                        AllDay                   = occurrence.AllDay,
-                        CustomerList             = recurringAppointment.CustomerList,
-                        Notice                   = recurringAppointment.Notice,
-                        EmployeeList             = recurringAppointment.EmployeeList,
-                        EndDate                  = occurrence.Start.AddMinutes(duration),
+                        AllDay = occurrence.AllDay,
+                        CustomerList = recurringAppointment.CustomerList,
+                        Notice = recurringAppointment.Notice,
+                        EmployeeList = recurringAppointment.EmployeeList,
+                        EndDate = occurrence.Start.AddMinutes(duration),
                         FormerBookingSequenceOid = recurringAppointment.FormerBookingSequenceOid,
-                        IsPrivate                = recurringAppointment.IsPrivate,
-                        Location                 = recurringAppointment.Location,
-                        Originator               = recurringAppointment.Originator,
-                        RecurrenceInfo           = occurrence.RecurrenceInfo.ToXml(),
-                        ReminderInfo             = recurringAppointment.ReminderInfo,
-                        ResourceList             = recurringAppointment.ResourceList,
-                        StartDate                = occurrence.Start,
-                        Subject                  = recurringAppointment.Subject ?? Empty,
-                        Type                     = recurringAppointment.Type
+                        IsPrivate = recurringAppointment.IsPrivate,
+                        Location = recurringAppointment.Location,
+                        Originator = recurringAppointment.Originator,
+                        RecurrenceInfo = occurrence.RecurrenceInfo.ToXml(),
+                        ReminderInfo = recurringAppointment.ReminderInfo,
+                        ResourceList = recurringAppointment.ResourceList,
+                        StartDate = occurrence.Start,
+                        Subject = recurringAppointment.Subject ?? Empty,
+                        Type = recurringAppointment.Type
                     };
 
-                    if(!(recurrenceId is null) && occurrenceIndex.HasValue)
+                    if (!(recurrenceId is null) && occurrenceIndex.HasValue)
                     {
                         var recId = occurrenceAppointment.GetRecurrenceId();
 
-                        if((recId?.Equals(recurrenceId.Value) ?? false) && index.Equals(occurrenceIndex.Value))
+                        if ((recId?.Equals(recurrenceId.Value) ?? false) && index.Equals(occurrenceIndex.Value))
                         {
                             continue;
                         }
@@ -3940,14 +3940,14 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
             }
             else
             {
-                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
                 {
                     user = LoggedInUserOperationContextExt.Current.User;
                 }
@@ -3963,19 +3963,19 @@ namespace BeWo.Data.Access
 
             var lCriteria = CreateCriteriaIsActive<Customer>();
 
-            if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.CustomerView_View))
+            if (rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.CustomerView_View))
             {
                 return lCriteria.List<Customer>().ToList();
             }
 
             var result = new List<Customer>();
 
-            if(rights.Contains(UserRightType.Customer_ViewMyCustomers))
+            if (rights.Contains(UserRightType.Customer_ViewMyCustomers))
             {
                 result = user.Employee.Employee2CustomerList.Select(employee2Customer => employee2Customer.Customer).Distinct().ToList();
             }
 
-            if(rights.Contains(UserRightType.Customer_ViewMyTeams))
+            if (rights.Contains(UserRightType.Customer_ViewMyTeams))
             {
                 var teams = FindAllActiveTeamsOfEmployee(user.Employee.Oid.Value);
 
@@ -4047,12 +4047,12 @@ namespace BeWo.Data.Access
                     Restrictions.Ge(nameof(ServiceRecord.End), span.StartDateTime)));
 
             lCriteria.Add(orCriteria);
-                        
+
             var allServiceRecords = lCriteria.List<ServiceRecord>().ToList();
 
             var result = new Dictionary<long, List<ServiceRecord>>();
 
-            foreach(var serviceRecord in allServiceRecords)
+            foreach (var serviceRecord in allServiceRecords)
             {
                 if (serviceDescriptionOids == null || serviceDescriptionOids.Count == 0 || serviceDescriptionOids.Contains(serviceRecord.ServiceDescription.Oid.Value))
                 {
@@ -4067,14 +4067,14 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
             }
             else
             {
-                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
                 {
                     user = LoggedInUserOperationContextExt.Current.User;
                 }
@@ -4084,7 +4084,7 @@ namespace BeWo.Data.Access
                 }
             }
 
-            if(user.Employee.Oid == null)
+            if (user.Employee.Oid == null)
             {
                 return new List<Employee>();
             }
@@ -4095,19 +4095,19 @@ namespace BeWo.Data.Access
 
             var lCriteria = CreateCriteriaIsActive<Employee>();
 
-            if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.EmployeeView_View))
+            if (rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.EmployeeView_View))
             {
                 return lCriteria.List<Employee>().ToList();
             }
 
             var result = new List<Employee>();
 
-            if(rights.Contains(UserRightType.Employee_AllowViewOwnEmployees))
+            if (rights.Contains(UserRightType.Employee_AllowViewOwnEmployees))
             {
                 result.AddIfNotIn(user.Employee);
             }
 
-            if(rights.Contains(UserRightType.Employee_AllowViewOwnTeam))
+            if (rights.Contains(UserRightType.Employee_AllowViewOwnTeam))
             {
                 var leadingTeams = user.Employee.LeadingTeams;
                 leadingTeams.DoForEach(team =>
@@ -4192,14 +4192,14 @@ namespace BeWo.Data.Access
             ApplicationUser user;
             var result = new List<Team>();
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
             }
             else
             {
-                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
                 {
                     user = LoggedInUserOperationContextExt.Current.User;
                 }
@@ -4209,7 +4209,7 @@ namespace BeWo.Data.Access
                 }
             }
 
-            if(user.Employee.Oid == null)
+            if (user.Employee.Oid == null)
             {
                 return result;
             }
@@ -4218,12 +4218,12 @@ namespace BeWo.Data.Access
 
             user.UserGroups.DoForEach(s => s.Rights.DoForEach(right => rights.AddIfNotIn(right.RightType)));
 
-            if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.TeamView_ViewAll))
+            if (rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.TeamView_ViewAll))
             {
                 return CreateCriteriaIsActive<Team>().List<Team>();
             }
 
-            if(rights.Contains(UserRightType.TeamView_ViewMyTeams))
+            if (rights.Contains(UserRightType.TeamView_ViewMyTeams))
             {
                 result.AddRangeIfElementsNotIn(FindLeadingTeams(user.Employee.Oid.Value));
                 result.AddRangeIfElementsNotIn(FindTeamsOfEmployee(user.Employee.Oid.Value));
@@ -4264,7 +4264,7 @@ namespace BeWo.Data.Access
 
         public SchedulerAppointment FindIndexZeroChangedOccurrence(Guid? recurrenceId)
         {
-            if(recurrenceId == null)
+            if (recurrenceId == null)
             {
                 return null;
             }
@@ -4295,23 +4295,23 @@ namespace BeWo.Data.Access
 
             var stringBuilder = new StringBuilder();
 
-            foreach(var resourceName2Intervals in info)
+            foreach (var resourceName2Intervals in info)
             {
                 stringBuilder.AppendLine($"Die Ressource \"{resourceName2Intervals.Key}\" ist im ausgewählten Zeitraum {start:dd.MM.yyyy HH:mm} bis {end:dd.MM.yyyy HH:mm} bereits gebucht:");
-                if(!resourceName2Intervals.Value.All(IsNullOrWhiteSpace))
+                if (!resourceName2Intervals.Value.All(IsNullOrWhiteSpace))
                 {
                     stringBuilder.Append("\r\n\r\n");
                 }
 
-                foreach(var interval in resourceName2Intervals.Value)
+                foreach (var interval in resourceName2Intervals.Value)
                 {
                     stringBuilder.AppendLine($"{interval}");
                 }
             }
 
-            if(isOverlapping)
+            if (isOverlapping)
             {
-                if(info.Any())
+                if (info.Any())
                 {
                     stringBuilder.Append("\n\n");
                 }
@@ -4319,7 +4319,7 @@ namespace BeWo.Data.Access
                 stringBuilder.Append("Dieser Termin überschneidet sich mit einem anderen bereits existierenden Termin.");
             }
 
-            if(info.Any() || isOverlapping)
+            if (info.Any() || isOverlapping)
             {
                 stringBuilder.Append("\n\nMöchten Sie trotzdem speichern?");
             }
@@ -4338,14 +4338,14 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
             }
             else
             {
-                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
                 {
                     user = LoggedInUserOperationContextExt.Current.User;
                 }
@@ -4369,7 +4369,7 @@ namespace BeWo.Data.Access
             });
 
             // Der ApplicationUser darf alles Sehen oder alle Hilfepläne
-            if(user.CheckForAtLeastOneRight(new List<UserRightType> {UserRightType.ViewAll, UserRightType.SupportConcept_ViewAllSupportConcepts}) && supportConceptFilter == CustomerFilterEnum.All)
+            if (user.CheckForAtLeastOneRight(new List<UserRightType> { UserRightType.ViewAll, UserRightType.SupportConcept_ViewAllSupportConcepts }) && supportConceptFilter == CustomerFilterEnum.All)
             {
                 return lCriteria.List<SupportConcept>().ToList();
             }
@@ -4377,17 +4377,17 @@ namespace BeWo.Data.Access
             var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList();
 
             // Wählt man "Nur Klienten meiner Teams anzeigen", sollen nicht die Hilfepläne der eigenen Klienten angezeigt werden.
-            if(supportConceptFilter == CustomerFilterEnum.TeamCustomer)
+            if (supportConceptFilter == CustomerFilterEnum.TeamCustomer)
             {
                 customerOids.Clear();
             }
 
             // Der ApplicationUser darf die Hilfepläne seiner Teams sehen
-            if(user.CheckForRight(UserRightType.SupportConcept_ViewMyTeams) && (supportConceptFilter == CustomerFilterEnum.TeamCustomer || supportConceptFilter == CustomerFilterEnum.All))
+            if (user.CheckForRight(UserRightType.SupportConcept_ViewMyTeams) && (supportConceptFilter == CustomerFilterEnum.TeamCustomer || supportConceptFilter == CustomerFilterEnum.All))
             {
-                foreach(var coid in customerOids)
+                foreach (var coid in customerOids)
                 {
-                    if(!teamCustomerOids.Contains(coid))
+                    if (!teamCustomerOids.Contains(coid))
                     {
                         teamCustomerOids.Add(coid);
                     }
@@ -4420,14 +4420,14 @@ namespace BeWo.Data.Access
 
             var result = false;
 
-            if(serviceRecordOids.Any() && signatures.Any())
+            if (serviceRecordOids.Any() && signatures.Any())
             {
                 var blubb = new List<long>();
                 signatures.DoForEach(s =>
                 {
                     s.ServiceRecords.DoForEach(sr =>
                     {
-                        if(sr.Oid.HasValue)
+                        if (sr.Oid.HasValue)
                         {
                             blubb.AddIfNotIn(sr.Oid.Value);
                         }
@@ -4517,7 +4517,7 @@ namespace BeWo.Data.Access
 
             confirmationReceiptSignatures.DoForEach(crs => crs.ServiceRecords.DoForEach(sr =>
             {
-                if(sr.Oid.HasValue)
+                if (sr.Oid.HasValue)
                 {
                     result.AddIfNotIn(sr.Oid.Value);
                 }
@@ -4542,7 +4542,7 @@ namespace BeWo.Data.Access
 
             confirmationReceiptSignatures.DoForEach(crs => crs.ServiceRecords.DoForEach(sr =>
             {
-                if(sr.Oid.HasValue)
+                if (sr.Oid.HasValue)
                 {
                     result.AddIfNotIn(sr.Oid.Value);
                 }
@@ -4580,7 +4580,7 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
@@ -4591,15 +4591,15 @@ namespace BeWo.Data.Access
             }
 
             var lCriteria = CreateCriteriaIsActive<Customer>();
-            
+
             // Der ApplicationUser darf alles sehen
             var viewAllRights = new List<UserRightType> { UserRightType.CustomerView_View };
-            if(!ignoreViewAllRight)
+            if (!ignoreViewAllRight)
             {
                 viewAllRights.Add(UserRightType.ViewAll);
             }
 
-            if(user.CheckForAtLeastOneRight(viewAllRights) && customerFilter == CustomerFilterEnum.All)
+            if (user.CheckForAtLeastOneRight(viewAllRights) && customerFilter == CustomerFilterEnum.All)
             {
                 return lCriteria.List<Customer>().ToList();
             }
@@ -4607,7 +4607,7 @@ namespace BeWo.Data.Access
             var customerOids = user.Employee.Employee2CustomerList.Where(employee2Customer => employee2Customer.Customer.Oid.HasValue).Select(employee2Customer => employee2Customer.Customer.Oid.Value).Distinct().ToList();
 
             // Der ApplicationUser darf die Klienten seiner Teams sehen
-            if(user.CheckForRight(UserRightType.Customer_ViewMyTeams) && (customerFilter == CustomerFilterEnum.TeamCustomer || customerFilter == CustomerFilterEnum.All) && (user.Employee?.Oid.HasValue ?? false))
+            if (user.CheckForRight(UserRightType.Customer_ViewMyTeams) && (customerFilter == CustomerFilterEnum.TeamCustomer || customerFilter == CustomerFilterEnum.All) && (user.Employee?.Oid.HasValue ?? false))
             {
                 var teamCustomerOids = new List<long>();
 
@@ -4615,7 +4615,7 @@ namespace BeWo.Data.Access
 
                 teams.DoForEach(team =>
                 {
-                    if(team.Oid is null)
+                    if (team.Oid is null)
                     {
                         return;
                     }
@@ -4654,9 +4654,9 @@ namespace BeWo.Data.Access
                 }
                 oidList += String.Format("{0}", oid);
             }
-            
+
             return GetSqlResult("SELECT oid,personoid,customeroid,istfamilie FROM customer2person where personoid in (" + oidList + ")");
-            
+
         }
 
         public List<SchedulerAppointment> FindActiveAppointmentsForCustomers(List<long> customerOids, DateTime startDate, DateTime endDate)
@@ -4685,13 +4685,13 @@ namespace BeWo.Data.Access
                 employeeOid,
                 start, end,
                 new List<long>(),
-                customerOids, 
-                new List<long>(), 
-                false, 
-                true, 
-                false, 
-                false, 
-                false, 
+                customerOids,
+                new List<long>(),
+                false,
+                true,
+                false,
+                false,
+                false,
                 false);
 
             return appointments.ToList();
@@ -4702,12 +4702,12 @@ namespace BeWo.Data.Access
             var c = CreateCriteriaIsActive<ServiceRecord>().Add(Restrictions.Eq(nameof(ServiceRecord.CustomerOid), customerOid));
 
             c.Add(Restrictions.In(nameof(ServiceRecord.EmployeeOid), employeeOids));
-            
+
             var betweenCriterion = CreateBetweenDateTimesCriterion(start, end, nameof(ServiceRecord.Start), nameof(ServiceRecord.End));
 
             c.Add(betweenCriterion);
 
-            if(onlyBillableCategories)
+            if (onlyBillableCategories)
             {
                 c.CreateAlias(ServiceRecord.PropertyName_ServiceDescription, "sd", JoinType.InnerJoin)
                     .CreateAlias("sd." + ServiceDescription.PropertyName_ServiceCategory, "sc", JoinType.InnerJoin)
@@ -4771,7 +4771,7 @@ namespace BeWo.Data.Access
 
             serviceRecords.DoForEach(sr =>
             {
-                if(sr?.Customer != null)
+                if (sr?.Customer != null)
                 {
                     result.AddIfNotIn(sr.Customer);
                 }
@@ -4788,7 +4788,7 @@ namespace BeWo.Data.Access
 
             serviceRecords.DoForEach(sr =>
             {
-                if(sr?.Customer != null)
+                if (sr?.Customer != null)
                 {
                     result.AddIfNotIn(sr.Customer);
                 }
@@ -4802,11 +4802,11 @@ namespace BeWo.Data.Access
             var lCriteria = CreateCriteria<ServiceRecord>()
                 .Add(Restrictions.In(nameof(ServiceRecord.EmployeeOid), employeeOids));
 
-            if(span != null)
+            if (span != null)
             {
                 lCriteria.Add(Restrictions.Between(ServiceRecord.PropertyName_Start, span.StartDateTime, span.EndDateTime));
             }
-            
+
             var result = lCriteria.List<ServiceRecord>().ToList();
 
             return result;
@@ -4869,7 +4869,7 @@ namespace BeWo.Data.Access
 
                 result.AddRangeIfElementsNotIn(apptmts);
             }
-            
+
             /*
             Normal = 0,
             Pattern = 1,
@@ -4880,7 +4880,7 @@ namespace BeWo.Data.Access
 
             var changedOccurrences = result.Where(a => a.Type == 3).Select(s => BS.Shared.Core.Utils.GetOccurrenceId(s.RecurrenceInfo)).ToList();
             var deletedOccurrences = result.Where(a => a.Type == 4).Select(s => BS.Shared.Core.Utils.GetOccurrenceId(s.RecurrenceInfo)).ToList();
-            
+
             var kek = IntervalFinderHelper.GetRecurrencesForIntervalFinder(result, intervalStart, intervalEnd, changedOccurrences, deletedOccurrences, skipWeekends);
 
             result.AddRange(kek);
@@ -4889,7 +4889,7 @@ namespace BeWo.Data.Access
 
             if (intervals.Count > 0)
             {
-                if(result.Count > 0)
+                if (result.Count > 0)
                 {
                     foreach (var interval in intervals)
                     {
@@ -4923,9 +4923,9 @@ namespace BeWo.Data.Access
                 var criteria = CreateCriteriaIsActiveWithAlias<SchedulerAppointment>("sa")
                     .Add(Restrictions.Not(Restrictions.Eq(nameof(SchedulerAppointment.IsTask), true)));
 
-                if(intervals.Count > 0)
+                if (intervals.Count > 0)
                 {
-                    if(intervals.Count > 1)
+                    if (intervals.Count > 1)
                     {
                         var criterionList = new List<ICriterion>();
 
@@ -5030,12 +5030,12 @@ namespace BeWo.Data.Access
 
         private static string GetGeneratedSql(ICriteria criteria)
         {
-            var criteriaImpl = (CriteriaImpl) criteria;
-            var sessionImpl = (SessionImpl) criteriaImpl.Session;
-            var factory = (SessionFactoryImpl) sessionImpl.SessionFactory;
+            var criteriaImpl = (CriteriaImpl)criteria;
+            var sessionImpl = (SessionImpl)criteriaImpl.Session;
+            var factory = (SessionFactoryImpl)sessionImpl.SessionFactory;
             var implementors = factory.GetImplementors(criteriaImpl.EntityOrClassName);
-            var loader = new CriteriaLoader((IOuterJoinLoadable) factory.GetEntityPersister(implementors[0]), factory, criteriaImpl, implementors[0], sessionImpl.EnabledFilters);
-            
+            var loader = new CriteriaLoader((IOuterJoinLoadable)factory.GetEntityPersister(implementors[0]), factory, criteriaImpl, implementors[0], sessionImpl.EnabledFilters);
+
             return loader.SqlString.ToString();
         }
 
@@ -5085,7 +5085,7 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
@@ -5094,13 +5094,13 @@ namespace BeWo.Data.Access
             {
                 user = LoggedInUserOperationContextExt.Current?.User != null ? LoggedInUserOperationContextExt.Current.User : SessionFacade.LoggedInUser;
             }
-            
+
             var criteria = CreateCriteria<Customer>();
 
             // Der ApplicationUser darf alles sehen
             var viewAllRights = new List<UserRightType> { UserRightType.CustomerView_View };
 
-            if(user.CheckForAtLeastOneRight(viewAllRights) && customerFilter == CustomerFilterEnum.All)
+            if (user.CheckForAtLeastOneRight(viewAllRights) && customerFilter == CustomerFilterEnum.All)
             {
                 return criteria.List<Customer>().ToList();
             }
@@ -5110,13 +5110,13 @@ namespace BeWo.Data.Access
             var customerOids = new List<long>();
 
             // Der ApplicationUser darf die Klienten seiner Teams sehen
-            if(user.CheckForRight(UserRightType.Customer_ViewMyTeams) && (customerFilter == CustomerFilterEnum.TeamCustomer || customerFilter == CustomerFilterEnum.All) && (user.Employee?.Oid.HasValue ?? false))
+            if (user.CheckForRight(UserRightType.Customer_ViewMyTeams) && (customerFilter == CustomerFilterEnum.TeamCustomer || customerFilter == CustomerFilterEnum.All) && (user.Employee?.Oid.HasValue ?? false))
             {
                 var teams = FindAllActiveTeamsOfEmployee(user.Employee.Oid.Value);
 
                 teams.DoForEach(team =>
                 {
-                    if(team.Oid is null)
+                    if (team.Oid is null)
                     {
                         return;
                     }
@@ -5128,7 +5128,7 @@ namespace BeWo.Data.Access
             }
 
             // Der ApplicationUser darf seine eigenen Klienten sehen.
-            if(user.CheckForRight(UserRightType.Customer_ViewMyCustomers) && (customerFilter == CustomerFilterEnum.All || customerFilter == CustomerFilterEnum.MyCustomer))
+            if (user.CheckForRight(UserRightType.Customer_ViewMyCustomers) && (customerFilter == CustomerFilterEnum.All || customerFilter == CustomerFilterEnum.MyCustomer))
             {
                 customerOids.AddRangeIfElementsNotIn(ownCustomerOids);
             }
@@ -5142,14 +5142,14 @@ namespace BeWo.Data.Access
         {
             ApplicationUser user;
 
-            if(employeeOid.HasValue)
+            if (employeeOid.HasValue)
             {
                 var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
                 user = FindUserForEmployee(employee);
             }
             else
             {
-                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                if (LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
                 {
                     user = LoggedInUserOperationContextExt.Current.User;
                 }
@@ -5159,7 +5159,7 @@ namespace BeWo.Data.Access
                 }
             }
 
-            if(user.Employee.Oid == null)
+            if (user.Employee.Oid == null)
             {
                 return new List<Employee>();
             }
@@ -5170,19 +5170,19 @@ namespace BeWo.Data.Access
 
             var criteria = CreateCriteria<Employee>();
 
-            if(rights.Contains(UserRightType.EmployeeView_View))
+            if (rights.Contains(UserRightType.EmployeeView_View))
             {
                 return criteria.List<Employee>().ToList();
             }
 
             var result = new List<Employee>();
 
-            if(rights.Contains(UserRightType.Employee_AllowViewOwnEmployees))
+            if (rights.Contains(UserRightType.Employee_AllowViewOwnEmployees))
             {
                 result.AddIfNotIn(user.Employee);
             }
 
-            if(rights.Contains(UserRightType.Employee_AllowViewOwnTeam))
+            if (rights.Contains(UserRightType.Employee_AllowViewOwnTeam))
             {
                 var leadingTeams = user.Employee.LeadingTeams;
 
@@ -5281,9 +5281,9 @@ namespace BeWo.Data.Access
             var c2 = CreateCriteriaIsActive<SchedulerAppointment>()
                 //.Add(Restrictions.Not(Restrictions.Eq(nameof(SchedulerAppointment.Type), 4)))
                 .Add(betweenCriterion);
-            
 
-            if(!(selectedAppointmentOid is null))
+
+            if (!(selectedAppointmentOid is null))
             {
                 c2.Add(Restrictions.Not(Restrictions.Eq(nameof(BeWoEntityBase.Oid), selectedAppointmentOid)));
             }
@@ -5295,14 +5295,14 @@ namespace BeWo.Data.Access
 
             var isBeingUpdatedToNormalAppointment = false;
             Guid? recurrenceIdToIgnore = null;
-            if(selectedAppointmentOid.HasValue)
+            if (selectedAppointmentOid.HasValue)
             {
                 // Das Pattern wird geladen, bzw. mit der Ausnahme mit Index 0 verglichen
                 // Wird die Serie in einen Einzeltermin geändert und es existiert eine Ausnahme mit Index 0, sollte die Ausnahme behalten werden und nicht der Root-Termin
                 var original = DAOFactory.GenericDAO.LoadByID<SchedulerAppointment>(selectedAppointmentOid.Value);
                 var originalRecurrenceId = original?.GetRecurrenceId();
 
-                if(!(originalRecurrenceId is null) && IsNullOrWhiteSpace(recurrenceId?.ToString()))
+                if (!(originalRecurrenceId is null) && IsNullOrWhiteSpace(recurrenceId?.ToString()))
                 {
                     isBeingUpdatedToNormalAppointment = true;
                     recurrenceIdToIgnore = originalRecurrenceId;
@@ -5311,7 +5311,7 @@ namespace BeWo.Data.Access
 
             var appointments = tempAppointments.Where(appointment =>
             {
-                if(appointment.RecurrenceInfo is null)
+                if (appointment.RecurrenceInfo is null)
                 {
                     return true;
                 }
@@ -5328,7 +5328,7 @@ namespace BeWo.Data.Access
 
             var recurringAppointments = recurringAppointmentsCriteria.List<SchedulerAppointment>().ToList();
 
-            if(isBeingUpdatedToNormalAppointment)
+            if (isBeingUpdatedToNormalAppointment)
             {
                 recurringAppointments = recurringAppointments.Where(root => FilterRootAppointment(root, recurrenceIdToIgnore)).ToList();
 
@@ -5337,7 +5337,7 @@ namespace BeWo.Data.Access
 
             recurringAppointments = recurringAppointments.Where(s => s.ResourceList.Any(r => r.Oid.HasValue && resourceOids.Contains(r.Oid.Value))).ToList();
 
-            foreach(var appointment in recurringAppointments)
+            foreach (var appointment in recurringAppointments)
             {
                 var recurrenceInfo = new RecurrenceInfo();
                 recurrenceInfo.FromXml(appointment.RecurrenceInfo);
@@ -5346,7 +5346,7 @@ namespace BeWo.Data.Access
 
                 var pattern = StaticAppointmentFactory.CreateAppointment(AppointmentType.Pattern);
 
-                if(pattern is null)
+                if (pattern is null)
                 {
                     continue;
                 }
@@ -5361,9 +5361,9 @@ namespace BeWo.Data.Access
 
                 var occurrences = occurrenceCalculator.CalcOccurrences(interval, pattern);
 
-                foreach(var occurrence in occurrences.GetAppointments(interval))
+                foreach (var occurrence in occurrences.GetAppointments(interval))
                 {
-                    if(appointment.EndDate is null || appointment.StartDate is null)
+                    if (appointment.EndDate is null || appointment.StartDate is null)
                     {
                         continue;
                     }
@@ -5380,7 +5380,7 @@ namespace BeWo.Data.Access
                     // und darf nicht in der Liste der geänderten Serientermine oder der Liste der gelöschten Serientermine sein.
                     var isInIntervalTest = start.IsInInterval(end, occurrence.Start, occurrence.Start.AddMinutes(duration));
 
-                    if(!isInIntervalTest ||
+                    if (!isInIntervalTest ||
                        changedOccurrences.Any(changedOccurence => changedOccurence.PatternId.Equals(patternId) && changedOccurence.Index == index) ||
                        deletedOccurrences.Any(deletedOccurence => deletedOccurence.PatternId.Equals(patternId) && deletedOccurence.Index == index) ||
                        index == occurrenceIndex && guidParsingSuccessful && recurrenceId != null && recurrenceId.Equals(occurrenceGuid))
@@ -5392,7 +5392,7 @@ namespace BeWo.Data.Access
                     var relatedAppointments = FindAppointmentsByRecurrenceId(new List<string> { recurrenceInfo.Id.ToString() }, true);
                     var relatedAppointmentsInInterval = relatedAppointments.Where(a =>
                     {
-                        if(a.StartDate == null || a.EndDate == null)
+                        if (a.StartDate == null || a.EndDate == null)
                         {
                             return false;
                         }
@@ -5409,23 +5409,23 @@ namespace BeWo.Data.Access
 
                     // Prüfen, ob es sich bei dem Termin für den Überschneidungen gesucht werden, um zu unterscheiden, ob ein Serientermin in einen normalen geändert wird.
                     var root = FindRootAppointmentByRecurrenceId(recurrenceInfo.Id.ToString());
-                    if(root.Oid != null && selectedAppointmentOid != null && root.Oid == selectedAppointmentOid && root.RecurrenceInfo != null && IsNullOrWhiteSpace(recurrenceId?.ToString()))
+                    if (root.Oid != null && selectedAppointmentOid != null && root.Oid == selectedAppointmentOid && root.RecurrenceInfo != null && IsNullOrWhiteSpace(recurrenceId?.ToString()))
                     {
                         hasToStop = true;
                     }
 
                     // Indices und Ids der RecurrenceInfo vergleichen. Stimmen sie überein, dann wird das generiert Serienelement ignoriert.
-                    if(occurrence.RecurrenceInfo?.Id != null && !hasToStop)
+                    if (occurrence.RecurrenceInfo?.Id != null && !hasToStop)
                     {
-                        if(Guid.TryParse(occurrence.RecurrenceInfo.Id.ToString(), out var guid))
+                        if (Guid.TryParse(occurrence.RecurrenceInfo.Id.ToString(), out var guid))
                         {
-                            foreach(var relatedAppointment in relatedAppointmentsInInterval)
+                            foreach (var relatedAppointment in relatedAppointmentsInInterval)
                             {
                                 var relatedAppointmentRecurrenceId = relatedAppointment.GetRecurrenceIdAndIndex(out var relatedAppointmentRecurrenceIndex);
 
-                                if(relatedAppointmentRecurrenceId != null)
+                                if (relatedAppointmentRecurrenceId != null)
                                 {
-                                    if(guid.Equals(relatedAppointmentRecurrenceId) && relatedAppointmentRecurrenceIndex.Equals(occurrence.RecurrenceIndex))
+                                    if (guid.Equals(relatedAppointmentRecurrenceId) && relatedAppointmentRecurrenceIndex.Equals(occurrence.RecurrenceIndex))
                                     {
                                         hasToStop = true;
                                         break;
@@ -5435,28 +5435,28 @@ namespace BeWo.Data.Access
                         }
                     }
 
-                    if(hasToStop)
+                    if (hasToStop)
                     {
                         continue;
                     }
 
                     var recurringAppointment = new SchedulerAppointment
                     {
-                        AllDay                   = occurrence.AllDay,
-                        CustomerList             = appointment.CustomerList,
-                        Notice                   = appointment.Notice,
-                        EmployeeList             = appointment.EmployeeList,
-                        EndDate                  = occurrence.Start.AddMinutes(duration),
+                        AllDay = occurrence.AllDay,
+                        CustomerList = appointment.CustomerList,
+                        Notice = appointment.Notice,
+                        EmployeeList = appointment.EmployeeList,
+                        EndDate = occurrence.Start.AddMinutes(duration),
                         FormerBookingSequenceOid = appointment.FormerBookingSequenceOid,
-                        IsPrivate                = appointment.IsPrivate,
-                        Location                 = appointment.Location,
-                        Originator               = appointment.Originator,
-                        RecurrenceInfo           = occurrence.RecurrenceInfo.ToXml(),
-                        ReminderInfo             = appointment.ReminderInfo,
-                        ResourceList             = appointment.ResourceList,
-                        StartDate                = occurrence.Start,
-                        Subject                  = appointment.Subject ?? "",
-                        Type                     = appointment.Type
+                        IsPrivate = appointment.IsPrivate,
+                        Location = appointment.Location,
+                        Originator = appointment.Originator,
+                        RecurrenceInfo = occurrence.RecurrenceInfo.ToXml(),
+                        ReminderInfo = appointment.ReminderInfo,
+                        ResourceList = appointment.ResourceList,
+                        StartDate = occurrence.Start,
+                        Subject = appointment.Subject ?? "",
+                        Type = appointment.Type
                     };
 
                     appointments.AddIfNotIn(recurringAppointment);
@@ -5470,7 +5470,7 @@ namespace BeWo.Data.Access
         {
             var recId = root.GetRecurrenceId();
 
-            if(recId is null || recurrenceIdToIgnore is null)
+            if (recId is null || recurrenceIdToIgnore is null)
             {
                 return true;
             }
@@ -5500,7 +5500,7 @@ namespace BeWo.Data.Access
 
             var result = new Dictionary<string, List<string>>();
 
-            if(user is null)
+            if (user is null)
             {
                 return result;
             }
@@ -5512,17 +5512,17 @@ namespace BeWo.Data.Access
 
             var dictionary = new Dictionary<Resource, List<SchedulerAppointment>>();
 
-            foreach(var appointment in appointments)
+            foreach (var appointment in appointments)
             {
-                foreach(var resource in appointment.ResourceList)
+                foreach (var resource in appointment.ResourceList)
                 {
                     dictionary.AddOrUpdateValueInDictionary(resource, appointment);
                 }
             }
 
-            foreach(var resource2Appointments in dictionary)
+            foreach (var resource2Appointments in dictionary)
             {
-                foreach(var appointment in resource2Appointments.Value)
+                foreach (var appointment in resource2Appointments.Value)
                 {
                     var originator = appointment.Originator;
                     var employee2Appointments = appointment.EmployeeList;
@@ -5530,15 +5530,15 @@ namespace BeWo.Data.Access
                     var isOwnAppointment = (originator?.Equals(loggedInEmployee) ?? false) || employee2Appointments.ToList().Any(e2a => e2a.Employee.Equals(loggedInEmployee));
 
                     // Wenn isOwnAppointment true ist, darf der Benutzer die Uhrzeiten und die Mitarbeiter sehen. Ansonsten müssen die Rechte geprüft werden.
-                    if(isOwnAppointment || hasRightToViewEmployeeAppointments) // Es werden Zeit und Mitarbeiter angezeigt
+                    if (isOwnAppointment || hasRightToViewEmployeeAppointments) // Es werden Zeit und Mitarbeiter angezeigt
                     {
                         result.AddOrUpdateValueInDictionary(resource2Appointments.Key.Name, $"{CreateDateTimeInfoFromAppointment(appointment.StartDate, appointment.EndDate, appointment.AllDay)} von {originator}");
                     }
-                    else if(hasRightToViewResourceAppointments && !hasRightToViewEmployeeAppointments) // Nur die Uhrzeit anzeigen
+                    else if (hasRightToViewResourceAppointments && !hasRightToViewEmployeeAppointments) // Nur die Uhrzeit anzeigen
                     {
                         result.AddOrUpdateValueInDictionary(resource2Appointments.Key.Name, $"{CreateDateTimeInfoFromAppointment(appointment.StartDate, appointment.EndDate, appointment.AllDay)}");
                     }
-                    else if(!hasRightToViewEmployeeAppointments) // Es werden weder Zeit noch Mitarbeiter angezeigt
+                    else if (!hasRightToViewEmployeeAppointments) // Es werden weder Zeit noch Mitarbeiter angezeigt
                     {
                         result.AddOrUpdateValueInDictionary(resource2Appointments.Key.Name, string.Empty);
                     }
@@ -5550,14 +5550,14 @@ namespace BeWo.Data.Access
 
         private static string CreateDateTimeInfoFromAppointment(DateTime? start, DateTime? end, bool allDay)
         {
-            if(start.HasValue && end.HasValue && allDay == false)
+            if (start.HasValue && end.HasValue && allDay == false)
             {
                 return start.Value.Date == end.Value.Date ?
                     $"{start.Value.ToShortTimeString()} - {end.Value.ToShortTimeString()} " :
                     $"{start.Value:dd.MM.yyyy HH:mm} - {end.Value:dd.MM.yyyy HH:mm} ";
             }
 
-            if(allDay && start.HasValue && end.HasValue)
+            if (allDay && start.HasValue && end.HasValue)
             {
                 return start.Value.Date == end.Value.Date ? " " : $"{start.Value.ToShortDateString()} - {end.Value.ToShortDateString()} ";
             }
@@ -5601,7 +5601,7 @@ namespace BeWo.Data.Access
 
                 return criteira.List<ServiceRecordHistory>().FirstOrDefault();
             }
-            catch(Exception e)
+            catch (Exception e)
             {
                 return null;
             }
@@ -5618,9 +5618,9 @@ namespace BeWo.Data.Access
 
             var result = new Dictionary<long, ServiceRecordHistory>();
 
-            foreach(var entry in historyEntries)
+            foreach (var entry in historyEntries)
             {
-                if(entry.ServiceRecordOid.HasValue && result.ContainsKey(entry.ServiceRecordOid.Value) || entry.ServiceRecordOid is null)
+                if (entry.ServiceRecordOid.HasValue && result.ContainsKey(entry.ServiceRecordOid.Value) || entry.ServiceRecordOid is null)
                 {
                     continue;
                 }
@@ -5634,11 +5634,11 @@ namespace BeWo.Data.Access
         // ToDo: Veraltet und wird nicht mehr benutzt!
         public List<ServiceRecord> FindFormerlyLinkedServiceRecords(long confirmationReceiptSignatureOid, long customerOid, long supportConceptOid, long costBearer2SupportConceptOid, string timeSpanString)
         {
-            if(timeSpanString?.Length != 21)
+            if (timeSpanString?.Length != 21)
             {
                 return new List<ServiceRecord>();
             }
- 
+
             var d1 = timeSpanString.Substring(0, 2);
             var m1 = timeSpanString.Substring(3, 2);
             var d2 = timeSpanString.Substring(11, 2);
@@ -5701,16 +5701,16 @@ namespace BeWo.Data.Access
 
             var row = objectsList.FirstOrDefault();
 
-            if(row is null || row.Length != 5)
+            if (row is null || row.Length != 5)
             {
                 return null;
             }
 
             var customerConfirmationReceiptSignatureState = (SignatureStateType)row[0];
             var employeeConfirmationReceiptSignatureState = (SignatureStateType)row[1];
-            var serviceRecordSignatureStateType           = (SignatureStateType)row[2];
-            var customerConfirmationReceiptSignatureOid   = (long?)row[3];
-            var employeeConfirmationReceiptSignatureOid   = (long?)row[4];
+            var serviceRecordSignatureStateType = (SignatureStateType)row[2];
+            var customerConfirmationReceiptSignatureOid = (long?)row[3];
+            var employeeConfirmationReceiptSignatureOid = (long?)row[4];
 
             return new SignatureStateInfoFromServiceRecordHistoryEntry(customerConfirmationReceiptSignatureState, employeeConfirmationReceiptSignatureState, serviceRecordSignatureStateType, customerConfirmationReceiptSignatureOid, employeeConfirmationReceiptSignatureOid);
         }
@@ -5719,7 +5719,7 @@ namespace BeWo.Data.Access
         {
             var result = new Dictionary<long, SignatureStateInfoFromServiceRecordHistoryEntry>();
 
-            if(serviceRecordOids is null || serviceRecordOids.Count == 0)
+            if (serviceRecordOids is null || serviceRecordOids.Count == 0)
             {
                 return result;
             }
@@ -5734,16 +5734,16 @@ namespace BeWo.Data.Access
 
             var objectsList = sqlQuery.List<object[]>().ToList();
 
-            foreach(var obj in objectsList)
+            foreach (var obj in objectsList)
             {
-                if(obj?.Length != 6)
+                if (obj?.Length != 6)
                 {
                     continue;
                 }
 
                 var serviceRecordOid = (long?)obj[0];
 
-                if(serviceRecordOid is null || result.ContainsKey(serviceRecordOid.Value))
+                if (serviceRecordOid is null || result.ContainsKey(serviceRecordOid.Value))
                 {
                     continue;
                 }
@@ -5767,12 +5767,12 @@ namespace BeWo.Data.Access
             var criteria = CreateCriteriaIsActive<ServiceRecord>();
             var rowCountCirteria = CreateCriteriaIsActive<ServiceRecord>();
 
-            if(costBearer2SupportConceptOid.HasValue)
+            if (costBearer2SupportConceptOid.HasValue)
             {
                 var groupOidsQuery = Session.CreateSQLQuery($"SELECT MIN(Oid) FROM servicerecord WHERE CostBearer2SupportConceptOid = {costBearer2SupportConceptOid} GROUP BY GroupOid");
                 var groupOids = groupOidsQuery.List<long>().ToArray();
 
-                criteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costBearer2SupportConceptOid)); 
+                criteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costBearer2SupportConceptOid));
                 rowCountCirteria.Add(Restrictions.Eq(ServiceRecord.PropertyName_CostBearer2SupportConceptOid, costBearer2SupportConceptOid));
 
                 criteria.Add(Restrictions.Or(Restrictions.IsNull(nameof(ServiceRecord.GroupOid)), Restrictions.In(nameof(ServiceRecord.Oid), groupOids)));
@@ -5787,7 +5787,7 @@ namespace BeWo.Data.Access
                     .Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
             }
 
-            if(dayCount > 0)
+            if (dayCount > 0)
             {
                 criteria.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, minStart));
                 rowCountCirteria.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, minStart));
@@ -5812,7 +5812,7 @@ namespace BeWo.Data.Access
                 .Add(Restrictions.Eq(ServiceRecord.PropertyName_EmployeeOid, pEmployeeOid))
                 .Add(Restrictions.IsNull(ServiceRecord.PropertyName_CostBearer2SupportConceptOid));
 
-            if(days.HasValue)
+            if (days.HasValue)
             {
                 var minDate = DateTime.Now.Date.AddDays(-1 * days.Value);
                 criteria.Add(Restrictions.Ge(ServiceRecord.PropertyName_Start, minDate));
@@ -5820,7 +5820,7 @@ namespace BeWo.Data.Access
             }
 
             criteria.AddOrder(Order.Desc(nameof(ServiceRecord.Start))).AddOrder(Order.Desc(nameof(ServiceRecord.End))).AddOrder(Order.Desc(nameof(BeWoEntityBase.InsTs)));
-            
+
             rowCount = rowCountCirteria.SetProjection(Projections.RowCount()).FutureValue<int>().Value;
 
             return criteria.SetFirstResult(firstResult).SetMaxResults(maxResults).Future<ServiceRecord>();
@@ -5924,21 +5924,26 @@ namespace BeWo.Data.Access
             return criteria.List<Bargeldtransaktionshistory>().ToList();
         }
 
-        public int GetLastDatenaustauschreferenz(string datenannahmestelle)
+        public int GetNextDatenaustauschreferenz(string datenannahmestelle)
         {
-            var criteria = CreateCriteria<GkvAbrechnung>()
-                .Add(Restrictions.Where<GkvAbrechnung>(x => x.IKDatenannahmestelle == datenannahmestelle));
+            var criteria = CreateCriteria<GkvTransferProtokoll>()
+            .Add(Restrictions.Where<GkvTransferProtokoll>(x => x.IKDatenannahmestelle == datenannahmestelle))
+            .SetProjection(Projections.Max("Datenaustauschreferenz"));
 
-            criteria.AddOrder(Order.Desc(nameof(GkvAbrechnung.Oid)));
+            var t = criteria.List<int?>().SingleOrDefault();
 
-            criteria.SetMaxResults(1);
+            return t + 1 ?? 1;
+        }
 
-            var list = criteria.List<GkvAbrechnung>().ToList();
+        public int GetNextTransfernummer(string datenannahmestelle)
+        {
+            var criteria = CreateCriteria<GkvTransferProtokoll>()
+            .Add(Restrictions.Where<GkvTransferProtokoll>(x => x.IKDatenannahmestelle == datenannahmestelle))
+            .SetProjection(Projections.Max("Transfernummer"));
 
-            if (!list.Any())
-                return 0;
+            var t = criteria.List<int?>().SingleOrDefault();
 
-            return list.First().Datenaustauschreferenz;
+            return t + 1?? 0;
         }
 
         public List<Bargeldtransaktionshistory> LoadBargeldtransaktionshistoryEntriesByTransaktionsOids(List<long> transaktionsOids)
diff --git a/Data/Entities/GkvAbrechnung.cs b/Data/Entities/GkvAbrechnung.cs
index 239dab7f8..30412ac3f 100644
--- a/Data/Entities/GkvAbrechnung.cs
+++ b/Data/Entities/GkvAbrechnung.cs
@@ -12,36 +12,14 @@ namespace BeWo.Data.Entities
             this._Tid = TableID.GkvAbrechnung;
         }
 
-        public virtual string IKLeistungserbringer { get; set; }
-
-        public virtual string IKVersichertenKarte { get; set; }
-
-        public virtual string IKKostentrager { get; set; }
-
-        public virtual string IKDatenannahmestelle { get; set; }
+        public virtual DateTime ErstelltAm { get; set; }
 
         public virtual DateTime? AbrechnungsZeitraumStart { get; set; }
-
         public virtual DateTime? AbrechnungsZeitraumEnde { get; set; }
-
-        public virtual string Nutzdatendatei { get; set; }
-
-        public virtual string Auftragsdatei { get; set; }
-
-        public virtual int Dateigrosse { get; set; }
-
-        public virtual string Transfername { get; set; }
-
-        public virtual int Datenaustauschreferenz { get; set; }
-
-        public virtual DateTime? ErstelltAm { get; set; }
-
         public virtual decimal Betrag { get; set; }
-
         public virtual bool Bezahlt { get; set; }
 
         public virtual IList<InvoiceBase> InvoiceBases { get; set; }
-
-        public virtual IList<GkvTransferProtokoll> GkvTransferProtokolle { get; set; }
+        public virtual IList<GkvTransferProtokoll> GkvTransferProtokolle { get; set; } 
     }
 }
\ No newline at end of file
diff --git a/Data/Entities/GkvTransferprotokoll.cs b/Data/Entities/GkvTransferprotokoll.cs
index 2d2cce0bf..a7f496994 100644
--- a/Data/Entities/GkvTransferprotokoll.cs
+++ b/Data/Entities/GkvTransferprotokoll.cs
@@ -13,15 +13,31 @@ namespace BeWo.Data.Entities
         }
 
         public virtual long GkvAbrechnungOid { get; set; }
+
         public virtual string AbsenderBezeichnung { get; set; }
         public virtual string EmpfangerBezeichnung { get; set; }
+
+        public virtual string IKLeistungserbringer { get; set; }
+        public virtual string IKKrankenkasse { get; set; }
+        public virtual string IKKostentrager { get; set; }
+        public virtual string IKDatenannahmestelle { get; set; }
+
+        public virtual int Datenaustauschreferenz { get; set; }
+        public virtual int Transfernummer { get; set; }
+        public virtual string Transfername { get; set; }
+
+        public virtual DateTime? ErstelltAm { get; set; }
+
         public virtual string Dateityp { get; set; }
         public virtual string Dateiname { get; set; }
-        public virtual DateTime? PruftDatum { get; set; }
-        public virtual string PruftFehler { get; set; }
-        public virtual DateTime? VerschlusseltDatum { get; set; }
-        public virtual string VerschlusseltFehler { get; set; }
-        public virtual DateTime? UbertragDatum { get; set; }
-        public virtual string UbertragFehler { get; set; }
+        public virtual int Dateigrosse { get; set; }
+
+        public virtual string Nutzdatendatei { get; set; }
+        public virtual string Auftragsdatei { get; set; }
+
+        public virtual string Fehlertitel { get; set; }
+        public virtual DateTime? Fehlerdatum { get; set; }
+        public virtual string Fehlernachricht { get; set; }
+        public virtual GkvTransferFehlerlevel Fehlerlevel { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Data/Mappings/GkvAbrechnung.hbm.xml b/Data/Mappings/GkvAbrechnung.hbm.xml
index e9c2f6808..53add4154 100644
--- a/Data/Mappings/GkvAbrechnung.hbm.xml
+++ b/Data/Mappings/GkvAbrechnung.hbm.xml
@@ -1,40 +1,35 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-  <class name="BeWo.Data.Entities.GkvAbrechnung, BeWo.Data" table="GkvAbrechnung">
-    <id name="Oid" column="Oid" type="Int64" unsaved-value="null">
-      <generator class="identity" />
-    </id>
-    <version type="Int64" column="Version" name="Version" />
-    <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
-	<property column="IKLeistungserbringer" type="string" name="IKLeistungserbringer" />
-    <property column="IKVersichertenKarte" type="string" name="IKVersichertenKarte" />
-	  <property column="IKKostentrager" type="string" name="IKKostentrager" />
-	  <property column="IKDatenannahmestelle" type="string" name="IKDatenannahmestelle" />
-    <property column="AbrechnungsZeitraumStart" type="DateTime" name="AbrechnungsZeitraumStart" />
-	<property column="AbrechnungsZeitraumEnde" type="DateTime" name="AbrechnungsZeitraumEnde" />
-    <property column="Nutzdatendatei" type="string" name="Nutzdatendatei" />
-	<property column="Auftragsdatei" type="string" name="Auftragsdatei" />
-	<property column="Transfername" type="string" name="Transfername" />
-	<property column="Dateigrosse" type="int" name="Dateigrosse" />
-	<property column="Datenaustauschreferenz" type="int" name="Datenaustauschreferenz" />
-	<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
-    <property column="Notice" type="String" name="Notice" length="1024" />
-    <property column="InsTs" type="DateTime" name="InsTs" />
-    <property column="InsUser" type="String" name="InsUser" length="256" />
-    <property column="UdpUser" type="String" name="UdpUser" length="256" />
-    <property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
-    <property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
-	<property column="Betrag" type="decimal" name="Betrag" />
-	  <property column="Bezahlt" type="bool" name="Bezahlt" />
+	<class name="BeWo.Data.Entities.GkvAbrechnung, BeWo.Data" table="GkvAbrechnung">
+		<id name="Oid" column="Oid" type="Int64" unsaved-value="null">
+			<generator class="identity" />
+		</id>
+		<version type="Int64" column="Version" name="Version" />
+		<property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
 
-	  <bag name="InvoiceBases" table="gkvabrechnung2invoicebase" generic="true" cascade="none" batch-size="250">
-		  <key column="gkvabrechnungoid" />
-		  <many-to-many column="invoicebaseoid" class="BeWo.Data.Entities.InvoiceBase, BeWo.Data" />
-	  </bag>
-	  <bag name="GkvTransferProtokolle" table="gkvtransferprotokoll" generic="true" cascade="all-delete-orphan" batch-size="250">
-		  <key column="gkvabrechnungoid" />
-		  <one-to-many class="BeWo.Data.Entities.GkvTransferProtokoll, BeWo.Data" />
-	  </bag>
-  </class>
+		<property column="AbrechnungsZeitraumStart" type="DateTime" name="AbrechnungsZeitraumStart" />
+		<property column="AbrechnungsZeitraumEnde" type="DateTime" name="AbrechnungsZeitraumEnde" />
+
+		<property column="Notice" type="String" name="Notice" length="1024" />
+		<property column="InsTs" type="DateTime" name="InsTs" />
+		<property column="InsUser" type="String" name="InsUser" length="256" />
+		<property column="UdpUser" type="String" name="UdpUser" length="256" />
+		<property column="IsActive" type="BS.Shared.ActivationTypeId, BS.Shared" name="IsActive" />
+		<property column="SystemEntryID" type="BS.Shared.SystemEntryID, BS.Shared" name="SystemEntryID" />
+
+		<property column="Betrag" type="decimal" name="Betrag" />
+		<property column="Bezahlt" type="bool" name="Bezahlt" />
+
+		<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
+
+		<bag name="InvoiceBases" table="gkvabrechnung2invoicebase" generic="true" cascade="none" batch-size="250">
+			<key column="gkvabrechnungoid" />
+			<many-to-many column="invoicebaseoid" class="BeWo.Data.Entities.InvoiceBase, BeWo.Data" />
+		</bag>
+		<bag name="GkvTransferProtokolle" table="gkvtransferprotokoll" generic="true" cascade="all-delete-orphan" batch-size="250">
+			<key column="gkvabrechnungoid" />
+			<one-to-many class="BeWo.Data.Entities.GkvTransferProtokoll, BeWo.Data" />
+		</bag>
+	</class>
 </hibernate-mapping>
diff --git a/Data/Mappings/GkvTransferProtokoll.hbm.xml b/Data/Mappings/GkvTransferProtokoll.hbm.xml
index 0b017a55e..343fbb663 100644
--- a/Data/Mappings/GkvTransferProtokoll.hbm.xml
+++ b/Data/Mappings/GkvTransferProtokoll.hbm.xml
@@ -18,11 +18,23 @@
 		<property column="EmpfangerBezeichnung" type="string" name="EmpfangerBezeichnung" />
 		<property column="Dateityp" type="string" name="Dateityp" />
 		<property column="Dateiname" type="string" name="Dateiname" />
-		<property column="PruftDatum" type="DateTime" name="PruftDatum" />
-		<property column="PruftFehler" type="string" name="PruftFehler" />
-		<property column="VerschlusseltDatum" type="DateTime" name="VerschlusseltDatum" />
-		<property column="VerschlusseltFehler" type="string" name="VerschlusseltFehler" />
-		<property column="UbertragDatum" type="DateTime" name="UbertragDatum" />
-		<property column="UbertragFehler" type="string" name="UbertragFehler" />
+
+		<property column="IKLeistungserbringer" type="string" name="IKLeistungserbringer" />
+		<property column="IKKrankenkasse" type="string" name="IKKrankenkasse" />
+		<property column="IKKostentrager" type="string" name="IKKostentrager" />
+		<property column="IKDatenannahmestelle" type="string" name="IKDatenannahmestelle" />
+		
+		<property column="Nutzdatendatei" type="string" name="Nutzdatendatei" />
+		<property column="Auftragsdatei" type="string" name="Auftragsdatei" />
+		<property column="Transfername" type="string" name="Transfername" />
+		<property column="Dateigrosse" type="int" name="Dateigrosse" />
+		<property column="Datenaustauschreferenz" type="int" name="Datenaustauschreferenz" />
+		<property column="Transfernummer" type="int" name="Transfernummer" />
+		<property column="ErstelltAm" type="DateTime" name="ErstelltAm" />
+		
+		<property column="Fehlertitel" type="string" name="Fehlertitel" />
+		<property column="Fehlerdatum" type="DateTime" name="Fehlerdatum" />
+		<property column="Fehlernachricht" type="string" name="Fehlernachricht" />
+		<property column="Fehlerlevel" type="BS.Shared.GkvTransferFehlerlevel, BS.Shared" name="Fehlerlevel" />
 	</class>
 </hibernate-mapping>
diff --git a/Host/GkvAbrechnungView.aspx.cs b/Host/GkvAbrechnungView.aspx.cs
index 130267112..25f4d9fc5 100644
--- a/Host/GkvAbrechnungView.aspx.cs
+++ b/Host/GkvAbrechnungView.aspx.cs
@@ -150,34 +150,30 @@ namespace Host
 
         private void SendNew(GkvApp8SendNewRequest req)
         {
-            var debug_mode = true;
+            var debug_mode = false;
 
-            // Save File
-            SaveFileInFileSystem(req, debug_mode);
-
-            // Make DB Entry
-            //var entry = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewEntity(req.GkvAbrechnung);
-
-            //entry.Kundennummer = req.Tenant;
-
-            // DAOFactory.GenericDAO.Insert(entry);
-
-            // Dakota Send
+#if DEBUG
+            debug_mode = true;
+#endif
 
             // Response
-            var response = new GkvApp8SendNewResponse();
+            var response = new GkvApp8SendNewResponse(false);
 
-            response.Success = true;
-            response.GkvTransferProtokollDC = new GkvTransferProtokollDC()
+            try
             {
-                AbsenderBezeichnung = "Absender",
-                Dateiname = req.GkvAbrechnung.Transfername,
-                Dateityp = "Nutzdatendatei",
-                EmpfangerBezeichnung = "Empfang",
-                GkvAbrechnungOid = req.GkvAbrechnung.GkvAbrechnungOid.Value,
-                PruftFehler = "Manueller Insert",
-                PruftDatum = DateTime.Now
-            };
+                // Save File
+                SaveFileInFileSystem(req, debug_mode);
+
+                // Dakota Send
+
+                response.Success = true;
+
+                response.GkvTransferProtokollDC = req.GkvTransferProtokoll;
+            }
+            catch(Exception e)
+            {
+                response.Message = e.Message;
+            }
 
             SendResponse(response);
         }
@@ -188,21 +184,21 @@ namespace Host
             if (debug_mode)
             {
                 root_path = $@"C:\GkvAbrechnung\";
-                file_path = $@"{req.Tenant}-{req.GkvAbrechnung.IKDatenannahmestelle}-{req.GkvAbrechnung.Transfername}";
+                file_path = $@"{req.Tenant}-{req.GkvTransferProtokoll.IKDatenannahmestelle}-{req.GkvTransferProtokoll.Transfername}";
             }
             else
             {
-                root_path = $@"C:\GkvAbrechnung\{req.Tenant}\{req.GkvAbrechnung.IKDatenannahmestelle}\";
-                file_path = $@"{req.GkvAbrechnung.Transfername}";
+                root_path = $@"C:\GkvAbrechnung\{req.Tenant}\{req.GkvTransferProtokoll.IKDatenannahmestelle}\";
+                file_path = $@"{req.GkvTransferProtokoll.Transfername}";
             }
 
             Directory.CreateDirectory(root_path);
 
             var finalpath = root_path + file_path;
 
-            File.WriteAllText(finalpath, req.GkvAbrechnung.Nutzdatendatei);
+            File.WriteAllText(finalpath, req.GkvTransferProtokoll.Nutzdatendatei);
 
-            var auftragsdatei2 = Encoding.GetEncoding("ISO-8859-1").GetBytes(req.GkvAbrechnung.Auftragsdatei);
+            var auftragsdatei2 = Encoding.GetEncoding("ISO-8859-1").GetBytes(req.GkvTransferProtokoll.Auftragsdatei);
                         
             File.WriteAllBytes(finalpath + ".auf", auftragsdatei2);
         }
diff --git a/Model/Changes_2024_05_15 ALLE GKV TABELLEN.txt b/Model/Changes_2024_05_15 ALLE GKV TABELLEN.txt
index a6db2ce98..5b2c4ab07 100644
--- a/Model/Changes_2024_05_15 ALLE GKV TABELLEN.txt	
+++ b/Model/Changes_2024_05_15 ALLE GKV TABELLEN.txt	
@@ -8,20 +8,11 @@ CREATE TABLE `gkvabrechnung` (
   `UdpUser` varchar(256) DEFAULT NULL,
   `IsActive` tinyint DEFAULT NULL,
   `SystemEntryID` int DEFAULT NULL,
-  `IKLeistungserbringer` varchar(256) DEFAULT NULL,
-  `IKVersichertenKarte` varchar(256) DEFAULT NULL,
-  `IKKostentrager` varchar(256) DEFAULT NULL,
-  `IKDatenannahmestelle` varchar(256) DEFAULT NULL,
   `AbrechnungsZeitraumStart` datetime DEFAULT NULL,
   `AbrechnungsZeitraumEnde` datetime DEFAULT NULL,
-  `Nutzdatendatei` text,
-  `Auftragsdatei` varchar(1024) DEFAULT NULL,
-  `Transfername` varchar(256) DEFAULT NULL,
-  `Dateigrosse` int DEFAULT NULL,
-  `Datenaustauschreferenz` int DEFAULT NULL,
-  `ErstelltAm` datetime DEFAULT NULL,
   `Betrag` decimal(18,10) DEFAULT NULL,
   `Bezahlt` tinyint DEFAULT NULL,
+  `ErstelltAm` datetime DEFAULT NULL,
   PRIMARY KEY (`Oid`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 
@@ -47,14 +38,23 @@ CREATE TABLE `gkvtransferprotokoll` (
   `GkvAbrechnungOid` bigint DEFAULT NULL,
   `AbsenderBezeichnung` varchar(4096) DEFAULT NULL,
   `EmpfangerBezeichnung` varchar(4096) DEFAULT NULL,
+  `IKLeistungserbringer` varchar(256) DEFAULT NULL,
+  `IKKrankenkasse` varchar(256) DEFAULT NULL,
+  `IKKostentrager` varchar(256) DEFAULT NULL,
+  `IKDatenannahmestelle` varchar(256) DEFAULT NULL,
+  `Datenaustauschreferenz` int DEFAULT NULL,
+  `Transfernummer` int DEFAULT NULL,
+  `Transfername` varchar(256) DEFAULT NULL,
+  `ErstelltAm` datetime DEFAULT NULL,
   `Dateityp` varchar(4096) DEFAULT NULL,
   `Dateiname` varchar(4096) DEFAULT NULL,
-  `PruftDatum` datetime DEFAULT NULL,
-  `PruftFehler` varchar(4096) DEFAULT NULL,
-  `VerschlusseltDatum` datetime DEFAULT NULL,
-  `VerschlusseltFehler` varchar(4096) DEFAULT NULL,
-  `UbertragDatum` datetime DEFAULT NULL,
-  `UbertragFehler` varchar(4096) DEFAULT NULL,
+  `Dateigrosse` int DEFAULT NULL,
+  `Nutzdatendatei` text,
+  `Auftragsdatei` varchar(1024) DEFAULT NULL,
+  `Fehlertitel` varchar(256) DEFAULT NULL,
+  `Fehlerdatum` datetime DEFAULT NULL,
+  `Fehlernachricht` varchar(4096) DEFAULT NULL,
+  `Fehlerlevel` int DEFAULT NULL,
   PRIMARY KEY (`Oid`),
   KEY `FK_GKVTRANSFERPROTOKOLL_GKVABRECHNUNG` (`GkvAbrechnungOid`),
   CONSTRAINT `FK_GKVTRANSFERPROTOKOLL_GKVABRECHNUNG` FOREIGN KEY (`GkvAbrechnungOid`) REFERENCES `gkvabrechnung` (`Oid`)
diff --git a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
index 6d2d78bbf..19b75f4cc 100644
--- a/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
+++ b/Service/DCEntityMapper/GkvAbrechnungDC_GkvAbrechnung.cs
@@ -23,24 +23,12 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.GkvAbrechnungVersion = pEntity.Version;
             pDataContract.Notice = pEntity.Notice;
 
-            pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
-            pDataContract.IKVersichertenKarte = pEntity.IKVersichertenKarte;
-            pDataContract.IKLeistungserbringer = pEntity.IKLeistungserbringer;
-            pDataContract.IKKostenträger = pEntity.IKKostentrager;
-
             pDataContract.AbrechnungsZeitraumStart = pEntity.AbrechnungsZeitraumStart;
             pDataContract.AbrechnungsZeitraumEnde = pEntity.AbrechnungsZeitraumEnde;
 
-            pDataContract.Nutzdatendatei = pEntity.Nutzdatendatei;
-            pDataContract.Auftragsdatei = pEntity.Auftragsdatei;
-            pDataContract.Transfername = pEntity.Transfername;
-            pDataContract.Dateigröße = pEntity.Dateigrosse;
-            pDataContract.Datenaustauschreferenz = pEntity.Datenaustauschreferenz;
-
-            pDataContract.ErstelltAm = pEntity.ErstelltAm;
-
             pDataContract.Betrag = pEntity.Betrag;
             pDataContract.Bezahlt = pEntity.Bezahlt;
+            pDataContract.ErstelltAm = pEntity.ErstelltAm;
 
             pDataContract.InvoiceBases = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDCs(pEntity.InvoiceBases);
 
@@ -59,25 +47,14 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.Version = pDataContract.GkvAbrechnungVersion;
             pEntity.Notice = pDataContract.Notice;
 
-            pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
-            pEntity.IKVersichertenKarte = pDataContract.IKVersichertenKarte;
-            pEntity.IKLeistungserbringer = pDataContract.IKLeistungserbringer;
-            pEntity.IKKostentrager = pDataContract.IKKostenträger;
-
             pEntity.AbrechnungsZeitraumStart = pDataContract.AbrechnungsZeitraumStart;
             pEntity.AbrechnungsZeitraumEnde = pDataContract.AbrechnungsZeitraumEnde;
 
-            pEntity.Nutzdatendatei = pDataContract.Nutzdatendatei;
-            pEntity.Auftragsdatei = pDataContract.Auftragsdatei;
-            pEntity.Transfername = pDataContract.Transfername;
-            pEntity.Dateigrosse = pDataContract.Dateigröße;
-            pEntity.Datenaustauschreferenz = pDataContract.Datenaustauschreferenz;
-
-            pEntity.ErstelltAm = pDataContract.ErstelltAm;
-
             pEntity.Betrag = pDataContract.Betrag;
             pEntity.Bezahlt = pDataContract.Bezahlt;
 
+            pEntity.ErstelltAm = pDataContract.ErstelltAm;
+
             if (pEntity.GkvTransferProtokolle is null)
                 pEntity.GkvTransferProtokolle = new List<GkvTransferProtokoll>();
 
diff --git a/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs b/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs
index a8305a609..e2de2a7a9 100644
--- a/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs
+++ b/Service/DCEntityMapper/GkvTransferProtokollDC_GkvTransferprotokoll.cs
@@ -13,6 +13,11 @@ namespace BeWo.Service.DCEntityMapper
     {
         public override GkvTransferProtokollDC MergeWithDC(GkvTransferProtokoll pEntity, GkvTransferProtokollDC pDataContract)
         {
+            pDataContract.IKDatenannahmestelle = pEntity.IKDatenannahmestelle;
+            pDataContract.IKKrankenkasse = pEntity.IKKrankenkasse;
+            pDataContract.IKLeistungserbringer = pEntity.IKLeistungserbringer;
+            pDataContract.IKKostenträger = pEntity.IKKostentrager;
+
             pDataContract.AbsenderBezeichnung = pEntity.AbsenderBezeichnung;
             pDataContract.Dateiname = pEntity.Dateiname;
             pDataContract.Dateityp = pEntity.Dateityp;
@@ -21,12 +26,19 @@ namespace BeWo.Service.DCEntityMapper
             pDataContract.GkvTransferProtokollOid = pEntity.Oid;
             pDataContract.GkvTransferProtokollVersion = pEntity.Version;
             pDataContract.Notice = pEntity.Notice;
-            pDataContract.PruftDatum = pEntity.PruftDatum;
-            pDataContract.PruftFehler = pEntity.PruftFehler;
-            pDataContract.UbertragDatum = pEntity.UbertragDatum;
-            pDataContract.UbertragFehler = pEntity.UbertragFehler;
-            pDataContract.VerschlusseltDatum = pEntity.VerschlusseltDatum;
-            pDataContract.VerschlusseltFehler = pEntity.VerschlusseltFehler;
+
+            pDataContract.Nutzdatendatei = pEntity.Nutzdatendatei;
+            pDataContract.Auftragsdatei = pEntity.Auftragsdatei;
+            pDataContract.Transfername = pEntity.Transfername;
+            pDataContract.Dateigröße = pEntity.Dateigrosse;
+            pDataContract.Datenaustauschreferenz = pEntity.Datenaustauschreferenz;
+
+            pDataContract.ErstelltAm = pEntity.ErstelltAm;
+
+            pDataContract.Fehlerdatum = pEntity.Fehlerdatum;
+            pDataContract.Fehlerlevel = pEntity.Fehlerlevel;
+            pDataContract.Fehlernachricht = pEntity.Fehlernachricht;
+            pDataContract.Fehlertitel = pEntity.Fehlertitel;
 
             return pDataContract;
         }
@@ -43,12 +55,24 @@ namespace BeWo.Service.DCEntityMapper
             pEntity.Oid = pDataContract.GkvTransferProtokollOid;
             pEntity.Version = pDataContract.GkvTransferProtokollVersion;
             pEntity.Notice = pDataContract.Notice;
-            pEntity.PruftDatum = pDataContract.PruftDatum;
-            pEntity.PruftFehler = pDataContract.PruftFehler;
-            pEntity.UbertragDatum = pDataContract.UbertragDatum;
-            pEntity.UbertragFehler = pDataContract.UbertragFehler;
-            pEntity.VerschlusseltDatum = pDataContract.VerschlusseltDatum;
-            pEntity.VerschlusseltFehler = pDataContract.VerschlusseltFehler;
+
+            pEntity.IKDatenannahmestelle = pDataContract.IKDatenannahmestelle;
+            pEntity.IKKrankenkasse = pDataContract.IKKrankenkasse;
+            pEntity.IKLeistungserbringer = pDataContract.IKLeistungserbringer;
+            pEntity.IKKostentrager = pDataContract.IKKostenträger;
+
+            pEntity.Nutzdatendatei = pDataContract.Nutzdatendatei;
+            pEntity.Auftragsdatei = pDataContract.Auftragsdatei;
+            pEntity.Transfername = pDataContract.Transfername;
+            pEntity.Dateigrosse = pDataContract.Dateigröße;
+            pEntity.Datenaustauschreferenz = pDataContract.Datenaustauschreferenz;
+
+            pEntity.ErstelltAm = pDataContract.ErstelltAm;
+
+            pEntity.Fehlerdatum = pDataContract.Fehlerdatum;
+            pEntity.Fehlerlevel = pDataContract.Fehlerlevel;
+            pEntity.Fehlernachricht = pDataContract.Fehlernachricht;
+            pEntity.Fehlertitel = pDataContract.Fehlertitel;
 
             return pEntity;
         }
diff --git a/Service/ServiceContracts/IAccountingService.cs b/Service/ServiceContracts/IAccountingService.cs
index 204df8250..7c1f800fd 100644
--- a/Service/ServiceContracts/IAccountingService.cs
+++ b/Service/ServiceContracts/IAccountingService.cs
@@ -137,10 +137,6 @@ namespace BeWo.Service.ServiceContracts
         [OperationContract]
         void StorniereInvoiceBases(List<InvoiceBaseDC> invoices);
 
-        [FaultContract(typeof(BeWoFault))]
-        [OperationContract]
-        List<long> InsertNewGkvAbrechnungen(List<GkvAbrechnungDC> dc);
-
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         GkvAbrechnungDC GetGkvAbrechnung(long oid);
diff --git a/Service/ServiceImplementations/AccountingServiceImp.cs b/Service/ServiceImplementations/AccountingServiceImp.cs
index 3e6b71954..0412bf232 100644
--- a/Service/ServiceImplementations/AccountingServiceImp.cs
+++ b/Service/ServiceImplementations/AccountingServiceImp.cs
@@ -677,6 +677,7 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        #region GKV
         public GkvAbrechnungDC GetGkvAbrechnung(long oid)
         {
             try
@@ -724,9 +725,7 @@ namespace BeWo.Service.ServiceImplementations
 
                 var dcs = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDCs(entries);
 
-                var updateables = dcs.Where(x => x.GetState() != 5 && x.GetState() != 1
-                //&& x.GesendetAm.HasValue
-                ).ToArray();
+                var updateables = dcs.Where(x => x.IsWaiting()).ToArray();
 
                 if (!updateables.Any())
                     return dcs;
@@ -748,6 +747,320 @@ namespace BeWo.Service.ServiceImplementations
             }
         }
 
+        public GkvAbrechnungResponseDC CreateNewGkvAbrechnung(GkvAbrechnungRequestDC request)
+        {
+            var response = new GkvAbrechnungResponseDC();
+
+            try
+            {
+                var gkv_abrechnung = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewEntity(request.GkvAbrechnungDC);
+
+                if (gkv_abrechnung.AbrechnungsZeitraumEnde.Value.Hour == 0)
+                {
+                    gkv_abrechnung.AbrechnungsZeitraumEnde = gkv_abrechnung.AbrechnungsZeitraumEnde.Value.Date.AddDays(1).AddMilliseconds(-1);
+                }
+
+                decimal gesamt = 0;
+                foreach (var invoicebase_oid in request.SelectedInvoiceBases)
+                {
+                    var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
+                    var invoicebase = DAOFactory.GenericDAO.GetByID<InvoiceBase>(invoicebase_oid);
+                    var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
+                    var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
+
+                    var invoicebase_dc = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(invoicebase);
+
+                    foreach (var peroid in service.ServiceInvoicePeriodList)
+                    {
+                        foreach (var invoice in peroid.InvoiceItemList)
+                        {
+                            gesamt += invoice.AmountTotal.Value;
+                        }
+                    }
+                }
+
+                gkv_abrechnung.Betrag = gesamt;
+                gkv_abrechnung.Bezahlt = false;
+
+                gkv_abrechnung.ErstelltAm = DateTime.Now;
+
+                DAOFactory.GenericDAO.Insert(gkv_abrechnung);
+
+                var gkv_abrechnung_dc = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkv_abrechnung);
+
+                response.Success = true;
+                response.GkvAbrechnungDC = gkv_abrechnung_dc;
+
+                return response;
+            }
+            catch (DakotaException exc)
+            {
+                response.Error = exc.Message;
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+
+            return response;
+        }
+
+        public GkvAbrechnungDC UpdateGkvAbrechnung(GkvAbrechnungDC abrechnung)
+        {
+            try
+            {
+                var entity = DAOFactory.GenericDAO.GetByID<GkvAbrechnung>(abrechnung.GkvAbrechnungOid.Value);
+
+                MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MergeWithEntity(abrechnung, entity);
+
+                DAOFactory.GenericDAO.Update(entity);
+
+                return MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(entity);
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public void DeleteGkvAbrechnung(GkvAbrechnungDC abrechnung)
+        {
+            try
+            {
+                ServiceLogic.SetActivationType<GkvAbrechnung>(abrechnung.GkvAbrechnungOid.Value, abrechnung.GkvAbrechnungVersion.Value, ActivationTypeId.Deleted);
+            }
+            catch (Exception e)
+            {
+                throw Utils.CreateBeWoFaultException(e);
+            }
+        }
+
+        public GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(GkvAbrechnungSendRequestDC req)
+        {
+            var response = new GkvAbrechnungSendResponseDC();
+
+            response.Successful = false;
+
+            var user = LoggedInUserOperationContextExt.Current?.User ?? SessionFacade.LoggedInUser;
+            if (user == null)
+            {
+                response.Message = "User unbekannt";
+                return response;
+            }
+
+            var oid = req.GkvAbrechnungOid;
+            var entity = DAOFactory.GenericDAO.LoadByID<GkvAbrechnung>(oid);
+
+            var protokoll = new GkvTransferProtokoll();
+
+            protokoll.ErstelltAm = DateTime.Now;
+            protokoll.GkvAbrechnungOid = entity.Oid.Value;
+
+            try
+            {
+                CreateGkvTransferProtokoll(entity, protokoll);
+
+                string response_app8_str = SendApp8SendNewRequest(protokoll, user.LoginName, user.RC2EncryptedHash);
+
+                if (string.IsNullOrEmpty(response_app8_str))
+                    throw new DakotaException("Leere Antwort", "App8");
+
+                var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
+
+                if (!response_app8.Success)
+                    throw new DakotaException(response_app8.Message, "App8 Error");
+
+                var app8_protokoll = response_app8.GkvTransferProtokollDC;
+
+                MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MergeWithEntity(app8_protokoll, protokoll);
+
+                response.Successful = true;
+            }
+            catch (DakotaException de)
+            {
+                protokoll.Fehlerdatum = DateTime.Now;
+                protokoll.Fehlerlevel = GkvTransferFehlerlevel.Soft;
+                protokoll.Fehlernachricht = de.Message;
+                protokoll.Fehlertitel = de.Title ?? "Default";
+            }
+            catch (Exception e)
+            {
+                protokoll.Fehlerdatum = DateTime.Now;
+                protokoll.Fehlerlevel = GkvTransferFehlerlevel.Fatal;
+                protokoll.Fehlernachricht = e.ToString();
+                protokoll.Fehlertitel = "Erstellung (kritisch)";
+            }
+
+            DAOFactory.GenericDAO.Insert(protokoll);
+
+            response.TransferProtokoll = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDC(protokoll);
+
+            response.GkvAbrechnungDC = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(DAOFactory.GenericDAO.LoadByID<GkvAbrechnung>(oid));
+
+            if (response.Successful)
+            {
+                
+            }
+            else
+            {
+                response.Message = $"{protokoll.Fehlertitel} - {protokoll.Fehlernachricht}";
+            }
+
+            return response;
+        }
+
+        private GkvTransferProtokoll CreateGkvTransferProtokoll(GkvAbrechnung gkvAbrechnung, GkvTransferProtokoll protokoll, GkvAbrechnungDC gkvAbrechnungDC = null)
+        {
+            try
+            {
+                if (gkvAbrechnungDC is null)
+                    gkvAbrechnungDC = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkvAbrechnung);
+
+                var state = gkvAbrechnungDC.GetState();
+
+                if (state == GkvState.Waiting || state == GkvState.OldAndNoFeedback || state == GkvState.Paid || state == GkvState.ErrorFatal)
+                {
+                    throw new ArgumentException("Darf nicht erneut senden", nameof(state));
+                }
+
+                var (datenaustauschreferenz, transfernummer) = GetNextDatenaustauschreferenzTransfernummer(gkvAbrechnungDC);
+
+                var (dat_short, tra_short) = ClearDatenaustauschreferenzTransfernummer(datenaustauschreferenz, transfernummer);
+
+                protokoll.Datenaustauschreferenz = datenaustauschreferenz;
+                protokoll.Transfernummer = transfernummer;
+
+                var manager = new DakotaManager();
+                var mandatordc = new OperationsServiceImp().GetMandator();
+
+                DakotaValidator.ValidateFirstStep(mandatordc);
+
+                foreach (var invoicebase in gkvAbrechnung.InvoiceBases)
+                {
+                    var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase.Oid.Value);
+                    var orga2 = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
+                    var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
+
+                    var invoicebase_dc = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(invoicebase);
+
+                    var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
+                    var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga2);
+                    var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
+
+                    DakotaValidator.ValidateSecondStep(orgadc, customerdc);
+
+                    manager.Add(servicedc, orgadc, customerdc, mandatordc, dat_short, tra_short);
+                }
+
+                manager.Apply();
+
+                if (manager.DakotaFileDict.Count != 1 || manager.DakotaFileDict.First().Value.GetKostenträgerCount() != 1)
+                {
+                    throw new DakotaException("Unerwartete Anzahl an Dakota Files berechnet.");
+                }
+
+                var file_from_manager = manager.DakotaFileDict.First().Value;
+
+                var nutzdatendatei = file_from_manager.GetNutzdatendatei();
+
+                // https://dev.mysql.com/doc/refman/8.3/en/string-type-syntax.html
+                // A TEXT column with a maximum length of 65,535 (2^16 − 1) characters.
+                // The effective maximum length is less if the value contains multibyte
+                // characters. Each TEXT value is stored using a 2-byte length prefix
+                // that indicates the number of bytes in the value.
+                if (nutzdatendatei.Length > 65535)
+                {
+                    throw new DakotaException($"nutzdatendatei - Länger als 65535: {nutzdatendatei.Length}");
+                }
+
+                protokoll.IKDatenannahmestelle = file_from_manager.GetIKDatenannahmestelle();
+                protokoll.IKKostentrager = file_from_manager.GetIKKostenträger();
+                protokoll.IKLeistungserbringer = file_from_manager.GetIKLeistungserbringer();
+                protokoll.IKKrankenkasse = file_from_manager.GetIKVersichertenKarte();
+
+                protokoll.Auftragsdatei = file_from_manager.GetAuftragsdatei();
+                protokoll.Nutzdatendatei = file_from_manager.GetNutzdatendatei();
+                protokoll.Transfername = file_from_manager.GetTransferName();
+                protokoll.Dateigrosse = nutzdatendatei.Length;
+
+                protokoll.Dateityp = "Nutzdatendatei";
+                protokoll.Dateiname = protokoll.Transfername;
+
+                protokoll.AbsenderBezeichnung = "TestAbsBez";
+                protokoll.EmpfangerBezeichnung = "TestEmpBez";
+
+                return protokoll;
+            }
+            catch(DakotaException de)
+            {
+                if (string.IsNullOrEmpty(de.Title))
+                    de.Title = "Protokoll Erstellung";
+
+                throw de;
+            }
+            catch(Exception e)
+            {
+                throw new DakotaException(e.Message, "Erstellung");
+            }
+        }
+
+        private Tuple<int, int> GetNextDatenaustauschreferenzTransfernummer(GkvAbrechnungDC gkvAbrechnung)
+        {
+            var datenannahmestelle = gkvAbrechnung.Organisation.IKDatenannahmestelle;
+            var datenaustauschref = DAOFactory.SearchDAO.GetNextDatenaustauschreferenz(datenannahmestelle);
+            int transfernummer;
+
+            var state = gkvAbrechnung.GetState();
+
+            if (state == GkvState.NoSend)
+            {
+                transfernummer = DAOFactory.SearchDAO.GetNextTransfernummer(datenannahmestelle);
+            }
+            else if (state == GkvState.Error)
+            {
+                transfernummer = gkvAbrechnung.TransferProtokolle.Last().Transfernummer;
+            }
+            else
+            {
+                throw new ArgumentException("Versucht Datenaustauschref zu laden, invalid state", nameof(state));
+            }
+
+            return new Tuple<int, int>(datenaustauschref, transfernummer);
+        }
+
+        private Tuple<int, int> ClearDatenaustauschreferenzTransfernummer(int datenaustauschreferenz, int transfernummer)
+        {
+            int d = datenaustauschreferenz % 99999;
+            int t = transfernummer % 1000;
+
+            if (d == 0)
+            {
+                d = 99999;
+            }
+
+            return new Tuple<int, int>(d, t);
+        }
+
+        private string SendApp8SendNewRequest(GkvTransferProtokoll protokoll, string loginName, string hashed_password)
+        {
+            var gkv_transfer_dc = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewDC(protokoll);
+
+            var url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
+
+#if DEBUG
+            url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
+#endif
+
+            var request_app8 = new GkvApp8SendNewRequest
+            {
+                GkvTransferProtokoll = gkv_transfer_dc,
+                Username = loginName,
+                Password = hashed_password,
+                Tenant = MultitenancyOperationContextExt.Current.Tenant
+            };
+
+            return SendApp8Request(url, request_app8);
+        }
         /// <summary>
         /// 
         /// </summary>
@@ -808,246 +1121,13 @@ namespace BeWo.Service.ServiceImplementations
                 var gkv_abrechnung_entity = DAOFactory.GenericDAO.LoadByID<GkvAbrechnung>(gkv_abrechnung.GkvAbrechnungOid.Value);
 
                 var gkv_abrechnung_new_entity = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MergeWithEntity(gkv_abrechnung, gkv_abrechnung_entity);
-            
+
                 DAOFactory.GenericDAO.Update(gkv_abrechnung_new_entity);
             }
 
             return allAreUpToDate;
         }
 
-        public GkvAbrechnungResponseDC CreateNewGkvAbrechnung(GkvAbrechnungRequestDC request)
-        {
-            var response = new GkvAbrechnungResponseDC();
-
-            try
-            {
-                var gkv_abrechnung_dc = request.GkvAbrechnungDC;
-
-                if(gkv_abrechnung_dc.AbrechnungsZeitraumEnde.Value.Hour == 0)
-                {
-                    gkv_abrechnung_dc.AbrechnungsZeitraumEnde = gkv_abrechnung_dc.AbrechnungsZeitraumEnde.Value.Date.AddDays(1).AddMilliseconds(-1);
-                }
-
-                var manager = new DakotaManager();
-                var mandatordc = new OperationsServiceImp().GetMandator();
-                var loaded_invoicebases = new List<InvoiceBaseDC>();
-
-                DakotaValidator.ValidateFirstStep(mandatordc, request);
-
-                int? datenaustauschreferenz = null;
-                foreach (var invoicebase_oid in request.SelectedInvoiceBases)
-                {
-                    var service = DAOFactory.SearchDAO.GetServiceInvoiceByInvoiceBaseOid(invoicebase_oid);
-                    var invoicebase = DAOFactory.GenericDAO.GetByID<InvoiceBase>(invoicebase_oid);
-                    var orga = invoicebase.CostBearer2SupportConcept.CostBearer.Organisation;
-                    var customer = invoicebase.CostBearer2SupportConcept.SupportConcept.Customer;
-
-                    var invoicebase_dc = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(invoicebase);
-
-                    if(!datenaustauschreferenz.HasValue)
-                        datenaustauschreferenz = DAOFactory.SearchDAO.GetLastDatenaustauschreferenz(orga.IKDatenannahmestelle) + 1;
-
-                    loaded_invoicebases.Add(invoicebase_dc);
-
-                    var servicedc = MapperFactory.ServiceInvoiceDC_ServiceInvoice.MapToNewDC(service);
-                    var orgadc = MapperFactory.OrganisationDC_OrganisationMapper.MapToNewDC(orga);
-                    var customerdc = MapperFactory.CustomerDC_Customer.MapToNewDC(customer);
-
-                    DakotaValidator.ValidateSecondStep(orgadc, customerdc);
-
-                    manager.Add(servicedc, orgadc, customerdc, mandatordc, datenaustauschreferenz.Value);
-                }
-
-                manager.Apply();
-
-                if (manager.DakotaFileDict.Count != 1 || manager.DakotaFileDict.First().Value.GetKostenträgerCount() != 1)
-                {
-                    throw new DakotaException("Unerwartete Anzahl an Dakota Files berechnet.");
-                }
-
-                var file_from_manager = manager.DakotaFileDict.First().Value;
-
-                var nutzdatendatei = file_from_manager.GetNutzdatendatei();
-
-                // https://dev.mysql.com/doc/refman/8.3/en/string-type-syntax.html
-                // A TEXT column with a maximum length of 65,535 (2^16 − 1) characters.
-                // The effective maximum length is less if the value contains multibyte
-                // characters. Each TEXT value is stored using a 2-byte length prefix
-                // that indicates the number of bytes in the value.
-                if (nutzdatendatei.Length > 65535)
-                {
-                    throw new DakotaException($"nutzdatendatei - Länger als 65535: {nutzdatendatei.Length}");
-                }
-
-                gkv_abrechnung_dc.IKDatenannahmestelle = file_from_manager.GetIKDatenannahmestelle();
-                gkv_abrechnung_dc.IKKostenträger = file_from_manager.GetIKKostenträger();
-                gkv_abrechnung_dc.IKLeistungserbringer = file_from_manager.GetIKLeistungserbringer();
-                gkv_abrechnung_dc.IKVersichertenKarte = file_from_manager.GetIKVersichertenKarte();
-
-                gkv_abrechnung_dc.Auftragsdatei = file_from_manager.GetAuftragsdatei();
-                gkv_abrechnung_dc.Nutzdatendatei = file_from_manager.GetNutzdatendatei();
-                gkv_abrechnung_dc.Transfername = file_from_manager.GetTransferName();
-                gkv_abrechnung_dc.Datenaustauschreferenz = file_from_manager.GetDatenaustauschreferenz();
-                gkv_abrechnung_dc.Dateigröße = nutzdatendatei.Length;
-
-                gkv_abrechnung_dc.ErstelltAm = file_from_manager.Created;
-                gkv_abrechnung_dc.Betrag = file_from_manager.GetBetrag();
-                gkv_abrechnung_dc.InvoiceBases = loaded_invoicebases;
-
-                var gkv_abrechnung = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewEntity(gkv_abrechnung_dc);
-
-                DAOFactory.GenericDAO.Insert(gkv_abrechnung);
-
-                var new_gkv_abrechnung_dc = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(gkv_abrechnung);
-
-                response.Success = true;
-                response.GkvAbrechnungDC = new_gkv_abrechnung_dc;
-
-                return response;
-            }
-            catch (DakotaException exc)
-            {
-                response.Error = exc.Message;
-            }
-            catch (Exception e)
-            {
-                throw Utils.CreateBeWoFaultException(e);
-            }
-
-            return response;
-        }
-
-        public GkvAbrechnungDC UpdateGkvAbrechnung(GkvAbrechnungDC abrechnung)
-        {
-            try
-            {
-                var entity = DAOFactory.GenericDAO.GetByID<GkvAbrechnung>(abrechnung.GkvAbrechnungOid.Value);
-
-                MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MergeWithEntity(abrechnung, entity);
-
-                //entity.Notice = abrechnung.Notice;
-                //entity.Bezahlt = abrechnung.Bezahlt;
-
-                DAOFactory.GenericDAO.Update(entity);
-
-                return MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(entity);
-            }
-            catch (Exception e)
-            {
-                throw Utils.CreateBeWoFaultException(e);
-            }
-        }
-
-        public void DeleteGkvAbrechnung(GkvAbrechnungDC abrechnung)
-        {
-            try
-            {
-                ServiceLogic.SetActivationType<GkvAbrechnung>(abrechnung.GkvAbrechnungOid.Value, abrechnung.GkvAbrechnungVersion.Value, ActivationTypeId.Deleted);
-            }
-            catch (Exception e)
-            {
-                throw Utils.CreateBeWoFaultException(e);
-            }
-        }
-
-
-        public List<long> InsertNewGkvAbrechnungen(List<GkvAbrechnungDC> dcList)
-        {
-            //try
-            //{
-            //    var newGkvAbrechnungen = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewEntities(dcList);
-
-            //    DAOFactory.GenericDAO.Insert(newGkvAbrechnungen);
-
-            //    return newGkvAbrechnungen.Select(i => i.Oid.Value).ToList();
-            //}
-            //catch (Exception e)
-            //{
-            //    throw Utils.CreateBeWoFaultException(e);
-            //}
-
-            return null;
-        }
-
-        public GkvAbrechnungSendResponseDC SendNewGkvAbrechnung(GkvAbrechnungSendRequestDC req)
-        {
-            var response = new GkvAbrechnungSendResponseDC();
-
-            response.Successful = false;
-
-            var user = LoggedInUserOperationContextExt.Current?.User ?? SessionFacade.LoggedInUser;
-            if (user == null)
-            {
-                response.Message = "User unbekannt";
-                return response;
-            }
-
-            try
-            {
-                var oid = req.GkvAbrechnungDC.GkvAbrechnungOid.Value;
-
-                string response_app8_str = SendApp8SendNewRequest(oid, user.LoginName, user.RC2EncryptedHash);
-
-                if (string.IsNullOrEmpty(response_app8_str))
-                {
-                    response.Message = "App8 leere Antwort";
-                    return response;
-                }
-
-                var response_app8 = JsonConvert.DeserializeObject<GkvApp8SendNewResponse>(response_app8_str);
-
-                response.Successful = response_app8.Success;
-
-                if (response_app8.Success)
-                {
-                    var entity = DAOFactory.GenericDAO.GetByID<GkvAbrechnung>(req.GkvAbrechnungDC.GkvAbrechnungOid.Value);
-
-                    var child_dc = response_app8.GkvTransferProtokollDC;
-                    var child = MapperFactory.GkvTransferProtokollDC_GkvTransferprotokoll.MapToNewEntity(child_dc);
-
-                    entity.GkvTransferProtokolle.Add(child);
-
-                    DAOFactory.GenericDAO.Update(entity);
-
-                    response.Message = "Erfolgreich gesendet";
-                    response.GkvAbrechnungDC = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(entity);
-                }
-                else
-                {
-                    response.Message = response_app8.Message;
-                }
-                    
-
-                return response;
-            }
-            catch (Exception e)
-            {
-                throw Utils.CreateBeWoFaultException(e);
-            }
-        }
-        private string SendApp8SendNewRequest(long oid, string loginName, string hashed_password)
-        {
-            var entity = DAOFactory.GenericDAO.LoadByID<GkvAbrechnung>(oid);
-
-            var gkv_abrechnung_dc = MapperFactory.GkvAbrechnungDC_GkvAbrechnung.MapToNewDC(entity);
-
-            var url = "https://app8.bewoplaner.de/service/GkvAbrechnungView.aspx";
-
-#if DEBUG
-            url = "http://localhost:3777/Host/GkvAbrechnungView.aspx";
-#endif
-
-            var request_app8 = new GkvApp8SendNewRequest
-            {
-                GkvAbrechnung = gkv_abrechnung_dc,
-                Username = loginName,
-                Password = hashed_password,
-                Tenant = MultitenancyOperationContextExt.Current.Tenant
-            };
-
-            return SendApp8Request(url, request_app8);
-        }
-
         private string SendApp8Request(string url, object request) => SendApp8Request(url, JsonConvert.SerializeObject(request));
         private string SendApp8Request(string url, string dataString)
         {
@@ -1063,5 +1143,7 @@ namespace BeWo.Service.ServiceImplementations
 
             return response_app8_str;
         }
+
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/Shared/BeWoEntityEnums.cs b/Shared/BeWoEntityEnums.cs
index 0616db050..1279e5d00 100644
--- a/Shared/BeWoEntityEnums.cs
+++ b/Shared/BeWoEntityEnums.cs
@@ -1231,4 +1231,21 @@ namespace BS.Shared
         GetStatus,
         GetIKNumber
     }
+
+    public enum GkvTransferFehlerlevel
+    {
+        None, // Kein Fehler
+        Soft, // Kann erneut senden
+        Fatal // Kann nicht erneut senden
+    }
+
+    public enum GkvState
+    {
+        NoSend,
+        Waiting,
+        Error,
+        ErrorFatal,
+        Paid,
+        OldAndNoFeedback
+    }
 }
\ No newline at end of file
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
index 5a8e8ec09..796ba4b6c 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungDC.cs
@@ -17,48 +17,21 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
         [DataMember]
         public string Notice { get; set; }
 
-        [DataMember]
-        public string IKLeistungserbringer { get; set; }
-
-        [DataMember]
-        public string IKVersichertenKarte { get; set; }
-
-        [DataMember]
-        public string IKKostenträger { get; set; }
-
-        [DataMember]
-        public string IKDatenannahmestelle { get; set; }
-
         [DataMember]
         public DateTime? AbrechnungsZeitraumStart { get; set; }
 
         [DataMember]
         public DateTime? AbrechnungsZeitraumEnde { get; set; }
 
-        [DataMember]
-        public string Nutzdatendatei { get; set; }
-
-        [DataMember]
-        public string Auftragsdatei { get; set; }
-
-        [DataMember]
-        public string Transfername { get; set; }
-
-        [DataMember]
-        public int Dateigröße { get; set; }
-
-        [DataMember]
-        public int Datenaustauschreferenz { get; set; }
-
-        [DataMember]
-        public DateTime? ErstelltAm { get; set; }
-
         [DataMember]
         public decimal Betrag { get; set; }
 
         [DataMember]
         public bool Bezahlt { get; set; }
 
+        [DataMember]
+        public DateTime ErstelltAm { get; set; }
+
         [DataMember]
         public IList<InvoiceBaseDC> InvoiceBases { get; set; }
 
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendRequestDC.cs b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendRequestDC.cs
index d9de6a8fd..95e905492 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendRequestDC.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendRequestDC.cs
@@ -11,6 +11,6 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
     public class GkvAbrechnungSendRequestDC : IDataContract
     {
         [DataMember]
-        public GkvAbrechnungDC GkvAbrechnungDC { get; set; }
+        public long GkvAbrechnungOid { get; set; }
     }
 }
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendResponseDC.cs b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendResponseDC.cs
index fd3e073d7..4b6dad049 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendResponseDC.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvAbrechnungSendResponseDC.cs
@@ -18,5 +18,8 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
 
         [DataMember]
         public GkvAbrechnungDC GkvAbrechnungDC { get; set; }
+
+        [DataMember]
+        public GkvTransferProtokollDC TransferProtokoll { get; set; }
     }
 }
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewRequest.cs b/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewRequest.cs
index d9c58486d..dcd1e3b19 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewRequest.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewRequest.cs
@@ -12,6 +12,9 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
         [DataMember]
         public GkvAbrechnungDC GkvAbrechnung { get; set; }
 
+        [DataMember]
+        public GkvTransferProtokollDC GkvTransferProtokoll { get; set; }
+
         public GkvApp8SendNewRequest()
         {
             Type = GkvAbrechnungApp8RequestTypeDC.SendNew;
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewResponse.cs b/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewResponse.cs
index 2caf0ef18..b58950cec 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewResponse.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvApp8SendNewResponse.cs
@@ -14,7 +14,12 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
 
         public GkvApp8SendNewResponse()
         {
+            
+        }
 
+        public GkvApp8SendNewResponse(bool success) : this()
+        {
+            Success = success;
         }
     }
 }
diff --git a/Shared/DataContracts/GkvAbrechnung/GkvTransferProtokollDC.cs b/Shared/DataContracts/GkvAbrechnung/GkvTransferProtokollDC.cs
index ac9907571..7084ee195 100644
--- a/Shared/DataContracts/GkvAbrechnung/GkvTransferProtokollDC.cs
+++ b/Shared/DataContracts/GkvAbrechnung/GkvTransferProtokollDC.cs
@@ -17,15 +17,39 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
         [DataMember]
         public string Notice { get; set; }
 
-        [DataMember]
+        [DataMember] 
         public long GkvAbrechnungOid { get; set; }
 
-        [DataMember]
+        [DataMember] 
         public string AbsenderBezeichnung { get; set; }
 
-        [DataMember]
+        [DataMember] 
         public string EmpfangerBezeichnung { get; set; }
 
+        [DataMember]
+        public string IKLeistungserbringer { get; set; }
+
+        [DataMember]
+        public string IKKrankenkasse { get; set; }
+
+        [DataMember]
+        public string IKKostenträger { get; set; }
+
+        [DataMember]
+        public string IKDatenannahmestelle { get; set; }
+
+        [DataMember]
+        public int Datenaustauschreferenz { get; set; }
+
+        [DataMember]
+        public int Transfernummer { get; set; }
+
+        [DataMember]
+        public string Transfername { get; set; }
+
+        [DataMember]
+        public DateTime? ErstelltAm { get; set; }
+
         [DataMember]
         public string Dateityp { get; set; }
 
@@ -33,21 +57,24 @@ namespace BS.Shared.DataContracts.GkvAbrechnung
         public string Dateiname { get; set; }
 
         [DataMember]
-        public DateTime? PruftDatum { get; set; }
+        public int Dateigröße { get; set; }
 
         [DataMember]
-        public string PruftFehler { get; set; }
+        public string Nutzdatendatei { get; set; }
 
         [DataMember]
-        public DateTime? VerschlusseltDatum { get; set; }
+        public string Auftragsdatei { get; set; }
 
         [DataMember]
-        public string VerschlusseltFehler { get; set; }
+        public string Fehlertitel { get; set; }
 
         [DataMember]
-        public DateTime? UbertragDatum { get; set; }
+        public DateTime? Fehlerdatum { get; set; }
 
         [DataMember]
-        public string UbertragFehler { get; set; }
+        public string Fehlernachricht { get; set; }
+
+        [DataMember]
+        public GkvTransferFehlerlevel Fehlerlevel { get; set; }
     }
 }
\ No newline at end of file
diff --git a/Shared/Extensions/GkvAbrechnungExtensions.cs b/Shared/Extensions/GkvAbrechnungExtensions.cs
index e6cb23c9d..aae372393 100644
--- a/Shared/Extensions/GkvAbrechnungExtensions.cs
+++ b/Shared/Extensions/GkvAbrechnungExtensions.cs
@@ -9,76 +9,51 @@ namespace BS.Shared.Extensions
 {
     public static class GkvAbrechnungExtensions
     {
-        /// <summary>
-        /// 1 - Ãœbertragung nicht begonnen
-        /// 2 - Prüfung keine Antwort
-        /// 3 - Verschlüsselt keine Antwort
-        /// 4 - Ãœbertragung keine Antwort
-        /// 5 - Fertig (Erfolreich oder Fehler)
-        /// </summary>
-        /// <param name="gkvAbrechnungDC"></param>
-        /// <returns></returns>
-        public static int GetState(this GkvAbrechnungDC gkvAbrechnungDC)
+        public static GkvState GetState(this GkvAbrechnungDC gkvAbrechnungDC)
         {
-            if (gkvAbrechnungDC.TransferProtokolle == null || !gkvAbrechnungDC.TransferProtokolle.Any())
-                return 1;
+            if (gkvAbrechnungDC is null)
+                throw new ArgumentNullException(nameof(gkvAbrechnungDC));
 
-            var last_protokoll = gkvAbrechnungDC.TransferProtokolle.Last();
+            if (gkvAbrechnungDC.Bezahlt)
+                return GkvState.Paid;
 
-            return GetState(last_protokoll);
+            if (gkvAbrechnungDC.TransferProtokolle is null || !gkvAbrechnungDC.TransferProtokolle.Any())
+                return GkvState.NoSend;
+
+            var last_transfer = gkvAbrechnungDC.TransferProtokolle.Last();
+
+            if (last_transfer.Fehlerdatum.HasValue)
+            {
+                if (last_transfer.Fehlerlevel == GkvTransferFehlerlevel.Fatal)
+                    return GkvState.ErrorFatal;
+                else
+                    return GkvState.Error;
+            }
+
+            // Kein Fehler
+                
+            if (DateTime.Now - last_transfer.ErstelltAm > TimeSpan.FromDays(28))
+            {
+                return GkvState.OldAndNoFeedback;
+            }
+            
+            return GkvState.Waiting;
         }
 
-        public static int GetState(this GkvTransferProtokollDC last_protokoll)
-        {
-            if (!last_protokoll.PruftDatum.HasValue)
-            {
-                return 2;
-            }
-            else
-            {
-                if (last_protokoll.PruftFehler != null)
-                {
-                    return 5;
-                }
-            }
 
-            if (!last_protokoll.VerschlusseltDatum.HasValue)
-            {
-                return 3;
-            }
-            else
-            {
-                if (last_protokoll.VerschlusseltFehler != null)
-                {
-                    return 5;
-                }
-            }
-
-            if (!last_protokoll.UbertragDatum.HasValue)
-            {
-                return 4;
-            }
-            else
-            {
-                if (last_protokoll.UbertragFehler != null)
-                {
-                    return 5;
-                }
-            }
-
-            return 6;
-        }
-
-        public static bool IsStatusComplete(this GkvAbrechnungDC gkvAbrechnungDC)
+        public static bool IsWaiting(this GkvAbrechnungDC gkvAbrechnungDC)
         {
             var state = gkvAbrechnungDC.GetState();
 
-            return state == 5 || state == 6;
-                
-                //gkvAbrechnungDC.VerschluesseltAm.HasValue
-                //&& gkvAbrechnungDC.UebertragenAm.HasValue
-                //&& gkvAbrechnungDC.AntwortErhaltenAm.HasValue
-                //&& gkvAbrechnungDC.AntwortEntschluesseltAm.HasValue;
+            if (state == GkvState.Waiting || state == GkvState.OldAndNoFeedback)
+                return true;
+
+            return false;
+        }
+
+        public static bool IsSend(this GkvAbrechnungDC gkvAbrechnung)
+        {
+            return gkvAbrechnung.TransferProtokolle is object && gkvAbrechnung.TransferProtokolle.Any();
         }
 
         public static bool IsUpToDate(this GkvAbrechnungDC gkvAbrechnungDC, GkvAbrechnungDC compareTo)