Merge branch 'master' of ssh://float.ownsoft.de/git/beyondSoft/BeWo

BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml

@@ -50,7 +50,7 @@
                                         <!--<Button Click="btn_nutz_Click" Content="¥" Padding="0" Margin="1" ToolTip="Nutzdatendatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_nutz" Height="17" Width="20" VerticalAlignment="Center" />
                                         <Button Click="btn_auf_Click" Content="¥" Padding="0" Margin="1" ToolTip="Auftragsdatei" Foreground="#BBBBBB" FontSize="10" FontFamily="Webdings" x:Name="btn_auf" Height="17" Width="20" VerticalAlignment="Center" />-->
                                         <Button Click="btn_send_Click" Content="*" Padding="0" Margin="1" ToolTip="Senden" Foreground="#ffffff" FontSize="11" FontFamily="Wingdings" x:Name="btn_send" Height="18" Width="20" VerticalAlignment="Center"/>
-                                        <Button Click="btn_force_send_Click" Content="r" Padding="0" Margin="1" ToolTip="DEBUG: Protokolle Löschen" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_force_send" Height="18" Width="20" VerticalAlignment="Center" Visibility="Visible"/>
+                                        <Button Click="btn_force_send_Click" Content="r" Padding="0" Margin="1" ToolTip="DEBUG: Protokolle Löschen" Foreground="#FFFF00" FontSize="11" FontFamily="Wingdings" x:Name="btn_force_send" Height="18" Width="20" VerticalAlignment="Center" Visibility="Collapsed"/>
                                         <Button Click="btn_delete_Click" Content="r" Padding="0" Margin="1" ToolTip="Löschen" Foreground="#FF0000" FontSize="11" FontFamily="Webdings" x:Name="btn_delete" Height="18" Width="20" VerticalAlignment="Center" />
                                     </StackPanel>
                                 </ControlTemplate>

BeWo/View/Detail/Accounting/GkvAbrechnungOverview.xaml.cs

@@ -137,10 +137,13 @@ namespace BeWo.View.Detail.Accounting
 
             if (checked_invoice_bases.Count == 0)
             {
+#if DEBUG
                 if (MessageBox.Show("Sie haben keine Rechnung hinzugefügt. Wollen Sie fortfahren?", "GKV-Abrechnung erstellen", MessageBoxButton.YesNo, MessageBoxImage.Warning) != MessageBoxResult.Yes)
-                {
                     return;
-                }
+#else
+                MessageBox.Show("Sie haben keine Rechnung hinzugefügt.", "GKV-Abrechnung erstellen", MessageBoxButton.OK, MessageBoxImage.Warning);
+                return;
+#endif
             }
 
             MainControl.CloseCurrentPopUp();

BeWoPlanerMobil/BeWoPlanerMobil.csproj

@@ -484,7 +484,6 @@
     <None Include="Scripts\jquery\jquery-3.7.1.intellisense.js" />
     <Content Include="Scripts\jquery\jquery-3.7.1.min.js" />
     <Content Include="Scripts\knockout-3.5.1.js" />
-    <Content Include="Scripts\ownSoft-Scripts\group-booking.js" />
     <Content Include="Content\style.css.map" />
     <Content Include="Content\style.scss" />
     <Content Include="Content\fonts\signika-negative.regular.ttf" />
@@ -542,7 +541,7 @@
     <Content Include="Scripts\ownSoft-Scripts\utils\js-helper.js" />
     <Content Include="Scripts\ownSoft-Scripts\utils\list-utils.js" />
     <Content Include="Scripts\ownSoft-Scripts\utils\logging.js" />
-    <Content Include="Scripts\ownSoft-Scripts\utils\password-security.js" />
+    <Content Include="Scripts\ownSoft-Scripts\utils\MoKPasswordSecurity.js" />
     <Content Include="Scripts\ownSoft-Scripts\utils\resources-list-utils.js" />
     <Content Include="Scripts\ownSoft-Scripts\utils\service-record-time-calc.js" />
     <Content Include="Scripts\ownSoft-Scripts\utils\trimCanvas.js" />
@@ -603,6 +602,11 @@
     <Content Include="Views\Main\GroupBookingScCbRelList.cshtml" />
     <Content Include="Views\Main\GroupBookingFormPartial.cshtml" />
     <Content Include="Views\Main\Category2ServiceDescriptionPartial.cshtml" />
+    <Content Include="Views\Main\GroupBookingSelectionPartial.cshtml" />
+    <Content Include="Views\Main\MultiBookingFormPartial.cshtml" />
+    <Content Include="Views\Main\MultiBookingSelectionPartial.cshtml" />
+    <Content Include="Views\Main\MultiBookingScCbRelList.cshtml" />
+    <Content Include="Views\Main\GoalRatingPopupContentPartial.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="packages.config" />
@@ -691,7 +695,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>8808</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>

BeWoPlanerMobil/BeWoPlanerMobil.csproj.user

@@ -8,7 +8,7 @@
     <IISExpressWindowsAuthentication />
     <IISExpressUseClassicPipelineMode />
     <UseGlobalApplicationHostFile />
-    <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
     <ProjectView>ShowAllFiles</ProjectView>
     <WebStackScaffolding_ViewDialogWidth>600</WebStackScaffolding_ViewDialogWidth>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>

BeWoPlanerMobil/Controllers/AbstractBaseController.cs

@@ -5,6 +5,7 @@ using System.Web.Security;
 using BeWo.Service.ServiceContracts;
 using BeWoPlanerMobil.Models;
 using BeWoPlanerMobil.Service;
+using BeWoPlanerMobil.Util;
 using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;

BeWoPlanerMobil/Controllers/CustomerController.cs

@@ -49,7 +49,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             try
             {
-                if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
+                if(!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
                 {
                     return Logout();
                 }
@@ -130,6 +130,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
                 {
+                    TempData[TempDataConstants.DoLogoutKey] = true;
                     return Logout();
                 }
 
@@ -155,6 +156,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -175,7 +177,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
             {
-                Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return null;
             }
             
@@ -211,6 +213,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -318,7 +321,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeMedikamentenliste)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerReportPartial", Model);
             }
 
             var selectedReportType = (CustomerReportType)reportType;
@@ -333,7 +337,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeMedikamentenliste)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerReportPartial", Model);
             }
 
             Model.SelectedReportType = CustomerReportType.Historie;
@@ -348,7 +353,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeMedikamentenliste)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerMedListPartial", Model);
             }
 
             Model.SelectedReportType = CustomerReportType.Historie;
@@ -490,6 +496,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadFormPartial()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassenFormPartial", Model);
+            }
+
             Model.SelectedBargeldkasse = null;
             Model.SelectedAuszahlungsintervall = 0;
 
@@ -499,6 +511,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadEditFormPartial(long bargeldkassenOid)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassenFormPartial", Model);
+            }
+
             Model.SelectedBargeldkasse = Model.Bargeldkassen.FirstOrDefault(bargeldkasse => bargeldkasse.BargeldkassenOid.HasValue && bargeldkasse.BargeldkassenOid.Value.Equals(bargeldkassenOid));
 
             if(Model.SelectedBargeldkasse != null)
@@ -515,6 +533,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null || !long.TryParse(formCollection["bk-to-delete-oid"], out var bargeldkassenOid) || Model.SelectedCustomerOid is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -540,6 +559,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -591,6 +611,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult PrintBargeldkasse(long kassenbuchOid, string reportStartDate, string reportEndDate)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerReportPartial", Model);
+            }
+
             var bargeldkasse = Model.Bargeldkassen.FirstOrDefault(f => f.BargeldkassenOid.HasValue && f.BargeldkassenOid.Value.Equals(kassenbuchOid));
 
             var startDate = DateTime.TryParse(reportStartDate, out var parsedStartDate) ? parsedStartDate : DateTime.Today.GetFirstOfMonth();
@@ -630,6 +656,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult DownloadZahlungsbeleg(long transaktionsOid)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerReportPartial", Model);
+            }
+
             var kassenbuch = Model.Bargeldkassen.FirstOrDefault(bargeldkasse => bargeldkasse.Bargeldtransaktionen.Any(transaktion => transaktion.BargeldtransaktionOid.Equals(transaktionsOid)));
 
             var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid));
@@ -652,6 +684,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadBargeldtransaktionsEditForm(long transaktionsOid)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldtransaktionenFormPartial");
+            }
+
             var kassenbuch = GetBargeldkasseByTransaktionsOid(transaktionsOid);
 
             var zahlung = kassenbuch?.Bargeldtransaktionen.FirstOrDefault(bargeldtransaktion => bargeldtransaktion.BargeldtransaktionOid.Equals(transaktionsOid));
@@ -684,6 +722,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadBargeldtransaktionsForm(long bargeldkassenOid)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldtransaktionenFormPartial");
+            }
+
             Model.SelectedBargeldtransaktion = null;
             Model.SelectedTransaktionsart = 0;
 
@@ -695,6 +739,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult CreateOrUpdateBargeldTransaktion2(string rawDate, string rawArt, string rawBetrag, string belegnummer, string notice)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassen");
+            }
+
             var transaktion2Edit = Model.SelectedBargeldtransaktion;
             var bargeldkasse = Model.SelectedBargeldkasse;
 
@@ -759,7 +809,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassen");
             }
 
             if(bargeldtransaktionsOid is null)
@@ -798,7 +849,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassen");
             }
 
             var bargeldkasse = GetBargeldkasseByTransaktionsOid(transaktionsOid);
@@ -853,7 +905,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldkassen");
             }
 
             BargeldkassenDC bargeldkasse = null;
@@ -898,11 +951,10 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerBargeldtransaktionshistorienPartial");
             }
 
-
-
             var historyEntries = OperationsService.LoadBargeldtransaktionshistoryEntries(transactionOid);
 
             Model.BargeldtransaktionshistoryEntries = historyEntries.OrderByDescending(he => he.InsertedOn).ToList();
@@ -931,6 +983,12 @@ namespace BeWoPlanerMobil.Controllers
         [HttpPost]
         public ActionResult CreateOrUpdateAbsenceTime(FormCollection formCollection)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return Logout();
+            }
+
             var selectedAbsenceTime = Model.SelectedAbsenceTime;
             var oid = selectedAbsenceTime?.AbsenceTimeOid;
 
@@ -999,6 +1057,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -1042,6 +1101,11 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadAbsenceTimeToForm()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("CustomerAbsenceTimeFormPartial", Model);
         }
 
@@ -1057,6 +1121,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult DeleteAbsenceTime(long absenceTimeOid)
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("CustomerAbsenceTimePartial");
+            }
+
             var absenceTime2Delete = Model.SelectedCustomer.AbsenceTimes.FirstOrDefault(absenceTime => absenceTime.AbsenceTimeOid.HasValue && absenceTime.AbsenceTimeOid.Equals(absenceTimeOid));
 
             if(absenceTime2Delete is null)

BeWoPlanerMobil/Controllers/LoginController.cs

@@ -154,6 +154,8 @@ namespace BeWoPlanerMobil.Controllers
                 ViewData[IsSessionTimedOut] = "Sie wurden automatisch abgemeldet, da Ihre Session abgelaufen ist.";
             }
 
+            var errorMessage = TempData[TempDataConstants.ErrorMessageKey];
+
 		    if(tenant is null)
 		    {
 				var keks = HttpContext.Request.Cookies.Get(MobileSessionFacade.CookieName);

BeWoPlanerMobil/Controllers/ReportController.cs

@@ -92,6 +92,12 @@ namespace BeWoPlanerMobil.Controllers
                     return RedirectToActionPermanent("Main", "Main");
                 }
 
+                if(Model is null)
+                {
+                    TempData[TempDataConstants.DoLogoutKey] = true;
+                    return Logout();
+                }
+
                 var month = DateTime.Today.Month;
                 var year  = DateTime.Today.Year;
                 var first = new DateTime(year, month, 1).AddMonths(-1);
@@ -832,7 +838,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("QuittierungsbelegsResultPartial");
             }
 
             if(Model.SelectedFilterItem is null)
@@ -1110,6 +1117,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -1131,6 +1139,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model?.ConfirmationReceiptObject is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -1183,7 +1192,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                PartialView("ConfirmationReceiptSignaturePartial");
             }
 
             if(!Guid.TryParse(identifier, out var resultIdentifier))
@@ -1228,6 +1238,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult LoadReportToModel()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("QuittierungsbelegsPreviewPartial");
+            }
+
             var month = Model.SelectedMonth ?? DateTime.Now.AddMonths(-1).Month;
             var year = Model.SelectedYear ?? DateTime.Now.Year;
             var customerOid = Model.SelectedCustomerOid;
@@ -1261,6 +1277,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 

BeWoPlanerMobil/Controllers/ReportViewerController.cs

@@ -42,11 +42,12 @@ namespace BeWoPlanerMobil.Controllers
             }
         }
 
-
+        [Authorize]
         public ActionResult ReportViewer()
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -107,6 +108,11 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult DocumentWebViewerPartial()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("DocumentWebViewerPartial", Model);
         }
 
@@ -117,7 +123,8 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model?.Employee?.EmployeeOid is null || reportOid is null)
                 {
-                    return Logout();
+                    TempData[TempDataConstants.DoLogoutKey] = true;
+                    return PartialView("DocumentWebViewerPartial");
                 }
 
                 var selectedQuery = Model.Queries.FirstOrDefault(query => query.Oid.Equals(reportOid.Value));
@@ -152,7 +159,7 @@ namespace BeWoPlanerMobil.Controllers
             return PartialView("DocumentWebViewerPartial", Model);
         }
 
-        [Authorize]
+        //[Authorize]
         //private string GetQueryReportUrl(QueryDC query)
         //{
         //    var url = Request?.Url;
@@ -192,7 +199,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("ReportViewerFormPartial");
             }
 
             Model.SelectedReportType = reportType == "0" ? ReportType.Berichte : ReportType.Mitarbeiterstundenkonto;
@@ -205,7 +213,8 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model?.Employee?.EmployeeOid is null)
             {
-                return Logout();
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("DocumentWebViewerPartial");
             }
 
             if(!string.IsNullOrWhiteSpace(parameters))

BeWoPlanerMobil/Controllers/SchedulerController.cs

@@ -49,7 +49,7 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult Scheduler()
         {
-            if(!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeScheduler)
+            if(Model is null || !MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeScheduler)
             {
                 return Logout();
             }
@@ -267,6 +267,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if(Model is null)
                 {
+                    TempData[TempDataConstants.DoLogoutKey] = true;
                     return Logout();
                 }
 
@@ -393,6 +394,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -413,6 +415,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -432,6 +435,7 @@ namespace BeWoPlanerMobil.Controllers
         public ActionResult SelectSchedulerDate(FormCollection formCollection) {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -453,6 +457,10 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+#if DEBUG
+                TempData[TempDataConstants.ErrorMessageKey] = "Model war null";
+#endif
                 return Logout();
             }
 
@@ -596,7 +604,6 @@ namespace BeWoPlanerMobil.Controllers
             return JsonConvert.SerializeObject(Model.SelectedCustomers.OrderBy(o => o.LastNameFirstName));
         }
 
-        // ToDo: AUSFÜHRLICH TESTEN!
         [Authorize]
         public string CheckResourcesAvailability(string start, string end, string resourceOids, bool allDay)
         {
@@ -660,6 +667,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -676,6 +684,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -759,6 +768,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -782,6 +792,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 
@@ -845,6 +856,12 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult FetchAppointments()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+                return PartialView("OneDaySchedulerPartial");
+            }
+
             LoadAppointmentsForDate();
 
             return PartialView("OneDaySchedulerPartial", Model);
@@ -905,12 +922,22 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult FetchSelectedEmployeesForPopup()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("EmployeeForFilteringPartial", Model);
         }
 
         [Authorize]
         public ActionResult FetchEmployeeFilteringModalBody()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("EmployeeFilteringModalContentPartial", Model);
         }
 
@@ -963,12 +990,22 @@ namespace BeWoPlanerMobil.Controllers
         [Authorize]
         public ActionResult FetchCustomersForFiltering()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("CustomerFilterSelectionPartial", Model);
         }
 
         [Authorize]
         public ActionResult FetchCustomerFilteringModalBody()
         {
+            if(Model is null)
+            {
+                TempData[TempDataConstants.DoLogoutKey] = true;
+            }
+
             return PartialView("CustomerFilteringModalContentPartial", Model);
         }
 
@@ -1138,6 +1175,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model is null)
             {
+                TempData[TempDataConstants.DoLogoutKey] = true;
                 return Logout();
             }
 

BeWoPlanerMobil/Models/MainModel.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
+using System.Diagnostics;
 using System.Linq;
 using System.Web.Mvc;
 using BeWo.View.Navigation.Filter;
@@ -774,7 +775,27 @@ namespace BeWoPlanerMobil.Models
         public Dictionary<ServiceCategoryDC, List<ServiceDescriptionDC>> Categories2Descriptions { get; set; }
 
         public ServiceCategoryDC SelectedServiceCategory { get; set; }
+
+        private ServiceDescriptionDC _SelectedServiceDescription;
+
         public ServiceDescriptionDC SelectedServiceDescription { get; set; }
+
+        public ServiceDescriptionDC GetSelectedOrFirstServiceDescription()
+        {
+            if(!(SelectedServiceDescription is null) || Categories2Descriptions is null)
+            {
+                return SelectedServiceDescription;
+            }
+
+            var firstServiceCategory2ServiceDescriptions = Categories2Descriptions.OrderBy(c2d => c2d.Key.Position).ThenBy(c2d => c2d.Key.ServiceCategoryOid).FirstOrDefault(c2d => c2d.Value.Any());
+
+            if(firstServiceCategory2ServiceDescriptions.Key != null && (firstServiceCategory2ServiceDescriptions.Value?.Any() ?? false))
+            {
+                return firstServiceCategory2ServiceDescriptions.Value.OrderBy(sd => sd.Position).ThenBy(sd => sd.ServiceDescriptionOid).First();
+            }
+
+            return SelectedServiceDescription;
+        }
     }
 
     public class CustomSelectListItem
@@ -783,13 +804,17 @@ namespace BeWoPlanerMobil.Models
         public string Text2 { get; }
         public string Value { get; }
         public string TextColor { get; }
+        public long? SupportConceptOid { get; }
+        public long? CostBearer2SupportConceptOid { get; }
 
-        public CustomSelectListItem(string pText1, string pText2, string pValue, string pTextColor)
+        public CustomSelectListItem(string pText1, string pText2, string pValue, string pTextColor, long? supportConceptOid, long? costBearer2SupportConceptOid)
         {
             Text1     = pText1;
             Text2     = pText2;
             Value     = pValue;
             TextColor = pTextColor;
+            SupportConceptOid = supportConceptOid;
+            CostBearer2SupportConceptOid = costBearer2SupportConceptOid;
         }
     }
 

BeWoPlanerMobil/Scripts/ownSoft-Scripts/group-booking.js

@@ -1,123 +0,0 @@
-function updateGroupBookingCb2ScList(result) {
-    try {
-        var list = $("#selected-cb2sc-list");
-
-        if(isEmptyOrSpaces(result) || result === "SessionTimeout") {
-            window.location.href = getRedirectLink();
-            return;
-        }
-
-        var groupBookingSelectionObject = $.parseJSON(result);
-
-        var resultList = groupBookingSelectionObject.SelectedRelations;
-
-        list.empty();
-
-        $.each(resultList,
-            function (index, customListItem) {
-                var html = '<div class="list-group-item" id="relation-item-' + customListItem.Value + '"><div class="row"><div class="col"><span>' + customListItem.Text1 + '<br /><span class="' + customListItem.TextColor + '">' + customListItem.Text2 + '</span></span></div><div class="col-auto my-auto"><button type="button" class="btn btn-primary" onclick="removeCb2ScRelation(' + customListItem.Value + ')"><span class="fas fa-times-circle"></span></button></div></div>';
-
-                list.append(html);
-            });
-
-        updateGroupBookingGroupList(groupBookingSelectionObject);
-    } catch (error) {
-        if (stringContainsDoctype(result)) {
-            showErrorPopup(error, result);
-        } else {
-            showErrorPopup(error);
-        }
-    }
-}
-
-function removeCb2ScRelation(relOid) {
-    try {
-        $("#relation-item-" + relOid).remove();
-
-        if($("#cb2sc-checkbox-" + relOid).length) {
-            $("#cb2sc-checkbox-" + relOid).prop("checked", false);
-        }
-
-        if($("#selected-cb2sc-list").find(".list-group-item").length === 0) {
-            deactivateGroupBookingForm();
-
-            $("#group-booking-supportconcepts input:checked").each(function () {
-                $(this).prop("checked", false);
-            });
-        }
-
-        $.get(getRemoveCb2ScRelFromGroupBookingUrl(), {pRelOid: relOid}).done(function (result) {
-            try {
-                updateGroupBookingGroupList($.parseJSON(result));
-            } catch (error) {
-                if(stringContainsDoctype(result)) {
-                    showErrorPopup(error, result);
-                } else {
-                    showErrorPopup(error);
-                }
-            }
-        });
-    } catch (error) {
-        showErrorPopup(error);
-    }
-}
- 
-function updateGroupBookingGroupList(groupBookingSelectionObject) {
-    var groupOids = groupBookingSelectionObject.GroupOids === undefined ? [] : groupBookingSelectionObject.GroupOids;
-    var relOids = [];
-
-    if(groupBookingSelectionObject.SelectedRelations !== undefined){
-        for(var i = 0; i < groupBookingSelectionObject.SelectedRelations.length; i++) {
-            var oidStringValue = groupBookingSelectionObject.SelectedRelations[i].Value;
-            var oidIntValue = parseInt(oidStringValue, 10);
-
-            relOids.push(oidIntValue);
-        }
-    }
-    
-    $("#group-booking-supportconcepts input").each(function() {
-        var value = $(this).val();
-
-        $(this).prop("checked", isInArray(value, relOids));
-    });
-
-    $("#group-booking-groups input").each(function() {
-        var value = $(this).val();
-
-        $(this).prop("checked", isInArray(value, groupOids));
-    });
-
-    if(relOids.length === 0 && groupOids.length === 0) {
-        deactivateGroupBookingForm();
-    } else {
-        activateGroupBookingForm();
-    }
-}
-
-function addEmployeeToGroupBooking() {
-    var url = getAddEmployeesToGroupBookingUrl();
-
-    var selectedEmployees = [];
-
-    var oidString = "";
-
-    $("#group-booking-employee-selection-popup input:checked").each(function() {
-        var oid = $(this).val();
-
-        selectedEmployees.push(oid);
-    });
-
-    for(var i = 0; i < selectedEmployees.length; i++) {
-        oidString += selectedEmployees[i];
-
-        if(i < selectedEmployees.length - 1) {
-            oidString += ",";
-        }
-    }
-
-    $.get(url, { pEmployeeOids: oidString }).done(function(numberOfSelectedEmployees) {
-        $("#selected-employees-count-badge").text(numberOfSelectedEmployees);
-
-        $("#create-button").prop("disabled", numberOfSelectedEmployees === "0" ? true : false);
-    });
-}

BeWoPlanerMobil/Scripts/ownSoft-Scripts/signature.js

@@ -77,6 +77,12 @@ function initializeSignature(selectedServiceRecordOid) {
             return;
         }
 
+        if(false === checkJson(jsonServiceRecord2Monatsunterschrift)) {
+            logWarning("initializeSignature: Der zurückgegebene Wert ist kein gültiges JSON!");
+            hideSpinner();
+            return;
+        }
+
         var serviceRecord2Monatsunterschrift = parseJason(jsonServiceRecord2Monatsunterschrift);
 
         var hasMonatsunterschrift = serviceRecord2Monatsunterschrift.HasMonatsunterschrift;

BeWoPlanerMobil/Scripts/ownSoft-Scripts/support-concept-statistics.js

@@ -18,6 +18,12 @@ function getSupportConceptStatistics(cb2ScRRelOid) {
 
     $.get(url, { oid: cb2ScRRelOid }).done(function(jsonObject) {
         try {
+            if(false === checkJson(jsonObject)) {
+                logWarning("getSupportConceptStatistics: Der zurückgegebene Wert ist kein gültiges JSON!");
+                hideSpinner();
+                return;
+            }
+
             var scStatistics = parseJason(jsonObject);
 
             $("#period-statistics-container").empty();

BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/js-helper.js

@@ -67,4 +67,13 @@ function checkArraysForEquality(a1, a2) {
     } finally {
         return false;
     }
+}
+
+function checkJson(jsonToParse) {
+    try {
+        $.parseJSON(jsonToParse);
+        return true;
+    } catch(parsingError) {
+        return false;
+    }
 }

BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/list-utils.js

@@ -28,7 +28,9 @@ function changeItemListSelection(url, popupId, listId, itemIdPrefix, isCustomer,
 // Wird aufgerufen, um die Liste mit den ausgewählten Objekten zu aktualisieren
 function updateSelectedList(jsonResult, listId, itemIdPrefix, isCustomer, popupId, checkBoxIdSuffix, url, filterAppointmentsUrl, allItemsCheckBoxSuffix, teamMemberOids, allItemsCheckBoxId) {
     try {
-        if(isEmptyOrSpaces(jsonResult)) {
+        if(false === checkJson(jsonResult)) {
+            logWarning("updateSelectedList: Der zurückgegebene Wert ist kein gültiges JSON!");
+            hideSpinner();
             return;
         }
 

BeWoPlanerMobil/Scripts/ownSoft-Scripts/utils/resources-list-utils.js

@@ -34,7 +34,9 @@ function updateSelectedResourceList(jsonResult, listId, listItemIdPrefix, popupI
 
         list.empty();
 
-        if(isEmptyOrSpaces(jsonResult)) {
+        if(false === checkJson(jsonResult)) {
+            logWarning("updateSelectedResourceList: Der zurückgegebene Wert ist kein gültiges JSON!");
+            hideSpinner();
             return;
         }
 

BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/main.js

@@ -91,11 +91,18 @@ function deleteServiceRecord(serviceRecordOid) {
             var url = getValidateServiceRecordDeletionUrl();
 
             $.get(url, { serviceRecordOidString: serviceRecordOid }).done(function(result) {
-                if (result === "Error") {
+                if(result === "Error") {
+                    hideSpinner();
                     showAlertMessageBox("Fehler", "Es ist ein Fehler aufgetreten", null, false);
                     return;
                 }
 
+                if(false === checkJson(result)) {
+                    logWarning("deleteServiceRecord: Der zurückgegebene Wert ist kein gültiges JSON!");
+                    hideSpinner();
+                    return;
+                }
+
                 var form = $("#deletion-form");
 
                 if(result.length === 0) {
@@ -291,26 +298,7 @@ function hideGoalRatingPopup() {
     }
 }
 
-function rateGoal(ratingTypeOid) {
-    try {
-        var url = getRateSelectedGoalUrl();
 
-        var goalOid = $("#goal-to-rate-oid").val();
-
-        $.get(url, { ratingTypeOid: ratingTypeOid, goalOid: goalOid }).done(
-            function (result) {
-                var obj = parseJason(result);
-
-                $("#goal-rating-" + goalOid).text(obj.RatingName);
-
-                hideGoalRatingPopup();
-                $("#goal-to-rate-oid").val("");
-            }
-        );
-    } catch(error) {
-        showErrorPopup(error);
-    }
-}
 
 function checkChildNodes(parentOid) {
     var rootElement = $("#c-" + parentOid);

BeWoPlanerMobil/Scripts/ownSoft-Scripts/view-scripts/scheduler.js

@@ -191,6 +191,11 @@ function insertOrUpdateAppointment(formattedStartDate, formattedEndDate, formatt
             endTimeRaw: formattedEndTime
         }
     ).done(function(result) {
+        if(false === checkJson(result)) {
+            logWarning("insertOrUpdateAppointment: Der zurückgegebene Wert ist kein gültiges JSON!");
+            return;
+        }
+
         var isOverlapping = parseJason(result);
 
         if(isOverlapping === true) {

BeWoPlanerMobil/Util/FormCollectionConstants.cs

@@ -75,5 +75,6 @@
         public static string AutoEndOfSessionLogoutMessageKey => "ein_schluessel";
         public static string HasWarningMessageKey => "HasWarningMessage";
         public static string ErrorMessageKey => "ErrorMessage";
+        public static string DoLogoutKey => "DoLogout";
     }
 }

BeWoPlanerMobil/Util/GroupBookingSelectionObject.cs

@@ -8,6 +8,7 @@ namespace BeWoPlanerMobil.Util
     {
         public List<CustomSelectListItem> SelectedRelations { get; set; } = new List<CustomSelectListItem>();
         public IEnumerable<long> GroupOids { get; set; }
+        
 
         public GroupBookingSelectionObject(IEnumerable<SupportConceptCostBearerRelDC> selectedConceptCostBearerRelations, IEnumerable<long> groupOids)
         {
@@ -26,7 +27,7 @@ namespace BeWoPlanerMobil.Util
                         "text-bewo-expires-in-three-months" :
                         "text-dark";
 
-                var listItem = new CustomSelectListItem(text1, text2, value, textColor);
+                var listItem = new CustomSelectListItem(text1, text2, value, textColor, rel.SupportConcept?.SupportConceptOid, rel.CostBearer2SupportConceptOid);
 
                 SelectedRelations.Add(listItem);
             }

BeWoPlanerMobil/Views/Login/Index.cshtml

@@ -80,4 +80,20 @@
                 $("#login-btn").click();
             }
         });
-</script>
+</script>
+
+@if(Html.IsInDebugMode())
+{
+    if(!(TempData[TempDataConstants.ErrorMessageKey] is null))
+    {
+        <div class="container-fluid mt-3">
+            <div class="row d-flex justify-content-center">
+                <div class="col-md-3 col-lg-4">
+                    <div class="alert alert-danger" role="alert">
+                        @TempData[TempDataConstants.ErrorMessageKey]
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+}

BeWoPlanerMobil/Views/Main/Category2ServiceDescriptionPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.MainModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <script type="text/javascript">
     function setSelectedServiceDescription(serviceDescriptionOid) {
@@ -21,15 +33,20 @@
         }
     }
 
-    function loadServiceDescriptions(categoryOid) {
+    $(document).ready(function() {
         try {
-            // ToDo: Benötigt?
+            calcPrependWidth();
         } catch(error) {
             showErrorPopup(error);
         }
-    }
+    });
 </script>
 
+@{
+    var selectedServiceDescription = Model.GetSelectedOrFirstServiceDescription();
+    var selectedCategory = selectedServiceDescription?.Category;
+}
+
 <!-- Kategorie -->
 <div class="form-row">
     <div class="col-md">
@@ -45,9 +62,14 @@
                     {
                         var category = serviceCategory2ServiceDescriptions.Key;
 
-                        var selected = Model.SelectedServiceCategory?.Equals(category) ?? false ? "selected" : string.Empty;
+                        if(category is null)
+                        {
+                            continue;
+                        }
 
-                        <option value="@category.ServiceCategoryOid" @selected>@category.Name</option>
+                        var selected = selectedCategory != null && selectedCategory.Equals(category) ? " selected" : string.Empty;
+
+                        <option value="@category.ServiceCategoryOid"@selected>@category.Name</option>
                     }
                 </select>
             </div>
@@ -66,16 +88,17 @@
                     </div>
                 </div>
                 <select class="custom-select" id="leistung-select" name="ServiceDescription" onchange="setServiceDescription('leistung-select')">
-                    @{
-                        var selectedCategory = Model.SelectedServiceCategory ?? Model.Categories2Descriptions.FirstOrDefault().Key;
-                    }
-
                     @if(selectedCategory != null && Model.Categories2Descriptions.ContainsKey(selectedCategory))
                     {
                         foreach(var serviceDescription in Model.Categories2Descriptions[selectedCategory])
                         {
-                            var selected = Model.SelectedServiceDescription?.Equals(serviceDescription) ?? false ? "selected" : string.Empty;
-                            <option value="@serviceDescription.ServiceDescriptionOid" @selected>@serviceDescription.Name</option>
+                            if(serviceDescription is null)
+                            {
+                                continue;
+                            }
+
+                            var selected = selectedServiceDescription != null && selectedServiceDescription.Equals(serviceDescription) ? " selected" : string.Empty;
+                            <option value="@serviceDescription.ServiceDescriptionOid"@selected>@serviceDescription.Name</option>
                         }
                     }
                 </select>

BeWoPlanerMobil/Views/Main/GoalRatingPopupContentPartial.cshtml

@@ -0,0 +1,51 @@
+@using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+<script type="text/javascript">
+    function rateGoal(ratingTypeOid) {
+        try {
+            var goalOid = $("#goal-to-rate-oid").val();
+
+            $.get("@Url.Action("RateSelectedGoal")", { ratingTypeOid: ratingTypeOid, goalOid: goalOid }).done(
+                function (result) {
+                    if(false === checkJson(result)) {
+                        logWarning("rateGoal: Der zurückgegebene Wert ist kein gültiges JSON!");
+                        hideSpinner();
+                        return;
+                    }
+
+                    var obj = parseJason(result);
+
+                    $(`#goal-rating-${goalOid}`).text(obj.RatingName);
+                    $(`#${goalOid}`).prop("checked", true);
+                    hideGoalRatingPopup();
+                    $("#goal-to-rate-oid").val("");
+                }
+            );
+        } catch(error) {
+            showErrorPopup(error);
+        }
+    }
+</script>
+
+@if(AbstractModel.HasRightToRateGoals)
+{
+    <ul class="list-group">
+        @foreach(var ratingType in Model.GoalRatingTypes)
+        {
+            <li class="list-group-item" id="grt-@ratingType.RatingTypeOid" onclick="rateGoal(@ratingType.RatingTypeOid)">@ratingType.DisplayName</li>
+        }
+    </ul>
+}

BeWoPlanerMobil/Views/Main/GroupBookingFormPartial.cshtml

@@ -3,22 +3,82 @@
 @using BS.Shared
 @model BeWoPlanerMobil.Models.MainModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
+    function addScCbRelsToGroupBooking() {
+        try {
+            var selectedGroups = [];
+            var selectedSupportConcepts = [];
+
+            $("#group-booking-supportconcepts input:checked").each(function () {
+                selectedSupportConcepts.push($(this).attr("value"));
+            });
+
+            $("#group-booking-groups input:checked").each(function () {
+                selectedGroups.push($(this).attr("value"));
+            });
+
+            $("#group-booking-sc-cb-rel-tab-content").load("@Url.Action("AddScCbRelsToGroupBooking")", {relOids: selectedSupportConcepts, groupOids: selectedGroups}, function() {
+                $("#groupbooking-selection-container").load("@Url.Action("ReloadGroupBookingForm")", function () {
+                    var checkedCheckboxes = $(".cb2sc-input:checkbox:checked");
+
+                    $("#employees-button, #category-select, #leistung-select, " +
+                            "#start-date, #end-date, #start-time, #end-time, #duration, " +
+                            "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb")
+                        .prop("disabled", (checkedCheckboxes.length > 0 ? false : true));
+
+                    $("#goals-tree").load("@Url.Action("ReloadGoals")", function () {
+                        $("#goal-ratings-container").load("@Url.Action("ReloadGoalRatings")", function() {
+                            try {
+                                $("#tree").load("@Url.Action("LoadUpToDateTextModules")");
+                            } catch (error) {
+                                showErrorPopup(error);
+                            }
+                        });
+                    });
+                });
+            });
+        } catch(blubb) {
+            showErrorPopup(blubb);
+        }
+    }
+
     function removeSupportConceptCostBearerRel(relOid) {
         try {
             $(`#cb2sc-checkbox-${relOid}`).prop("checked", false);
 
-            $("#group-booking-form-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", {relOid: relOid}, function () {
-                $("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
-                    var checkedCheckboxes = $(".cb2sc-input:checkbox:checked");
+            $("#groupbooking-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRel")", {relOid: relOid}
+                , function () {
+                    $("#goals-tree").load("@Url.Action("ReloadGoals")"
+                        , function () {
+                            $("#goal-ratings-container").load("@Url.Action("ReloadGoalRatings")", function() {
+                                try {
+                                    var checkedCheckboxes = $(".cb2sc-input:checkbox:checked");
 
-                    $("#employees-button, #category-select, #leistung-select, " +
-                        "#start-date, #end-date, #start-time, #end-time, #duration, " +
-                        "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb").prop("disabled", (checkedCheckboxes.length > 0 ? false : true));
+                                    $("#employees-button, #category-select, #leistung-select, " +
+                                            "#start-date, #end-date, #start-time, #end-time, #duration, " +
+                                            "#distance, textarea, #reset-button, #create-button, #textbausteine-button, #hours-minutes-dropdown-btn, #marker-cb")
+                                        .prop("disabled", (checkedCheckboxes.length > 0 ? false : true));
 
-                    $("#category-to-description-container").load("@Url.Action("UpdateServiceCategories")");
-                });
-            });
+                                    $("#tree").load("@Url.Action("LoadUpToDateTextModules")");
+                                } catch (error) {
+                                    showErrorPopup(error);
+                                }
+                            });
+                        }
+                    );
+                }
+            );
         } catch (error) {
             showErrorPopup(error);
         }
@@ -29,15 +89,11 @@
 {
     var submitButtonText = Model.IsInEditingMode ? "Speichern" : "Anlegen";
 
-    using(Html.BeginForm("CreateOrUpdateGroupBooking", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('category-select', 'leistung-select', 'textmodule-container', 'tree')", id = "groupBookingForm" }))
+    using(Html.BeginForm("CreateOrUpdateGroupBooking", "Main", FormMethod.Post, new { id = "groupBookingForm" }))
     {
         var startDate = Model.SelectedServiceRecord?.Start?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
         var endDate = Model.SelectedServiceRecord?.End?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
 
-        var startTime = Model.SelectedServiceRecord?.Start?.ToShortTimeString() ?? string.Empty;
-        var endTime = Model.SelectedServiceRecord?.End?.ToShortTimeString() ?? string.Empty;
-
-        var duration = Model.SelectedServiceRecord?.GroupRoundedDuration?.ToString() ?? string.Empty;
         var distance = Model.SelectedServiceRecord?.DistanceInMeter?.ToString() ?? string.Empty;
 
         var notice0 = Model.SelectedServiceRecord?.Notice ?? string.Empty;
@@ -52,343 +108,248 @@
             }
         }
 
-<div class="mt-3">
-    <div class="form-row">
-        <div class="col-md">
-            <div class="alert alert-danger collapse" role="alert" id="form-alert">
-
-            </div>
-        </div>
-    </div>
-
-    <div class="form-row">
-        <div class="col-md">
-            <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#group-booking-popup" id="support-concepts-and-groups-button">Hilfepläne und Gruppen hinzufügen</button>
-        </div>
-    </div>
-
-    <!-- Hilfeplanauswahl -->
-    <div class="form-row">
-        <div class="col-md">
-            <div class="form-group my-1">
-                <div class="list-group" id="selected-cb2sc-list">
-                    @foreach(var selectedCb2ScRelation in Model.GroupBookingSelectionObject.SelectedRelations)
-                    {
-                        <div class="list-group-item" id="relation-item-@selectedCb2ScRelation.Value">
-                            <div class="row">
-                                <div class="col">
-                                    <span>
-                                        @selectedCb2ScRelation.Text1
-                                        <br />
-                                        <span class="@selectedCb2ScRelation.TextColor">
-                                            @selectedCb2ScRelation.Text2
-                                        </span>
-                                    </span>
-                                </div>
-                                <div class="col-auto my-auto">
-                                    <button type="button" class="btn btn-primary" onclick="removeSupportConceptCostBearerRel(@selectedCb2ScRelation.Value)">
-                                        <span class="fas fa-times-circle"></span>
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Mitarbeiter -->
-    <div class="form-row">
-        <div class="col-md">
-            <div class="form-group mb-1">
-                <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#group-booking-employee-selection-popup" id="employees-button">
-                    Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="selected-employees-count-badge">@Model.GroupBookingSelectedEmployees.Count</span>
-                </button>
-            </div>
-        </div>
-    </div>
-
-    <!-- Ziele -->
-    @if((Model.GroupBookingSelectedSupportConcepts?.Any() ?? false) && Model.GroupBookingSelectedSupportConcepts.Any(sc => sc.Goals.Any()))
-    {
+        <div class="mt-3">
         <div class="form-row">
             <div class="col-md">
-                <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">Ziele</button>
-            </div>
-        </div>
-        <div class="form-row">
-            <div class="col-md">
-                <div class="collapse w-100 mt-1 max-vw-50" id="goals-container"></div>
-            </div>
-        </div>
-    }
+                <div class="alert alert-danger collapse" role="alert" id="form-alert">
 
-    <!-- Kategorie -->
-    <!--<div class="form-row">
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text prepend-input-group-text">
-                            Kategorie
-                        </div>
-                    </div>
-                    @*
-                      @Html.DropDownListFor(m => m.SelectedServiceCategoryOid, Model.ServiceCategoryListItems, new { onchange = "loadServiceDescriptions('category-select', 'leistung-select', 'textmodule-container', 'tree')", @class = "custom-select", Id = "category-select" })
-                    *@
                 </div>
             </div>
         </div>
-    </div>-->
-    <!-- Leistung -->
-    <!--<div class="form-row">
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text prepend-input-group-text">
-                            Leistung
-                        </div>
-                    </div>
-                    <select class="custom-select" id="leistung-select" name="ServiceDescription" onchange="setServiceDescription('leistung-select')"></select>
-                </div>
+            @* Hilfepläne und Mitarbeiter *@
+            <div id="groupbooking-selection-container">
+                @Html.Partial("GroupBookingSelectionPartial", Model)
             </div>
-        </div>
-    </div>-->
-    
-    @* Kategorie und Leistungen *@
-    <div id="category-to-description-container">
-        @Html.Partial("Category2ServiceDescriptionPartial", Model)
-    </div>
 
-
-    <!-- Marker -->
-    @if(Model.ShowMarker)
-    {
-        var markerCheckedValue = Model.SelectedServiceRecord?.ServiceRecordType == ServiceRecordTypeId.Content ? "checked" : string.Empty;
-
-        <div class="form-row">
-            <div class="col-md">
-                <div class="custom-control custom-checkbox custom-control-inline">
-                    <input type="checkbox" class="custom-control-input" name="marker-cb" id="marker-cb" @markerCheckedValue />
-                    <label class="custom-control-label" for="marker-cb">Marker</label>
-                </div>
-            </div>
-        </div>
-    }
-
-    <div class="form-row">
-        <div class="col-md">
-            <hr />
-        </div>
-    </div>
-
-    <!-- Start- und Enddatum -->
-    <div class="form-row">
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group date" id="start-date-picker" data-target-input="nearest">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text prepend-input-group-text">
-                            Startdatum
-                        </div>
-                    </div>
-                    <input type="text" id="start-date" name="Datum" class="form-control datetimepicker-input" data-target="#start-date-picker" data-toggle="datetimepicker" value="@startDate" />
-                    <div class="input-group-append" data-target="#start-date-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text">
-                            <i class="fas fa-calendar-alt"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        @if(Model.IsEndDateVisible)
-        {
-            <div class="col-md">
-                <div class="form-group my-2">
-                    <div class="input-group date" id="end-date-picker" data-target-input="nearest">
-                        <div class="input-group-prepend">
-                            <div class="input-group-text prepend-input-group-text">
-                                Enddatum
-                            </div>
-                        </div>
-                        <input type="text" id="end-date" name="Enddatum" class="form-control datetimepicker-input" data-target="#end-date-picker" data-toggle="datetimepicker" value="@endDate" />
-                        <div class="input-group-append" data-target="#end-date-picker" data-toggle="datetimepicker">
-                            <div class="input-group-text">
-                                <i class="fas fa-calendar-alt"></i>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        }
-    </div>
-
-    <div class="form-row">
-        @{
-            var startTimeValue = Model.StartTimeToEdit;
-            var endTimeValue = Model.EndTimeToEdit;
-            var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
-            var durationValue = string.Empty;
-
-            if(!(Model.SelectedServiceRecord is null))
+            <!-- Marker -->
+            @if(Model.ShowMarker)
             {
-                durationValue = (Model.SelectedServiceRecord?.RoundedDuration / divisor).ToString();
+                var markerCheckedValue = Model.SelectedServiceRecord?.ServiceRecordType == ServiceRecordTypeId.Content ? "checked" : string.Empty;
+
+                <div class="form-row">
+                    <div class="col-md">
+                        <div class="custom-control custom-checkbox custom-control-inline">
+                            <input type="checkbox" class="custom-control-input" name="marker-cb" id="marker-cb" @markerCheckedValue />
+                            <label class="custom-control-label" for="marker-cb">Marker</label>
+                        </div>
+                    </div>
+                </div>
             }
+            
+            @* Trennstrich *@
+            <div class="form-row">
+                <div class="col-md">
+                    <hr />
+                </div>
+            </div>
 
-            var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
+            @* Start- und Enddatum *@
+            <div class="form-row">
+                <div class="col-md">
+                    <div class="form-group my-2">
+                        <div class="input-group date" id="start-date-picker" data-target-input="nearest">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text prepend-input-group-text">
+                                    Startdatum
+                                </div>
+                            </div>
+                            <input type="text" id="start-date" name="Datum" class="form-control datetimepicker-input" data-target="#start-date-picker" data-toggle="datetimepicker" value="@startDate" />
+                            <div class="input-group-append" data-target="#start-date-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text">
+                                    <i class="fas fa-calendar-alt"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
 
-            if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
-            {
-                startTimeValue = Model.NewStartTime;
-                endTimeValue = Model.NewEndTime;
-                if(Model.NewDuration.HasValue)
+                @if(Model.IsEndDateVisible)
                 {
-                    durationValue = (Model.NewDuration / divisor).ToString();
-                }
-            }
-        }
-        <!-- Von -->
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group date" id="start-time-picker" data-target-input="nearest">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text sm-prepend-input-group-text">
-                            Von
-                        </div>
-                    </div>
-                    <input type="text" id="start-time" name="Start" class="form-control datetimepicker-input" data-target="#start-time-picker" value="@startTimeValue" />
-                    <div class="input-group-append" data-target="#start-time-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text">
-                            <i class="fas fa-clock"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <!-- Bis -->
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group date" id="end-time-picker" data-target-input="nearest">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text sm-prepend-input-group-text">
-                            Bis
-                        </div>
-                    </div>
-                    <input type="text" id="end-time" name="Ende" class="form-control datetimepicker-input" data-target="#end-time-picker" value="@endTimeValue" />
-                    <div class="input-group-append" data-target="#end-time-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text">
-                            <i class="fas fa-clock"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <!-- Dauer und Stunden/Minuten-Auswahl -->
-    <div class="form-row">
-        <div class="col-md">
-            <div class="form-group my-2">
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        @{
-                            var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
-                        }
-                        <div class="input-group-text prepend-input-group-text">
-                            @labelText
-                        </div>
-                    </div>
-                    <input type="text" class="form-control" id="duration" name="Dauer" onchange="onDurationChange('start-time', 'end-time', 'start-date', 'end-date', 'duration', 'hours-minutes-dropdown-btn', 'start-date-picker', 'end-date-picker')" value="@durationValue">
-                    @if(Model.IsZeiterfassungInStdMin)
-                    {
-                        <div class="input-group-append">
-                            <button id="hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle w-100" type="button" data-toggle="dropdown">
-                                @Model.SelectedDurationUnit
-                            </button>
-                            <div class="dropdown-menu w-100">
-                                <a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
-                                <a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
+                    <div class="col-md">
+                        <div class="form-group my-2">
+                            <div class="input-group date" id="end-date-picker" data-target-input="nearest">
+                                <div class="input-group-prepend">
+                                    <div class="input-group-text prepend-input-group-text">
+                                        Enddatum
+                                    </div>
+                                </div>
+                                <input type="text" id="end-date" name="Enddatum" class="form-control datetimepicker-input" data-target="#end-date-picker" data-toggle="datetimepicker" value="@endDate" />
+                                <div class="input-group-append" data-target="#end-date-picker" data-toggle="datetimepicker">
+                                    <div class="input-group-text">
+                                        <i class="fas fa-calendar-alt"></i>
+                                    </div>
+                                </div>
                             </div>
                         </div>
-                    }
-                </div>
+                    </div>
+                }
             </div>
-        </div>
-    </div>
+            
+             @* Von und Bis *@
+            <div class="form-row">
+                @{
+                    var startTimeValue = Model.StartTimeToEdit;
+                    var endTimeValue = Model.EndTimeToEdit;
+                    var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
+                    var durationValue = string.Empty;
 
-    @if(Model.ShowDistanceField)
-    {
-        <!-- Gefahrene Kilomter -->
-        <div class="form-row">
-            <div class="col-md">
-                <div class="form-group my-2">
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <div class="input-group-text">Gefahrene Kilometer</div>
+                    if(!(Model.SelectedServiceRecord is null))
+                    {
+                        durationValue = (Model.SelectedServiceRecord?.RoundedDuration / divisor).ToString();
+                    }
+
+                    var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
+
+                    if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
+                    {
+                        startTimeValue = Model.NewStartTime;
+                        endTimeValue = Model.NewEndTime;
+                        if(Model.NewDuration.HasValue)
+                        {
+                            durationValue = (Model.NewDuration / divisor).ToString();
+                        }
+                    }
+                }
+
+                @* Von *@
+                <div class="col-md">
+                    <div class="form-group my-2">
+                        <div class="input-group date" id="start-time-picker" data-target-input="nearest">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text sm-prepend-input-group-text">
+                                    Von
+                                </div>
+                            </div>
+                            <input type="text" id="start-time" name="Start" class="form-control datetimepicker-input" data-target="#start-time-picker" value="@startTimeValue" />
+                            <div class="input-group-append" data-target="#start-time-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text">
+                                    <i class="fas fa-clock"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+
+                @* Bis *@
+                <div class="col-md">
+                    <div class="form-group my-2">
+                        <div class="input-group date" id="end-time-picker" data-target-input="nearest">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text sm-prepend-input-group-text">
+                                    Bis
+                                </div>
+                            </div>
+                            <input type="text" id="end-time" name="Ende" class="form-control datetimepicker-input" data-target="#end-time-picker" value="@endTimeValue" />
+                            <div class="input-group-append" data-target="#end-time-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text">
+                                    <i class="fas fa-clock"></i>
+                                </div>
+                            </div>
                         </div>
-                        <input type="text" class="form-control" id="distance" name="Distanz" onchange="validateDistanceInput()" value="@distance">
                     </div>
                 </div>
             </div>
-        </div>
-    }
 
-    @if(AbstractModel.HasRightToSeeTextModules)
-    {
-        <!-- Textbausteine -->
-        <div class="form-row" id="textmodule-container">
-            <div class="col-md">
-                <button type="button" class="btn btn-primary form-control mt-3" data-toggle="modal" data-target="#textbausteine-popup" id="textbausteine-button">Textbausteine</button>
+            @* Dauer und Stunden/Minuten-Auswahl *@
+            <div class="form-row">
+                <div class="col-md">
+                    <div class="form-group my-2">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                @{
+                                    var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
+                                }
+                                <div class="input-group-text prepend-input-group-text">
+                                    @labelText
+                                </div>
+                            </div>
+                            <input type="text" class="form-control" id="duration" name="Dauer" onchange="onDurationChange('start-time', 'end-time', 'start-date', 'end-date', 'duration', 'hours-minutes-dropdown-btn', 'start-date-picker', 'end-date-picker')" value="@durationValue">
+                            @if(Model.IsZeiterfassungInStdMin)
+                            {
+                                <div class="input-group-append">
+                                    <button id="hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle w-100" type="button" data-toggle="dropdown">
+                                        @Model.SelectedDurationUnit
+                                    </button>
+                                    <div class="dropdown-menu w-100">
+                                        <a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
+                                        <a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
+                                    </div>
+                                </div>
+                            }
+                        </div>
+                    </div>
+                </div>
             </div>
-        </div>
-    }
 
-    <!-- Dokumentation -->
-    <div class="form-row">
-        <div class="col-md mt-3">
-            @if(Model.NumberOfDokuTypes == 0)
+            @* Gefahrene Kilometer *@
+            @if(Model.ShowDistanceField)
             {
-                <div class="form-group">
-                    <label for="dokufeld">Dokumentation</label>
-                    <textarea class="form-control" name="Dokumentation6" id="dokufeld">@notice0</textarea>
+                <div class="form-row">
+                    <div class="col-md">
+                        <div class="form-group my-2">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <div class="input-group-text">Gefahrene Kilometer</div>
+                                </div>
+                                <input type="text" class="form-control" id="distance" name="Distanz" onchange="validateDistanceInput()" value="@distance">
+                            </div>
+                        </div>
+                    </div>
                 </div>
             }
-            else
+
+            @* Textbausteine *@
+            @if(AbstractModel.HasRightToSeeTextModules)
             {
-                <ul class="nav nav-tabs" role="tab-list">
-                    @for(var i = 0; i < Model.Dokutypes.Length; i++)
-                    {
-                        var currentDokuType = Model.Dokutypes[i];
+                <div class="form-row" id="textmodule-container">
+                    <div class="col-md">
+                        <button type="button" class="btn btn-primary form-control mt-3" data-toggle="modal" data-target="#textbausteine-popup" id="textbausteine-button">Textbausteine</button>
+                    </div>
+                </div>
+            }
 
-                        <li class="nav-item">
-                            <a href="#doku_@i" id="doku_@i-tab" data-toggle="tab" role="tab" aria-controls="doku_@i" class="nav-link@(i == 0 ? " active" : string.Empty)" aria-selected="true">
-                                @currentDokuType.DisplayName
-                            </a>
-                        </li>
+            @* Dokumentation *@
+            <div class="form-row">
+                <div class="col-md mt-3">
+                    @if(Model.NumberOfDokuTypes == 0)
+                    {
+                        <div class="form-group">
+                            <label for="dokufeld">Dokumentation</label>
+                            <textarea class="form-control" name="Dokumentation6" id="dokufeld">@notice0</textarea>
+                        </div>
                     }
-                </ul>
-                <div class="tab-content" id="dokufelderTab">
-                    @for(var i = 0; i < Model.Dokutypes.Length; i++)
+                    else
                     {
-                        var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
+                        <ul class="nav nav-tabs" role="tab-list">
+                            @for(var i = 0; i < Model.Dokutypes.Length; i++)
+                            {
+                                var currentDokuType = Model.Dokutypes[i];
 
-                        <div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="doku_@i" role="tabpanel" aria-labelledby="doku_@i-tab">
-                            <textarea class="form-control doku-form-control" id="doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
+                                <li class="nav-item">
+                                    <a href="#doku_@i" id="doku_@i-tab" data-toggle="tab" role="tab" aria-controls="doku_@i" class="nav-link@(i == 0 ? " active" : string.Empty)" aria-selected="true">
+                                        @currentDokuType.DisplayName
+                                    </a>
+                                </li>
+                            }
+                        </ul>
+                        <div class="tab-content" id="dokufelderTab">
+                            @for(var i = 0; i < Model.Dokutypes.Length; i++)
+                            {
+                                var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
+
+                                <div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="doku_@i" role="tabpanel" aria-labelledby="doku_@i-tab">
+                                    <textarea class="form-control doku-form-control" id="doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
+                                </div>
+                            }
                         </div>
                     }
                 </div>
-            }
+            </div>
         </div>
-    </div>
-</div>
     }
     <div class="d-flex bd-highlight mt-3">
         <div class="mr-auto bd-highlight">
-            <!-- dient nur als Abstandshalter-->
+            @* dient nur als Abstandshalter *@
         </div>
         <div class="ml-3 bd-highlight">
             @if(TempData[TempDataConstants.IsInTransferModeKey] is bool isInTransferMode && isInTransferMode)

BeWoPlanerMobil/Views/Main/GroupBookingPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.MainModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <script>
     $(document).ready(function () {
@@ -23,6 +35,8 @@
 
             calculateDuration(true, 'start-time', 'end-time', 'duration', 'hours-minutes-dropdown-btn', 'start-date-picker', 'end-date-picker', false, false);
         });
+
+        calcPrependWidth();
     });
 
     function resetGroupBookingForm() {
@@ -33,6 +47,32 @@
             showErrorPopup(error);
         }
     }
+
+    function addEmployeeToGroupBooking() {
+        var selectedEmployees = [];
+
+        var oidString = "";
+
+        $("#group-booking-employee-selection-popup input:checked").each(function() {
+            var oid = $(this).val();
+
+            selectedEmployees.push(oid);
+        });
+
+        for(var i = 0; i < selectedEmployees.length; i++) {
+            oidString += selectedEmployees[i];
+
+            if(i < selectedEmployees.length - 1) {
+                oidString += ",";
+            }
+        }
+
+        $.get("@Url.Action("AddEmployeesToGroupBooking")", { pEmployeeOids: oidString }).done(function(numberOfSelectedEmployees) {
+            $("#selected-employees-count-badge").text(numberOfSelectedEmployees);
+
+            $("#create-button").prop("disabled", numberOfSelectedEmployees === "0" ? true : false);
+        });
+    }
 </script>
 
 @using(Html.BeginForm("ResetGroupBookingForm", "Main", FormMethod.Post, new { Id = "reset-group-booking-form-form" }))

BeWoPlanerMobil/Views/Main/GroupBookingScCbRelList.cshtml

@@ -1,31 +1,16 @@
-@model BeWoPlanerMobil.Models.MainModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
 
-<script type="text/javascript">
-    function addScCbRelsToGroupBooking() {
-        try {
-            var selectedGroups = [];
-            var selectedSupportConcepts = [];
-
-            $("#group-booking-supportconcepts input:checked").each(function () {
-                selectedSupportConcepts.push($(this).attr("value"));
-            });
-
-            $("#group-booking-groups input:checked").each(function () {
-                selectedGroups.push($(this).attr("value"));
-            });
-
-            $("#group-booking-sc-cb-rel-tab-content").load("@Url.Action("AddScCbRelsToGroupBooking")", {relOids: selectedSupportConcepts, groupOids: selectedGroups}, function() {
-                $("#group-booking-form-container").load("@Url.Action("ReloadGroupBookingForm")", function () {
-                    $("#goals-tree").load("@Url.Action("ReloadGoals")", function() {
-                        $("#category-to-description-container").load("@Url.Action("UpdateServiceCategories")");
-                    });
-                });
-            });
-        } catch(error) {
-            showErrorPopup(error);
-        }
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
     }
-</script>
+}
 
 <div class="tab-pane show active" role="tabpanel" id="group-booking-supportconcepts">
     <ul class="list-group">
@@ -42,7 +27,7 @@
 
                 <div class="custom-control custom-checkbox custom-control-inline">
                     <input type="checkbox"
-                           @{ if(checkedValue) { @Html.Raw("checked=\"checked\"")  ; } }
+                           @{ if(checkedValue) { @Html.Raw("checked=\"checked\"") } }
                            class="custom-control-input cb2sc-input" id="cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="addScCbRelsToGroupBooking()" name="cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
                     <label for="cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" class="custom-control-label">
                         <span class="justify-content-between mb-1 text-dark text-left">

BeWoPlanerMobil/Views/Main/GroupBookingSelectionPartial.cshtml

@@ -0,0 +1,82 @@
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+@* Hilfeplanauswahl-Button *@
+<div class="form-row">
+    <div class="col-md">
+        <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#group-booking-popup" id="support-concepts-and-groups-button">Hilfepläne und Gruppen hinzufügen</button>
+    </div>
+</div>
+
+@* (Gruppenbuchung) Ausgewählte Hilfepläne *@
+<div class="form-row">
+    <div class="col-md">
+        <div class="form-group my-1">
+            <div class="list-group" id="selected-cb2sc-list">
+                @foreach(var selectedCb2ScRelation in Model.GroupBookingSelectionObject.SelectedRelations)
+                {
+                    <div class="list-group-item" id="relation-item-@selectedCb2ScRelation.Value">
+                        <div class="row">
+                            <div class="col">
+                                <span>
+                                    @selectedCb2ScRelation.Text1
+                                    <br />
+                                    <span class="@selectedCb2ScRelation.TextColor">
+                                        @selectedCb2ScRelation.Text2
+                                    </span>
+                                </span>
+                            </div>
+                            <div class="col-auto my-auto">
+                                <button type="button" class="btn btn-primary" onclick="removeSupportConceptCostBearerRel(@selectedCb2ScRelation.Value)">
+                                    <span class="fas fa-times-circle"></span>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+@* Mitarbeiterauswahl-Button *@
+<div class="form-row">
+    <div class="col-md">
+        <div class="form-group mb-1">
+            <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#group-booking-employee-selection-popup" id="employees-button">
+                Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="selected-employees-count-badge">@Model.GroupBookingSelectedEmployees.Count</span>
+            </button>
+        </div>
+    </div>
+</div>
+
+@* Ziele *@
+@if((Model.GroupBookingSelectedSupportConcepts?.Any() ?? false) && Model.GroupBookingSelectedSupportConcepts.Any(sc => sc.Goals.Any()))
+{
+    <div class="form-row">
+        <div class="col-md">
+            <button type="button" class="btn btn-primary form-control my-3" data-toggle="modal" data-target="#goal-popup" id="goals-button">Ziele</button>
+        </div>
+    </div>
+    <div class="form-row">
+        <div class="col-md">
+            <div class="collapse w-100 mt-1 max-vw-50" id="goals-container"></div>
+        </div>
+    </div>
+}
+
+@* Kategorie und Leistungen *@
+<div id="category-to-description-container">
+    @Html.Partial("Category2ServiceDescriptionPartial", Model)
+</div>

BeWoPlanerMobil/Views/Main/Main.cshtml

@@ -9,15 +9,22 @@
     {
         var loginStateMessage = new HtmlString(loginState.Message.Replace("\n", "<br/>").Replace("\"", "\\"));
 
-        <script>
+        <script type="text/javascript">
             showMessagePopupWithHtml("Warnung", "@loginStateMessage");
         </script>
     }
+
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
 }
 
-<script>
-    //var passwortsicherheit = new MoKPasswordSecurity("pw-strength-feedback");
-
+<script type="text/javascript">
     function validatePasswordStrength() {
         try {
             (new MoKPasswordSecurity("pw-strength-feedback")).validatePassword($("#new-password").val());
@@ -114,7 +121,11 @@
 
         $.get("@Url.Action("LoadServiceCategories")", { pServiceCategoryOid: selectedCategoryOid })
             .done(function (data) {
-
+                if(false === checkJson(data)) {
+                    logWarning("loadServiceDescriptions: Der zurückgegebene Wert ist kein gültiges JSON!");
+                    hideSpinner();
+                    return;
+                }
 
                 var serviceDescriptions = parseJason(data);
                 var serviceDescriptionsSelect = $(`#${leistungSelectId}`);
@@ -134,8 +145,6 @@
                     serviceDescriptionToEdit = parseFloat("@Model.SelectedServiceDescriptionOid");
                 }
 
-                logInfo3(`Leistungen geladen... ${serviceDescriptionToEdit}`);
-
                 var selectedOid = 0;
 
                 if(serviceDescriptionToEdit > 0) {
@@ -260,24 +269,23 @@
             $("#fehlerdetail-textarea").prop("disabled", false);
 
             if ("@Model.IsInMultiBookingMode".toLowerCase() === "true") {
-                var isMultiBookingFormEnabeld = "@Model.MultiBookingSelectedConceptCostBearerRelations.Any()".toLowerCase() === "true";
+                var isMultiBookingFormDisabled = "@Model.MultiBookingSelectedConceptCostBearerRelations.Any()".toLowerCase() === "false";
 
-                if(isMultiBookingFormEnabeld) {
-                    activateMultiBookingForm();
-                } else {
-                    deactivateMultiBookingForm();
-                }
+                toggleMultiBookingForm(isMultiBookingFormDisabled);
             }
 
-            var categorySelectId = "category-select";
-            var leistungSelectId = "leistung-select";
+            //var categorySelectId = "category-select";
+            //var leistungSelectId = "leistung-select";
 
-            if("@Model.IsInMultiBookingMode".toLowerCase() === "true") {
+            @*if("@Model.IsInMultiBookingMode".toLowerCase() === "true") {
                 categorySelectId = "mb-category-select";
                 leistungSelectId = "mb-leistung-select";
-            }
+            }*@
 
-            loadServiceDescriptions(categorySelectId, leistungSelectId, 'textmodule-container', 'tree');
+            if("@Model.IsInGroupBookingMode".toLowerCase() === "false") {
+                loadServiceDescriptions("category-select", "leistung-select", 'textmodule-container', 'tree');
+            }
+            
 
             initializeTimeInputs();
 
@@ -503,18 +511,10 @@
         return '@Url.Action("Index", "Login")';
     }
 
-    function getRemoveCb2ScRelFromGroupBookingUrl() {
-        return '@Url.Action("RemoveSupportConceptCostBearerRelationFromGroupBooking")';
-    }
-
     function getLoadStatisticsUrl() {
         return '@Url.Action("LoadStatistics")';
     }
 
-    function getAddEmployeesToGroupBookingUrl() {
-        return '@Url.Action("AddEmployeesToGroupBooking")';
-    }
-
     function getSelectedRecordInformationUrlWithOid() {
         return '@Url.Action("GetSelectedRecordInformationWithOid")';
     }
@@ -572,10 +572,6 @@
     function getGetSignatureImageUrl() {
         return "@Url.Action("GetSignatureImage")";
     }
-
-    function getRateSelectedGoalUrl() {
-        return "@Url.Action("RateSelectedGoal")";
-    }
 </script>
 
 <div class="container mt-3" id="checkbox-container">
@@ -804,7 +800,7 @@
 @* ----- Bewertungspopup für Ziele ----- *@
 @if(AbstractModel.HasRightToRateGoals)
 {
-    <div id="goal-rating-popup" class="modal" tabindex="-1" role="dialog">
+    <div id="goal-rating-popup" class="modal" tabindex="-1" role="dialog" style="z-index: 9999 !important">
         <div class="modal-dialog modal-lg" role="document">
             <div class="modal-content">
                 <div class="modal-header">
@@ -814,11 +810,8 @@
                     </button>
                 </div>
                 <div class="modal-body">
-                    <ul class="list-group">
-                        @foreach(var ratingType in Model.GoalRatingTypes)
-                        {
-                            <li class="list-group-item" id="grt-@ratingType.RatingTypeOid" onclick="rateGoal(@ratingType.RatingTypeOid)">@ratingType.DisplayName</li>
-                        }
+                    <ul class="list-group" id="goal-ratings-container">
+                        @Html.Partial("GoalRatingPopupContentPartial", Model)
                     </ul>
                     <input type="hidden" id="goal-to-rate-oid" />
                 </div>

BeWoPlanerMobil/Views/Main/MultiBookingFormPartial.cshtml

@@ -0,0 +1,326 @@
+@using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+<script type="text/javascript">
+    function addScCbRelsToMultiBooking() {
+        try {
+            var selectedGroups = [];
+            var selectedSupportConcepts = [];
+
+            $("#multi-booking-supportconcepts input:checked").each(function () {
+                selectedSupportConcepts.push($(this).attr("value"));
+            });
+
+            $("#multi-booking-groups input:checked").each(function () {
+                selectedGroups.push($(this).attr("value"));
+            });
+
+            $("#multi-booking-sc-cb-rel-tab-content").load("@Url.Action("AddScCbRelsToMultiBooking")", {relOids: selectedSupportConcepts, groupOids: selectedGroups}, function() {
+                $("#multibooking-selection-container").load("@Url.Action("ReloadMultiBookingForm")", function () {
+                    toggleMultiBookingForm($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
+
+                    $("#tree").load("@Url.Action("LoadUpToDateTextModules")");
+                });
+            });
+        } catch(blubb) {
+            showErrorPopup(blubb);
+        }
+    }
+
+    function removeSupportConceptCostBearerRel(relOid) {
+        try {
+            $(`#mb-cb2sc-checkbox-${relOid}`).prop("checked", false);
+
+            $("#multibooking-selection-container").load("@Url.Action("RemoveSupportConceptCostbearerRelFromMultiBooking")", {relOid: relOid}
+                , function () {
+                    $("#goals-tree").load("@Url.Action("ReloadGoals")"
+                        , function () {
+                            toggleMultiBookingForm($(".mb-cb2sc-input:checkbox:checked").length > 0 ? false : true);
+
+                            $("#tree").load("@Url.Action("LoadUpToDateTextModules")");
+                        }
+                    );
+                }
+            );
+        } catch (error) {
+            showErrorPopup(error);
+        }
+    }
+</script>
+
+@if(!(Model is null))
+{
+    using(Html.BeginForm("CreateMultiBooking", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('mb-category-select', 'mb-leistung-select', 'textmodule-container', 'tree')", id = "multiBookingForm" }))
+    {
+        var startDate = Model.SelectedServiceRecord?.Start?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
+        var endDate = Model.SelectedServiceRecord?.End?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
+
+        var distance = Model.SelectedServiceRecord?.DistanceInMeter?.ToString() ?? string.Empty;
+
+        var notice0 = Model.SelectedServiceRecord?.Notice ?? string.Empty;
+        var noticeList = new[] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
+
+        if(Model.SelectedServiceRecord?.NoticeList != null)
+        {
+            var selectedNoticeList = Model.SelectedServiceRecord.NoticeList;
+            for(var i = 0; i < selectedNoticeList.Count; i++)
+            {
+                noticeList[i] = selectedNoticeList[i] ?? string.Empty;
+            }
+        }
+<div class="mt-3">
+    <div id="multibooking-selection-container">
+        @Html.Partial("MultiBookingSelectionPartial", Model)
+    </div>
+
+    @* Marker *@
+    @if(Model.ShowMarker)
+    {
+        <div class="form-row">
+            <div class="col-md">
+                <div class="custom-control custom-checkbox custom-control-inline">
+                    <input type="checkbox" class="custom-control-input" name="marker-cb" id="mb-marker-cb" />
+                    <label class="custom-control-label" for="mb-marker-cb">Marker</label>
+                </div>
+            </div>
+        </div>
+    }
+    
+    @* Trennlinie *@
+    <div class="form-row">
+        <div class="col-md">
+            <hr />
+        </div>
+    </div>
+
+    @* Start- und Enddatum *@
+    <div class="form-row">
+        <div class="col-md">
+            <div class="form-group my-2">
+                <div class="input-group date" id="mb-start-date-picker" data-target-input="nearest">
+                    <div class="input-group-prepend">
+                        <div class="input-group-text prepend-input-group-text">
+                            Startdatum
+                        </div>
+                    </div>
+                    <input type="text" id="mb-start-date" name="Datum" class="form-control datetimepicker-input" data-target="#mb-start-date-picker" data-toggle="datetimepicker" value="@startDate" />
+                    <div class="input-group-append" data-target="#mb-start-date-picker" data-toggle="datetimepicker">
+                        <div class="input-group-text">
+                            <i class="fas fa-calendar-alt"></i>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        @if(Model.IsEndDateVisible)
+        {
+            <div class="col-md">
+                <div class="form-group my-2">
+                    <div class="input-group date" id="mb-end-date-picker" data-target-input="nearest">
+                        <div class="input-group-prepend">
+                            <div class="input-group-text prepend-input-group-text">
+                                Enddatum
+                            </div>
+                        </div>
+                        <input type="text" id="mb-end-date" name="Enddatum" class="form-control datetimepicker-input" data-target="#mb-end-date-picker" data-toggle="datetimepicker" value="@endDate" />
+                        <div class="input-group-append" data-target="#mb-end-date-picker" data-toggle="datetimepicker">
+                            <div class="input-group-text">
+                                <i class="fas fa-calendar-alt"></i>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        }
+    </div>
+
+    @* Start- und Endzeit *@
+    <div class="form-row">
+        @{
+            var startTimeValue = Model.StartTimeToEdit;
+            var endTimeValue = Model.EndTimeToEdit;
+
+            var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
+
+            var durationValue = string.Empty;
+
+            if(!(Model.SelectedServiceRecord is null))
+            {
+                durationValue = (Model.SelectedServiceRecord?.RoundedDuration / divisor).ToString();
+            }
+
+            var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
+
+            if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
+            {
+                startTimeValue = Model.NewStartTime;
+                endTimeValue = Model.NewEndTime;
+                if(Model.NewDuration.HasValue)
+                {
+                    durationValue = (Model.NewDuration / divisor).ToString();
+                }
+            }
+        }
+        <div class="col-md">
+            <div class="form-group my-2">
+                <div class="input-group date" id="mb-start-time-picker" data-target-input="nearest">
+                    <div class="input-group-prepend">
+                        <div class="input-group-text sm-prepend-input-group-text">
+                            Von
+                        </div>
+                    </div>
+                    <input type="text" id="mb-start-time" name="Start" class="form-control datetimepicker-input" data-target="#mb-start-time-picker" value="@startTimeValue" />
+                    <div class="input-group-append" data-target="#mb-start-time-picker" data-toggle="datetimepicker">
+                        <div class="input-group-text">
+                            <i class="fas fa-clock"></i>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-md">
+            <div class="form-group my-2">
+                <div class="input-group date" id="mb-end-time-picker" data-target-input="nearest">
+                    <div class="input-group-prepend">
+                        <div class="input-group-text sm-prepend-input-group-text">
+                            Bis
+                        </div>
+                    </div>
+                    <input type="text" id="mb-end-time" name="Ende" class="form-control datetimepicker-input" data-target="#mb-end-time-picker" value="@endTimeValue" />
+                    <div class="input-group-append" data-target="#mb-end-time-picker" data-toggle="datetimepicker">
+                        <div class="input-group-text">
+                            <i class="fas fa-clock"></i>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    @* Dauer und Stunden/Minuten-Auswahl *@
+    <div class="form-row">
+        <div class="col-md">
+            <div class="form-group my-2">
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        @{
+                            var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
+                        }
+                        <div class="input-group-text prepend-input-group-text">
+                            @labelText
+                        </div>
+                    </div>
+                    <input type="text" class="form-control" id="mb-duration" name="Dauer" onchange="onDurationChange('mb-start-time', 'mb-end-time', 'mb-start-date', 'mb-end-date', 'mb-duration', 'mb-hours-minutes-dropdown-btn', 'mb-start-date-picker', 'mb-end-date-picker')" value="@durationValue">
+                    @if(Model.IsZeiterfassungInStdMin)
+                    {
+                        <div class="input-group-append">
+                            <button id="mb-hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle" type="button" data-toggle="dropdown">
+                                @Model.SelectedDurationUnit
+                            </button>
+                            <div class="dropdown-menu">
+                                <a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
+                                <a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
+                            </div>
+                        </div>
+                    }
+                </div>
+            </div>
+        </div>
+    </div>
+
+    @* Gefahrene Kilometer *@
+    @if(Model.ShowDistanceField)
+    {
+        <div class="form-row">
+            <div class="col-md">
+                <div class="form-group my-2">
+                    <div class="input-group">
+                        <div class="input-group-prepend">
+                            <div class="input-group-text">
+                                Gefahrene Kilometer
+                            </div>
+                        </div>
+                        <input type="text" class="form-control" id="mb-distance" name="Distanz" onchange="validateDistanceInput()" value="@distance">
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @* Textbausteinebutton *@
+    @if(AbstractModel.HasRightToSeeTextModules)
+    {
+        <div class="form-row" id="textmodule-container">
+            <div class="col-md">
+                <button type="button" class="btn btn-primary form-control mt-3" data-toggle="modal" data-target="#textbausteine-popup" id="mb-textbausteine-button">Textbausteine</button>
+            </div>
+        </div>
+    }
+
+    @* Dokumentationsfelder *@
+    <div class="form-row">
+        <div class="col-md mt-3">
+            @if(Model.NumberOfDokuTypes == 0)
+            {
+                <div class="form-group">
+                    <label for="mb-dokufeld">Dokumentation</label>
+                    <textarea class="form-control" name="Dokumentation6" id="mb-dokufeld">@notice0</textarea>
+                </div>
+            }
+            else
+            {
+                <ul class="nav nav-tabs" role="tab-list">
+                    @for(var i = 0; i < Model.Dokutypes.Length; i++)
+                    {
+                        var currentDokuType = Model.Dokutypes[i];
+
+                        <li class="nav-item">
+                            <a href="#mb-doku_@i" id="mb-doku_@i-tab" data-toggle="tab" role="tab" aria-controls="mb-doku_@i" class="nav-link@(i == 0 ? " active" : string.Empty)" aria-selected="true">
+                                @currentDokuType.DisplayName
+                            </a>
+                        </li>
+                    }
+                </ul>
+                <div class="tab-content" id="mb-dokufelderTab">
+                    @for(var i = 0; i < Model.Dokutypes.Length; i++)
+                    {
+                        var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
+
+                        <div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="mb-doku_@i" role="tabpanel" aria-labelledby="mb-doku_@i-tab">
+                            <textarea class="form-control doku-form-control" id="mb-doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
+                        </div>
+                    }
+                </div>
+            }
+        </div>
+    </div>
+</div>
+    }
+    <div class="d-flex bd-highlight mt-3">
+        <div class="mr-auto bd-highlight">
+            <!-- dient nur als Abstandshalter-->
+        </div>
+        <div class="ml-3 bd-highlight">
+            @using(Html.BeginForm("ResetMultiBookingForm", "Main", FormMethod.Post))
+            {
+                <button type="submit" class="btn btn-primary" onclick="showSpinner()">Abbrechen</button>
+            }
+        </div>
+        <div class="ml-3 bd-highlight">
+            <button type="button" class="btn btn-primary" id="mb-create-button" onclick="submitMultiBookingForm()">Anlegen</button>
+        </div>
+    </div>
+}

BeWoPlanerMobil/Views/Main/MultiBookingPartial.cshtml

@@ -1,8 +1,17 @@
-@using BeWoPlanerMobil.Models
-@using BeWoPlanerMobil.Util
-@using BS.Shared
+@using BeWoPlanerMobil.Util
 @model BeWoPlanerMobil.Models.MainModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script>
     $(document).ready(function () {
         try {
@@ -34,145 +43,6 @@
         }
     });
 
-    function addCostBearer2SupportConceptsToMultiBooking() {
-        try {
-            var selectedGroups = [];
-            var selectedSupportConcepts = [];
-
-            var scOidString = "";
-            var groupOidString = "";
-
-            $("#multi-booking-supportconcepts input:checked").each(function () {
-                selectedSupportConcepts.push($(this).attr("value"));
-            });
-
-            $("#multi-booking-groups input:checked").each(function () {
-                selectedGroups.push($(this).attr("value"));
-            });
-
-            for(var i = 0; i < selectedSupportConcepts.length; i++) {
-                scOidString += selectedSupportConcepts[i];
-
-                if(i < selectedSupportConcepts.length - 1) {
-                    scOidString += ",";
-                }
-            }
-
-            for(var j = 0; j < selectedGroups.length; j++) {
-                groupOidString += selectedGroups[j];
-
-                if(j < selectedGroups.length - 1) {
-                    groupOidString += ",";
-                }
-            }
-
-            $.get("@Url.Action("AddSupportConceptCostBearerRelationsToMultiBooking")", { pRelOids: scOidString, pGroupOids: groupOidString }).done(updateMultiBookingCb2ScList);
-        } catch(error) {
-            showErrorPopup(error);
-        }
-    }
-
-    function updateMultiBookingCb2ScList(result) {
-        try {
-            var list = $("#mb-selected-cb2sc-list");
-
-            if (isEmptyOrSpaces(result) || result === "SessionTimeout") {
-                window.location.href = getRedirectLink();
-                return;
-            }
-
-            var multiBookingSelectionObject = parseJason(result);
-
-            var resultList = multiBookingSelectionObject.SelectedRelations;
-
-            list.empty();
-
-            $.each(resultList,
-                function (index, customListItem) {
-                    var html =
-                        '<div class="list-group-item" id="mb-relation-item-' + customListItem.Value + '">' +
-                            '<div class="row">' +
-                            '<div class="col">' +
-                            '<span>' + customListItem.Text1 + '<br />' +
-                            '<span class="' + customListItem.TextColor + '">' + customListItem.Text2 + '</span>' +
-                            '</span>' +
-                            '</div>' +
-                            '<div class="col-auto my-auto">' +
-                            '<button type="button" class="btn btn-primary" onclick="removeMultiBookingCb2ScRelation(' + customListItem.Value + ')">' +
-                            '<span class="fas fa-times-circle"></span>' +
-                            '</button>' +
-                            '</div>' +
-                            '</div>';
-
-                    list.append(html);
-                });
-
-            updateMultiBookingGroupList(multiBookingSelectionObject);
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
-    function updateMultiBookingGroupList(multiBookingSelectionObject) {
-        try {
-            var groupOids = multiBookingSelectionObject.GroupOids === undefined ? [] : multiBookingSelectionObject.GroupOids;
-            var relOids = [];
-
-            if (multiBookingSelectionObject.SelectedRelations !== undefined) {
-                for (var i = 0; i < multiBookingSelectionObject.SelectedRelations.length; i++) {
-                    var oidStringValue = multiBookingSelectionObject.SelectedRelations[i].Value;
-                    var oidIntValue = parseInt(oidStringValue, 10);
-
-                    relOids.push(oidIntValue);
-                }
-            }
-
-            $("#multi-booking-supportconcepts input").each(function () {
-                var value = $(this).val();
-
-                $(this).prop("checked", isInArray(value, relOids));
-            });
-
-            $("#multi-booking-groups input").each(function () {
-                var value = $(this).val();
-
-                $(this).prop("checked", isInArray(value, groupOids));
-            });
-
-            if (relOids.length === 0 && groupOids.length === 0) {
-                deactivateMultiBookingForm();
-            } else {
-                activateMultiBookingForm();
-            }
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
-    function removeMultiBookingCb2ScRelation(selectedCb2ScRelOid) {
-        try {
-            $("#mb-relation-item-" + selectedCb2ScRelOid).remove();
-
-            if ($("#mb-cb2sc-checkbox-" + selectedCb2ScRelOid).length) {
-                $("#mb-cb2sc-checkbox-" + selectedCb2ScRelOid).prop("checked", false);
-            }
-
-            if ($("#mb-selected-cb2sc-list").find(".list-group-item").length === 0) {
-                deactivateMultiBookingForm();
-
-                $("#multi-booking-supportconcepts input:checked").each(function () {
-                    $(this).prop("checked", false);
-                });
-            }
-
-            $.get("@Url.Action("RemoveSupportConceptCostBearerRelationFromMultiBooking")", { pRelOid: selectedCb2ScRelOid }).done(function(result) {
-                updateMultiBookingGroupList(parseJason(result));
-            });
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
     function addEmployeeToMultiBooking() {
         try {
             var selectedEmployees = [];
@@ -203,29 +73,24 @@
         }
     }
 
-    function deactivateMultiBookingForm() {
-        try {
-            $("#multi-booking-employees-button, #mb-category-select, #mb-leistung-select, #mb-start-date, #mb-end-date, #mb-start-time, #mb-end-time, #mb-duration, #mb-distance, textarea, #mb-reset-button, #mb-create-button, #mb-textbausteine-button, #mb-hours-minutes-dropdown-btn, #mb-marker-cb").prop("disabled", true);
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
-    function activateMultiBookingForm() {
-        try {
-            $("#multi-booking-employees-button, #mb-category-select, #mb-leistung-select, #mb-start-date, #mb-end-date, #mb-start-time, #mb-end-time, #mb-duration, #mb-distance, textarea, #mb-reset-button, #mb-create-button, #mb-textbausteine-button, #mb-hours-minutes-dropdown-btn, #mb-marker-cb").prop("disabled", false);
-        } catch (error) {
-            showErrorPopup(error);
-        }
-    }
-
     function submitMultiBookingForm() {
         try {
             showSpinner();
 
-            $.get("@Url.Action("MultiBookingHasSelectedSupportConcepts")").done(function(result1) {
+            $.get("@Url.Action("MultiBookingHasSelectedSupportConcepts")").done(function (result1) {
+                if(false === checkJson(result1)) {
+                    logWarning("submitMultiBookingForm: Der zurückgegebene Wert ist kein gültiges JSON!");
+                    hideSpinner();
+                    return;
+                }
+
                 $.get("@Url.Action("MultiBookingHasSelectedEmployees")").done(function (result2) {
-                    
+                    if(false === checkJson(result2)) {
+                        logWarning("submitMultiBookingForm: Der zurückgegebene Wert ist kein gültiges JSON!");
+                        hideSpinner();
+                        return;
+                    }
+
                     var hasSupportConcepts = parseJason(result1);
                     var hasEmployees = parseJason(result2);
 
@@ -255,345 +120,9 @@
 
 <div class="row">
     <div class="col col-12">
-        @if(!(Model is null))
+        @if(Model != null)
         {
-            using(Html.BeginForm("CreateMultiBooking", "Main", FormMethod.Post, new { onreset = "serviceDescriptionSelectOnReset('mb-category-select', 'mb-leistung-select', 'textmodule-container', 'tree')", id = "multiBookingForm" }))
-            {
-                var startDate = Model.SelectedServiceRecord?.Start?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
-                var endDate = Model.SelectedServiceRecord?.End?.ToShortDateString() ?? DateTime.Today.ToShortDateString();
-
-                var distance = Model.SelectedServiceRecord?.DistanceInMeter?.ToString() ?? string.Empty;
-
-                var notice0 = Model.SelectedServiceRecord?.Notice ?? string.Empty;
-                var noticeList = new[] { string.Empty, string.Empty, string.Empty, string.Empty, string.Empty };
-
-                if(Model.SelectedServiceRecord?.NoticeList != null)
-                {
-                    var selectedNoticeList = Model.SelectedServiceRecord.NoticeList;
-                    for(var i = 0; i < selectedNoticeList.Count; i++)
-                    {
-                        noticeList[i] = selectedNoticeList[i] ?? string.Empty;
-                    }
-                }
-        <div class="mt-3">
-            <!-- Hilfeplanauswahlbutton -->
-            <div class="form-row">
-                <div class="col-md">
-                    <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#multi-booking-popup" id="support-concepts-and-groups-button">Hilfepläne und Gruppen hinzufügen</button>
-                </div>
-            </div>
-
-            <!-- Hilfeplanauswahl -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group my-1">
-                        <div class="list-group" id="mb-selected-cb2sc-list">
-                            @foreach(var selectedCb2ScRelation in Model.MultiBookingSelectionObject.SelectedRelations)
-                            {
-                                <div class="list-group-item" id="mb-relation-item-@selectedCb2ScRelation.Value">
-                                    <div class="row">
-                                        <div class="col">
-                                            <span>
-                                                @selectedCb2ScRelation.Text1
-                                                <br />
-                                                <span class="@selectedCb2ScRelation.TextColor">
-                                                    @selectedCb2ScRelation.Text2
-                                                </span>
-                                            </span>
-                                        </div>
-                                        <div class="col-auto my-auto">
-                                            <button type="button" class="btn btn-primary" onclick="removeMultiBookingCb2ScRelation(@selectedCb2ScRelation.Value)">
-                                                <span class="fas fa-times-circle"></span>
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Mitarbeiterauswahl -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group mb-1">
-                        <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#multi-booking-employee-selection-popup" id="multi-booking-employees-button">
-                            Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="multi-booking-selected-employees-count-badge">@Model.MultiBookingSelectedEmployees.Count</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Kategorie -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text prepend-input-group-text">
-                                    Kategorie
-                                </div>
-                            </div>
-                            @Html.DropDownListFor(m => m.SelectedServiceCategoryOid, Model.ServiceCategoryListItems, new { onchange = "loadServiceDescriptions('mb-category-select', 'mb-leistung-select', 'textmodule-container', 'tree')", @class = "custom-select", Id = "mb-category-select" })
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Leistung -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text prepend-input-group-text">
-                                    Leistung
-                                </div>
-                            </div>
-                            <select class="custom-select" id="mb-leistung-select" name="ServiceDescription" onchange="setServiceDescription('mb-leistung-select')"></select>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            
-            <!-- Marker -->
-            @if(Model.ShowMarker)
-            {
-                <div class="form-row">
-                    <div class="col-md">
-                        <div class="custom-control custom-checkbox custom-control-inline">
-                            <input type="checkbox" class="custom-control-input" name="marker-cb" id="mb-marker-cb" />
-                            <label class="custom-control-label" for="mb-marker-cb">Marker</label>
-                        </div>
-                    </div>
-                </div>
-            }
-
-            <div class="form-row">
-                <div class="col-md">
-                    <hr/>
-                </div>
-            </div>
-
-            <!-- Start- und Enddatum -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group date" id="mb-start-date-picker" data-target-input="nearest">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text prepend-input-group-text">
-                                    Startdatum
-                                </div>
-                            </div>
-                            <input type="text" id="mb-start-date" name="Datum" class="form-control datetimepicker-input" data-target="#mb-start-date-picker" data-toggle="datetimepicker" value="@startDate" />
-                            <div class="input-group-append" data-target="#mb-start-date-picker" data-toggle="datetimepicker">
-                                <div class="input-group-text">
-                                    <i class="fas fa-calendar-alt"></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-
-                @if(Model.IsEndDateVisible)
-                {
-                    <div class="col-md">
-                        <div class="form-group my-2">
-                            <div class="input-group date" id="mb-end-date-picker" data-target-input="nearest">
-                                <div class="input-group-prepend">
-                                    <div class="input-group-text prepend-input-group-text">
-                                        Enddatum
-                                    </div>
-                                </div>
-                                <input type="text" id="mb-end-date" name="Enddatum" class="form-control datetimepicker-input" data-target="#mb-end-date-picker" data-toggle="datetimepicker" value="@endDate" />
-                                <div class="input-group-append" data-target="#mb-end-date-picker" data-toggle="datetimepicker">
-                                    <div class="input-group-text">
-                                        <i class="fas fa-calendar-alt"></i>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                }
-            </div>
-
-            <!-- Start- und Endzeit -->
-            <div class="form-row">
-                @{
-                    var startTimeValue = Model.StartTimeToEdit;
-                    var endTimeValue = Model.EndTimeToEdit;
-
-                    var divisor = Model.SelectedDurationUnit == "Stunden" ? 60 : 1;
-
-                    var durationValue = string.Empty;
-
-                    if(!(Model.SelectedServiceRecord is null))
-                    {
-                        durationValue = (Model.SelectedServiceRecord?.RoundedDuration / divisor).ToString();
-                    }
-
-                    var afterValidationState = TempData[TempDataConstants.AfterValidationStateKey];
-
-                    if(Model.SetStartTimeToEndTimeAfterSave && !Model.IsInEditingMode && afterValidationState is bool isAfterValidation && isAfterValidation == false)
-                    {
-                        startTimeValue = Model.NewStartTime;
-                        endTimeValue = Model.NewEndTime;
-                        if(Model.NewDuration.HasValue)
-                        {
-                            durationValue = (Model.NewDuration / divisor).ToString();
-                        }
-                    }
-                }
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group date" id="mb-start-time-picker" data-target-input="nearest">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text sm-prepend-input-group-text">
-                                    Von
-                                </div>
-                            </div>
-                            <input type="text" id="mb-start-time" name="Start" class="form-control datetimepicker-input" data-target="#mb-start-time-picker" value="@startTimeValue" />
-                            <div class="input-group-append" data-target="#mb-start-time-picker" data-toggle="datetimepicker">
-                                <div class="input-group-text">
-                                    <i class="fas fa-clock"></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group date" id="mb-end-time-picker" data-target-input="nearest">
-                            <div class="input-group-prepend">
-                                <div class="input-group-text sm-prepend-input-group-text">
-                                    Bis
-                                </div>
-                            </div>
-                            <input type="text" id="mb-end-time" name="Ende" class="form-control datetimepicker-input" data-target="#mb-end-time-picker" value="@endTimeValue" />
-                            <div class="input-group-append" data-target="#mb-end-time-picker" data-toggle="datetimepicker">
-                                <div class="input-group-text">
-                                    <i class="fas fa-clock"></i>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Dauer und Stunden/Minuten-Auswahl -->
-            <div class="form-row">
-                <div class="col-md">
-                    <div class="form-group my-2">
-                        <div class="input-group">
-                            <div class="input-group-prepend">
-                                @{
-                                    var labelText = Model.EinheitZeiterfassung == 1 ? "Dauer (h)" : "Dauer";
-                                }
-                                <div class="input-group-text prepend-input-group-text">
-                                    @labelText
-                                </div>
-                            </div>
-                            <input type="text" class="form-control" id="mb-duration" name="Dauer" onchange="onDurationChange('mb-start-time', 'mb-end-time', 'mb-start-date', 'mb-end-date', 'mb-duration', 'mb-hours-minutes-dropdown-btn', 'mb-start-date-picker', 'mb-end-date-picker')" value="@durationValue">
-                            @if(Model.IsZeiterfassungInStdMin)
-                            {
-                                <div class="input-group-append">
-                                    <button id="mb-hours-minutes-dropdown-btn" class="btn btn-outline-primary dropdown-toggle" type="button" data-toggle="dropdown">
-                                        @Model.SelectedDurationUnit
-                                    </button>
-                                    <div class="dropdown-menu">
-                                        <a class="dropdown-item hours-minutes-link" href="#">Minuten</a>
-                                        <a class="dropdown-item hours-minutes-link" href="#">Stunden</a>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <!-- Gefahrene Kilometer -->
-            @if(Model.ShowDistanceField)
-            {
-                <div class="form-row">
-                    <div class="col-md">
-                        <div class="form-group my-2">
-                            <div class="input-group">
-                                <div class="input-group-prepend">
-                                    <div class="input-group-text">
-                                        Gefahrene Kilometer
-                                    </div>
-                                </div>
-                                <input type="text" class="form-control" id="mb-distance" name="Distanz" onchange="validateDistanceInput()" value="@distance">
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            }
-
-            <!-- Textbausteinebutton -->
-            @if(AbstractModel.HasRightToSeeTextModules)
-            {
-                <div class="form-row" id="textmodule-container">
-                    <div class="col-md">
-                        <button type="button" class="btn btn-primary form-control mt-3" data-toggle="modal" data-target="#textbausteine-popup" id="mb-textbausteine-button">Textbausteine</button>
-                    </div>
-                </div>
-            }
-
-            <!-- Dokumentationsfelder -->
-            <div class="form-row">
-                <div class="col-md mt-3">
-                    @if(Model.NumberOfDokuTypes == 0)
-                    {
-                        <div class="form-group">
-                            <label for="mb-dokufeld">Dokumentation</label>
-                            <textarea class="form-control" name="Dokumentation6" id="mb-dokufeld">@notice0</textarea>
-                        </div>
-                    }
-                    else
-                    {
-                        <ul class="nav nav-tabs" role="tab-list">
-                            @for(var i = 0; i < Model.Dokutypes.Length; i++)
-                            {
-                                var currentDokuType = Model.Dokutypes[i];
-
-                                <li class="nav-item">
-                                    <a href="#mb-doku_@i" id="mb-doku_@i-tab" data-toggle="tab" role="tab" aria-controls="mb-doku_@i" class="nav-link@(i == 0 ? " active" : string.Empty)" aria-selected="true">
-                                        @currentDokuType.DisplayName
-                                    </a>
-                                </li>
-                            }
-                        </ul>
-                        <div class="tab-content" id="mb-dokufelderTab">
-                            @for(var i = 0; i < Model.Dokutypes.Length; i++)
-                            {
-                                var textareaName = i + 1 < 1 ? "Dokumentation" : "Dokumentation" + (i + 1);
-
-                                <div class="tab-pane show@(i == 0 ? " active" : string.Empty)" id="mb-doku_@i" role="tabpanel" aria-labelledby="mb-doku_@i-tab">
-                                    <textarea class="form-control doku-form-control" id="mb-doku-textarea-@i" name="@textareaName">@noticeList[i]</textarea>
-                                </div>
-                            }
-                        </div>
-                    }
-                </div>
-            </div>
-        </div>
-            }
-            <div class="d-flex bd-highlight mt-3">
-                <div class="mr-auto bd-highlight">
-                    <!-- dient nur als Abstandshalter-->
-                </div>
-                <div class="ml-3 bd-highlight">
-                    @using(Html.BeginForm("ResetMultiBookingForm", "Main", FormMethod.Post))
-                    {
-                        <button type="submit" class="btn btn-primary" onclick="showSpinner()">Abbrechen</button>
-                    }
-                </div>
-                <div class="ml-3 bd-highlight">
-                    <button type="button" class="btn btn-primary" id="mb-create-button" onclick="submitMultiBookingForm()">Anlegen</button>
-                </div>
-            </div>
+            @Html.Partial("MultiBookingFormPartial", Model);
         }
     </div>
 </div>
@@ -613,61 +142,8 @@
                     <a class="nav-item nav-link active" href="#multi-booking-supportconcepts" data-toggle="tab" role="tab">Hilfepläne</a>
                     <a class="nav-item nav-link" href="#multi-booking-groups" data-toggle="tab" role="tab">Gruppen</a>
                 </nav>
-                <div class="tab-content">
-                    <div class="tab-pane show active" role="tabpanel" id="multi-booking-supportconcepts">
-                        <ul class="list-group">
-                            @foreach(var cb2Sc in Model.MultiBookingSupportConceptListObjects)
-                            {
-                                <li class="list-group-item">
-                                    @{
-                                        var timeSpanColorClass2 = cb2Sc.IsAboutToExpire ? "text-bewo-is-about-to-expire" : cb2Sc.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
-
-                                        var wasSuccessful = long.TryParse(cb2Sc.CostBearer2SupportConceptOid, out var cb2ScOid);
-
-                                        var checkedValue = wasSuccessful ? Model.MultiBookingSelectedConceptCostBearerRelations.Any(a => a.CostBearer2SupportConceptOid.Equals(cb2ScOid)) : wasSuccessful;
-                                    }
-
-                                    <div class="custom-control custom-checkbox custom-control-inline">
-                                        <input type="checkbox"
-                                               @{ if(checkedValue) { @Html.Raw("checked=\"checked\"")  ; } }
-                                               class="custom-control-input" id="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="addCostBearer2SupportConceptsToMultiBooking()" name="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
-                                        <label for="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" class="custom-control-label">
-                                            <span class="justify-content-between mb-1 text-dark text-left">
-                                                @cb2Sc.NameAndDateOfBirth
-                                            </span>
-                                            <br />
-                                            <span class="mb-1 text-left @timeSpanColorClass2">
-                                                @cb2Sc.SupportConceptTimeSpan
-                                            </span>
-                                        </label>
-                                    </div>
-                                </li>
-                            }
-                        </ul>
-                    </div>
-                    <div class="tab-pane show" role="tabpanel" id="multi-booking-groups">
-                        <ul class="list-group">
-                            @foreach(var group in Model.GroupOfPeopleListItems)
-                            {
-                                <li class="list-group-item">
-                                    @{
-                                        long groupOid;
-                                        var wasSuccessful = long.TryParse(group.Value, out groupOid);
-
-                                        var shouldBeChecked = wasSuccessful ? Model.MultiBookingSelectedGroupOfPeopleOids.Contains(groupOid) : wasSuccessful;
-
-                                        var attribute = shouldBeChecked ? "checked=\"checked\"" : string.Empty;
-                                    }
-                                    <div class="custom-control custom-checkbox custom-control-inline">
-                                        <input type="checkbox" @attribute class="custom-control-input" id="mb-group-checkbox-@group.Value" value="@group.Value" onchange="addCostBearer2SupportConceptsToMultiBooking()" />
-                                        <label for="mb-group-checkbox-@group.Value" class="custom-control-label">
-                                            @group.Text
-                                        </label>
-                                    </div>
-                                </li>
-                            }
-                        </ul>
-                    </div>
+                <div class="tab-content" id="multi-booking-sc-cb-rel-tab-content">
+                    @Html.Partial("MultiBookingScCbRelList", Model)
                 </div>
             </div>
         </div>

BeWoPlanerMobil/Views/Main/MultiBookingScCbRelList.cshtml

@@ -0,0 +1,68 @@
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+<div class="tab-pane show active" role="tabpanel" id="multi-booking-supportconcepts">
+    <ul class="list-group">
+        @foreach(var cb2Sc in Model.MultiBookingSupportConceptListObjects)
+        {
+            <li class="list-group-item">
+                @{
+                    var timeSpanColorClass2 = cb2Sc.IsAboutToExpire ? "text-bewo-is-about-to-expire" : cb2Sc.ExpiresInThreeMonthsOrLess ? "text-bewo-expires-in-three-months" : "text-dark";
+
+                    var wasSuccessful = long.TryParse(cb2Sc.CostBearer2SupportConceptOid, out var cb2ScOid);
+
+                    var checkedValue = wasSuccessful ? Model.MultiBookingSelectedConceptCostBearerRelations.Any(a => a.CostBearer2SupportConceptOid.Equals(cb2ScOid)) : wasSuccessful;
+                }
+
+                <div class="custom-control custom-checkbox custom-control-inline">
+                    <input type="checkbox"
+                           @{ if(checkedValue) { @Html.Raw("checked=\"checked\"")  ; } }
+                           class="custom-control-input mb-cb2sc-input" id="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" onchange="addScCbRelsToMultiBooking()" name="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" value="@cb2Sc.CostBearer2SupportConceptOid">
+                    <label for="mb-cb2sc-checkbox-@cb2Sc.CostBearer2SupportConceptOid" class="custom-control-label">
+                        <span class="justify-content-between mb-1 text-dark text-left">
+                            @cb2Sc.NameAndDateOfBirth
+                        </span>
+                        <br />
+                        <span class="mb-1 text-left @timeSpanColorClass2">
+                            @cb2Sc.SupportConceptTimeSpan
+                        </span>
+                    </label>
+                </div>
+            </li>
+        }
+    </ul>
+</div>
+<div class="tab-pane show" role="tabpanel" id="multi-booking-groups">
+    <ul class="list-group">
+        @foreach(var group in Model.GroupOfPeopleListItems)
+        {
+            <li class="list-group-item">
+                @{
+                    long groupOid;
+                    var wasSuccessful = long.TryParse(group.Value, out groupOid);
+
+                    var shouldBeChecked = wasSuccessful ? Model.MultiBookingSelectedGroupOfPeopleOids.Contains(groupOid) : wasSuccessful;
+
+                    var attribute = shouldBeChecked ? "checked=\"checked\"" : string.Empty;
+                }
+                <div class="custom-control custom-checkbox custom-control-inline">
+                    <input type="checkbox" @attribute class="custom-control-input" id="mb-group-checkbox-@group.Value" value="@group.Value" onchange="addScCbRelsToMultiBooking()" />
+                    <label for="mb-group-checkbox-@group.Value" class="custom-control-label">
+                        @group.Text
+                    </label>
+                </div>
+            </li>
+        }
+    </ul>
+</div>

BeWoPlanerMobil/Views/Main/MultiBookingSelectionPartial.cshtml

@@ -0,0 +1,67 @@
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.MainModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
+@* (Mehrfachbuchung) Hilfeplanauswahl-Button *@
+<div class="form-row">
+    <div class="col-md">
+        <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#multi-booking-popup" id="support-concepts-and-groups-button">Hilfepläne und Gruppen hinzufügen</button>
+    </div>
+</div>
+
+@* (Mehrfachbuchung) Ausgewählte Hilfepläne *@
+<div class="form-row">
+    <div class="col-md">
+        <div class="form-group my-1">
+            <div class="list-group" id="mb-selected-cb2sc-list">
+                @foreach(var selectedCb2ScRelation in Model.MultiBookingSelectionObject.SelectedRelations)
+                {
+                    <div class="list-group-item" id="mb-relation-item-@selectedCb2ScRelation.Value">
+                        <div class="row">
+                            <div class="col">
+                                <span>
+                                    @selectedCb2ScRelation.Text1
+                                    <br />
+                                    <span class="@selectedCb2ScRelation.TextColor">
+                                        @selectedCb2ScRelation.Text2
+                                    </span>
+                                </span>
+                            </div>
+                            <div class="col-auto my-auto">
+                                <button type="button" class="btn btn-primary" onclick="removeSupportConceptCostBearerRel(@selectedCb2ScRelation.Value)">
+                                    <span class="fas fa-times-circle"></span>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+                }
+            </div>
+        </div>
+    </div>
+</div>
+
+@* (Mehrfachbuchung) Mitarbeiterauswahl-Button *@
+<div class="form-row">
+    <div class="col-md">
+        <div class="form-group mb-1">
+            <button type="button" class="btn btn-primary btn-block" data-toggle="modal" data-target="#multi-booking-employee-selection-popup" id="multi-booking-employees-button">
+                Mitarbeiter hinzufügen <span class="badge badge-light text-primary" id="multi-booking-selected-employees-count-badge">@Model.MultiBookingSelectedEmployees.Count</span>
+            </button>
+        </div>
+    </div>
+</div>
+
+@* Kategorie und Leistungen *@
+<div id="category-to-description-container">
+    @Html.Partial("Category2ServiceDescriptionPartial", Model)
+</div>

BeWoPlanerMobil/Views/Main/OneTimeLinkCreationPartial.cshtml

@@ -1,13 +1,23 @@
-
+@using BeWoPlanerMobil.Util
 @model BeWoPlanerMobil.Models.MainModel
-    
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 @if(Model.OneTimeLink != null)
 {
-<script type="text/javascript">
-    $(document).ready(function () {
+    <script type="text/javascript">
+        $(document).ready(function () {
             try {
-                $(function() {
+                $(function () {
                     $('[data-toggle="popover"]').popover();
                 });
 
@@ -35,7 +45,7 @@
                 showErrorPopup(error);
             }
         }
-</script>
+    </script>
 
     @Html.Raw(Model.OneTimeLinkText)
     <a class="text-break" href="@Model.OneTimeLink" id="one-time-link">@Model.OneTimeLink</a>

BeWoPlanerMobil/Views/Main/ServiceRecordListPartial.cshtml

@@ -3,6 +3,17 @@
 @using BS.Shared
 @model MainModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
     function generateExternalLink(serviceRecordOid) {
         try {
@@ -62,7 +73,7 @@
         }
     }
 
-    
+
 </script>
 
 @{
@@ -172,25 +183,41 @@
 
                         var durationStr = serviceRecord.GroupOid.HasValue ? string.Format("{0:###0.#} ({0:###0.#})", roundedDuration) : $"{duration:###0.#} ({roundedDuration:###0.#})";
 
-                        var goalsString = string.Empty;
-                        var goalCategoriesString = string.Empty;
+                        var massnahmenString = string.Empty;
+                        var zieleString = string.Empty;
 
                         if(serviceRecord.Goals != null && serviceRecord.Goals.Count > 0)
                         {
-                            foreach(var goal in serviceRecord.Goals)
+                            foreach(var goal in serviceRecord.Goals.Where(g => g.Type == ValueListEntryType.SupportConceptGoalType || g.Type == ValueListEntryType.SupportConceptIndividualGoalType))
                             {
-                                if(goal.Abbreviation != null)
+                                if(goal.Abbreviation != null && goal.TypeDescription != null)
                                 {
-                                    goalsString += $"{goal.Abbreviation}: {goal.TypeDescription}";
+                                    massnahmenString += $"{goal.Abbreviation}: {goal.TypeDescription}";
                                 }
-                                else
+                                else if(goal.Abbreviation is null && goal.TypeDescription != null)
                                 {
-                                    goalsString += goal.TypeDescription;
+                                    massnahmenString += goal.TypeDescription;
                                 }
+                                else if(goal.Abbreviation != null && goal.TypeDescription is null)
+                                {
+                                    massnahmenString += goal.Abbreviation;
+                                }
+
+#if DEBUG
+                if(goal.RatingTypeOid.HasValue)
+                {
+                    var goalRating = Model.GoalRatingTypes.FirstOrDefault(g => g.RatingTypeOid.HasValue && g.RatingTypeOid.Equals(goal.RatingTypeOid.Value));
+
+                    if(goalRating?.DisplayName != null && goalRating.DisplayName.Length > 0)
+                    {
+                        massnahmenString += $"<strong style='color: blue;'>({goalRating.DisplayName})</strong>";
+                    }
+                }
+#endif
 
                                 if(serviceRecord.Goals.IndexOf(goal) < serviceRecord.Goals.Count - 1)
                                 {
-                                    goalsString += ", ";
+                                    massnahmenString += ", ";
                                 }
                             }
 
@@ -198,11 +225,11 @@
                             {
                                 foreach(var goalHeader in Model.ServiceRecordOids2GoalHeader[serviceRecord.ServiceRecordOid.Value])
                                 {
-                                    goalCategoriesString += $"{goalHeader}, ";
+                                    zieleString += $"{goalHeader}, ";
                                 }
                             }
 
-                            goalCategoriesString = goalCategoriesString.TrimEnd(' ').TrimEnd(',');
+                            zieleString = zieleString.TrimEnd(' ').TrimEnd(',');
                         }
 
                         var cardBackground = serviceRecord.ServiceRecordType == ServiceRecordTypeId.Content ? "bg-service-record-marked" : serviceRecord.GroupOid.HasValue ? "bg-bewo-group-booking" : string.Empty;
@@ -306,17 +333,20 @@
                                         Ziele:
                                     </div>
                                     <div class="col">
-                                        @goalCategoriesString
+                                        @zieleString
                                     </div>
                                 </div>
-                                <div class="row">
-                                    <div class="col text-secondary">
-                                        Maßnahmen:
+                                if(serviceRecord.Goals.Any(goal => goal.Type == ValueListEntryType.SupportConceptGoalType || goal.Type == ValueListEntryType.SupportConceptIndividualGoalType))
+                                {
+                                    <div class="row">
+                                        <div class="col text-secondary">
+                                            Maßnahmen:
+                                        </div>
+                                        <div class="col">
+                                            @(new HtmlString(massnahmenString))
+                                        </div>
                                     </div>
-                                    <div class="col">
-                                        @goalsString
-                                    </div>
-                                </div>
+                                }
                             }
                             <div class="row">
                                 <div class="col text-secondary">

BeWoPlanerMobil/Views/Main/SingleBookingPartial.cshtml

@@ -4,6 +4,17 @@
 @using BS.Shared.Extensions
 @model MainModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script>
     $(document).ready(function () {
         $("#hours-minutes-dropdown-btn").on("click", function() {
@@ -22,7 +33,7 @@
             $("#hours-minutes-dropdown-btn").text(buttonText);
 
             setInputFilter('duration', 'distance', 'hours-minutes-dropdown-btn');
-            
+
             $.get('@Url.Action("ToggleDurationUnit")', { isInHoursMode: buttonText === "Stunden" });
 
             calculateDuration(true, 'start-time', 'end-time', 'duration', 'hours-minutes-dropdown-btn', 'start-date-picker', 'end-date-picker', false, false);
@@ -796,10 +807,10 @@
     </div>
     @*----- /Liste mit den Einträgen und dem Auswahl-Select ----- *@
 
-    
+
 </div>
-    
-@using(Html.BeginForm("DeleteSignature", "Main", FormMethod.Post, new { id = "delete-signature-form"}))
+
+@using(Html.BeginForm("DeleteSignature", "Main", FormMethod.Post, new { id = "delete-signature-form" }))
 {
     <input type="hidden" name="sr-signature-to-del-oid" id="sr-signature-to-del-oid-input" />
     <input type="hidden" name="sr-sig-to-del-record-oid" id="sr-sig-to-del-record-oid-input" />

BeWoPlanerMobil/Views/Main/TextModulePartial.cshtml

@@ -1,6 +1,17 @@
 @using BeWoPlanerMobil.Util
 @model BeWoPlanerMobil.Models.MainModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 @helper BuildTextModuleTree(TextbausteinDisplayItem textModule)
 {
     if(textModule.IsParent)

BeWoPlanerMobil/Views/Report/ConfirmationReceiptSignaturePartial.cshtml

@@ -1,29 +1,39 @@
-@using BeWoPlanerMobil.Util.ReportUtils
+@using BeWoPlanerMobil.Util
+@using BeWoPlanerMobil.Util.ReportUtils
 @model BeWoPlanerMobil.Models.ReportModel
 
 @{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+
     var plural = Model.ConfirmationReceiptObject.NumberOfServiceRecords > 1 ? "en" : string.Empty;
 
     var leistungsplurarl = Model.ConfirmationReceiptObject.NumberOfServiceRecords > 1 ? "en" : string.Empty;
-    
+
     var sigInfo = $"Unterschrift{plural} von {Model.Quittierungsbelegsunterschriftenobjekt.PersonName} für {Model.Quittierungsbelegsunterschriftenobjekt.ServiceRecordCount} erbrachte Leistung{leistungsplurarl} von {Model.Quittierungsbelegsunterschriftenobjekt.CustomerName} ({Model.Quittierungsbelegsunterschriftenobjekt.TimeSpanInfo})";
 }
 
 <script>
-    $(document).ready(function() {
+    $(document).ready(function () {
         try {
             $(".left-col").width(getMaxWidth("left-col"));
-        } catch (error) {
+        } catch(error) {
             showErrorPopup(error);
         }
     });
 
     $(".signature-card").ready(function () {
         try {
-            setTimeout(function() {
+            setTimeout(function () {
                 $(".signature-card").height(getMaxElementHeight("signature-card"));
             }, 100);
-        } catch (error) {
+        } catch(error) {
             showErrorPopup(error);
         }
     });
@@ -151,7 +161,7 @@
             <div class="@GetColumnClass()">
                 <div class="card signature-card mt-4">
                     <div class="justify-content-center">
-                        <img style="display: block; margin-left: auto; margin-right: auto; max-width: 100% !important;" src="@signature.ImageStr" alt="Unterschrift von @signature.PersonName geleistet am @signature.InsTsStr"/>
+                        <img style="display: block; margin-left: auto; margin-right: auto; max-width: 100% !important;" src="@signature.ImageStr" alt="Unterschrift von @signature.PersonName geleistet am @signature.InsTsStr" />
                     </div>
                     <div class="card-body m-0 p-0" style="height: 0 !important;"></div>
                     <div class="card-footer">

BeWoPlanerMobil/Views/Report/QuittierungsbelegsPreviewPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.ReportModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.ReportModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <script type="text/javascript">
     function quittierungsbelegsViewerInit(s, e) {
@@ -7,7 +19,7 @@
                 'Page': 'Seite',
                 'of': 'von'
             });
-        } catch (error) {
+        } catch(error) {
             showErrorPopup(error);
         }
     }

BeWoPlanerMobil/Views/Report/QuittierungsbelegsResultPartial.cshtml

@@ -2,7 +2,18 @@
 @using BeWoPlanerMobil.Util
 @using BeWoPlanerMobil.Util.ReportUtils
 @model BeWoPlanerMobil.Models.ReportModel
-    
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
     function deleteCustomerSignatures(cardBodyId, resultIdentifier, customerName, timeSpan) {
         try {
@@ -143,186 +154,186 @@
 
         foreach(var result in Model.ConfirmationReceiptObject.ConfirmationReceiptResultList)
         {
-    <div class="card w-100 mb-3">
-        <div class="card-header" onclick="cardHeaderClick2(this)">
-            @{
-                var employeeSignatureState = result.EmployeeSignatureState;
-                var customerSignatureState = result.CustomerSignatureState;
+            <div class="card w-100 mb-3">
+                <div class="card-header" onclick="cardHeaderClick2(this)">
+                    @{
+                        var employeeSignatureState = result.EmployeeSignatureState;
+                        var customerSignatureState = result.CustomerSignatureState;
 
-                var canCustomerSign = customerSignatureState != SignatureState.All;
-                var canEmployeeSign = employeeSignatureState != SignatureState.All && employeeSignatureState != SignatureState.AllOwnServiceRecords; // || (employeeSignatureState != SignatureState.AllOwnServiceRecords);
+                        var canCustomerSign = customerSignatureState != SignatureState.All;
+                        var canEmployeeSign = employeeSignatureState != SignatureState.All && employeeSignatureState != SignatureState.AllOwnServiceRecords; // || (employeeSignatureState != SignatureState.AllOwnServiceRecords);
 
-                var employeeName = Model.Employee.ToString();
+                        var employeeName = Model.Employee.ToString();
 
-                var overwrite_ssp = (employeeSignatureState == SignatureState.All).ToString().ToLower();
-                var cardBodyId_ssp = $"#collapse-result-{result.Identifier}";
-                var timeSpan_ssp = Model.ConfirmationReceiptObject.TimeSpanString;
+                        var overwrite_ssp = (employeeSignatureState == SignatureState.All).ToString().ToLower();
+                        var cardBodyId_ssp = $"#collapse-result-{result.Identifier}";
+                        var timeSpan_ssp = Model.ConfirmationReceiptObject.TimeSpanString;
 
-                var hasNoOwnEntries = !AbstractModel.HasRightToProvideEmployeeSignatureForOthers && result.Items.All(item => !item.EmployeeOid.Equals(Model.Employee.EmployeeOid));
-                var disabledString = hasNoOwnEntries ? "disabled" : string.Empty;
-            }
-
-            <div class="row">
-                <div class="col-sm-auto mr-auto">
-                    <div class="input-group">
-                        <div class="input-group-prepend">
-                            <i class="fas fa-chevron-down text-primary h-100" id="chevron-@result.Identifier"></i>
-                        </div>
-                        <p class="form-control text-primary border-0 bg-transparent" style="user-select: none !important;">
-                            @result.CustomerName
-                        </p>
-                    </div>
-                </div>
-                <div class="col-sm-auto">
-                    @using(Html.BeginForm("DeleteCustomerSignature", "Report", FormMethod.Post, new { id = "delCSigForm-" + result.Identifier }))
-                    {
-                        <input type="hidden" name="deleteCustomerSignaturesInfo" value="@result.Identifier" />
+                        var hasNoOwnEntries = !AbstractModel.HasRightToProvideEmployeeSignatureForOthers && result.Items.All(item => !item.EmployeeOid.Equals(Model.Employee.EmployeeOid));
+                        var disabledString = hasNoOwnEntries ? "disabled" : string.Empty;
                     }
-                    @using(Html.BeginForm("DeleteEmployeeSignature", "Report", FormMethod.Post, new { id = "delESigForm-" + result.Identifier }))
-                    {
-                        <input type="hidden" name="deleteEmployeeSignatureInfo" value="@result.Identifier" />
-                    }
-                <div class="btn-toolbar">
-                    <!-- w-auto -->
-                    <div class="btn-group pr-1" role="group" style="width: 150px !important;">
-                        @if(AbstractModel.HasRightToDeleteReceiptSignatures && result.CustomerSignatureOids.Any())
-                        {
-                            <button class="btn btn-danger mx-0" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier', '@result.Identifier', '@result.CustomerName', '@timeSpan_ssp')">
-                                <span class="fas fa-trash"></span>
-                            </button>
-                        }
-                        <button class="btn btn-bewo-customers" type="button" onclick="loadConfirmationReceiptSignatures('@cardBodyId_ssp', '@result.Identifier', false, @result.HasCustomerSignature.ToString().ToLower(), @canCustomerSign.ToString().ToLower(), @result.CustomerOid)">
-                            <span class="fas fa-signature mr-0 pr-0"></span>
-                            @if(customerSignatureState != SignatureState.All)
-                            {
-                                <span class="fa-stack align-middle mx-0 px-0" style="height: auto !important">
-                                    <i class="fas fa-check fa-stack-1x mx-0 px-0"></i>
-                                    <i class="fas fa-slash fa-stack-1x mx-0 px-0" style="color: tomato;"></i>
-                                </span>
-                            }
-                            else
-                            {
-                                <span class="fas fa-check-double" style="color: yellowgreen !important"></span>
-                            }
-                            K
-                        </button>
-                    </div>
-                    <!-- w-auto -->
-                    <div class="btn-group role="group" style="width: 150px !important;">
-                        @if(AbstractModel.HasRightToDeleteReceiptSignatures && result.EmployeeSignatureOids.Any())
-                        {
-                            <button class="btn btn-danger mx-0" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier', '@result.Identifier', '@employeeName', '@result.CustomerName', '@timeSpan_ssp')">
-                                <span class="fas fa-trash"></span>
-                            </button>
-                        }
-                        <button class="btn btn-bewo-employee" @disabledString type="button" onclick="loadConfirmationReceiptSignatures('@cardBodyId_ssp', '@result.Identifier', true, @overwrite_ssp, @canEmployeeSign.ToString().ToLower(), @result.CustomerOid)">
-                            <span class="fas fa-signature mr-0 pr-0"></span>
-                            @if(employeeSignatureState == SignatureState.Some || employeeSignatureState == SignatureState.None)
-                            {
-                                <span class="fa-stack align-middle mx-0 px-0" style="height: auto !important">
-                                    <i class="fas fa-check fa-stack-1x mx-0 px-0"></i>
-                                    <i class="fas fa-slash fa-stack-1x mx-0 px-0" style="color: tomato;"></i>
-                                </span>
-                            }
-                            else if(employeeSignatureState == SignatureState.AllOwnServiceRecords && !AbstractModel.HasRightToProvideEmployeeSignatureForOthers)
-                            {
-                                <span class="fas fa-ban" style="color: tomato;"></span>
-                            }
-                            else
-                            {
-                                <span class="fas fa-check-double" style="color: yellowgreen !important"></span>
-                            }
-                            M
-                        </button>
-                    </div>
-                </div>
-                </div>
-            </div>
-        </div>
-        <div class="collapse" id="collapse-result-@result.Identifier">
-            <div class="card-body mx-0 px-0">
-                <div class="container-fluid">
-                    @foreach(var item in result.Items)
-                    {
-                        var isNotOwnEntry = !AbstractModel.HasRightToProvideEmployeeSignatureForOthers && !item.EmployeeOid.Equals(Model.Employee.EmployeeOid);
 
-                        var headerTextColorClass = isNotOwnEntry ? "text-secondary" : "text-primary";
-
-                        <div class="card w-100 mb-3">
-                            <div class="card-header" onclick="cardHeaderClick('#chevron-@item.Identifier', '#collapse-item-@item.Identifier')">
-                                <div class="d-inline-flex">
-                                    <i class="fas fa-chevron-down h-100 @headerTextColorClass" id="chevron-@item.Identifier"></i>
+                    <div class="row">
+                        <div class="col-sm-auto mr-auto">
+                            <div class="input-group">
+                                <div class="input-group-prepend">
+                                    <i class="fas fa-chevron-down text-primary h-100" id="chevron-@result.Identifier"></i>
                                 </div>
-                                <div class="p2 d-inline-flex @headerTextColorClass h-100">
-                                    <button type="button" class="btn btn-link @headerTextColorClass">
-                                        @item.DateTimeString
-                                    </button>
-                                    @if(isNotOwnEntry)
-                                    {
-                                        <span class="fa-stack fa-1x text-secondary mt-1">
-                                            <i class="fas fa-signature fa-stack-1x"></i>
-                                            <i class="fas fa-ban fa-stack-2x"></i>
-                                        </span>
-                                    }
-                                </div>
-
-                                @{
-                                    var hasEmployeeSignatureTextColorClass = item.HasEmployeeSignature ? "text-bewo-employee" : "text-light";
-                                }
-
-                                <span class="fas fa-check h-100 @hasEmployeeSignatureTextColorClass float-right pt-2"></span>
-
-                                <span class="float-right pt-2 text-light">m</span>
-
-                                @if(item.HasCustomerSignature)
-                                {
-                                    <span class="fas fa-check h-100 text-bewo-customers float-right pt-2"></span>
-                                }
+                                <p class="form-control text-primary border-0 bg-transparent" style="user-select: none !important;">
+                                    @result.CustomerName
+                                </p>
                             </div>
-                            <div class="collapse" id="collapse-item-@item.Identifier">
-                                <div class="card-body">
-                                    <div class="container-fluid">
-                                        <div class="row">
-                                            <div class="col text-secondary">
-                                                Kontaktart:
-                                            </div>
-                                            <div class="col">
-                                                @item.Kontaktart
-                                            </div>
+                        </div>
+                        <div class="col-sm-auto">
+                            @using(Html.BeginForm("DeleteCustomerSignature", "Report", FormMethod.Post, new { id = "delCSigForm-" + result.Identifier }))
+                            {
+                                <input type="hidden" name="deleteCustomerSignaturesInfo" value="@result.Identifier" />
+                            }
+                            @using(Html.BeginForm("DeleteEmployeeSignature", "Report", FormMethod.Post, new { id = "delESigForm-" + result.Identifier }))
+                            {
+                                <input type="hidden" name="deleteEmployeeSignatureInfo" value="@result.Identifier" />
+                            }
+                            <div class="btn-toolbar">
+                                <!-- w-auto -->
+                                <div class="btn-group pr-1" role="group" style="width: 150px !important;">
+                                    @if(AbstractModel.HasRightToDeleteReceiptSignatures && result.CustomerSignatureOids.Any())
+                                    {
+                                        <button class="btn btn-danger mx-0" type="button" onclick="deleteCustomerSignatures('#collapse-result-@result.Identifier', '@result.Identifier', '@result.CustomerName', '@timeSpan_ssp')">
+                                            <span class="fas fa-trash"></span>
+                                        </button>
+                                    }
+                                    <button class="btn btn-bewo-customers" type="button" onclick="loadConfirmationReceiptSignatures('@cardBodyId_ssp', '@result.Identifier', false, @result.HasCustomerSignature.ToString().ToLower(), @canCustomerSign.ToString().ToLower(), @result.CustomerOid)">
+                                        <span class="fas fa-signature mr-0 pr-0"></span>
+                                        @if(customerSignatureState != SignatureState.All)
+                                        {
+                                            <span class="fa-stack align-middle mx-0 px-0" style="height: auto !important">
+                                                <i class="fas fa-check fa-stack-1x mx-0 px-0"></i>
+                                                <i class="fas fa-slash fa-stack-1x mx-0 px-0" style="color: tomato;"></i>
+                                            </span>
+                                        }
+                                        else
+                                        {
+                                            <span class="fas fa-check-double" style="color: yellowgreen !important"></span>
+                                        }
+                                        K
+                                    </button>
+                                </div>
+                                <!-- w-auto -->
+                                <div class="btn-group role="group" style="width: 150px !important;">
+                                    @if(AbstractModel.HasRightToDeleteReceiptSignatures && result.EmployeeSignatureOids.Any())
+                                    {
+                                        <button class="btn btn-danger mx-0" type="button" onclick="deleteEmployeeSignature('#collapse-result-@result.Identifier', '@result.Identifier', '@employeeName', '@result.CustomerName', '@timeSpan_ssp')">
+                                            <span class="fas fa-trash"></span>
+                                        </button>
+                                    }
+                                    <button class="btn btn-bewo-employee" @disabledString type="button" onclick="loadConfirmationReceiptSignatures('@cardBodyId_ssp', '@result.Identifier', true, @overwrite_ssp, @canEmployeeSign.ToString().ToLower(), @result.CustomerOid)">
+                                        <span class="fas fa-signature mr-0 pr-0"></span>
+                                        @if(employeeSignatureState == SignatureState.Some || employeeSignatureState == SignatureState.None)
+                                        {
+                                            <span class="fa-stack align-middle mx-0 px-0" style="height: auto !important">
+                                                <i class="fas fa-check fa-stack-1x mx-0 px-0"></i>
+                                                <i class="fas fa-slash fa-stack-1x mx-0 px-0" style="color: tomato;"></i>
+                                            </span>
+                                        }
+                                        else if(employeeSignatureState == SignatureState.AllOwnServiceRecords && !AbstractModel.HasRightToProvideEmployeeSignatureForOthers)
+                                        {
+                                            <span class="fas fa-ban" style="color: tomato;"></span>
+                                        }
+                                        else
+                                        {
+                                            <span class="fas fa-check-double" style="color: yellowgreen !important"></span>
+                                        }
+                                        M
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="collapse" id="collapse-result-@result.Identifier">
+                    <div class="card-body mx-0 px-0">
+                        <div class="container-fluid">
+                            @foreach(var item in result.Items)
+                            {
+                                var isNotOwnEntry = !AbstractModel.HasRightToProvideEmployeeSignatureForOthers && !item.EmployeeOid.Equals(Model.Employee.EmployeeOid);
+
+                                var headerTextColorClass = isNotOwnEntry ? "text-secondary" : "text-primary";
+
+                                <div class="card w-100 mb-3">
+                                    <div class="card-header" onclick="cardHeaderClick('#chevron-@item.Identifier', '#collapse-item-@item.Identifier')">
+                                        <div class="d-inline-flex">
+                                            <i class="fas fa-chevron-down h-100 @headerTextColorClass" id="chevron-@item.Identifier"></i>
                                         </div>
-                                        <div class="row">
-                                            <div class="col text-secondary">
-                                                Anzahl Klienten:
-                                            </div>
-                                            <div class="col">
-                                                @item.CustomersCount
-                                            </div>
+                                        <div class="p2 d-inline-flex @headerTextColorClass h-100">
+                                            <button type="button" class="btn btn-link @headerTextColorClass">
+                                                @item.DateTimeString
+                                            </button>
+                                            @if(isNotOwnEntry)
+                                            {
+                                                <span class="fa-stack fa-1x text-secondary mt-1">
+                                                    <i class="fas fa-signature fa-stack-1x"></i>
+                                                    <i class="fas fa-ban fa-stack-2x"></i>
+                                                </span>
+                                            }
                                         </div>
-                                        <div class="row">
-                                            <div class="col text-secondary">
-                                                FLS in Minuten (ohne 1,2):
-                                            </div>
-                                            <div class="col">
-                                                @item.Minutes
-                                            </div>
-                                        </div>
-                                        <div class="row">
-                                            <div class="col text-secondary">
-                                                Mitarbeiter:
-                                            </div>
-                                            <div class="col">
-                                                @item.Employees
+
+                                        @{
+                                            var hasEmployeeSignatureTextColorClass = item.HasEmployeeSignature ? "text-bewo-employee" : "text-light";
+                                        }
+
+                                        <span class="fas fa-check h-100 @hasEmployeeSignatureTextColorClass float-right pt-2"></span>
+
+                                        <span class="float-right pt-2 text-light">m</span>
+
+                                        @if(item.HasCustomerSignature)
+                                        {
+                                            <span class="fas fa-check h-100 text-bewo-customers float-right pt-2"></span>
+                                        }
+                                    </div>
+                                    <div class="collapse" id="collapse-item-@item.Identifier">
+                                        <div class="card-body">
+                                            <div class="container-fluid">
+                                                <div class="row">
+                                                    <div class="col text-secondary">
+                                                        Kontaktart:
+                                                    </div>
+                                                    <div class="col">
+                                                        @item.Kontaktart
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col text-secondary">
+                                                        Anzahl Klienten:
+                                                    </div>
+                                                    <div class="col">
+                                                        @item.CustomersCount
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col text-secondary">
+                                                        FLS in Minuten (ohne 1,2):
+                                                    </div>
+                                                    <div class="col">
+                                                        @item.Minutes
+                                                    </div>
+                                                </div>
+                                                <div class="row">
+                                                    <div class="col text-secondary">
+                                                        Mitarbeiter:
+                                                    </div>
+                                                    <div class="col">
+                                                        @item.Employees
+                                                    </div>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
                                 </div>
-                            </div>
+                            }
                         </div>
-                    }
+                    </div>
                 </div>
             </div>
-        </div>
-    </div>
         }
     }
 </div>

BeWoPlanerMobil/Views/Report/Report.cshtml

@@ -1,7 +1,17 @@
-@model BeWoPlanerMobil.Models.ReportModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.ReportModel
 
 @{
     ViewBag.Title = "Quittierungsbeleg";
+
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
 }
 
 <style type="text/css">

BeWoPlanerMobil/Views/ReportViewer/DocumentWebViewerPartial.cshtml

@@ -1,6 +1,18 @@
 
+@using BeWoPlanerMobil.Util
 @model BeWoPlanerMobil.Models.ReportViewerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
     function initEvent(s, e) {
         var viewer = $("#webDocumentViewer1");

BeWoPlanerMobil/Views/ReportViewer/ReportViewer.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.ReportViewerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.ReportViewerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <script>
     $(window).ready(function () {

BeWoPlanerMobil/Views/ReportViewer/ReportViewerFormPartial.cshtml

@@ -1,6 +1,18 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 @model BeWoPlanerMobil.Models.ReportViewerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
     function reportFilterOnChange() {
         try {
@@ -114,9 +126,9 @@
 
 @*ToDo: Bis auf weiteres nur Mitarbeiterstundenkonto anzeigen!*@
 @*@if(Model.SelectedReportType == ReportType.Berichte)
-{
-    @Html.DropDownListFor(model => model.SelectedCustomReport, Model.CustomReports, new { @class = "custom-select", id = "msk-customReportSelect", onchange = "loadCustomReport()" })
-}*@
+    {
+        @Html.DropDownListFor(model => model.SelectedCustomReport, Model.CustomReports, new { @class = "custom-select", id = "msk-customReportSelect", onchange = "loadCustomReport()" })
+    }*@
 
 @if(Model.SelectedReportType == ReportType.Mitarbeiterstundenkonto && AbstractModel.HasRightToViewMitarbeiterstundenkonto)
 {
@@ -133,7 +145,7 @@
             <div class="form-row">
                 <div class="col">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="filterRadio" id="msk-filterForEmployeesRadio" onchange="reportFilterOnChange()" checked/>
+                        <input class="form-check-input" type="radio" name="filterRadio" id="msk-filterForEmployeesRadio" onchange="reportFilterOnChange()" checked />
                         <label for="msk-filterForEmployeesRadio">Nach Mitarbeiter filtern</label>
                     </div>
                 </div>
@@ -141,7 +153,7 @@
             <div class="form-row">
                 <div class="col">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="filterRadio" id="msk-filterForTeamsRadio" onchange="reportFilterOnChange()"/>
+                        <input class="form-check-input" type="radio" name="filterRadio" id="msk-filterForTeamsRadio" onchange="reportFilterOnChange()" />
                         <label for="msk-filterForTeamsRadio">Nach Teams filtern</label>
                     </div>
                 </div>
@@ -154,7 +166,7 @@
                 <div class="form-row">
                     <div class="col">
                         <div class="form-group form-check">
-                            <input type="checkbox" class="form-check-input" id="msk-all-employees-cb"/>
+                            <input type="checkbox" class="form-check-input" id="msk-all-employees-cb" />
                             <label class="form-check-label" for="msk-all-employees-cb" onclick="allEmployeesCbOnClick()">Alle Mitarbeiter</label>
                         </div>
                     </div>
@@ -172,7 +184,7 @@
                 <div class="form-row">
                     <div class="col">
                         <div class="form-group form-check">
-                            <input type="checkbox" class="form-check-input" id="msk-all-teams-cb"/>
+                            <input type="checkbox" class="form-check-input" id="msk-all-teams-cb" />
                             <label class="form-check-label" for="msk-all-teams-cb" onclick="allTeamsCbOnClick()">Alle Teams</label>
                         </div>
                     </div>
@@ -203,19 +215,19 @@
             {
                 <div class="col-4">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-tagesansichtsradio"/>
+                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-tagesansichtsradio" />
                         <label for="msk-tagesansichtsradio">Tag</label>
                     </div>
                 </div>
                 <div class="col-4">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-monatsansichtsradio" checked/>
+                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-monatsansichtsradio" checked />
                         <label for="msk-monatsansichtsradio">Monat</label>
                     </div>
                 </div>
                 <div class="col-4">
                     <div class="form-check">
-                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-jahresansichtsradio"/>
+                        <input class="form-check-input" type="radio" name="msk-ansichtsradio" id="msk-jahresansichtsradio" />
                         <label for="msk-jahresansichtsradio">Jahr</label>
                     </div>
                 </div>
@@ -224,7 +236,7 @@
             {
                 <div class="col">
                     <div class="form-group form-check">
-                        <input type="checkbox" class="form-check-input" id="msk-tagesansicht-cb"/>
+                        <input type="checkbox" class="form-check-input" id="msk-tagesansicht-cb" />
                         <label class="form-check-label" for="msk-tagesansicht-cb">@str</label>
                     </div>
                 </div>

BeWoPlanerMobil/Views/Scheduler/AppointmentFormPartial.cshtml

@@ -1,16 +1,29 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 @using BS.Shared.Extensions
 @model SchedulerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script>
     function alldayChange() {
         try {
             $("#scheduler-start-time, #scheduler-end-time").attr("disabled", $("#IsAllDay").prop("checked"));
-        } catch (error) {
+        } catch(error) {
             showErrorPopup(error);
         }
     }
 
-    $("#insert-appointment-form").ready(function() {
+    $("#insert-appointment-form").ready(function () {
         calcPrependTextSizes();
     });
 
@@ -42,7 +55,7 @@
                                 Start
                             </div>
                         </div>
-                        <input type="text" id="scheduler-start-date" name="StartDate" class="form-control datetimepicker-input" data-target="#scheduler-start-date-picker" data-toggle="datetimepicker" value="@Model.StartDateToEdit"/>
+                        <input type="text" id="scheduler-start-date" name="StartDate" class="form-control datetimepicker-input" data-target="#scheduler-start-date-picker" data-toggle="datetimepicker" value="@Model.StartDateToEdit" />
                         <div class="input-group-append" data-target="#scheduler-start-date-picker" data-toggle="datetimepicker">
                             <div class="input-group-text px-2">
                                 <i class="fas fa-calendar-alt"></i>
@@ -73,7 +86,7 @@
                                 Ende
                             </div>
                         </div>
-                        <input type="text" id="scheduler-end-date" name="EndDate" class="form-control datetimepicker-input" data-target="#scheduler-end-date-picker" data-toggle="datetimepicker" value="@Model.EndDateToEdit"/>
+                        <input type="text" id="scheduler-end-date" name="EndDate" class="form-control datetimepicker-input" data-target="#scheduler-end-date-picker" data-toggle="datetimepicker" value="@Model.EndDateToEdit" />
                         <div class="input-group-append" data-target="#scheduler-end-date-picker" data-toggle="datetimepicker">
                             <div class="input-group-text px-2">
                                 <i class="fas fa-calendar-alt"></i>
@@ -138,7 +151,7 @@
                     </div>
                 }
             </div>
-            
+
             <div class="form-row">
                 @if(AbstractModel.HasRightToViewEmployeeAppointments && AbstractModel.HasRightToInsertEmployeeAppointments)
                 {
@@ -276,7 +289,7 @@
                                 Notiz
                             </div>
                         </div>
-                        <textarea class="form-control" id="notice" name="Notice" maxlength="1024" >@Model.DescriptionToEdit</textarea>
+                        <textarea class="form-control" id="notice" name="Notice" maxlength="1024">@Model.DescriptionToEdit</textarea>
                     </div>
                 </div>
             </div>
@@ -365,7 +378,7 @@
 
 @if(AbstractModel.HasRightToViewEmployeeAppointments && AbstractModel.HasRightToInsertEmployeeAppointments && Model.AllEmployees.Any())
 {
-<script type="text/javascript">
+    <script type="text/javascript">
         function resetEmployeeSearch() {
             try {
                 $("#employee-search-input").val("");
@@ -430,6 +443,12 @@
 
         function updateSelectedEmployees(jsonResult) {
             try {
+                if(false === checkJson(jsonResult)) {
+                    logWarning("updateSelectedEmployees: Der zurückgegebene Wert ist kein gültiges JSON!");
+                    hideSpinner();
+                    return;
+                }
+
                 var listItems = parseJason(jsonResult);
 
                 var list = $("#selected-employees-list");
@@ -483,7 +502,13 @@
 
         function selectTeamForAppointment(teamOid) {
             try {
-                $.get('@Url.Action("SelectTeamForAppointment")', { teamOidString: teamOid }).done(function(jsonResult) {
+                $.get('@Url.Action("SelectTeamForAppointment")', {teamOidString: teamOid}).done(function (jsonResult) {
+                    if(false === checkJson(jsonResult)) {
+                        logWarning("selectTeamForAppointment: Der zurückgegebene Wert ist kein gültiges JSON!");
+                        hideSpinner();
+                        return;
+                    }
+
                     var oids = parseJason(jsonResult);
 
                     $("#employees-popup .employee-input-container input[type=checkbox]").each(function () {
@@ -504,83 +529,83 @@
                 showErrorPopup(error);
             }
         }
-</script>
+    </script>
 
-<div class="modal" tabindex="-1" role="dialog" id="employees-popup">
-    <div class="modal-dialog modal-dialog-scrollable" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h6 class="modal-title text-center w-100">Mitarbeiter</h6>
-                <button type="button" class="close" data-dismiss="modal" onclick="resetEmployeeSearch()">
-                    <span>&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <div class="container-fluid">
-                    <div class="input-group mb-3">
-                        <div class="input-group-prepend">
-                            <div class="input-group-text">
-                                <div class="custom-control custom-checkbox custom-control-inline mx-auto">
-                                    @{
-                                        var allEmployeesCheckedVal = Model.AllEmployees.AreListEqual(Model.SelectedEmployees) ? "checked" : string.Empty;
-                                    }
+    <div class="modal" tabindex="-1" role="dialog" id="employees-popup">
+        <div class="modal-dialog modal-dialog-scrollable" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h6 class="modal-title text-center w-100">Mitarbeiter</h6>
+                    <button type="button" class="close" data-dismiss="modal" onclick="resetEmployeeSearch()">
+                        <span>&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <div class="container-fluid">
+                        <div class="input-group mb-3">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text">
+                                    <div class="custom-control custom-checkbox custom-control-inline mx-auto">
+                                        @{
+                                            var allEmployeesCheckedVal = Model.AllEmployees.AreListEqual(Model.SelectedEmployees) ? "checked" : string.Empty;
+                                        }
 
-                                    <input type="checkbox" class="custom-control-input" id="all-employees-checkbox" @allEmployeesCheckedVal onchange="selectAllEmployeesOnChange()" />
-                                    <label class="custom-control-label" for="all-employees-checkbox">Alle</label>
-                                </div>
-                            </div>
-                        </div>
-                        <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="employeeListSearchOnChange()" id="employee-search-input" />
-                        <div class="input-group-append">
-                            <button class="btn btn-outline-secondary" type="button" onclick="resetEmployeeSearch()">
-                                <span class="fas fa-times-circle"></span>
-                            </button>
-                        </div>
-                    </div>
-
-                    @if(AbstractModel.HasRightToViewTeams)
-                    {
-                        <div class="card w-100 mb-3">
-                            <div class="card-header" data-toggle="collapse" data-target="#collapsable-teams-selection">
-                                <div class="d-flex align-items-center">
-                                    <h5 class="mr-auto">Meine Teams</h5>
-                                    <div class="btn-group" role="group">
-                                        <span class="fas fa-chevron-down text-primary"></span>
+                                        <input type="checkbox" class="custom-control-input" id="all-employees-checkbox" @allEmployeesCheckedVal onchange="selectAllEmployeesOnChange()" />
+                                        <label class="custom-control-label" for="all-employees-checkbox">Alle</label>
                                     </div>
                                 </div>
                             </div>
-                            <div class="collapse" id="collapsable-teams-selection">
-                                <div class="card-body">
-                                    @foreach(var team in Model.MyTeams)
-                                    {
-                                        <button type="button" class="btn btn-bewo-teams w-100 my-2" onclick="selectTeamForAppointment(@team.TeamOid)">@team.Name</button>
-                                    }
-                                </div>
+                            <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="employeeListSearchOnChange()" id="employee-search-input" />
+                            <div class="input-group-append">
+                                <button class="btn btn-outline-secondary" type="button" onclick="resetEmployeeSearch()">
+                                    <span class="fas fa-times-circle"></span>
+                                </button>
                             </div>
                         </div>
 
-                        <hr />
-                    }
-                    
-                    <div class="employee-input-container">
-                        @foreach(var employee in Model.AllEmployees)
+                        @if(AbstractModel.HasRightToViewTeams)
                         {
-                            var checkedValue = Model.SelectedEmployees.Contains(employee) ? "checked" : string.Empty;
-
-                            <div class="custom-control custom-checkbox employee-text">
-                                <input type="checkbox" class="custom-control-input" id="employee-@employee.EmployeeOid-checkbox" @checkedValue onchange="changeEmployeeListSelection()" />
-                                <label class="custom-control-label employee-name-label" for="employee-@employee.EmployeeOid-checkbox">@employee.DetailDescription</label>
+                            <div class="card w-100 mb-3">
+                                <div class="card-header" data-toggle="collapse" data-target="#collapsable-teams-selection">
+                                    <div class="d-flex align-items-center">
+                                        <h5 class="mr-auto">Meine Teams</h5>
+                                        <div class="btn-group" role="group">
+                                            <span class="fas fa-chevron-down text-primary"></span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="collapse" id="collapsable-teams-selection">
+                                    <div class="card-body">
+                                        @foreach(var team in Model.MyTeams)
+                                        {
+                                            <button type="button" class="btn btn-bewo-teams w-100 my-2" onclick="selectTeamForAppointment(@team.TeamOid)">@team.Name</button>
+                                        }
+                                    </div>
+                                </div>
                             </div>
+
+                            <hr />
                         }
+
+                        <div class="employee-input-container">
+                            @foreach(var employee in Model.AllEmployees)
+                            {
+                                var checkedValue = Model.SelectedEmployees.Contains(employee) ? "checked" : string.Empty;
+
+                                <div class="custom-control custom-checkbox employee-text">
+                                    <input type="checkbox" class="custom-control-input" id="employee-@employee.EmployeeOid-checkbox" @checkedValue onchange="changeEmployeeListSelection()" />
+                                    <label class="custom-control-label employee-name-label" for="employee-@employee.EmployeeOid-checkbox">@employee.DetailDescription</label>
+                                </div>
+                            }
+                        </div>
                     </div>
                 </div>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-primary" data-dismiss="modal">Übernehmen</button>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-primary" data-dismiss="modal">Übernehmen</button>
+                </div>
             </div>
         </div>
     </div>
-</div>
 }
 
 @if(AbstractModel.HasRightToViewCustomerSelectionInScheduler && AbstractModel.HasRightToInsertCustomerAppointments && Model.AllCustomers.Any())
@@ -616,7 +641,7 @@
                                 </button>
                             </div>
                         </div>
-                        
+
                         <div class="popup-list-item-container">
                             @foreach(var customer in Model.AllCustomers)
                             {
@@ -628,7 +653,7 @@
                                 </div>
                             }
                         </div>
-                        
+
                     </div>
                 </div>
                 <div class="modal-footer">

BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderPartial.cshtml

@@ -1,7 +1,19 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 @using BS.Shared.Extensions
 @model BeWoPlanerMobil.Models.SchedulerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script type="text/javascript">
     $(function () {
         $("#scheduler-interval-start-picker").datetimepicker({
@@ -144,7 +156,13 @@
     function selectTeamForIntervalFinder(teamOid) {
         try {
             $.get('@Url.Action("SelectTeamForIntervalFinder")', { teamOidString: teamOid }).done(
-                function(jsonResult) {
+                function (jsonResult) {
+                    if(false === checkJson(jsonResult)) {
+                        logWarning("selectTeamForIntervalFinder: Der zurückgegebene Wert ist kein gültiges JSON!");
+                        hideSpinner();
+                        return;
+                    }
+
                     var employeeOids = parseJason(jsonResult);
 
                     $("#employees-interval-finder-popup .popup-list-item-container input[type=checkbox]").map(function() {
@@ -170,240 +188,241 @@
 </script>
 
 <div id="interval-form-container">
-<div class="alert alert-danger collapse" role="alert" id="interval-finder-validation-alert"></div>
-@using(Html.BeginForm("FindFreeIntervals", "Scheduler", FormMethod.Post, new { id = "find-appointment-intervals-form", @class = "needs-validation", novalidate = true }))
-{
-    <div class="mt-3">
-    <div class="form-row">
-        <div class="col-7 mx-0 pr-1">
-            <div class="form-group mb-1 mr-0 pr-0">
-                <div class="input-group date" id="scheduler-interval-start-picker" data-target-input="nearest">
-                    <div class="input-group-prepend">
-                        <span class="input-group-text prepend-text px-2">
-                            Von
-                        </span>
-                    </div>
-                    <input value="@Model.IntervalStartDateStr" type="text" id="scheduler-interval-start" name="IntervalStart" class="form-control datetimepicker-input" data-target="#scheduler-interval-start-picker" data-toggle="datetimepicker"/>
-                    <div class="input-group-append" data-target="#scheduler-interval-start-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text px-2">
-                            <i class="fas fa-calendar-alt"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-5 mx-0 pl-0">
-            <div class="form-group mb-1 ml-0 pl-0">
-                <div class="input-group date" id="scheduler-interval-start-time-picker" data-target-input="nearest">
-                    <input value="@Model.IntervalStartTimeStr" type="text" id="scheduler-interval-start-time" name="IntervalStartTime" class="form-control datetimepicker-input" data-target="#scheduler-interval-start-time-picker"/>
-                    <div class="input-group-append" data-target="#scheduler-interval-start-time-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text px-2">
-                            <i class="fas fa-clock"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-row">
-        <div class="col-7 mx-0 pr-1">
-            <div class="form-group mb-1 ml-0 pl-0">
-                <div class="input-group date" id="scheduler-interval-end-picker" data-target-input="nearest">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text prepend-text px-2">
-                            Bis
-                        </div>
-                    </div>
-                    <input value="@Model.IntervalEndDateStr" type="text" id="scheduler-interval-end" name="IntervalEnd" class="form-control datetimepicker-input" data-target="#scheduler-interval-end-picker" data-toggle="datetimepicker"/>
-                    <div class="input-group-append" data-target="#scheduler-interval-end-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text px-2">
-                            <i class="fas fa-calendar-alt"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="col-5 mx-0 pl-0">
-            <div class="form-group mb-1 ml-0 pl-0">
-                <div class="input-group date" id="scheduler-interval-end-time-picker" data-target-input="nearest">
-                    <input value="@Model.IntervalEndTimeStr" type="text" id="scheduler-interval-end-time" name="IntervalEndTime" class="form-control datetimepicker-input" data-target="#scheduler-interval-end-time-picker"/>
-                    <div class="input-group-append" data-target="#scheduler-interval-end-time-picker" data-toggle="datetimepicker">
-                        <div class="input-group-text px-2">
-                            <i class="fas fa-clock"></i>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="form-row">
-        <div class="col-md">
-            <div class="form-group mb-1">
-                <div class="input-group">
-                    <div class="input-group-prepend">
-                        <div class="input-group-text prepend-text px-2">
-                            Dauer
-                        </div>
-                    </div>
-                    <input value="@Model.IntervalDurationStr" type="number" min="10" id="interval-duration" name="Duration" class="form-control"/>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    @if(Model.HasResourcesEmployeesOrCustomers)
+    <div class="alert alert-danger collapse" role="alert" id="interval-finder-validation-alert"></div>
+    @using(Html.BeginForm("FindFreeIntervals", "Scheduler", FormMethod.Post, new { id = "find-appointment-intervals-form", @class = "needs-validation", novalidate = true }))
     {
-        <!-- Hinzufügen-Buttons -->
-        <div class="form-row">
-            @if(AbstractModel.HasRightToViewEmployeeAppointments)
-            {
-                <div class="col-md">
-                    <div class="form-group my-1">
-                        <button type="button" class="btn btn-bewo-employee w-100" data-toggle="modal" data-target="#employees-interval-finder-popup">Mitarbeiter</button>
+        <div class="mt-3">
+            <div class="form-row">
+                <div class="col-7 mx-0 pr-1">
+                    <div class="form-group mb-1 mr-0 pr-0">
+                        <div class="input-group date" id="scheduler-interval-start-picker" data-target-input="nearest">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text prepend-text px-2">
+                                    Von
+                                </span>
+                            </div>
+                            <input value="@Model.IntervalStartDateStr" type="text" id="scheduler-interval-start" name="IntervalStart" class="form-control datetimepicker-input" data-target="#scheduler-interval-start-picker" data-toggle="datetimepicker" />
+                            <div class="input-group-append" data-target="#scheduler-interval-start-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text px-2">
+                                    <i class="fas fa-calendar-alt"></i>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
-            }
-            @if(AbstractModel.HasRightToViewCustomerAppointments)
-            {
-                <div class="col-md">
-                    <div class="form-group my-1">
-                        <button type="button" class="btn btn-bewo-customers w-100" data-toggle="modal" data-target="#customers-interval-finder-popup">Klienten</button>
+                <div class="col-5 mx-0 pl-0">
+                    <div class="form-group mb-1 ml-0 pl-0">
+                        <div class="input-group date" id="scheduler-interval-start-time-picker" data-target-input="nearest">
+                            <input value="@Model.IntervalStartTimeStr" type="text" id="scheduler-interval-start-time" name="IntervalStartTime" class="form-control datetimepicker-input" data-target="#scheduler-interval-start-time-picker" />
+                            <div class="input-group-append" data-target="#scheduler-interval-start-time-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text px-2">
+                                    <i class="fas fa-clock"></i>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
-            }
-            @if(AbstractModel.HasRightToViewAllResourceAppointments && Model.ResourceCategories2Resources.Any())
-            {
-                <div class="col-md">
-                    <div class="form-group my-1">
-                        <button type="button" class="btn btn-bewo-resource w-100" data-toggle="modal" data-target="#resources-interval-finder-popup">Ressourcen</button>
-                    </div>
-                </div>
-            }
-        </div>
-
-        <div class="form-row">
-            @if(AbstractModel.HasRightToViewEmployeeAppointments)
-            {
-                <div class="col-12">
-                    <div class="form-group my-1">
-                        <div class="list-group" id="selected-employees-interval-finder-list">
-                            @foreach(var selectedEmployee in Model.SelectedEmployeesForIntervalFinder)
-                            {
-                                <div class="list-group-item my-auto" id="related-employee-interval-finder-@selectedEmployee.EmployeeOid">
-                                    <div class="row">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <i class="fas fa-user text-bewo-employee h-100"></i>
-                                            </div>
-                                            <p class="form-control border-0 bg-transparent text-truncate">
-                                                @selectedEmployee.DetailDescription
-                                            </p>
-                                            <div class="input-group-append">
-                                                @{
-                                                    var url = Url.Action("SelectEmployeesForIntervalFinder", "Scheduler");
-                                                    var oid = selectedEmployee.EmployeeOid;
-
-                                                    var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler");
-
-                                                    var onClickParams = $"{oid}, '-interval-finder-checkbox', false, '{url}', 'employees-interval-finder-popup', 'employees-interval-finder-popup', 'related-employee-interval-finder-', '{filterAppointmentsUrl}'";
-                                                }
-
-                                                <button type="button" class="btn btn-primary" onclick="removeSelectedItem(@onClickParams)">
-                                                    <span class="fas fa-times-circle"></span>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
-            @if(AbstractModel.HasRightToViewCustomerAppointments)
-            {
-                <div class="col-12">
-                    <div class="form-group my-1">
-                        <div class="list-group" id="selected-customers-interval-finder-list">
-                            @foreach(var selectedCustomer in Model.SelectedCustomersForIntervalFinder)
-                            {
-                                <div class="list-group-item my-auto" id="related-customer-interval-finder-@selectedCustomer.CustomerOid">
-                                    <div class="row">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <i class="fas fa-user text-bewo-customers h-100"></i>
-                                            </div>
-                                            <p class="form-control border-0 bg-transparent text-truncate">
-                                                @selectedCustomer.DetailDescription
-                                            </p>
-                                            <div class="input-group-append">
-                                                @{
-                                                    var url = Url.Action("SelectCustomersForIntervalFinder", "Scheduler");
-                                                    var oid = selectedCustomer.CustomerOid;
-
-                                                    var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler");
-
-                                                    var onClickParams = $"{oid}, '-interval-finder-checkbox', false, '{url}', 'customers-interval-finder-popup', 'customers-interval-finder-popup', 'related-customer-interval-finder-', '{filterAppointmentsUrl}'";
-                                                }
-                                                <button type="button" class="btn btn-primary" onclick="removeSelectedItem(@onClickParams)">
-                                                    <span class="fas fa-times-circle"></span>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
-                    </div>
-                </div>
-            }
-            @if(AbstractModel.HasRightToViewAllResourceAppointments && Model.ResourceCategories2Resources.Any())
-            {
-                <div class="col-12">
-                    <div class="form-group my-1">
-                        <div class="list-group" id="selected-resources-interval-finder-list">
-                            @foreach(var selectedResource in Model.SelectedResourcesForIntervalFinder)
-                            {
-                                <div class="list-group-item my-auto" id="related-resource-interval-finder-item-@selectedResource.ResourceOid">
-                                    <div class="row">
-                                        <div class="input-group">
-                                            <div class="input-group-prepend">
-                                                <i class="fas fa-cubes text-bewo-resource h-100"></i>
-                                            </div>
-                                            <p class="form-control border-0 bg-transparent text-truncate">
-                                                @selectedResource.Name
-                                            </p>
-                                            <div class="input-group-append">
-                                                <button type="button" class="btn btn-primary" onclick="removeSelectedResource('related-resource-interval-finder-item-@selectedResource.ResourceOid', 'resource-@selectedResource.ResourceOid-interval-finder-checkbox', 'resources-interval-finder-popup', '@Url.Action("SelectResourcesForIntervalFinder", "Scheduler")', 'selected-resources-interval-finder-list', '@Url.Action("FetchAppointments", "Scheduler")', 'related-resource-interval-finder-item-', '-interval-finder-checkbox', 'all-resources-for-interval-finder-checkbox')"><span class="fas fa-times-circle"></span>
-                                                </button>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            }
-                        </div>
+            </div>
+            <div class="form-row">
+                <div class="col-7 mx-0 pr-1">
+                    <div class="form-group mb-1 ml-0 pl-0">
+                        <div class="input-group date" id="scheduler-interval-end-picker" data-target-input="nearest">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text prepend-text px-2">
+                                    Bis
+                                </div>
+                            </div>
+                            <input value="@Model.IntervalEndDateStr" type="text" id="scheduler-interval-end" name="IntervalEnd" class="form-control datetimepicker-input" data-target="#scheduler-interval-end-picker" data-toggle="datetimepicker" />
+                            <div class="input-group-append" data-target="#scheduler-interval-end-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text px-2">
+                                    <i class="fas fa-calendar-alt"></i>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
+                <div class="col-5 mx-0 pl-0">
+                    <div class="form-group mb-1 ml-0 pl-0">
+                        <div class="input-group date" id="scheduler-interval-end-time-picker" data-target-input="nearest">
+                            <input value="@Model.IntervalEndTimeStr" type="text" id="scheduler-interval-end-time" name="IntervalEndTime" class="form-control datetimepicker-input" data-target="#scheduler-interval-end-time-picker" />
+                            <div class="input-group-append" data-target="#scheduler-interval-end-time-picker" data-toggle="datetimepicker">
+                                <div class="input-group-text px-2">
+                                    <i class="fas fa-clock"></i>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="form-row">
+                <div class="col-md">
+                    <div class="form-group mb-1">
+                        <div class="input-group">
+                            <div class="input-group-prepend">
+                                <div class="input-group-text prepend-text px-2">
+                                    Dauer
+                                </div>
+                            </div>
+                            <input value="@Model.IntervalDurationStr" type="number" min="10" id="interval-duration" name="Duration" class="form-control" />
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            @if(Model.HasResourcesEmployeesOrCustomers)
+            {
+                <!-- Hinzufügen-Buttons -->
+                <div class="form-row">
+                    @if(AbstractModel.HasRightToViewEmployeeAppointments)
+                    {
+                        <div class="col-md">
+                            <div class="form-group my-1">
+                                <button type="button" class="btn btn-bewo-employee w-100" data-toggle="modal" data-target="#employees-interval-finder-popup">Mitarbeiter</button>
+                            </div>
+                        </div>
+                    }
+                    @if(AbstractModel.HasRightToViewCustomerAppointments)
+                    {
+                        <div class="col-md">
+                            <div class="form-group my-1">
+                                <button type="button" class="btn btn-bewo-customers w-100" data-toggle="modal" data-target="#customers-interval-finder-popup">Klienten</button>
+                            </div>
+                        </div>
+                    }
+                    @if(AbstractModel.HasRightToViewAllResourceAppointments && Model.ResourceCategories2Resources.Any())
+                    {
+                        <div class="col-md">
+                            <div class="form-group my-1">
+                                <button type="button" class="btn btn-bewo-resource w-100" data-toggle="modal" data-target="#resources-interval-finder-popup">Ressourcen</button>
+                            </div>
+                        </div>
+                    }
+                </div>
+
+                <div class="form-row">
+                    @if(AbstractModel.HasRightToViewEmployeeAppointments)
+                    {
+                        <div class="col-12">
+                            <div class="form-group my-1">
+                                <div class="list-group" id="selected-employees-interval-finder-list">
+                                    @foreach(var selectedEmployee in Model.SelectedEmployeesForIntervalFinder)
+                                    {
+                                        <div class="list-group-item my-auto" id="related-employee-interval-finder-@selectedEmployee.EmployeeOid">
+                                            <div class="row">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <i class="fas fa-user text-bewo-employee h-100"></i>
+                                                    </div>
+                                                    <p class="form-control border-0 bg-transparent text-truncate">
+                                                        @selectedEmployee.DetailDescription
+                                                    </p>
+                                                    <div class="input-group-append">
+                                                        @{
+                                                            var url = Url.Action("SelectEmployeesForIntervalFinder", "Scheduler");
+                                                            var oid = selectedEmployee.EmployeeOid;
+
+                                                            var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler");
+
+                                                            var onClickParams = $"{oid}, '-interval-finder-checkbox', false, '{url}', 'employees-interval-finder-popup', 'employees-interval-finder-popup', 'related-employee-interval-finder-', '{filterAppointmentsUrl}'";
+                                                        }
+
+                                                        <button type="button" class="btn btn-primary" onclick="removeSelectedItem(@onClickParams)">
+                                                            <span class="fas fa-times-circle"></span>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if(AbstractModel.HasRightToViewCustomerAppointments)
+                    {
+                        <div class="col-12">
+                            <div class="form-group my-1">
+                                <div class="list-group" id="selected-customers-interval-finder-list">
+                                    @foreach(var selectedCustomer in Model.SelectedCustomersForIntervalFinder)
+                                    {
+                                        <div class="list-group-item my-auto" id="related-customer-interval-finder-@selectedCustomer.CustomerOid">
+                                            <div class="row">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <i class="fas fa-user text-bewo-customers h-100"></i>
+                                                    </div>
+                                                    <p class="form-control border-0 bg-transparent text-truncate">
+                                                        @selectedCustomer.DetailDescription
+                                                    </p>
+                                                    <div class="input-group-append">
+                                                        @{
+                                                            var url = Url.Action("SelectCustomersForIntervalFinder", "Scheduler");
+                                                            var oid = selectedCustomer.CustomerOid;
+
+                                                            var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler");
+
+                                                            var onClickParams = $"{oid}, '-interval-finder-checkbox', false, '{url}', 'customers-interval-finder-popup', 'customers-interval-finder-popup', 'related-customer-interval-finder-', '{filterAppointmentsUrl}'";
+                                                        }
+                                                        <button type="button" class="btn btn-primary" onclick="removeSelectedItem(@onClickParams)">
+                                                            <span class="fas fa-times-circle"></span>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    }
+                    @if(AbstractModel.HasRightToViewAllResourceAppointments && Model.ResourceCategories2Resources.Any())
+                    {
+                        <div class="col-12">
+                            <div class="form-group my-1">
+                                <div class="list-group" id="selected-resources-interval-finder-list">
+                                    @foreach(var selectedResource in Model.SelectedResourcesForIntervalFinder)
+                                    {
+                                        <div class="list-group-item my-auto" id="related-resource-interval-finder-item-@selectedResource.ResourceOid">
+                                            <div class="row">
+                                                <div class="input-group">
+                                                    <div class="input-group-prepend">
+                                                        <i class="fas fa-cubes text-bewo-resource h-100"></i>
+                                                    </div>
+                                                    <p class="form-control border-0 bg-transparent text-truncate">
+                                                        @selectedResource.Name
+                                                    </p>
+                                                    <div class="input-group-append">
+                                                        <button type="button" class="btn btn-primary" onclick="removeSelectedResource('related-resource-interval-finder-item-@selectedResource.ResourceOid', 'resource-@selectedResource.ResourceOid-interval-finder-checkbox', 'resources-interval-finder-popup', '@Url.Action("SelectResourcesForIntervalFinder", "Scheduler")', 'selected-resources-interval-finder-list', '@Url.Action("FetchAppointments", "Scheduler")', 'related-resource-interval-finder-item-', '-interval-finder-checkbox', 'all-resources-for-interval-finder-checkbox')">
+                                                            <span class="fas fa-times-circle"></span>
+                                                        </button>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    }
+                                </div>
+                            </div>
+                        </div>
+                    }
+                </div>
             }
         </div>
+        <button type="submit" class="d-none" id="hidden-submit-btn"></button>
     }
+    <div class="d-flex bd-highlight mt-3">
+        <div class="mr-auto bd-highlight">
+            @using(Html.BeginForm("SetIsInIntervalFinderMode", "Scheduler", FormMethod.Post))
+            {
+                <button type="submit" onclick="showSpinner()" class="btn btn-primary">Zurück</button>
+            }
+        </div>
+        <div class="ml-3 bd-highlight">
+            <button type="button" class="btn btn-primary" id="reset-interval-finder-button" onclick="resetIntervalFinderForm()">Abbrechen</button>
+        </div>
+        <div class="ml-3 bd-highlight">
+            <button type="button" class="btn btn-primary" id="find-interval-finder-button" onclick="submitIntervalFinderForm()">Intervalle Prüfen</button>
+        </div>
     </div>
-    <button type="submit" class="d-none" id="hidden-submit-btn"></button>
-}
-<div class="d-flex bd-highlight mt-3">
-    <div class="mr-auto bd-highlight">
-        @using(Html.BeginForm("SetIsInIntervalFinderMode", "Scheduler", FormMethod.Post))
-        {
-            <button type="submit" onclick="showSpinner()" class="btn btn-primary">Zurück</button>
-        }
-    </div>
-    <div class="ml-3 bd-highlight">
-        <button type="button" class="btn btn-primary" id="reset-interval-finder-button" onclick="resetIntervalFinderForm()">Abbrechen</button>
-    </div>
-    <div class="ml-3 bd-highlight">
-        <button type="button" class="btn btn-primary" id="find-interval-finder-button" onclick="submitIntervalFinderForm()">Intervalle Prüfen</button>
-    </div>
-</div>
 </div>
 
 @if(AbstractModel.HasRightToViewAllResourceAppointments && Model.ResourceCategories2Resources.Any())
@@ -457,10 +476,10 @@
                                         {
                                             var checkedValue = Model.SelectedResourcesForIntervalFinder.Contains(resource) ? "checked" : string.Empty;
 
-                                        <div class="custom-control custom-checkbox resource-text">
-                                            <input type="checkbox" class="custom-control-input" id="resource-@resource.ResourceOid-interval-finder-checkbox" @checkedValue onchange="changeResourceSelection('resources-interval-finder-popup', '@Url.Action("SelectResourcesForIntervalFinder", "Scheduler")', 'selected-resources-interval-finder-list', 'related-resource-interval-finder-item-', '-interval-finder-checkbox', '@Url.Action("FetchAppointments", "Scheduler")', 'all-resources-for-interval-finder-checkbox')" />
-                                            <label class="custom-control-label resource-name-label" for="resource-@resource.ResourceOid-interval-finder-checkbox">@resource.Name</label>
-                                        </div>
+                                            <div class="custom-control custom-checkbox resource-text">
+                                                <input type="checkbox" class="custom-control-input" id="resource-@resource.ResourceOid-interval-finder-checkbox" @checkedValue onchange="changeResourceSelection('resources-interval-finder-popup', '@Url.Action("SelectResourcesForIntervalFinder", "Scheduler")', 'selected-resources-interval-finder-list', 'related-resource-interval-finder-item-', '-interval-finder-checkbox', '@Url.Action("FetchAppointments", "Scheduler")', 'all-resources-for-interval-finder-checkbox')" />
+                                                <label class="custom-control-label resource-name-label" for="resource-@resource.ResourceOid-interval-finder-checkbox">@resource.Name</label>
+                                            </div>
                                         }
                                     </div>
                                 </div>
@@ -496,21 +515,21 @@
                                         @{
                                             var allEmployeesCheckedVal = Model.AllEmployees.AreListEqual(Model.SelectedEmployeesForIntervalFinder) ? "checked" : string.Empty;
                                         }
-                                        
-                                        <input type="checkbox" class="custom-control-input" id="all-employees-for-interval-finder-checkbox" @allEmployeesCheckedVal 
+
+                                        <input type="checkbox" class="custom-control-input" id="all-employees-for-interval-finder-checkbox" @allEmployeesCheckedVal
                                                onchange="selectAllCheckboxOnChange('all-employees-for-interval-finder-checkbox', '@Url.Action("SelectEmployeesForIntervalFinder", "Scheduler")', 'employees-interval-finder-popup', 'selected-employees-interval-finder-list', 'related-employee-interval-finder-', false, '-interval-finder-checkbox', '@Url.Action("FetchAppointments", "Scheduler")', '')" />
                                         <label class="custom-control-label" for="all-employees-for-interval-finder-checkbox">Alle</label>
                                     </div>
                                 </div>
                             </div>
-                            <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="listSearchOnChange('interval-finder-employee-search-input', 'interval-finder-employee-text', 'interval-finder-employee-name-label')" id="interval-finder-employee-search-input"/>
+                            <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="listSearchOnChange('interval-finder-employee-search-input', 'interval-finder-employee-text', 'interval-finder-employee-name-label')" id="interval-finder-employee-search-input" />
                             <div class="input-group-append">
                                 <button type="button" class="btn btn-outline-secondary" onclick="resetSearch('interval-finder-employee-search-input', 'interval-finder-employee-text')">
                                     <span class="fas fa-times-circle"></span>
                                 </button>
                             </div>
                         </div>
-                        
+
                         @if(AbstractModel.HasRightToViewTeams)
                         {
                             <div class="card w-100 mb-3">
@@ -534,7 +553,7 @@
 
                             <hr />
                         }
-                        
+
                         <div class="popup-list-item-container">
                             @foreach(var employee in Model.AllEmployees)
                             {
@@ -543,7 +562,7 @@
                                 var url = Url.Action("SelectEmployeesForIntervalFinder", "Scheduler");
 
                                 var filterAppointmentsUrl = Url.Action("FetchAppointments", "Scheduler");
-                                
+
                                 var onClickParams = $"'{url}', 'employees-interval-finder-popup', 'selected-employees-interval-finder-list', 'related-employee-interval-finder-', false, '-interval-finder-checkbox', '{filterAppointmentsUrl}', '', getTeamMemberOids(), 'all-employees-for-interval-finder-checkbox'";
 
                                 <div class="custom-control custom-checkbox interval-finder-employee-text">
@@ -581,7 +600,7 @@
                                     @{
                                         var allCustomersCheckedVal = Model.AllCustomers.AreListEqual(Model.SelectedCustomersForIntervalFinder) ? "checked" : string.Empty;
                                     }
-                                    
+
                                     <div class="custom-control custom-checkbox custom-control-inline mx-auto">
                                         <input type="checkbox" class="custom-control-input" id="all-customers-for-interval-finder-checkbox" @allCustomersCheckedVal
                                                onchange="selectAllCheckboxOnChange('all-customers-for-interval-finder-checkbox', '@Url.Action("SelectCustomersForIntervalFinder")', 'customers-interval-finder-popup', 'selected-customers-interval-finder-list', 'related-customer-interval-finder-', true, '-interval-finder-checkbox', '@Url.Action("FetchAppointments")', '')" />
@@ -589,14 +608,14 @@
                                     </div>
                                 </div>
                             </div>
-                            <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="listSearchOnChange('interval-finder-customer-search-input', 'interval-finder-customer-text', 'interval-finder-customer-name-label')" id="interval-finder-customer-search-input"/>
+                            <input class="form-control w-100" type="text" placeholder="Suchen..." oninput="listSearchOnChange('interval-finder-customer-search-input', 'interval-finder-customer-text', 'interval-finder-customer-name-label')" id="interval-finder-customer-search-input" />
                             <div class="input-group-append">
                                 <button type="button" class="btn btn-outline-secondary" onclick="resetSearch('interval-finder-customer-search-input', 'interval-finder-customer-text')">
                                     <span class="fas fa-times-circle"></span>
                                 </button>
                             </div>
                         </div>
-                        
+
                         <div class="popup-list-item-container">
                             @foreach(var customer in Model.AllCustomers)
                             {
@@ -609,7 +628,7 @@
                                 var onClickParams = $"'{url}', 'customers-interval-finder-popup', 'selected-customers-interval-finder-list', 'related-customer-interval-finder-', true, '-interval-finder-checkbox', '{filterAppointmentsUrl}', '', getTeamMemberOids(), 'all-customers-for-interval-finder-checkbox'";
 
                                 <div class="custom-control custom-checkbox interval-finder-customer-text">
-                                    <input type="checkbox" class="custom-control-input" id="customer-@customer.CustomerOid-interval-finder-checkbox" @checkedValue onchange="changeItemListSelection(@onClickParams)"/>
+                                    <input type="checkbox" class="custom-control-input" id="customer-@customer.CustomerOid-interval-finder-checkbox" @checkedValue onchange="changeItemListSelection(@onClickParams)" />
                                     <label class="custom-control-label interval-finder-customer-name-label" for="customer-@customer.CustomerOid-interval-finder-checkbox">@customer.DetailDescription</label>
                                 </div>
                             }

BeWoPlanerMobil/Views/Scheduler/AppointmentIntervalFinderResultPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.SchedulerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.SchedulerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 @if(Model.FreeIntervals.Count > 0)
 {
@@ -23,22 +35,22 @@
                                         @foreach(var dts in kv.Value)
                                         {
                                             <div class="list-group-item my-auto">
-                                                    @using(Html.BeginForm("SelectIntervalForForm", "Scheduler", FormMethod.Post))
-                                                    {
-                                                        <div class="input-group">
-                                                            <p class="form-control border-0 bg-transparent">
-                                                                @dts.StartDate.ToString("HH:mm") - @dts.EndDate.ToString("HH:mm")
-                                                            </p>
+                                                @using(Html.BeginForm("SelectIntervalForForm", "Scheduler", FormMethod.Post))
+                                                {
+                                                    <div class="input-group">
+                                                        <p class="form-control border-0 bg-transparent">
+                                                            @dts.StartDate.ToString("HH:mm") - @dts.EndDate.ToString("HH:mm")
+                                                        </p>
 
-                                                            <div class="input-group-append">
-                                                                <button class="btn btn-primary" type="submit" onclick="showSpinner()">
-                                                                    <span class="far fa-calendar-plus"></span>
-                                                                </button>
-                                                            </div>
+                                                        <div class="input-group-append">
+                                                            <button class="btn btn-primary" type="submit" onclick="showSpinner()">
+                                                                <span class="far fa-calendar-plus"></span>
+                                                            </button>
                                                         </div>
-                                                        <input type="hidden" value="@dts.StartDate.ToString("dd.MM.yyyy HH:mm")" name="startDate"/>
-                                                        <input type="hidden" value="@dts.EndDate.ToString("dd.MM.yyyy HH:mm")" name="endDate"/>
-                                                    }
+                                                    </div>
+                                                    <input type="hidden" value="@dts.StartDate.ToString("dd.MM.yyyy HH:mm")" name="startDate" />
+                                                    <input type="hidden" value="@dts.EndDate.ToString("dd.MM.yyyy HH:mm")" name="endDate" />
+                                                }
                                             </div>
                                         }
                                     </div>

BeWoPlanerMobil/Views/Scheduler/CustomerFilterSelectionPartial.cshtml

@@ -1,7 +1,19 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 
 @model SchedulerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script>
     function resetCustomerSearchForFiltering() {
         try {

BeWoPlanerMobil/Views/Scheduler/CustomerFilteringModalContentPartial.cshtml

@@ -1,6 +1,18 @@
-@using BS.Shared.Extensions
+@using BeWoPlanerMobil.Util
+@using BS.Shared.Extensions
 @model BeWoPlanerMobil.Models.SchedulerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <!-- Suche -->
 <div class="input-group mb-3">
     <div class="input-group-prepend">
@@ -27,8 +39,8 @@
 <!-- !Suche -->
 @foreach(var customer in Model.AllCustomers)
 {
-    var customerNameWithAlias = string.IsNullOrEmpty(customer.CustomerAlias) ? 
-        customer.DetailDescription : 
+    var customerNameWithAlias = string.IsNullOrEmpty(customer.CustomerAlias) ?
+        customer.DetailDescription :
         $"{customer.LastName}, {customer.FirstName} ({customer.CustomerAlias})";
 
     var checkedValue = Model.SelectedCustomersForFiltering.Contains(customer) ? "checked" : string.Empty;

BeWoPlanerMobil/Views/Scheduler/EmployeeFilteringModalContentPartial.cshtml

@@ -1,7 +1,19 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 @using BS.Shared.Extensions
 @model BeWoPlanerMobil.Models.SchedulerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <!-- Suche -->
 <div class="input-group mb-3">
     <div class="input-group-prepend">
@@ -26,7 +38,6 @@
     </div>
 </div>
 <!-- !Suche -->
-
 <!-- Meine Teams -->
 @if(AbstractModel.HasRightToViewTeams)
 {

BeWoPlanerMobil/Views/Scheduler/EmployeeForFilteringPartial.cshtml

@@ -1,7 +1,19 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 
 @model SchedulerModel
 
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
+
 <script>
     function resetEmployeeSearchForFiltering() {
         try {
@@ -82,9 +94,9 @@
 
             $.get('@Url.Action("SelectEmployeesForAppointmentFiltering")', { oidString: oidStr }).done(function (employeeCount) {
                 updateEmployeeForFilteringPopup();
-                
+
                 $("#one-day-scheduler-partial-container").load('@Url.Action("FetchAppointments")');
-                
+
                 $("#employe-count2").text(employeeCount);
             });
         } catch (error) {

BeWoPlanerMobil/Views/Scheduler/FiveDaySchedulerPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.SchedulerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.SchedulerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <div class="row">
     <div class="five-day-card py-1">
@@ -16,7 +28,7 @@
             <div class="collapse show" id="collapse-calendar-monday">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.MondayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.MondayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -25,7 +37,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -34,7 +46,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -44,24 +56,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -72,9 +84,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -112,7 +124,7 @@
             <div class="collapse show" id="collapse-calendar-tuesday">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.TuesdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.TuesdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -121,7 +133,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -130,7 +142,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -140,24 +152,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -168,9 +180,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -208,7 +220,7 @@
             <div class="collapse show" id="collapse-calendar-wednesday">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.WednesdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.WednesdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -217,7 +229,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -226,7 +238,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -236,24 +248,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -264,9 +276,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -304,7 +316,7 @@
             <div class="collapse show" id="collapse-calendar-thursday">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.ThursdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.ThursdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -313,7 +325,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -322,7 +334,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -332,24 +344,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -360,9 +372,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -400,7 +412,7 @@
             <div class="collapse show" id="collapse-calendar-friday">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.FridayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.FridayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -409,7 +421,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -418,7 +430,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -428,24 +440,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -456,9 +468,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Identifier) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -482,4 +494,4 @@
         </div>
     </div>
 </div>
-    
+

BeWoPlanerMobil/Views/Scheduler/OneDaySchedulerPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.SchedulerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.SchedulerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <script>
     function deleteAppointment(appointmentOid, appointmentIdentifier, isException, subject) {
@@ -105,7 +117,7 @@
                                     <i class="fas fa-slash fa-stack-1x text-secondary"></i>
                                 </span>
                             }
-                            
+
                             @if(appointment.HasServiceRecord)
                             {
                                 <i class="ml-2 fas fa-clock text-bewo-service-records"></i>
@@ -167,8 +179,8 @@
                                             </span>
                                         </button>
                                     </div>
-                                    
-                                    @using(Html.BeginForm("TransformAppointmentToServiceRecord", "Scheduler", FormMethod.Post, new {id="transformAppToServiceRecForm-" + appointment.Identifier}))
+
+                                    @using(Html.BeginForm("TransformAppointmentToServiceRecord", "Scheduler", FormMethod.Post, new { id = "transformAppToServiceRecForm-" + appointment.Identifier }))
                                     {
                                         <input type="hidden" value="@appointment.Identifier" name="appointment-id-input" />
                                     }
@@ -214,7 +226,7 @@
                                 <i class="fas fa-slash fa-stack-1x text-secondary"></i>
                             </span>
                         }
-                        
+
                         @if(appointment.HasServiceRecord)
                         {
                             <i class="ml-1 fas fa-clock text-bewo-service-records"></i>
@@ -269,7 +281,7 @@
                                         </div>
                                     }
                                 }
-                                
+
                                 <div class="col-auto">
                                     <button type="button" class="btn btn-primary" onclick="deleteAppointment(@(appointment.Oid ?? 0), '@appointment.Identifier', @appointment.IsException.ToString().ToLower(), '@appointment.Subject')">
                                         <span class="fas fa-trash-alt"></span>
@@ -284,8 +296,8 @@
                                     </button>
                                 </div>
                             </div>
-                            
-                            using(Html.BeginForm("TransformAppointmentToServiceRecord", "Scheduler", FormMethod.Post, new {id="transformAppToServiceRecForm-" + appointment.Identifier}))
+
+                            using(Html.BeginForm("TransformAppointmentToServiceRecord", "Scheduler", FormMethod.Post, new { id = "transformAppToServiceRecForm-" + appointment.Identifier }))
                             {
                                 <input type="hidden" value="@appointment.Identifier" name="appointment-id-input" />
                             }

BeWoPlanerMobil/Views/Scheduler/Scheduler.cshtml

@@ -1,9 +1,19 @@
 @using BeWoPlanerMobil.Models
+@using BeWoPlanerMobil.Util
 @using BS.Shared.Extensions
 
 @model SchedulerModel
 @{
     ViewBag.Title = "BeWoPlaner Mobil";
+
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
 }
 
 <script>

BeWoPlanerMobil/Views/Scheduler/SevenDaySchedulerPartial.cshtml

@@ -1,4 +1,16 @@
-@model BeWoPlanerMobil.Models.SchedulerModel
+@using BeWoPlanerMobil.Util
+@model BeWoPlanerMobil.Models.SchedulerModel
+
+@{
+    if(TempData[TempDataConstants.DoLogoutKey] is bool doLogout && doLogout)
+    {
+        <text>
+            <script type="text/javascript">
+                $("#second-logout-form").submit();
+            </script>
+        </text>
+    }
+}
 
 <div class="row">
     <div class="seven-day-card">
@@ -16,7 +28,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-monday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.MondayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.MondayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -25,7 +37,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -34,7 +46,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -44,24 +56,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -72,9 +84,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -112,7 +124,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-tuesday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.TuesdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.TuesdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -121,7 +133,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -130,7 +142,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -140,24 +152,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -168,9 +180,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -208,7 +220,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-wednesday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.WednesdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.WednesdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -217,7 +229,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -226,7 +238,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -236,24 +248,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -264,9 +276,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -304,7 +316,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-thursday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.ThursdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.ThursdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -313,7 +325,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -322,7 +334,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -332,24 +344,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -360,9 +372,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -400,7 +412,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-friday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.FridayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.FridayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -409,7 +421,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -418,7 +430,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -428,24 +440,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -456,9 +468,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -496,7 +508,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-saturday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.SaturdayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.SaturdayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -505,7 +517,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -514,7 +526,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -524,24 +536,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -552,9 +564,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">
@@ -592,7 +604,7 @@
             <div class="collapse week-view-show" id="collapse-calendar-sunday-7">
                 <div class="card-body">
                     <div class="container-fluid px-0">
-                        @foreach (var appointment in Model.WeekViewObject.SundayAppointments.Value)
+                        @foreach(var appointment in Model.WeekViewObject.SundayAppointments.Value)
                         {
                             <div class="card w-100 mb-3">
                                 <div class="card-header border-left appointment-header" onclick="cardHeaderClick('#chevron-appointment-@appointment.Identifier', '#collapse-appointment-@appointment.Identifier')">
@@ -601,7 +613,7 @@
                                     </div>
                                     <div class="p2 d-inline-flex text-primary h-100">
                                         <button type="button" class="btn btn-link">
-                                            @if (appointment.IsTask)
+                                            @if(appointment.IsTask)
                                             {
                                                 <span class="text-bewo-task-red">@appointment.DateTimeInfo</span>
                                             }
@@ -610,7 +622,7 @@
                                                 <span>@appointment.DateTimeInfo</span>
                                             }
 
-                                            @if (appointment.Oid == null)
+                                            @if(appointment.Oid == null)
                                             {
                                                 <i class="ml-2 fas fa-sync-alt text-secondary"></i>
                                             }
@@ -620,24 +632,24 @@
                                 <div class="collapse" id="collapse-appointment-@appointment.Identifier">
                                     <div class="card-body">
                                         <div class="container-fluid">
-                                            @if (appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
+                                            @if(appointment.HasEmployeesCustomersOrResources && !appointment.IsTask)
                                             {
                                                 <div class="row">
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.EmployeeListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-employee"></i>
                                                             @appointment.EmployeeListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.CustomerListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-user text-bewo-customers"></i>
                                                             @appointment.CustomerListInfo
                                                         </div>
                                                     }
-                                                    @if (!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
+                                                    @if(!string.IsNullOrWhiteSpace(appointment.ResourceListInfo))
                                                     {
                                                         <div class="col col-12 col-md-@appointment.ColSize">
                                                             <i class="fas fa-cubes text-bewo-resource"></i>
@@ -648,9 +660,9 @@
                                                 <hr />
                                             }
 
-                                            @if (Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
+                                            @if(Model.HasRightToEditAppointment(appointment.Oid) && !appointment.IsTask && appointment.Oid.HasValue)
                                             {
-                                                using (Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
+                                                using(Html.BeginForm("SelectAppointmentToEdit", "Scheduler", FormMethod.Post))
                                                 {
                                                     <div class="row mb-3">
                                                         <div class="col-auto">

BeWoPlanerMobil/Views/Shared/_Layout.cshtml

@@ -54,7 +54,6 @@
     <script src="@Scripts.Url("~/Scripts/tempusdominus-boostrap-4.min.js")" type="text/javascript"></script>
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/mobileUtils.js")" type="text/javascript"></script>
 
-    <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/group-booking.js")" type="text/javascript"></script>
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/view-scripts/main.js")" type="text/javascript"></script>
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/signature.js")" type="text/javascript"></script>
 
@@ -72,7 +71,7 @@
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/service-record-time-calc.js")" type="text/javascript"></script>
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/js-helper.js")" type="text/javascript"></script>
     <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/logging.js")" type="text/javascript"></script>
-    <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/password-security.js")" type="text/javascript"></script>
+    <script src="@Scripts.Url("~/Scripts/ownSoft-Scripts/utils/MoKPasswordSecurity.js")" type="text/javascript"></script>
 
     <script type="text/javascript" src="@Scripts.Url("~/Scripts/devexpress-dependencies/devextreme/dx.all.js")"></script>
     
@@ -113,8 +112,6 @@
                 return;
             }
 
-            alert(`<<${event.message}>>`);
-
             configureErrorPopup(textToShow);
         });
 
@@ -188,7 +185,6 @@
                         return;
                     }
 
-                    //this.setAttribute("style", "height:" + (this.scrollHeight) + "px;overflow-y:hidden;");
                     this.setAttribute("style", "height:"+(this.scrollHeight) + "px;overflow-y:scroll;");
                 }).on("input", function () {
                     this.style.height = 0;
@@ -315,10 +311,12 @@
                 var smallPrependInputGroupTextWidth = getMaxWidth("sm-prepend-input-group-text");
                 var documentWidth = $(document).width();
 
-                $(".prepend-input-group-text").width(getMaxWidth("prepend-input-group-text"));
+                var prependInputGroupTextWidth = getMaxWidth("prepend-input-group-text");
+
+                $(".prepend-input-group-text").width(prependInputGroupTextWidth);
 
                 if(documentWidth < 768 && $.isNumeric(smallPrependInputGroupTextWidth)) {
-                    $(".sm-prepend-input-group-text").width(getMaxWidth("prepend-input-group-text"));
+                    $(".sm-prepend-input-group-text").width(prependInputGroupTextWidth);
                 } else if($.isNumeric(smallPrependInputGroupTextWidth)) {
                     $(".sm-prepend-input-group-text").width(initialVonWidth);
                 }
@@ -329,7 +327,7 @@
 
         function getMaxWidth(elementClassName) {
             try {
-                return Math.max.apply(Math, $('.' + elementClassName).map(function () { return $(this).width(); }).get());
+                return Math.max.apply(Math, $(`.${elementClassName}`).map(function () { return $(this).width(); }).get());
             } catch (error) {
                 showErrorPopup(error);
             }
@@ -337,7 +335,15 @@
 
         function getMaxElementHeight(elementClassName) {
             try {
-                return Math.max.apply(Math, $('.' + elementClassName).map(function () { return $(this).height(); }).get());
+                return Math.max.apply(Math, $(`.${elementClassName}`).map(function () { return $(this).height(); }).get());
+            } catch (error) {
+                showErrorPopup(error);
+            }
+        }
+
+        function toggleMultiBookingForm(shouldDisable) {
+            try {
+                $("#multi-booking-employees-button, #category-select, #leistung-select, #mb-start-date, #mb-end-date, #mb-start-time, #mb-end-time, #mb-duration, #mb-distance, textarea, #mb-reset-button, #mb-create-button, #mb-textbausteine-button, #mb-hours-minutes-dropdown-btn, #mb-marker-cb").prop("disabled", shouldDisable);
             } catch (error) {
                 showErrorPopup(error);
             }
@@ -345,219 +351,224 @@
     </script>
 </head>
 <body>
-    
-@if(MobileSessionFacade.IsUserLoggedIn())
-{
-    using(Html.BeginForm("LogOutAfterSessionTimeout", "Main", FormMethod.Post, new { id = "logout-form", css = "display:none;" }))
+
+    @if(MobileSessionFacade.IsUserLoggedIn())
+    {
+        using(Html.BeginForm("LogOutAfterSessionTimeout", "Main", FormMethod.Post, new { id = "logout-form", css = "display:none;" }))
+        {
+
+        }
+    }
+
+    @if(Model != null)
+    {
+        <nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top justify-content-end">
+            <div class="container-fluid">
+                <a href="#" class="navbar-brand">
+                    @Model.LoggedInEmplyeeFirstNameLastName
+                </a>
+
+                <span class="d-inline-block" data-toggle="tooltip" title="Zeit bis zur automatischen Abmeldung" id="countdown-tooltip">
+                    <span class="navbar-text" id="countdown" onclick="countdownClick()"></span>
+                </span>
+
+                <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
+                    <span class="navbar-toggler-icon"></span>
+                </button>
+
+                <div class="collapse navbar-collapse" id="navbarResponsive">
+                    <ul class="navbar-nav ml-auto">
+                        @*
+                            @if(Html.IsInDebugMode())
+                            {
+                                using(Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
+                                {
+                                    <li class="nav-item">
+                                        <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                            <i class="fas fa-hand-middle-finger"></i>
+                                            Scheduler
+                                        </button>
+                                    </li>
+                                }
+                            }
+                        *@
+
+                        @if(AbstractModel.IsAllowedToSeeCustomers)
+                        {
+                            using(Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
+                            {
+                                <li class="nav-item">
+                                    <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                        <i class="fas fa-user text-bewo-customers"></i>
+                                        Klienten
+                                    </button>
+                                </li>
+                            }
+                        }
+
+                        @using(Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
+                        {
+                            <li class="nav-item">
+                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                    <i class="fas fa-clock text-bewo-service-records"></i>
+                                    Zeiterfassung
+                                </button>
+                            </li>
+                        }
+
+                        @if(AbstractModel.IsAllowedToSeeScheduler)
+                        {
+                            using(Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
+                            {
+                                <li class="nav-item">
+                                    <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                        <i class="fas fa-calendar-alt text-bewo-calendar"></i>
+                                        Kalender
+                                    </button>
+                                </li>
+                            }
+                        }
+
+
+                        @if(AbstractModel.HasRightToViewQuittierungsbelege)
+                        {
+                            using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
+                            {
+                                <li class="nav-item">
+                                    <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                        <i class="fas fa-chart-bar text-bewo-report">
+
+                                        </i>
+                                        Quittierungsbelege
+                                    </button>
+                                </li>
+                            }
+                        }
+
+                        @if(AbstractModel.HasRightToViewReports && AbstractModel.HasRightToViewMitarbeiterstundenkonto)
+                        {
+                            using(Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
+                            {
+                                <li class="nav-item">
+                                    <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                        <i class="fas fa-chart-bar text-bewo-report"></i>
+                                        Auswertungen
+                                    </button>
+                                </li>
+                            }
+                        }
+
+                        <li class="nav-item">
+                            <button class="btn btn-link text-light no-underline" onclick="showAboutPopup()">
+                                <i class="fas fa-balance-scale text-primary"></i>
+                                &Uuml;ber
+                            </button>
+                        </li>
+
+                        <li class="nav-item">
+                            <button class="btn btn-link text-light no-underline" onclick="showChangePasswordPopup()">
+                                <i class="fas fa-lock text-danger"></i>
+                                Passwort &auml;ndern
+                            </button>
+                        </li>
+
+                        <li class="nav-item">
+                            @using(Html.BeginForm("Logout", "Main", FormMethod.Post, new { id = "normal-logout-form" }))
+                            {
+                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
+                                    <i class="fas fa-sign-out-alt text-primary"></i>
+                                    Abmelden
+                                </button>
+                            }
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </nav>
+    }
+
+    <div class="modal" role="dialog" tabindex="-1" id="mySpinner">
+        <div class="modal-dialog modal-dialog-centered text-center" role="document">
+            <div class="modal-content bg-transparent border-0">
+                <div class="d-flex justify-content-center">
+                    <div class="spinner-border text-primary" role="status" style="width: 5rem; height: 5rem;">
+                        <span class="sr-only"></span>
+                    </div>
+                </div>
+                <p id="loading-info-p" class="text-white mt-4">Lade ...</p>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal" tabindex="-1" role="dialog" id="messagePopup">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title" id="popupTitle"></h5>
+                    <button class="close" type="button" data-dismiss="modal" aria-label="close" id="message-popup-esc-btn">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body" id="modal-body">
+                    <p id="popupMessage"></p>
+                </div>
+                <div class="modal-footer">
+                    <button class="btn btn-primary" type="button" data-dismiss="modal" id="message-popup-ok-btn">OK</button>
+                    <button class="btn btn-secondary" type="button" data-dismiss="modal" id="message-popup-close-btn">Schlie&szlig;en</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal" tabindex="-1" role="dialog" id="error-message-popup">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h5 class="modal-title text-danger">Es ist ein Fehler aufgetreten</h5>
+                    <button class="close" type="button" data-dismiss="modal" aria-label="close">
+                        <span aria-hidden="true">&times;</span>
+                    </button>
+                </div>
+                <div class="modal-body">
+                    <p>
+                        Es ist leider ein unbekannter Fehler aufgetreten. Pr&uuml;fen Sie Ihre Internetverbindung oder versuchen Sie es sp&auml;ter erneut. Wir sind stets bem&uuml;ht, das Programm zu verbessern, daher freuen wir uns auch, wenn Sie die Fehlerdetails unten in einer Mail an <a href="mailto:support@bewoplaner.de" id="error-popup-mailto">support@bewoplaner.de</a> senden.
+                    </p>
+                    <hr />
+                    <div class="form-group">
+                        <label for="fehlerdetail-textarea">Fehlerdetails:</label>
+                        <textarea class="form-control font-italic text-monospace" style="height: 20em !important; max-height: 20em !important; scroll-behavior: auto !important;" id="fehlerdetail-textarea"></textarea>
+                        <div id="html-error-container"></div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <div class="clearfix w-100">
+                        <button class="btn btn-primary float-left" type="button" onclick="copyErrorToClipboard()">Text kopieren</button>
+                        <button class="btn btn-primary float-right" type="button" data-dismiss="modal">OK</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    @if(!(TempData[TempDataConstants.ErrorMessageKey] is null))
+    {
+        <div class="container-fluid mt-3">
+            <div class="row d-flex justify-content-center">
+                <div class="col-md-3 col-lg-4">
+                    <div class="alert alert-danger" role="alert">
+                        @TempData[TempDataConstants.ErrorMessageKey]
+                    </div>
+                </div>
+            </div>
+        </div>
+    }
+
+    @using(Html.BeginForm("ZombieLogout", "Main", FormMethod.Post, new { id = "second-logout-form", style="display:none;" }))
     {
 
     }
-}
 
-@if(Model != null)
-{
-    <nav class="navbar navbar-expand-lg navbar-dark bg-dark sticky-top justify-content-end">
-        <div class="container-fluid">
-            <a href="#" class="navbar-brand">
-                @Model.LoggedInEmplyeeFirstNameLastName
-            </a>
-
-            <span class="d-inline-block" data-toggle="tooltip" title="Zeit bis zur automatischen Abmeldung" id="countdown-tooltip">
-                <span class="navbar-text" id="countdown" onclick="countdownClick()"></span>
-            </span>
-
-            <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive">
-                <span class="navbar-toggler-icon"></span>
-            </button>
-
-            <div class="collapse navbar-collapse" id="navbarResponsive">
-                <ul class="navbar-nav ml-auto">
-                    @*
-                @if(Html.IsInDebugMode())
-                {
-                    using(Html.BeginForm("RedirectToDevExpressScheduler", "Main", FormMethod.Post))
-                    {
-                        <li class="nav-item">
-                            <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                <i class="fas fa-hand-middle-finger"></i>
-                                Scheduler
-                            </button>
-                        </li>
-                    }
-                }
-                    *@
-
-                    @if(AbstractModel.IsAllowedToSeeCustomers)
-                    {
-                        using(Html.BeginForm("RedirectToCustomer", "Main", FormMethod.Post))
-                        {
-                            <li class="nav-item">
-                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                    <i class="fas fa-user text-bewo-customers"></i>
-                                    Klienten
-                                </button>
-                            </li>
-                        }
-                    }
-
-                    @using(Html.BeginForm("RedirectToMain", "Main", FormMethod.Post))
-                    {
-                        <li class="nav-item">
-                            <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                <i class="fas fa-clock text-bewo-service-records"></i>
-                                Zeiterfassung
-                            </button>
-                        </li>
-                    }
-
-                    @if(AbstractModel.IsAllowedToSeeScheduler)
-                    {
-                        using(Html.BeginForm("RedirectToScheduler", "Main", FormMethod.Post))
-                        {
-                            <li class="nav-item">
-                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                    <i class="fas fa-calendar-alt text-bewo-calendar"></i>
-                                    Kalender
-                                </button>
-                            </li>
-                        }
-                    }
-
-
-                    @if(AbstractModel.HasRightToViewQuittierungsbelege)
-                    {
-                        using(Html.BeginForm("RedirectToReportView", "Main", FormMethod.Post))
-                        {
-                            <li class="nav-item">
-                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                    <i class="fas fa-chart-bar text-bewo-report">
-
-                                    </i>
-                                    Quittierungsbelege
-                                </button>
-                            </li>
-                        }
-                    }
-
-                    @if(AbstractModel.HasRightToViewReports && AbstractModel.HasRightToViewMitarbeiterstundenkonto)
-                    {
-                        using(Html.BeginForm("RedirectToReportViewer", "Main", FormMethod.Post))
-                        {
-                            <li class="nav-item">
-                                <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                    <i class="fas fa-chart-bar text-bewo-report"></i>
-                                    Auswertungen
-                                </button>
-                            </li>
-                        }
-                    }
-
-                    <li class="nav-item">
-                        <button class="btn btn-link text-light no-underline" onclick="showAboutPopup()">
-                            <i class="fas fa-balance-scale text-primary"></i>
-                            &Uuml;ber
-                        </button>
-                    </li>
-
-                    <li class="nav-item">
-                        <button class="btn btn-link text-light no-underline" onclick="showChangePasswordPopup()">
-                            <i class="fas fa-lock text-danger"></i>
-                            Passwort &auml;ndern
-                        </button>
-                    </li>
-
-                    <li class="nav-item">
-                        @using(Html.BeginForm("Logout", "Main", FormMethod.Post))
-                        {
-                            <button class="btn btn-link text-light no-underline" onclick="showSpinner()">
-                                <i class="fas fa-sign-out-alt text-primary"></i>
-                                Abmelden
-                            </button>
-                        }
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </nav>
-}
-    
-<div class="modal" role="dialog" tabindex="-1" id="mySpinner">
-    <div class="modal-dialog modal-dialog-centered text-center" role="document">
-        <div class="modal-content bg-transparent border-0">
-            <div class="d-flex justify-content-center">
-                <div class="spinner-border text-primary" role="status" style="width: 5rem; height: 5rem;">
-                    <span class="sr-only"></span>
-                </div>
-            </div>
-            <p id="loading-info-p" class="text-white mt-4">Lade ...</p>
-        </div>
-    </div>
-</div>
-
-<div class="modal" tabindex="-1" role="dialog" id="messagePopup">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title" id="popupTitle"></h5>
-                <button class="close" type="button" data-dismiss="modal" aria-label="close" id="message-popup-esc-btn">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body" id="modal-body">
-                <p id="popupMessage"></p>
-            </div>
-            <div class="modal-footer">
-                <button class="btn btn-primary" type="button" data-dismiss="modal" id="message-popup-ok-btn">OK</button>
-                <button class="btn btn-secondary" type="button" data-dismiss="modal" id="message-popup-close-btn">Schlie&szlig;en</button>
-            </div>
-        </div>
-    </div>
-</div>
-
-<div class="modal" tabindex="-1" role="dialog" id="error-message-popup">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h5 class="modal-title text-danger">Es ist ein Fehler aufgetreten</h5>
-                <button class="close" type="button" data-dismiss="modal" aria-label="close">
-                    <span aria-hidden="true">&times;</span>
-                </button>
-            </div>
-            <div class="modal-body">
-                <p>
-                    Es ist leider ein unbekannter Fehler aufgetreten. Pr&uuml;fen Sie Ihre Internetverbindung oder versuchen Sie es sp&auml;ter erneut. Wir sind stets bem&uuml;ht, das Programm zu verbessern, daher freuen wir uns auch, wenn Sie die Fehlerdetails unten in einer Mail an <a href="mailto:support@bewoplaner.de" id="error-popup-mailto">support@bewoplaner.de</a> senden.
-                </p>
-                <hr/>
-                <div class="form-group">
-                    <label for="fehlerdetail-textarea">Fehlerdetails:</label>
-                    <textarea class="form-control font-italic text-monospace" style="height: 20em !important; max-height: 20em !important; scroll-behavior: auto !important;" id="fehlerdetail-textarea"></textarea>
-                    <div id="html-error-container"></div>
-                </div>
-            </div>
-            <div class="modal-footer">
-                <div class="clearfix w-100">
-                    <button class="btn btn-primary float-left" type="button" onclick="copyErrorToClipboard()">Text kopieren</button>
-                    <button class="btn btn-primary float-right" type="button" data-dismiss="modal">OK</button>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-    
-
-@if(!(TempData[TempDataConstants.ErrorMessageKey] is null)) 
-{
-    <div class="container-fluid mt-3">
-        <div class="row d-flex justify-content-center">
-            <div class="col-md-3 col-lg-4">
-                <div class="alert alert-danger" role="alert">
-                    @TempData[TempDataConstants.ErrorMessageKey]
-                </div>
-            </div>
-        </div>
-    </div>
-}
-
-@RenderBody()
+    @RenderBody()
 </body>
 </html>

ReportImp/AachenerLaienhelfer/Quittierungsbeleg.Designer.cs

@@ -78,6 +78,7 @@ namespace AachenerLaienhelfer
             this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
@@ -126,7 +127,6 @@ namespace AachenerLaienhelfer
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableAbwesenheiten)).BeginInit();
@@ -568,6 +568,7 @@ namespace AachenerLaienhelfer
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox3,
             this.xrLabel14,
             this.xrLabel16,
             this.xrLabel7,
@@ -577,7 +578,7 @@ namespace AachenerLaienhelfer
             this.xrLabel4,
             this.xrLabel3,
             this.xrLabel2});
-            this.ReportHeader.HeightF = 130F;
+            this.ReportHeader.HeightF = 217.3611F;
             this.ReportHeader.Name = "ReportHeader";
             // 
             // xrLabel14
@@ -586,7 +587,7 @@ namespace AachenerLaienhelfer
             this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 139.1111F);
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
@@ -604,10 +605,10 @@ namespace AachenerLaienhelfer
             this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
             this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 139.1111F);
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel16.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(141.2499F, 30.50002F);
             this.xrLabel16.StylePriority.UseBackColor = false;
             this.xrLabel16.StylePriority.UseBorders = false;
             this.xrLabel16.StylePriority.UseFont = false;
@@ -622,7 +623,7 @@ namespace AachenerLaienhelfer
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 169.6111F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -639,10 +640,10 @@ namespace AachenerLaienhelfer
             this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 169.6111F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(199.361F, 30.50002F);
             this.xrLabel8.StylePriority.UseBackColor = false;
             this.xrLabel8.StylePriority.UseBorders = false;
             this.xrLabel8.StylePriority.UseFont = false;
@@ -656,7 +657,7 @@ namespace AachenerLaienhelfer
             this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(120.6388F, 169.6111F);
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
@@ -672,7 +673,7 @@ namespace AachenerLaienhelfer
             // 
             this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.1111F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(120.6388F, 139.1111F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
@@ -691,7 +692,7 @@ namespace AachenerLaienhelfer
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 169.6111F);
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -709,7 +710,7 @@ namespace AachenerLaienhelfer
             this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139.1111F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -723,19 +724,18 @@ namespace AachenerLaienhelfer
             // 
             // xrLabel2
             // 
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 14F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 13F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel2.ForeColor = System.Drawing.Color.Black;
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 101.25F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(734.9999F, 25F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(522.153F, 25F);
             this.xrLabel2.StylePriority.UseFont = false;
             this.xrLabel2.StylePriority.UseForeColor = false;
             this.xrLabel2.StylePriority.UseTextAlignment = false;
             this.xrLabel2.Text = "Quittierungsbeleg [Mandator.Name]";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
             // formattingRuleServiceDesc
             // 
@@ -760,11 +760,16 @@ namespace AachenerLaienhelfer
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox3});
             this.topMarginBand1.HeightF = 126.25F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox3
+            // 
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(522.1529F, 0F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(224.2916F, 126.25F);
+            // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.HeightF = 30F;
@@ -940,7 +945,7 @@ namespace AachenerLaienhelfer
             this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F);
             this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
             this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F);
+            this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6899F, 19.99997F);
             this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
@@ -1217,7 +1222,7 @@ namespace AachenerLaienhelfer
             this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 130F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
-            this.xrRichText2.SizeF = new System.Drawing.SizeF(264.972F, 68.05556F);
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(260.5274F, 68.05556F);
             this.xrRichText2.StylePriority.UseFont = false;
             // 
             // xrRichText1
@@ -1226,7 +1231,7 @@ namespace AachenerLaienhelfer
             this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 80.00005F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(262.5276F, 50.00001F);
             this.xrRichText1.StylePriority.UseFont = false;
             // 
             // xrLabel15
@@ -1375,13 +1380,6 @@ namespace AachenerLaienhelfer
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
             // 
-            // xrPictureBox3
-            // 
-            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
-            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(488.7085F, 0F);
-            this.xrPictureBox3.Name = "xrPictureBox3";
-            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(224.2916F, 126.25F);
-            // 
             // Quittierungsbeleg
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

ReportImp/AachenerLaienhelfer/QuittierungsbelegJugendamt.Designer.cs

@@ -78,6 +78,7 @@ namespace AachenerLaienhelfer
             this.formattingRuleCostBearer = new DevExpress.XtraReports.UI.FormattingRule();
             this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
@@ -102,7 +103,6 @@ namespace AachenerLaienhelfer
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.xrPictureBox3 = new DevExpress.XtraReports.UI.XRPictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
@@ -542,6 +542,7 @@ namespace AachenerLaienhelfer
             // ReportHeader
             // 
             this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrPictureBox3,
             this.xrLabel14,
             this.xrLabel16,
             this.xrLabel7,
@@ -551,7 +552,7 @@ namespace AachenerLaienhelfer
             this.xrLabel4,
             this.xrLabel3,
             this.xrLabel2});
-            this.ReportHeader.HeightF = 130F;
+            this.ReportHeader.HeightF = 221.1528F;
             this.ReportHeader.Name = "ReportHeader";
             // 
             // xrLabel14
@@ -560,7 +561,7 @@ namespace AachenerLaienhelfer
             this.xrLabel14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel14.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(414.9999F, 47.1111F);
+            this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(417.0001F, 137.9444F);
             this.xrLabel14.Name = "xrLabel14";
             this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel14.SizeF = new System.Drawing.SizeF(178.7501F, 30.50001F);
@@ -578,10 +579,10 @@ namespace AachenerLaienhelfer
             this.xrLabel16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLSPerWeek", "{0:0.##}")});
             this.xrLabel16.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(593.75F, 47.1111F);
+            this.xrLabel16.LocationFloat = new DevExpress.Utils.PointFloat(595.7502F, 137.9444F);
             this.xrLabel16.Name = "xrLabel16";
             this.xrLabel16.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel16.SizeF = new System.Drawing.SizeF(100.2502F, 30.50001F);
+            this.xrLabel16.SizeF = new System.Drawing.SizeF(139.2497F, 30.50002F);
             this.xrLabel16.StylePriority.UseBackColor = false;
             this.xrLabel16.StylePriority.UseBorders = false;
             this.xrLabel16.StylePriority.UseFont = false;
@@ -596,10 +597,10 @@ namespace AachenerLaienhelfer
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(415F, 77.6111F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(417.0002F, 168.4444F);
             this.xrLabel7.Name = "xrLabel7";
             this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(105.0139F, 30.50002F);
             this.xrLabel7.StylePriority.UseBackColor = false;
             this.xrLabel7.StylePriority.UseBorders = false;
             this.xrLabel7.StylePriority.UseFont = false;
@@ -613,10 +614,10 @@ namespace AachenerLaienhelfer
             this.xrLabel8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(535.6389F, 77.6111F);
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(522.0141F, 168.4445F);
             this.xrLabel8.Name = "xrLabel8";
             this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(158.3612F, 30.50001F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(212.9858F, 30.50002F);
             this.xrLabel8.StylePriority.UseBackColor = false;
             this.xrLabel8.StylePriority.UseBorders = false;
             this.xrLabel8.StylePriority.UseFont = false;
@@ -630,7 +631,7 @@ namespace AachenerLaienhelfer
             this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(170F, 77.6111F);
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(122.639F, 168.4444F);
             this.xrLabel6.Name = "xrLabel6";
             this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel6.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
@@ -646,7 +647,7 @@ namespace AachenerLaienhelfer
             // 
             this.xrLabel5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(170F, 47.1111F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(122.639F, 137.9444F);
             this.xrLabel5.Name = "xrLabel5";
             this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel5.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
@@ -665,7 +666,7 @@ namespace AachenerLaienhelfer
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(49.36111F, 77.6111F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(2.000173F, 168.4444F);
             this.xrLabel4.Name = "xrLabel4";
             this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel4.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -683,7 +684,7 @@ namespace AachenerLaienhelfer
             this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
             this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 47.11109F);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(2.000173F, 137.9444F);
             this.xrLabel3.Name = "xrLabel3";
             this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrLabel3.SizeF = new System.Drawing.SizeF(120.6389F, 30.50001F);
@@ -697,18 +698,18 @@ namespace AachenerLaienhelfer
             // 
             // xrLabel2
             // 
-            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 13F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel2.Font = new DevExpress.Drawing.DXFont("Arial", 12F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel2.ForeColor = System.Drawing.Color.Black;
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(2.000173F, 102F);
             this.xrLabel2.Multiline = true;
             this.xrLabel2.Name = "xrLabel2";
             this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(734.9999F, 25F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(520.1528F, 25F);
             this.xrLabel2.StylePriority.UseFont = false;
             this.xrLabel2.StylePriority.UseForeColor = false;
             this.xrLabel2.StylePriority.UseTextAlignment = false;
             this.xrLabel2.Text = "Jugendamt-Quittierungsbeleg [Mandator.Name]";
-            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
+            this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
             // formattingRuleServiceDesc
             // 
@@ -733,11 +734,16 @@ namespace AachenerLaienhelfer
             // 
             // topMarginBand1
             // 
-            this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrPictureBox3});
             this.topMarginBand1.HeightF = 126.25F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox3
+            // 
+            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
+            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(522.1529F, 0.7500013F);
+            this.xrPictureBox3.Name = "xrPictureBox3";
+            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(224.2916F, 126.25F);
+            // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.HeightF = 30F;
@@ -909,7 +915,7 @@ namespace AachenerLaienhelfer
             this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 182.8526F);
             this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
             this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6944F, 19.99998F);
+            this.lblUnterschriftMitarbeiter.SizeF = new System.Drawing.SizeF(336.6902F, 19.99998F);
             this.lblUnterschriftMitarbeiter.StylePriority.UseBackColor = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UseBorders = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
@@ -941,7 +947,7 @@ namespace AachenerLaienhelfer
             this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 80.00005F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(264.9721F, 50F);
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(260.5274F, 50.00001F);
             this.xrRichText1.StylePriority.UseFont = false;
             // 
             // xrLabel13
@@ -1074,13 +1080,6 @@ namespace AachenerLaienhelfer
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO);
             // 
-            // xrPictureBox3
-            // 
-            this.xrPictureBox3.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox3.ImageSource"));
-            this.xrPictureBox3.LocationFloat = new DevExpress.Utils.PointFloat(488.7085F, 0F);
-            this.xrPictureBox3.Name = "xrPictureBox3";
-            this.xrPictureBox3.SizeF = new System.Drawing.SizeF(224.2916F, 126.25F);
-            // 
             // QuittierungsbelegJugendamt
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {

ReportImp/AlphaEv/InvoiceCustomerReport.Designer.cs

@@ -28,319 +28,327 @@ namespace AlphaEv
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
-            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
-            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
-            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
-            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
-            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
-            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
-            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
-            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
-            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
-            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
-            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
-            // 
-            // Detail
-            // 
-            this.Detail.HeightF = 0F;
-            this.Detail.Name = "Detail";
-            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
-            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            // 
-            // ReportHeader
-            // 
-            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrRichText2,
-            this.xrLabel5,
-            this.xrLabel11,
-            this.xrLabel7,
-            this.xrLabel8,
-            this.xrLabel9,
-            this.xrLabel10,
-            this.xrLabel1,
-            this.xrLabel17,
-            this.lblAdresse,
-            this.xrLabel12});
-            this.ReportHeader.HeightF = 411.5988F;
-            this.ReportHeader.Name = "ReportHeader";
-            this.ReportHeader.StylePriority.UseFont = false;
-            // 
-            // xrLabel1
-            // 
-            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
-            this.xrLabel1.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F);
-            this.xrLabel1.Name = "xrLabel1";
-            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel1.SizeF = new System.Drawing.SizeF(153.2499F, 23F);
-            this.xrLabel1.StylePriority.UseFont = false;
-            this.xrLabel1.StylePriority.UseTextAlignment = false;
-            this.xrLabel1.Text = "xrLabel8";
-            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            // 
-            // xrLabel17
-            // 
-            this.xrLabel17.Font = new System.Drawing.Font("Calibri", 8F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
-            this.xrLabel17.Name = "xrLabel17";
-            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
-            this.xrLabel17.StylePriority.UseFont = false;
-            this.xrLabel17.Text = "alpha e.V. | Telegrafenstr. 11 | 42929 Wermelskirchen";
-            // 
-            // lblAdresse
-            // 
-            this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.lblAdresse.CanGrow = false;
-            this.lblAdresse.Font = new System.Drawing.Font("Calibri", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
-            this.lblAdresse.Multiline = true;
-            this.lblAdresse.Name = "lblAdresse";
-            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblAdresse.SizeF = new System.Drawing.SizeF(413.125F, 163.0208F);
-            this.lblAdresse.StylePriority.UseBorders = false;
-            this.lblAdresse.StylePriority.UseFont = false;
-            // 
-            // xrLabel12
-            // 
-            this.xrLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350F);
-            this.xrLabel12.Name = "xrLabel12";
-            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel12.SizeF = new System.Drawing.SizeF(308.33F, 25.33328F);
-            this.xrLabel12.StylePriority.UseFont = false;
-            this.xrLabel12.StylePriority.UseForeColor = false;
-            this.xrLabel12.Text = "Rechnung Eigenanteil Betreutes Wohnen ";
-            // 
-            // ruleRateFactorNull
-            // 
-            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
-            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
-            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
-            // 
-            // topMarginBand1
-            // 
-            this.topMarginBand1.HeightF = 100F;
-            this.topMarginBand1.Name = "topMarginBand1";
-            // 
-            // bottomMarginBand1
-            // 
-            this.bottomMarginBand1.HeightF = 40F;
-            this.bottomMarginBand1.Name = "bottomMarginBand1";
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalClaim")});
-            this.xrLabel4.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(276.7082F, 154.4271F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(171.6667F, 33.93744F);
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UseTextAlignment = false;
-            this.xrLabel4.Text = "Ihr Eigenanteil beträgt:";
-            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            // 
-            // xrLabel3
-            // 
-            this.xrLabel3.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold);
-            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(64.27078F, 154.4271F);
-            this.xrLabel3.Multiline = true;
-            this.xrLabel3.Name = "xrLabel3";
-            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel3.SizeF = new System.Drawing.SizeF(212.4374F, 33.93744F);
-            this.xrLabel3.StylePriority.UseFont = false;
-            this.xrLabel3.Text = "Ihr Eigenanteil beträgt:";
-            // 
-            // xrLabel2
-            // 
-            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.2917F);
-            this.xrLabel2.Multiline = true;
-            this.xrLabel2.Name = "xrLabel2";
-            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel2.SizeF = new System.Drawing.SizeF(623.25F, 33.93744F);
-            this.xrLabel2.StylePriority.UseFont = false;
-            this.xrLabel2.Text = "Wir bitten um Überweisung auf unser Konto";
-            // 
-            // xrLabel6
-            // 
-            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrLabel6.Multiline = true;
-            this.xrLabel6.Name = "xrLabel6";
-            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel6.SizeF = new System.Drawing.SizeF(623.2501F, 134.7083F);
-            this.xrLabel6.StylePriority.UseFont = false;
-            this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
-            // 
-            // ReportFooter
-            // 
-            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrRichText1});
-            this.ReportFooter.Font = new System.Drawing.Font("Times New Roman", 10F);
-            this.ReportFooter.HeightF = 156.8542F;
-            this.ReportFooter.Name = "ReportFooter";
-            this.ReportFooter.PrintAtBottom = true;
-            this.ReportFooter.StylePriority.UseFont = false;
-            // 
-            // xrRichText1
-            // 
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 0F);
-            this.xrRichText1.Name = "xrRichText1";
-            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
-            this.xrRichText1.SizeF = new System.Drawing.SizeF(170.25F, 156.8542F);
-            // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
-            // 
-            // GroupHeader1
-            // 
-            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel4,
-            this.xrLabel3,
-            this.xrLabel2,
-            this.xrLabel6});
-            this.GroupHeader1.HeightF = 241.2291F;
-            this.GroupHeader1.Name = "GroupHeader1";
-            // 
-            // xrRichText2
-            // 
-            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 48.96F);
-            this.xrRichText2.Name = "xrRichText2";
-            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
-            this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F);
-            // 
-            // xrLabel5
-            // 
-            this.xrLabel5.CanGrow = false;
-            this.xrLabel5.CanShrink = true;
-            this.xrLabel5.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 320.4216F);
-            this.xrLabel5.Multiline = true;
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(93.88F, 18F);
-            this.xrLabel5.StylePriority.UseFont = false;
-            this.xrLabel5.StylePriority.UseForeColor = false;
-            this.xrLabel5.StylePriority.UsePadding = false;
-            this.xrLabel5.Text = "Unser Zeichen:";
-            // 
-            // xrLabel11
-            // 
-            this.xrLabel11.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 281.8799F);
-            this.xrLabel11.Multiline = true;
-            this.xrLabel11.Name = "xrLabel11";
-            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
-            this.xrLabel11.StylePriority.UseFont = false;
-            this.xrLabel11.StylePriority.UseForeColor = false;
-            this.xrLabel11.StylePriority.UseTextAlignment = false;
-            this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
-            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.CanGrow = false;
-            this.xrLabel7.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 356.4308F);
-            this.xrLabel7.Multiline = true;
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F);
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.Text = "[InvoiceNumber]";
-            // 
-            // xrLabel8
-            // 
-            this.xrLabel8.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(655.63F, 320.4216F);
-            this.xrLabel8.Multiline = true;
-            this.xrLabel8.Name = "xrLabel8";
-            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel8.SizeF = new System.Drawing.SizeF(60F, 18F);
-            this.xrLabel8.StylePriority.UseFont = false;
-            this.xrLabel8.Text = "292300";
-            // 
-            // xrLabel9
-            // 
-            this.xrLabel9.CanGrow = false;
-            this.xrLabel9.CanShrink = true;
-            this.xrLabel9.Font = new System.Drawing.Font("Calibri", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.xrLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 338.4215F);
-            this.xrLabel9.Multiline = true;
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(93.88F, 18F);
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.StylePriority.UseForeColor = false;
-            this.xrLabel9.StylePriority.UsePadding = false;
-            this.xrLabel9.Text = "Rechnungs-Nr.:";
-            // 
-            // xrLabel10
-            // 
-            this.xrLabel10.CanGrow = false;
-            this.xrLabel10.CanShrink = true;
-            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 144.38F);
-            this.xrLabel10.Multiline = true;
-            this.xrLabel10.Name = "xrLabel10";
-            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F);
-            this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.StylePriority.UseForeColor = false;
-            this.xrLabel10.StylePriority.UsePadding = false;
-            this.xrLabel10.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " +
-    "72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de";
-            // 
-            // InvoiceCustomerReport
-            // 
-            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
-            this.Detail,
-            this.ReportHeader,
-            this.topMarginBand1,
-            this.bottomMarginBand1,
-            this.ReportFooter,
-            this.GroupHeader1});
-            this.DataSource = this.bindingSource1;
-            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
-            this.Font = new System.Drawing.Font("Calibri", 10F);
-            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
-            this.ruleRateFactorNull});
-            this.Margins = new System.Drawing.Printing.Margins(75, 20, 100, 40);
-            this.PageHeight = 1169;
-            this.PageWidth = 827;
-            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
-            this.Version = "17.1";
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
-
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(InvoiceCustomerReport));
+            this.Detail = new DevExpress.XtraReports.UI.DetailBand();
+            this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrRichText2 = new DevExpress.XtraReports.UI.XRRichText();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
+            this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
+            this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
+            this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
+            // 
+            // Detail
+            // 
+            this.Detail.HeightF = 0F;
+            this.Detail.Name = "Detail";
+            this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
+            this.Detail.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            // 
+            // ReportHeader
+            // 
+            this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText2,
+            this.xrLabel5,
+            this.xrLabel11,
+            this.xrLabel7,
+            this.xrLabel8,
+            this.xrLabel9,
+            this.xrLabel10,
+            this.xrLabel1,
+            this.xrLabel17,
+            this.lblAdresse,
+            this.xrLabel12});
+            this.ReportHeader.HeightF = 411.5988F;
+            this.ReportHeader.Name = "ReportHeader";
+            this.ReportHeader.StylePriority.UseFont = false;
+            // 
+            // xrRichText2
+            // 
+            this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 48.96F);
+            this.xrRichText2.Name = "xrRichText2";
+            this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
+            this.xrRichText2.SizeF = new System.Drawing.SizeF(153.2498F, 77.41667F);
+            // 
+            // xrLabel5
+            // 
+            this.xrLabel5.CanGrow = false;
+            this.xrLabel5.CanShrink = true;
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 320.4216F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(93.88F, 18F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            this.xrLabel5.StylePriority.UseForeColor = false;
+            this.xrLabel5.StylePriority.UsePadding = false;
+            this.xrLabel5.Text = "Unser Zeichen:";
+            // 
+            // xrLabel11
+            // 
+            this.xrLabel11.Font = new DevExpress.Drawing.DXFont("Calibri", 9F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 281.8799F);
+            this.xrLabel11.Multiline = true;
+            this.xrLabel11.Name = "xrLabel11";
+            this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel11.SizeF = new System.Drawing.SizeF(153.2499F, 38.5416F);
+            this.xrLabel11.StylePriority.UseFont = false;
+            this.xrLabel11.StylePriority.UseForeColor = false;
+            this.xrLabel11.StylePriority.UseTextAlignment = false;
+            this.xrLabel11.Text = "(bei Zahlung bitte angeben:)";
+            this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.CanGrow = false;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 356.4308F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(153.2499F, 19.24997F);
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.Text = "[InvoiceNumber]";
+            // 
+            // xrLabel8
+            // 
+            this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(655.63F, 320.4216F);
+            this.xrLabel8.Multiline = true;
+            this.xrLabel8.Name = "xrLabel8";
+            this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel8.SizeF = new System.Drawing.SizeF(60F, 18F);
+            this.xrLabel8.StylePriority.UseFont = false;
+            this.xrLabel8.Text = "292300";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.CanGrow = false;
+            this.xrLabel9.CanShrink = true;
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel9.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 338.4215F);
+            this.xrLabel9.Multiline = true;
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(93.88F, 18F);
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseForeColor = false;
+            this.xrLabel9.StylePriority.UsePadding = false;
+            this.xrLabel9.Text = "Rechnungs-Nr.:";
+            // 
+            // xrLabel10
+            // 
+            this.xrLabel10.CanGrow = false;
+            this.xrLabel10.CanShrink = true;
+            this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 144.38F);
+            this.xrLabel10.Multiline = true;
+            this.xrLabel10.Name = "xrLabel10";
+            this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 0, 0, 0, 100F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(160.2498F, 137.5F);
+            this.xrLabel10.StylePriority.UseFont = false;
+            this.xrLabel10.StylePriority.UseForeColor = false;
+            this.xrLabel10.StylePriority.UsePadding = false;
+            this.xrLabel10.Text = "Ihr Ansprechpartner:\r\nFrau Howe-Jakob\r\nFon: 0 21 96 - 72 63 - 16\r\nFax: 0 21 96 - " +
+    "72 63 - 32\r\njakob@alphaev.de\r\nwww.alphaev.de";
+            // 
+            // xrLabel1
+            // 
+            this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceDate")});
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(561.75F, 385F);
+            this.xrLabel1.Name = "xrLabel1";
+            this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel1.SizeF = new System.Drawing.SizeF(153.2499F, 23F);
+            this.xrLabel1.StylePriority.UseFont = false;
+            this.xrLabel1.StylePriority.UseTextAlignment = false;
+            this.xrLabel1.Text = "xrLabel8";
+            this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomLeft;
+            // 
+            // xrLabel17
+            // 
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Calibri", 8F, DevExpress.Drawing.DXFontStyle.Underline, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 100F);
+            this.xrLabel17.Name = "xrLabel17";
+            this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel17.SizeF = new System.Drawing.SizeF(308.33F, 17F);
+            this.xrLabel17.StylePriority.UseFont = false;
+            this.xrLabel17.Text = "alpha e.V. | Telegrafenstr. 11 | 42929 Wermelskirchen";
+            // 
+            // lblAdresse
+            // 
+            this.lblAdresse.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.lblAdresse.CanGrow = false;
+            this.lblAdresse.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.lblAdresse.LocationFloat = new DevExpress.Utils.PointFloat(0F, 135F);
+            this.lblAdresse.Multiline = true;
+            this.lblAdresse.Name = "lblAdresse";
+            this.lblAdresse.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.lblAdresse.SizeF = new System.Drawing.SizeF(413.125F, 163.0208F);
+            this.lblAdresse.StylePriority.UseBorders = false;
+            this.lblAdresse.StylePriority.UseFont = false;
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 350F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(308.33F, 25.33328F);
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.StylePriority.UseForeColor = false;
+            this.xrLabel12.Text = "Rechnung Eigenanteil Betreutes Wohnen ";
+            // 
+            // ruleRateFactorNull
+            // 
+            this.ruleRateFactorNull.Condition = "[RateFactorText2] == ?";
+            this.ruleRateFactorNull.Formatting.Visible = DevExpress.Utils.DefaultBoolean.False;
+            this.ruleRateFactorNull.Name = "ruleRateFactorNull";
+            // 
+            // topMarginBand1
+            // 
+            this.topMarginBand1.Name = "topMarginBand1";
+            // 
+            // bottomMarginBand1
+            // 
+            this.bottomMarginBand1.HeightF = 40F;
+            this.bottomMarginBand1.Name = "bottomMarginBand1";
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalClaim")});
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(276.7082F, 154.4271F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(171.6667F, 33.93744F);
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UseTextAlignment = false;
+            this.xrLabel4.Text = "Ihr Eigenanteil beträgt:";
+            this.xrLabel4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            // 
+            // xrLabel3
+            // 
+            this.xrLabel3.Font = new DevExpress.Drawing.DXFont("Calibri", 10F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(64.27078F, 154.4271F);
+            this.xrLabel3.Multiline = true;
+            this.xrLabel3.Name = "xrLabel3";
+            this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel3.SizeF = new System.Drawing.SizeF(212.4374F, 33.93744F);
+            this.xrLabel3.StylePriority.UseFont = false;
+            this.xrLabel3.Text = "Ihr Eigenanteil beträgt:";
+            // 
+            // xrLabel2
+            // 
+            this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.2917F);
+            this.xrLabel2.Multiline = true;
+            this.xrLabel2.Name = "xrLabel2";
+            this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel2.SizeF = new System.Drawing.SizeF(623.25F, 51.5052F);
+            this.xrLabel2.StylePriority.UseFont = false;
+            this.xrLabel2.Text = "Wir bitten um Überweisung auf unser Konto.\r\n\r\nDie Rechnung ist zahlbar innerhalb " +
+    "von 30 Tagen.";
+            // 
+            // xrLabel6
+            // 
+            this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrLabel6.Multiline = true;
+            this.xrLabel6.Name = "xrLabel6";
+            this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel6.SizeF = new System.Drawing.SizeF(623.2501F, 134.7083F);
+            this.xrLabel6.StylePriority.UseFont = false;
+            this.xrLabel6.Text = resources.GetString("xrLabel6.Text");
+            // 
+            // ReportFooter
+            // 
+            this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrRichText1});
+            this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F);
+            this.ReportFooter.HeightF = 156.8542F;
+            this.ReportFooter.Name = "ReportFooter";
+            this.ReportFooter.PrintAtBottom = true;
+            this.ReportFooter.StylePriority.UseFont = false;
+            // 
+            // xrRichText1
+            // 
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(561.7498F, 0F);
+            this.xrRichText1.Name = "xrRichText1";
+            this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
+            this.xrRichText1.SizeF = new System.Drawing.SizeF(170.25F, 156.8542F);
+            // 
+            // bindingSource1
+            // 
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.InvoiceCustomerRO);
+            // 
+            // GroupHeader1
+            // 
+            this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel4,
+            this.xrLabel3,
+            this.xrLabel2,
+            this.xrLabel6});
+            this.GroupHeader1.HeightF = 258.797F;
+            this.GroupHeader1.Name = "GroupHeader1";
+            // 
+            // InvoiceCustomerReport
+            // 
+            this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
+            this.Detail,
+            this.ReportHeader,
+            this.topMarginBand1,
+            this.bottomMarginBand1,
+            this.ReportFooter,
+            this.GroupHeader1});
+            this.DataSource = this.bindingSource1;
+            this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
+            this.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
+            this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
+            this.ruleRateFactorNull});
+            this.Margins = new DevExpress.Drawing.DXMargins(75F, 20F, 100F, 40F);
+            this.PageHeight = 1169;
+            this.PageWidth = 827;
+            this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
+            this.Version = "23.2";
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
+
         }
 
         

ReportImp/AlphaEv/InvoiceCustomerReport.resx

@@ -1,126 +1,126 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <data name="xrLabel6.Text" xml:space="preserve">
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrLabel6.Text" xml:space="preserve">
     <value>Abrechnungsmonat: [AccountingPeriodStart!MMMM yyyy]
 
 Lt. Bescheid des Landschaftsverbandes hat die Überprüfung der persönlichen und
@@ -128,12 +128,9 @@ wirtschaftlichen Verhältnisse ergeben, dass von Ihnen eine Einkommens- und
 Vermögenseinsatz verlangt wird. Der Einkommens- und Vermögenseinsatz ist für jeden
 Monat in voller Höhe zu entrichten, auch wenn die Betreuung im Laufe eines Monats
 beginnt oder endet. Dieser Eigenanteil ist direkt an den alpha e.V. zu entrichten.
-</value>
-  </data>
-  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
-  </data>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+</value>
+  </data>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+  </data>
 </root>

ReportImp/AlphaEv/SammelrechnungWuppertal.resx

@@ -1,129 +1,126 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAASwBvAG4AfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAxADgAXABjAGYAMQAgAHQAbwA6ACAANwAwADMANAAgADQAMAAwAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIABCAEwAWgB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAOgAgADMANwAwAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIAAyADAANQB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawAgAGYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAFMAbwB6AGkAYQBsAHcAaQByAHQAcwBjAGgAYQBmAHQAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABJAEIAQQBOADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABEAEUAOAA1ACAAMwA3ADAAMgAgADAANQAwADAAIAAwADAAMAA3ACAAMAAzADQANAAgADAAMAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEIASQBDADoAIABCAEYAUwBXAEQARQAzADMAWABYAFgAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAyADAAXABjAGYAMQAgAFMAdAAuAC0ATgByAC4AOgAgADIAMwAwAC8ANQA3ADIAMQAvADQANwA5ADYAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAE0AaQB0AGcAbABpAGUAZAAgAGkAbQAgAFAAYQByAGkAdABcAHUAMgAyADgAXAAnAGUANAB0AGkAcwBjAGgAZQBuAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAcwAxADgAXABjAGYAMQAgAFcAbwBoAGwAZgBhAGgAcgB0AHMAdgBlAHIAYgBhAG4AZAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAASwBvAG4AfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAxADgAXABjAGYAMQAgAHQAbwA6ACAANwAwADMANAAgADQAMAAwAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIABCAEwAWgB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAOgAgADMANwAwAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIAAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABmAHMAMQA4AFwAYwBmADEAIAAyADAANQB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADEAOABcAGMAZgAxACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawAgAGYAXAB1ADIANQAyAFwAJwBmAGMAcgAgAFMAbwB6AGkAYQBsAHcAaQByAHQAcwBjAGgAYQBmAHQAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABJAEIAQQBOADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABEAEUAOAA1ACAAMwA3ADAAMgAgADAANQAwADAAIAAwADAAMAA3ACAAMAAzADQANAAgADAAMAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEIASQBDADoAIABCAEYAUwBXAEQARQAzADMAWABYAFgAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAyADAAXABjAGYAMQAgAFMAdAAuAC0ATgByAC4AOgAgADIAMwAwAC8ANQA3ADIAMQAvADQANwA5ADYAfQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAE0AaQB0AGcAbABpAGUAZAAgAGkAbQAgAFAAYQByAGkAdABcAHUAMgAyADgAXAAnAGUANAB0AGkAcwBjAGgAZQBuAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAcwAxADgAXABjAGYAMQAgAFcAbwBoAGwAZgBhAGgAcgB0AHMAdgBlAHIAYgBhAG4AZAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
 </root>

ReportImp/AlphaEv/ServiceInvoiceReport.resx

@@ -1,129 +1,126 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
-  </data>
-  <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+  </data>
 </root>

ReportImp/AlphaEv/SettlementReport.cs

@@ -127,6 +127,11 @@ namespace AlphaEv.Alt
 				lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountRecordedFLS - pRO.ClaimWithEigenbeteiligung - summeAbschlaege);
 			}
 
+			if (pRO.SettlementDC.Claim > 0)
+            {
+				lblNotice.Text += "Die Rechnung ist zahlbar innerhalb von 30 Tagen.";
+			}
+
 			this.bindingSource1.DataSource = pRO;
         }
 

ReportImp/AlphaEv/SettlementReport.resx

@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <data name="xrRichText4.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
-  </data>
-  <data name="xrRichText5.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAOQAyAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADQAXABjAGYAMQAgAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBTAHQAYQByAHQARABhAHQAZQBTAHQAcgBpAG4AZwBdAH0AewBcAGYAcwAyADQAXABjAGYAMQAgACAAfQB7AFwAZgBzADIAMABcAGMAZgAzACAAYgBpAHMAfQB7AFwAZgBzADIAMABcAGMAZgAxACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAEUAbgBkAEQAYQB0AGUAUwB0AHIAaQBuAGcAXQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
-  </data>
-  <data name="xrRichText3.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEMAYQBsAGkAYgByAGkAOwB9AA0ACgB9AA0ACgB7AA0ACgBcAGMAbwBsAG8AcgB0AGIAbAANAAoAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ADsADQAKAFwAcgBlAGQAMQA5ADIAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgB9AA0ACgBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAHsAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADEAXABmAHMAMgAwAFwAYwBmADMAIABCAGUAdwBpAGwAbABpAGcAdQBuAGcAcwAtAC8AQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA</value>
-  </data>
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwALQAyADQAMABcAHMAbABtAHUAbAB0ADAAewBcAGIAXABmAHMAMgAwAFwAYwBmADEAIABWAGUAcgB3AGEAbAB0AHUAbgBnAH0AXABiAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsAC0AMgA0ADAAXABzAGwAbQB1AGwAdAAwAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQB7AFwAZgBzADIAMABcAGMAZgAxACAAVABlAGwAZQBnAHIAYQBmAGUAbgBzAHQAcgAuACAAMQAxAH0AXABmAHMAMgAwAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABzAGwAMwA2ADAAXABzAGwAbQB1AGwAdAAxAHsAXABmAHMAMgAwAFwAYwBmADEAIAA0ADIAOQAyADkAIABXAGUAcgBtAGUAbABzAGsAaQByAGMAaABlAG4AfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText4.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBhAG4AawB2AGUAcgBiAGkAbgBkAHUAbgBnADoAfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbABcAHQAeAA4ADAAMgAyAHsAXABmAHMAMQA4AFwAYwBmADEAIABCAGEAbgBrACAAZgBcAHUAMgA1ADIAXAAnAGYAYwByACAAUwBvAHoAaQBhAGwAdwBpAHIAdABzAGMAaABhAGYAdAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEkAQgBBAE4AOgB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAewBcAGYAcwAxADgAXABjAGYAMQAgAEQARQA4ADUAIAAzADcAMAAyACAAMAA1ADAAMAAgADAAMAAwADcAIAAwADMANAA0ACAAMAAwAH0AXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAAQgBJAEMAOgAgAEIARgBTAFcARABFADMAMwBYAFgAWAB9AFwAZgBzADEAOABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADIAMABcAGMAZgAxACAAUwB0AC4ALQBOAHIALgA6ACAAMgAzADAALwA1ADcAMgAxAC8ANAA3ADkANgB9AFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAdAB4ADgAMAAyADIAXABmAHMAMQA4AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXAB0AHgAOAAwADIAMgB7AFwAZgBzADEAOABcAGMAZgAxACAATQBpAHQAZwBsAGkAZQBkACAAaQBtACAAUABhAHIAaQB0AFwAdQAyADIAOABcACcAZQA0AHQAaQBzAGMAaABlAG4AfQBcAGYAcwAxADgAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgBzADEAOABcAGMAZgAxACAAVwBvAGgAbABmAGEAaAByAHQAcwB2AGUAcgBiAGEAbgBkAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+  </data>
+  <data name="xrRichText5.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwBcAHIAZQBkADEAOQAyAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAIAA7AH0AewBcACoAXABkAGUAZgBjAGgAcAAgAFwAZgAxAFwAZgBzADIANAB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAHUAbABcAGYAMQBcAGYAcwAyADQAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAcwAyADQAXABjAGYAMQAgAFsAQQBjAGMAbwB1AG4AdABpAG4AZwBTAHQAYQByAHQARABhAHQAZQBTAHQAcgBpAG4AZwBdAH0AewBcAGYAcwAyADQAXABjAGYAMQAgACAAfQB7AFwAZgBzADIAMABcAGMAZgAzACAAYgBpAHMAfQB7AFwAZgBzADIAMABcAGMAZgAxACAAIAB9AHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAZgBzADIANABcAGMAZgAxACAAWwBBAGMAYwBvAHUAbgB0AGkAbgBnAEUAbgBkAEQAYQB0AGUAUwB0AHIAaQBuAGcAXQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAFwAcwBsADMANgAwAFwAcwBsAG0AdQBsAHQAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+  </data>
+  <data name="xrRichText3.SerializableRtfString" xml:space="preserve">
+    <value>ewBcAHIAdABmADEAXABhAG4AcwBpAGMAcABnADEAMgA1ADIADQAKAHsADQAKAFwAZgBvAG4AdAB0AGIAbAANAAoAewBcAGYAMAAgAFQAaQBtAGUAcwAgAE4AZQB3ACAAUgBvAG0AYQBuADsAfQANAAoAewBcAGYAMQAgAEMAYQBsAGkAYgByAGkAOwB9AA0ACgB9AA0ACgB7AA0ACgBcAGMAbwBsAG8AcgB0AGIAbAANAAoAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADAAOwANAAoAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ADsADQAKAFwAcgBlAGQAMQA5ADIAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAA7AA0ACgB9AA0ACgBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAaAB0AG0AYQB1AHQAcwBwAHsAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABmADEAXABmAHMAMgAwAFwAYwBmADMAIABCAGUAdwBpAGwAbABpAGcAdQBuAGcAcwAtAC8AQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQANAAoAfQANAAoA</value>
+  </data>
 </root>

ReportImp/AlphaEv/SettlementReport2.Designer.cs

@@ -31,13 +31,14 @@ namespace AlphaEv
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung));
-            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary();
+            DevExpress.XtraReports.UI.XRSummary xrSummary2 = new DevExpress.XtraReports.UI.XRSummary();
             DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblNotice = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
@@ -85,6 +86,13 @@ namespace AlphaEv
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable5 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -109,14 +117,6 @@ namespace AlphaEv
             this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell();
             this.calculatedField1 = new DevExpress.XtraReports.UI.CalculatedField();
-            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit();
@@ -125,8 +125,8 @@ namespace AlphaEv
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -162,6 +162,19 @@ namespace AlphaEv
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
+            // xrLabel5
+            // 
+            this.xrLabel5.CanShrink = true;
+            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 64.24995F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(470.8333F, 43.75F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            // 
             // lblNotice
             // 
             this.lblNotice.CanShrink = true;
@@ -170,9 +183,9 @@ namespace AlphaEv
             this.lblNotice.Multiline = true;
             this.lblNotice.Name = "lblNotice";
             this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblNotice.SizeF = new System.Drawing.SizeF(470.8333F, 28.125F);
+            this.lblNotice.SizeF = new System.Drawing.SizeF(470.8333F, 41.24998F);
             this.lblNotice.StylePriority.UseFont = false;
-            this.lblNotice.Text = "Diese Leistungen sind umsatzsteuerfrei nach § 53, 54  SGB XII.";
+            this.lblNotice.Text = "Diese Leistungen sind umsatzsteuerfrei nach § 53, 54  SGB XII.\r\n\r\n";
             // 
             // xrRichText4
             // 
@@ -763,6 +776,86 @@ namespace AlphaEv
             this.GroupHeader2.Name = "GroupHeader2";
             this.GroupHeader2.StylePriority.UseBorderColor = false;
             // 
+            // Zwischensumme
+            // 
+            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Zwischensumme.HeightF = 27.00001F;
+            this.Zwischensumme.Name = "Zwischensumme";
+            this.Zwischensumme.Visible = false;
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow12,
+            this.xrTableRow10});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(610.0001F, 27.00001F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow12
+            // 
+            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell16,
+            this.xrTableCell18});
+            this.xrTableRow12.Name = "xrTableRow12";
+            this.xrTableRow12.Weight = 0.40476190476190466D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UseBorderColor = false;
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UseFont = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.Text = "Zwischensumme [ItemDescription]:";
+            this.xrTableCell16.Weight = 2.5081966173815942D;
+            // 
+            // xrTableCell18
+            // 
+            this.xrTableCell18.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
+            this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
+            this.xrTableCell18.Name = "xrTableCell18";
+            this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell18.StylePriority.UseBorderColor = false;
+            this.xrTableCell18.StylePriority.UseBorders = false;
+            this.xrTableCell18.StylePriority.UseFont = false;
+            this.xrTableCell18.StylePriority.UsePadding = false;
+            this.xrTableCell18.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell18.Summary = xrSummary1;
+            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
+            this.xrTableCell18.Weight = 0.49180338261840573D;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell22});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.23809523809523805D;
+            // 
+            // xrTableCell22
+            // 
+            this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrTableCell22.Name = "xrTableCell22";
+            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell22.StylePriority.UseBorderColor = false;
+            this.xrTableCell22.StylePriority.UseBorders = false;
+            this.xrTableCell22.StylePriority.UseFont = false;
+            this.xrTableCell22.StylePriority.UsePadding = false;
+            this.xrTableCell22.Weight = 3D;
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -1055,99 +1148,6 @@ namespace AlphaEv
             this.calculatedField1.Expression = "([UnitCount] * [RateFactor]) -[UnitCount]\n";
             this.calculatedField1.Name = "calculatedField1";
             // 
-            // Zwischensumme
-            // 
-            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable6});
-            this.Zwischensumme.HeightF = 27.00001F;
-            this.Zwischensumme.Name = "Zwischensumme";
-            this.Zwischensumme.Visible = false;
-            // 
-            // xrTable6
-            // 
-            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable6.Name = "xrTable6";
-            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow12,
-            this.xrTableRow10});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(610.0001F, 27.00001F);
-            this.xrTable6.StylePriority.UseFont = false;
-            // 
-            // xrTableRow12
-            // 
-            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell16,
-            this.xrTableCell18});
-            this.xrTableRow12.Name = "xrTableRow12";
-            this.xrTableRow12.Weight = 0.40476190476190466D;
-            // 
-            // xrTableCell16
-            // 
-            this.xrTableCell16.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell16.StylePriority.UseBorderColor = false;
-            this.xrTableCell16.StylePriority.UseBorders = false;
-            this.xrTableCell16.StylePriority.UseFont = false;
-            this.xrTableCell16.StylePriority.UsePadding = false;
-            this.xrTableCell16.Text = "Zwischensumme [ItemDescription]:";
-            this.xrTableCell16.Weight = 2.5081966173815942D;
-            // 
-            // xrTableCell18
-            // 
-            this.xrTableCell18.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell18.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
-            this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
-            this.xrTableCell18.Name = "xrTableCell18";
-            this.xrTableCell18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell18.StylePriority.UseBorderColor = false;
-            this.xrTableCell18.StylePriority.UseBorders = false;
-            this.xrTableCell18.StylePriority.UseFont = false;
-            this.xrTableCell18.StylePriority.UsePadding = false;
-            this.xrTableCell18.StylePriority.UseTextAlignment = false;
-            xrSummary1.FormatString = "{0:c}";
-            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell18.Summary = xrSummary1;
-            this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight;
-            this.xrTableCell18.Weight = 0.49180338261840573D;
-            // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell22});
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.23809523809523805D;
-            // 
-            // xrTableCell22
-            // 
-            this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell22.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
-            this.xrTableCell22.Name = "xrTableCell22";
-            this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell22.StylePriority.UseBorderColor = false;
-            this.xrTableCell22.StylePriority.UseBorders = false;
-            this.xrTableCell22.StylePriority.UseFont = false;
-            this.xrTableCell22.StylePriority.UsePadding = false;
-            this.xrTableCell22.Weight = 3D;
-            // 
-            // xrLabel5
-            // 
-            this.xrLabel5.CanShrink = true;
-            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Verdana", 8F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 51.24995F);
-            this.xrLabel5.Multiline = true;
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(470.8333F, 43.75F);
-            this.xrLabel5.StylePriority.UseFont = false;
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
@@ -1184,8 +1184,8 @@ namespace AlphaEv
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 

ReportImp/AlphaEv/SettlementReport2.cs

@@ -1,11 +1,7 @@
 using System;
-using System.Drawing;
-using System.Collections;
-using System.ComponentModel;
 using DevExpress.XtraReports.UI;
 using BeWo.Report.ReportObjects;
 using BeWo.Report;
-using System.Text.RegularExpressions;
 using BS.Shared.Extensions;
 using System.Text;
 
@@ -20,11 +16,6 @@ namespace AlphaEv
 
         public void SetReportDataSource(Settlement2RO pRO)
         {
-			//if (String.IsNullOrEmpty(pRO.Notice))
-			//{
-			//	lblNotice.Visible = false;
-			//}
-
             StringBuilder sb = new StringBuilder();
 
             if (!String.IsNullOrEmpty(pRO.RecipientOrganisation))
@@ -76,6 +67,11 @@ namespace AlphaEv
             {
                 lblDifferenzrechnungText.Text = "Höhe der bereits gestellten Rechnung vor Stundensatzanpassung:";
                 lblDifferenzrechnung.Text = string.Format("{0:c}", pRO.AmountBillableTotal - (pRO.AmountAdvancedPayments + pRO.Claim));
+            }
+
+            if (pRO.Claim > 0)
+            {
+                lblNotice.Text += "Die Rechnung ist zahlbar innerhalb von 30 Tagen.";
             }
 
             this.bindingSource1.DataSource = pRO;

ReportImp/AlphaEv/SettlementReportWuppertal.Designer.cs

@@ -43,11 +43,19 @@ namespace AlphaEv
             this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel();
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
+            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrRichText1 = new DevExpress.XtraReports.UI.XRRichText();
             this.lblParagrafen = new DevExpress.XtraReports.UI.XRLabel();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -71,6 +79,13 @@ namespace AlphaEv
             this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand();
+            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
+            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
+            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
+            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand();
             this.xrTable4 = new DevExpress.XtraReports.UI.XRTable();
             this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow();
@@ -95,28 +110,13 @@ namespace AlphaEv
             this.xrTableCell27 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTable3 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand();
-            this.xrTable6 = new DevExpress.XtraReports.UI.XRTable();
-            this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow();
-            this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
             // 
@@ -225,9 +225,21 @@ namespace AlphaEv
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
+            // xrLabel5
+            // 
+            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
+            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
+            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 73.9375F);
+            this.xrLabel5.Multiline = true;
+            this.xrLabel5.Name = "xrLabel5";
+            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel5.SizeF = new System.Drawing.SizeF(402.9219F, 74.56245F);
+            this.xrLabel5.StylePriority.UseFont = false;
+            // 
             // xrRichText1
             // 
-            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(444.5887F, 43.93749F);
+            this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(444.5887F, 60.93749F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
             this.xrRichText1.SizeF = new System.Drawing.SizeF(205.411F, 171.4376F);
@@ -235,13 +247,13 @@ namespace AlphaEv
             // lblParagrafen
             // 
             this.lblParagrafen.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
-            this.lblParagrafen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00002F);
+            this.lblParagrafen.LocationFloat = new DevExpress.Utils.PointFloat(0F, 10.00004F);
             this.lblParagrafen.Multiline = true;
             this.lblParagrafen.Name = "lblParagrafen";
             this.lblParagrafen.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.lblParagrafen.SizeF = new System.Drawing.SizeF(623.25F, 33.93744F);
+            this.lblParagrafen.SizeF = new System.Drawing.SizeF(623.25F, 50.93746F);
             this.lblParagrafen.StylePriority.UseFont = false;
-            this.lblParagrafen.Text = "Diese Leistungen sind umsatzsteuerfrei nach § 53, 54 SGB XII.";
+            this.lblParagrafen.Text = "Diese Leistungen sind umsatzsteuerfrei nach § 53, 54 SGB XII.\r\n\r\n";
             // 
             // topMarginBand1
             // 
@@ -279,6 +291,79 @@ namespace AlphaEv
             this.GroupHeader1.Name = "GroupHeader1";
             this.GroupHeader1.StylePriority.UseFont = false;
             // 
+            // xrTable3
+            // 
+            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F);
+            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 427.6296F);
+            this.xrTable3.Name = "xrTable3";
+            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow5});
+            this.xrTable3.SizeF = new System.Drawing.SizeF(649.9999F, 20F);
+            this.xrTable3.StylePriority.UseBorderColor = false;
+            this.xrTable3.StylePriority.UseFont = false;
+            // 
+            // xrTableRow5
+            // 
+            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell3,
+            this.xrTableCell6,
+            this.xrTableCell16,
+            this.xrTableCell29,
+            this.xrTableCell30});
+            this.xrTableRow5.Name = "xrTableRow5";
+            this.xrTableRow5.StylePriority.UseBorders = false;
+            this.xrTableRow5.Weight = 0.1D;
+            // 
+            // xrTableCell3
+            // 
+            this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell3.Name = "xrTableCell3";
+            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell3.StylePriority.UseBorders = false;
+            this.xrTableCell3.StylePriority.UsePadding = false;
+            this.xrTableCell3.Text = "Zeitraum";
+            this.xrTableCell3.Weight = 0.52556581663260749D;
+            // 
+            // xrTableCell6
+            // 
+            this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell6.Name = "xrTableCell6";
+            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell6.StylePriority.UseBorders = false;
+            this.xrTableCell6.StylePriority.UsePadding = false;
+            this.xrTableCell6.Text = "Stunden";
+            this.xrTableCell6.Weight = 0.2731899045499907D;
+            // 
+            // xrTableCell16
+            // 
+            this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell16.Name = "xrTableCell16";
+            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell16.StylePriority.UseBorders = false;
+            this.xrTableCell16.StylePriority.UsePadding = false;
+            this.xrTableCell16.Text = "Bezeichnung";
+            this.xrTableCell16.Weight = 0.43450149402048D;
+            // 
+            // xrTableCell29
+            // 
+            this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell29.Name = "xrTableCell29";
+            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell29.StylePriority.UseBorders = false;
+            this.xrTableCell29.StylePriority.UsePadding = false;
+            this.xrTableCell29.Text = "LE";
+            this.xrTableCell29.Weight = 0.27318969016758388D;
+            // 
+            // xrTableCell30
+            // 
+            this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
+            this.xrTableCell30.Name = "xrTableCell30";
+            this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell30.StylePriority.UseBorders = false;
+            this.xrTableCell30.StylePriority.UsePadding = false;
+            this.xrTableCell30.Text = "Summe";
+            this.xrTableCell30.Weight = 0.29660632316688823D;
+            // 
             // xrLabel6
             // 
             this.xrLabel6.Font = new DevExpress.Drawing.DXFont("Calibri", 11F);
@@ -565,6 +650,86 @@ namespace AlphaEv
             this.GroupHeader2.Name = "GroupHeader2";
             this.GroupHeader2.StylePriority.UseBorderColor = false;
             // 
+            // Zwischensumme
+            // 
+            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrTable6});
+            this.Zwischensumme.HeightF = 27F;
+            this.Zwischensumme.Name = "Zwischensumme";
+            this.Zwischensumme.Visible = false;
+            // 
+            // xrTable6
+            // 
+            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.xrTable6.Name = "xrTable6";
+            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
+            this.xrTableRow12,
+            this.xrTableRow10});
+            this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 27F);
+            this.xrTable6.StylePriority.UseFont = false;
+            // 
+            // xrTableRow12
+            // 
+            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell1,
+            this.xrTableCell2});
+            this.xrTableRow12.Name = "xrTableRow12";
+            this.xrTableRow12.Weight = 0.40476190476190466D;
+            // 
+            // xrTableCell1
+            // 
+            this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrTableCell1.Name = "xrTableCell1";
+            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell1.StylePriority.UseBorderColor = false;
+            this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
+            this.xrTableCell1.StylePriority.UsePadding = false;
+            this.xrTableCell1.Text = "Zwischensumme [ItemDescription]:";
+            this.xrTableCell1.Weight = 2.5080772986778848D;
+            // 
+            // xrTableCell2
+            // 
+            this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrTableCell2.Name = "xrTableCell2";
+            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell2.StylePriority.UseBorderColor = false;
+            this.xrTableCell2.StylePriority.UseBorders = false;
+            this.xrTableCell2.StylePriority.UseFont = false;
+            this.xrTableCell2.StylePriority.UsePadding = false;
+            this.xrTableCell2.StylePriority.UseTextAlignment = false;
+            xrSummary1.FormatString = "{0:c}";
+            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
+            this.xrTableCell2.Summary = xrSummary1;
+            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
+            this.xrTableCell2.Weight = 0.4919227013221153D;
+            // 
+            // xrTableRow10
+            // 
+            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
+            this.xrTableCell4});
+            this.xrTableRow10.Name = "xrTableRow10";
+            this.xrTableRow10.Weight = 0.23809523809523805D;
+            // 
+            // xrTableCell4
+            // 
+            this.xrTableCell4.BorderColor = System.Drawing.SystemColors.ControlLight;
+            this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
+            this.xrTableCell4.Name = "xrTableCell4";
+            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrTableCell4.StylePriority.UseBorderColor = false;
+            this.xrTableCell4.StylePriority.UseBorders = false;
+            this.xrTableCell4.StylePriority.UseFont = false;
+            this.xrTableCell4.StylePriority.UsePadding = false;
+            this.xrTableCell4.Weight = 3D;
+            // 
             // GroupFooter1
             // 
             this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -861,171 +1026,6 @@ namespace AlphaEv
             this.xrTableCell32.TextFormatString = "{0:C}";
             this.xrTableCell32.Weight = 0.1461538938457071D;
             // 
-            // xrTable3
-            // 
-            this.xrTable3.Font = new DevExpress.Drawing.DXFont("Times New Roman", 10F);
-            this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 427.6296F);
-            this.xrTable3.Name = "xrTable3";
-            this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow5});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(649.9999F, 20F);
-            this.xrTable3.StylePriority.UseBorderColor = false;
-            this.xrTable3.StylePriority.UseFont = false;
-            // 
-            // xrTableRow5
-            // 
-            this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell3,
-            this.xrTableCell6,
-            this.xrTableCell16,
-            this.xrTableCell29,
-            this.xrTableCell30});
-            this.xrTableRow5.Name = "xrTableRow5";
-            this.xrTableRow5.StylePriority.UseBorders = false;
-            this.xrTableRow5.Weight = 0.1D;
-            // 
-            // xrTableCell3
-            // 
-            this.xrTableCell3.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell3.Name = "xrTableCell3";
-            this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell3.StylePriority.UseBorders = false;
-            this.xrTableCell3.StylePriority.UsePadding = false;
-            this.xrTableCell3.Text = "Zeitraum";
-            this.xrTableCell3.Weight = 0.52556581663260749D;
-            // 
-            // xrTableCell6
-            // 
-            this.xrTableCell6.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell6.Name = "xrTableCell6";
-            this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell6.StylePriority.UseBorders = false;
-            this.xrTableCell6.StylePriority.UsePadding = false;
-            this.xrTableCell6.Text = "Stunden";
-            this.xrTableCell6.Weight = 0.2731899045499907D;
-            // 
-            // xrTableCell16
-            // 
-            this.xrTableCell16.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell16.Name = "xrTableCell16";
-            this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell16.StylePriority.UseBorders = false;
-            this.xrTableCell16.StylePriority.UsePadding = false;
-            this.xrTableCell16.Text = "Bezeichnung";
-            this.xrTableCell16.Weight = 0.43450149402048D;
-            // 
-            // xrTableCell29
-            // 
-            this.xrTableCell29.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell29.Name = "xrTableCell29";
-            this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell29.StylePriority.UseBorders = false;
-            this.xrTableCell29.StylePriority.UsePadding = false;
-            this.xrTableCell29.Text = "LE";
-            this.xrTableCell29.Weight = 0.27318969016758388D;
-            // 
-            // xrTableCell30
-            // 
-            this.xrTableCell30.Borders = DevExpress.XtraPrinting.BorderSide.Bottom;
-            this.xrTableCell30.Name = "xrTableCell30";
-            this.xrTableCell30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell30.StylePriority.UseBorders = false;
-            this.xrTableCell30.StylePriority.UsePadding = false;
-            this.xrTableCell30.Text = "Summe";
-            this.xrTableCell30.Weight = 0.29660632316688823D;
-            // 
-            // Zwischensumme
-            // 
-            this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrTable6});
-            this.Zwischensumme.HeightF = 27F;
-            this.Zwischensumme.Name = "Zwischensumme";
-            this.Zwischensumme.Visible = false;
-            // 
-            // xrTable6
-            // 
-            this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
-            this.xrTable6.Name = "xrTable6";
-            this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
-            this.xrTableRow12,
-            this.xrTableRow10});
-            this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 27F);
-            this.xrTable6.StylePriority.UseFont = false;
-            // 
-            // xrTableRow12
-            // 
-            this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell1,
-            this.xrTableCell2});
-            this.xrTableRow12.Name = "xrTableRow12";
-            this.xrTableRow12.Weight = 0.40476190476190466D;
-            // 
-            // xrTableCell1
-            // 
-            this.xrTableCell1.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell1.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
-            this.xrTableCell1.Name = "xrTableCell1";
-            this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell1.StylePriority.UseBorderColor = false;
-            this.xrTableCell1.StylePriority.UseBorders = false;
-            this.xrTableCell1.StylePriority.UseFont = false;
-            this.xrTableCell1.StylePriority.UsePadding = false;
-            this.xrTableCell1.Text = "Zwischensumme [ItemDescription]:";
-            this.xrTableCell1.Weight = 2.5080772986778848D;
-            // 
-            // xrTableCell2
-            // 
-            this.xrTableCell2.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell2.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")});
-            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
-            this.xrTableCell2.Name = "xrTableCell2";
-            this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell2.StylePriority.UseBorderColor = false;
-            this.xrTableCell2.StylePriority.UseBorders = false;
-            this.xrTableCell2.StylePriority.UseFont = false;
-            this.xrTableCell2.StylePriority.UsePadding = false;
-            this.xrTableCell2.StylePriority.UseTextAlignment = false;
-            xrSummary1.FormatString = "{0:c}";
-            xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group;
-            this.xrTableCell2.Summary = xrSummary1;
-            this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
-            this.xrTableCell2.Weight = 0.4919227013221153D;
-            // 
-            // xrTableRow10
-            // 
-            this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] {
-            this.xrTableCell4});
-            this.xrTableRow10.Name = "xrTableRow10";
-            this.xrTableRow10.Weight = 0.23809523809523805D;
-            // 
-            // xrTableCell4
-            // 
-            this.xrTableCell4.BorderColor = System.Drawing.SystemColors.ControlLight;
-            this.xrTableCell4.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F);
-            this.xrTableCell4.Name = "xrTableCell4";
-            this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrTableCell4.StylePriority.UseBorderColor = false;
-            this.xrTableCell4.StylePriority.UseBorders = false;
-            this.xrTableCell4.StylePriority.UseFont = false;
-            this.xrTableCell4.StylePriority.UsePadding = false;
-            this.xrTableCell4.Weight = 3D;
-            // 
-            // xrLabel5
-            // 
-            this.xrLabel5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")});
-            this.xrLabel5.Font = new DevExpress.Drawing.DXFont("Calibri", 10F);
-            this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.93749F);
-            this.xrLabel5.Multiline = true;
-            this.xrLabel5.Name = "xrLabel5";
-            this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel5.SizeF = new System.Drawing.SizeF(402.9219F, 74.56245F);
-            this.xrLabel5.StylePriority.UseFont = false;
-            // 
             // bindingSource1
             // 
             this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO);
@@ -1055,11 +1055,11 @@ namespace AlphaEv
             xrWatermark1.Id = "Watermark1";
             this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();
 

ReportImp/AlphaEv/SettlementReportWuppertal.cs

@@ -54,6 +54,11 @@ namespace AlphaEv
 				tableRowAbschlagszahlungen1.Visible = false;
 				if (lblDifferenzrechnungText.Text.IsNullOrEmpty())
 					tableRowEndbetrag.Visible = false;
+			}
+
+			if (pRO.Claim > 0)
+			{
+				lblParagrafen.Text += "Die Rechnung ist zahlbar innerhalb von 30 Tagen.";
 			}
 
 			this.bindingSource1.DataSource = pRO;

ReportImp/EvangelischeKirchengemeindeBottrop/Budgetnachweis.cs

@@ -62,7 +62,7 @@ namespace EvangelischeKirchengemeindeBottrop
 
 							if (ii.RateFactor == 0)
 							{
-								Zwischensumme.Visible = true;
+								// Zwischensumme.Visible = true;
 								
 								ii.ItemDescription = ii.ItemDescription.Replace("FLS", "Std.");
 								ii.UnitDescription = "Fehlkontakte";

ReportImp/EvangelischeKirchengemeindeBottrop/Budgetnachweis.designer.cs

@@ -31,9 +31,11 @@ namespace EvangelischeKirchengemeindeBottrop
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Budgetnachweis));
+            DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark();
             this.Detail = new DevExpress.XtraReports.UI.DetailBand();
             this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule();
             this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand();
+            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
             this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel();
@@ -49,25 +51,24 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
+            this.xrPanel1 = new DevExpress.XtraReports.UI.XRPanel();
+            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
+            this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel();
             this.lblAdresse = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel22 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel();
-            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand();
             this.xrCheckBox1 = new DevExpress.XtraReports.UI.XRCheckBox();
             this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrCheckBox2 = new DevExpress.XtraReports.UI.XRCheckBox();
-            this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
-            this.lblAktenzeichen = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel15 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPanel1 = new DevExpress.XtraReports.UI.XRPanel();
-            this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
+            this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this)).BeginInit();
@@ -92,6 +93,14 @@ namespace EvangelischeKirchengemeindeBottrop
             this.topMarginBand1.HeightF = 160F;
             this.topMarginBand1.Name = "topMarginBand1";
             // 
+            // xrPictureBox1
+            // 
+            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
+            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(416.7154F, 70.74997F);
+            this.xrPictureBox1.Name = "xrPictureBox1";
+            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(256.6039F, 89.25003F);
+            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            // 
             // bottomMarginBand1
             // 
             this.bottomMarginBand1.ForeColor = System.Drawing.Color.Transparent;
@@ -263,6 +272,131 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             this.xrTableCell2.Weight = 1D;
             // 
+            // xrPanel1
+            // 
+            this.xrPanel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrPanel1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
+            this.xrLabel15,
+            this.lblAktenzeichen,
+            this.xrLabel7,
+            this.xrLabel4,
+            this.xrLabel9,
+            this.xrLabel12});
+            this.xrPanel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 312.2108F);
+            this.xrPanel1.Name = "xrPanel1";
+            this.xrPanel1.SizeF = new System.Drawing.SizeF(673.3192F, 113.5367F);
+            this.xrPanel1.StylePriority.UseBorders = false;
+            // 
+            // xrLabel15
+            // 
+            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel15.CanShrink = true;
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 29.99999F);
+            this.xrLabel15.Name = "xrLabel15";
+            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel15.StylePriority.UseBackColor = false;
+            this.xrLabel15.StylePriority.UseBorders = false;
+            this.xrLabel15.StylePriority.UseFont = false;
+            this.xrLabel15.StylePriority.UsePadding = false;
+            this.xrLabel15.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown]";
+            this.xrLabel15.WordWrap = false;
+            // 
+            // lblAktenzeichen
+            // 
+            this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
+            this.lblAktenzeichen.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.lblAktenzeichen.CanShrink = true;
+            this.lblAktenzeichen.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 50F);
+            this.lblAktenzeichen.Multiline = true;
+            this.lblAktenzeichen.Name = "lblAktenzeichen";
+            this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.lblAktenzeichen.StylePriority.UseBackColor = false;
+            this.lblAktenzeichen.StylePriority.UseBorders = false;
+            this.lblAktenzeichen.StylePriority.UseFont = false;
+            this.lblAktenzeichen.StylePriority.UsePadding = false;
+            this.lblAktenzeichen.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]        Geburtsdatum: [CustomerBirthda" +
+    "yString]";
+            this.lblAktenzeichen.WordWrap = false;
+            // 
+            // xrLabel7
+            // 
+            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel7.CanShrink = true;
+            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00013F, 70.00008F);
+            this.xrLabel7.Multiline = true;
+            this.xrLabel7.Name = "xrLabel7";
+            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel7.StylePriority.UseBackColor = false;
+            this.xrLabel7.StylePriority.UseBorders = false;
+            this.xrLabel7.StylePriority.UseFont = false;
+            this.xrLabel7.StylePriority.UsePadding = false;
+            this.xrLabel7.Text = "Bewilligungszeitraum: [AccountingPeriod]";
+            this.xrLabel7.WordWrap = false;
+            // 
+            // xrLabel4
+            // 
+            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
+            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 90.00015F);
+            this.xrLabel4.Multiline = true;
+            this.xrLabel4.Name = "xrLabel4";
+            this.xrLabel4.SizeF = new System.Drawing.SizeF(551.38F, 20F);
+            this.xrLabel4.StylePriority.UseBackColor = false;
+            this.xrLabel4.StylePriority.UseBorders = false;
+            this.xrLabel4.StylePriority.UseFont = false;
+            this.xrLabel4.StylePriority.UsePadding = false;
+            this.xrLabel4.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum lt. Anlage:";
+            // 
+            // xrLabel9
+            // 
+            this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel9.BorderWidth = 2F;
+            this.xrLabel9.CanShrink = true;
+            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
+            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(561.38F, 90.00015F);
+            this.xrLabel9.Multiline = true;
+            this.xrLabel9.Name = "xrLabel9";
+            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
+            this.xrLabel9.SizeF = new System.Drawing.SizeF(98.62F, 20F);
+            this.xrLabel9.StylePriority.UseBackColor = false;
+            this.xrLabel9.StylePriority.UseBorders = false;
+            this.xrLabel9.StylePriority.UseBorderWidth = false;
+            this.xrLabel9.StylePriority.UseFont = false;
+            this.xrLabel9.StylePriority.UseTextAlignment = false;
+            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
+            this.xrLabel9.WordWrap = false;
+            // 
+            // xrLabel12
+            // 
+            this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
+            this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None;
+            this.xrLabel12.CanShrink = true;
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
+            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
+            this.xrLabel12.Name = "xrLabel12";
+            this.xrLabel12.SizeF = new System.Drawing.SizeF(650F, 20F);
+            this.xrLabel12.StylePriority.UseBackColor = false;
+            this.xrLabel12.StylePriority.UseBorders = false;
+            this.xrLabel12.StylePriority.UseFont = false;
+            this.xrLabel12.StylePriority.UsePadding = false;
+            this.xrLabel12.Text = "Leistungsberechtigte/r:";
+            this.xrLabel12.WordWrap = false;
+            // 
             // xrLabel8
             // 
             this.xrLabel8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold);
@@ -302,7 +436,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel2.StylePriority.UseBorders = false;
             this.xrLabel2.StylePriority.UseFont = false;
             this.xrLabel2.StylePriority.UseTextAlignment = false;
-            this.xrLabel2.Text = "ZAD-Nr. des LWL: ";
+            this.xrLabel2.Text = "ZAD-Nr. des LWL: 9029808.1";
             this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
             // xrLabel23
@@ -312,7 +446,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel23.CanShrink = true;
             this.xrLabel23.Font = new DevExpress.Drawing.DXFont("Arial", 12F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Italic))));
             this.xrLabel23.ForeColor = System.Drawing.Color.Transparent;
-            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 214.2915F);
+            this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 221.2915F);
             this.xrLabel23.Name = "xrLabel23";
             this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel23.SizeF = new System.Drawing.SizeF(647.8746F, 20F);
@@ -328,7 +462,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel22.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel22.CanShrink = true;
             this.xrLabel22.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
-            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 234.2915F);
+            this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0.0002543131F, 241.2915F);
             this.xrLabel22.Name = "xrLabel22";
             this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel22.SizeF = new System.Drawing.SizeF(647.8746F, 16.99998F);
@@ -351,10 +485,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel19.StylePriority.UseFont = false;
             this.xrLabel19.Text = resources.GetString("xrLabel19.Text");
             // 
-            // bindingSource1
-            // 
-            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
-            // 
             // ReportFooter
             // 
             this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -365,7 +495,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel22,
             this.xrLabel23});
             this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 12F);
-            this.ReportFooter.HeightF = 251.2915F;
+            this.ReportFooter.HeightF = 258.2915F;
             this.ReportFooter.Name = "ReportFooter";
             this.ReportFooter.StylePriority.UseFont = false;
             // 
@@ -386,11 +516,9 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel10.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink;
-            this.xrLabel10.SizeF = new System.Drawing.SizeF(647.8748F, 59.70834F);
+            this.xrLabel10.SizeF = new System.Drawing.SizeF(647.8748F, 75.64563F);
             this.xrLabel10.StylePriority.UseFont = false;
-            this.xrLabel10.Text = "Sollte sich bei der Abrechnung der Fachleistungsstunden ein Auszahlungsbetrag zu " +
-    "unseren Gunsten ergeben, bitten wir um Erstattung auf folgendes Konto:\n\n\r\nKredit" +
-    "institut:   \tIBAN: DE\r\nKontoinhaber:";
+            this.xrLabel10.Text = resources.GetString("xrLabel10.Text");
             // 
             // xrCheckBox2
             // 
@@ -401,138 +529,9 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrCheckBox2.StylePriority.UseFont = false;
             this.xrCheckBox2.Text = " Die Betreuung dauert an.";
             // 
-            // xrLabel12
+            // bindingSource1
             // 
-            this.xrLabel12.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel12.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel12.CanShrink = true;
-            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 9F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline))), DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 9.999974F);
-            this.xrLabel12.Name = "xrLabel12";
-            this.xrLabel12.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel12.StylePriority.UseBackColor = false;
-            this.xrLabel12.StylePriority.UseBorders = false;
-            this.xrLabel12.StylePriority.UseFont = false;
-            this.xrLabel12.StylePriority.UsePadding = false;
-            this.xrLabel12.Text = "Leistungsberechtigte/r:";
-            this.xrLabel12.WordWrap = false;
-            // 
-            // xrLabel9
-            // 
-            this.xrLabel9.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel9.BorderWidth = 2F;
-            this.xrLabel9.CanShrink = true;
-            this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "RecordedFLSTotal", "{0:0.00}")});
-            this.xrLabel9.Font = new DevExpress.Drawing.DXFont("Arial", 9F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
-            this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(561.38F, 90.00015F);
-            this.xrLabel9.Multiline = true;
-            this.xrLabel9.Name = "xrLabel9";
-            this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
-            this.xrLabel9.SizeF = new System.Drawing.SizeF(98.62F, 20F);
-            this.xrLabel9.StylePriority.UseBackColor = false;
-            this.xrLabel9.StylePriority.UseBorders = false;
-            this.xrLabel9.StylePriority.UseBorderWidth = false;
-            this.xrLabel9.StylePriority.UseFont = false;
-            this.xrLabel9.StylePriority.UseTextAlignment = false;
-            this.xrLabel9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrLabel9.WordWrap = false;
-            // 
-            // xrLabel7
-            // 
-            this.xrLabel7.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel7.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel7.CanShrink = true;
-            this.xrLabel7.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
-            this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(10.00013F, 70.00008F);
-            this.xrLabel7.Multiline = true;
-            this.xrLabel7.Name = "xrLabel7";
-            this.xrLabel7.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel7.StylePriority.UseBackColor = false;
-            this.xrLabel7.StylePriority.UseBorders = false;
-            this.xrLabel7.StylePriority.UseFont = false;
-            this.xrLabel7.StylePriority.UsePadding = false;
-            this.xrLabel7.Text = "Bewilligungszeitraum: [AccountingPeriod]";
-            this.xrLabel7.WordWrap = false;
-            // 
-            // lblAktenzeichen
-            // 
-            this.lblAktenzeichen.BackColor = System.Drawing.Color.Transparent;
-            this.lblAktenzeichen.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.lblAktenzeichen.CanShrink = true;
-            this.lblAktenzeichen.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
-            this.lblAktenzeichen.LocationFloat = new DevExpress.Utils.PointFloat(10.00001F, 50F);
-            this.lblAktenzeichen.Multiline = true;
-            this.lblAktenzeichen.Name = "lblAktenzeichen";
-            this.lblAktenzeichen.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.lblAktenzeichen.StylePriority.UseBackColor = false;
-            this.lblAktenzeichen.StylePriority.UseBorders = false;
-            this.lblAktenzeichen.StylePriority.UseFont = false;
-            this.lblAktenzeichen.StylePriority.UsePadding = false;
-            this.lblAktenzeichen.Text = "Aktenzeichen LWL: [CustomerReferenceNumber]        Geburtsdatum: [CustomerBirthda" +
-    "yString]";
-            this.lblAktenzeichen.WordWrap = false;
-            // 
-            // xrLabel15
-            // 
-            this.xrLabel15.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel15.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel15.CanShrink = true;
-            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
-            this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(10.0001F, 29.99999F);
-            this.xrLabel15.Name = "xrLabel15";
-            this.xrLabel15.SizeF = new System.Drawing.SizeF(650F, 20F);
-            this.xrLabel15.StylePriority.UseBackColor = false;
-            this.xrLabel15.StylePriority.UseBorders = false;
-            this.xrLabel15.StylePriority.UseFont = false;
-            this.xrLabel15.StylePriority.UsePadding = false;
-            this.xrLabel15.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown]";
-            this.xrLabel15.WordWrap = false;
-            // 
-            // xrPanel1
-            // 
-            this.xrPanel1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrPanel1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
-            this.xrLabel15,
-            this.lblAktenzeichen,
-            this.xrLabel7,
-            this.xrLabel4,
-            this.xrLabel9,
-            this.xrLabel12});
-            this.xrPanel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 312.2108F);
-            this.xrPanel1.Name = "xrPanel1";
-            this.xrPanel1.SizeF = new System.Drawing.SizeF(673.3192F, 113.5367F);
-            this.xrPanel1.StylePriority.UseBorders = false;
-            // 
-            // xrLabel4
-            // 
-            this.xrLabel4.BackColor = System.Drawing.Color.Transparent;
-            this.xrLabel4.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Arial", 9F);
-            this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(9.999974F, 90.00015F);
-            this.xrLabel4.Multiline = true;
-            this.xrLabel4.Name = "xrLabel4";
-            this.xrLabel4.SizeF = new System.Drawing.SizeF(551.38F, 20F);
-            this.xrLabel4.StylePriority.UseBackColor = false;
-            this.xrLabel4.StylePriority.UseBorders = false;
-            this.xrLabel4.StylePriority.UseFont = false;
-            this.xrLabel4.StylePriority.UsePadding = false;
-            this.xrLabel4.Text = "Tatsächlich geleistete Fachleistungsstunden im Bewilligungszeitraum lt. Anlage:";
-            // 
-            // xrPictureBox1
-            // 
-            this.xrPictureBox1.ImageSource = new DevExpress.XtraPrinting.Drawing.ImageSource("img", resources.GetString("xrPictureBox1.ImageSource"));
-            this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(416.7154F, 70.74997F);
-            this.xrPictureBox1.Name = "xrPictureBox1";
-            this.xrPictureBox1.SizeF = new System.Drawing.SizeF(256.6039F, 89.25003F);
-            this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
+            this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO);
             // 
             // Budgetnachweis
             // 
@@ -542,6 +541,8 @@ namespace EvangelischeKirchengemeindeBottrop
             this.bottomMarginBand1,
             this.GroupHeader1,
             this.ReportFooter});
+            this.ComponentStorage.AddRange(new System.ComponentModel.IComponent[] {
+            this.bindingSource1});
             this.DataSource = this.bindingSource1;
             this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung";
             this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] {
@@ -551,6 +552,8 @@ namespace EvangelischeKirchengemeindeBottrop
             this.PageWidth = 827;
             this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4;
             this.Version = "23.2";
+            xrWatermark1.Id = "Watermark1";
+            this.Watermarks.Add(xrWatermark1);
             ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this)).EndInit();

ReportImp/EvangelischeKirchengemeindeBottrop/Budgetnachweis.resx

@@ -123,4 +123,11 @@
   <data name="xrLabel19.Text" xml:space="preserve">
     <value>Hiermit wird erklärt, dass die Verpflichtungen aus den Vereinbarungen nach §§75 ff. SGB XII bzw. §§125 ff. SGB IX eingehalten wurden und alle hier gemachten Angaben je Betreuungskontakt anhand der Quittierungsbelege sowie der Betreuungsdokumentation jederzeit nachgewiesen werden können. Diese Unterlagen sind 5 Jahre lang aufzubewahren und auf Verlangen des Sozialhilfeträgers bzw. des Trägers der Eingliederungshilfe vorzulegen (§2 Abs.1 der Vergütungsvereinbarung).</value>
   </data>
+  <data name="xrLabel10.Text" xml:space="preserve">
+    <value>Sollte sich bei der Abrechnung der Fachleistungsstunden ein Auszahlungsbetrag zu unseren Gunsten ergeben, bitten wir um Erstattung auf folgendes Konto:
+
+
+Kreditinstitut:	KD Bank eG			IBAN:	DE42 3506 0190 2001 0620 10
+Kontoinhaber:	Ev. Kirchengemeinde Bottrop</value>
+  </data>
 </root>

ReportImp/EvangelischeKirchengemeindeBottrop/CustomReportCreator.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using BeWo.Report;
 using BeWo.Report.ReportObjects;
 using DevExpress.XtraReports.UI;
@@ -10,7 +11,7 @@ namespace EvangelischeKirchengemeindeBottrop
 	   
         public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
 		{
-			List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
+			List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay, serviceCategoryOid);
 
 			if (lROs.Count > 0)
 			{
@@ -52,37 +53,47 @@ namespace EvangelischeKirchengemeindeBottrop
 
         private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
 		{
-			XtraReport report = null;
+			XtraReport report = null;
+
+			ServicesOverviewRO eghRo = ServicesOverviewRO.CopyFromRO(ro);
+			eghRo.SupportConceptCostBearer = ro.SupportConceptCostBearer;
+			ServicesOverviewRO direkt67Ro = ServicesOverviewRO.CopyFromRO(ro);
+            direkt67Ro.SupportConceptCostBearer = ro.SupportConceptCostBearer;
+            ServicesOverviewRO indirekt67Ro = ServicesOverviewRO.CopyFromRO(ro);
+            indirekt67Ro.SupportConceptCostBearer = ro.SupportConceptCostBearer;
+
+			if (!String.IsNullOrWhiteSpace(ro.Costbearer) && ro.Costbearer.ToLower().Contains("lwl egh"))
+			{
+				eghRo.Services.AddRange(ro.Services);
+			}
+			else
+			{
+				if (ro.Services != null)
+				{
+					foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
+					{
+						if (s.IsBillable)
+						{
+							if (s.ServiceCategory.Contains("Fachleistung"))
+							{
+								direkt67Ro.Services.Add(s);
+							}
+							else
+							{
+								indirekt67Ro.Services.Add(s);
+							}
+						}
+					}
+				}
+			}
 
-            ServicesOverviewRO direktRo = ServicesOverviewRO.CopyFromRO(ro);
-            direktRo.SupportConceptCostBearer = ro.SupportConceptCostBearer;
-            ServicesOverviewRO indirektRo = ServicesOverviewRO.CopyFromRO(ro);
-            indirektRo.SupportConceptCostBearer = ro.SupportConceptCostBearer;
-
-            if (ro.Services != null)
-            {
-                foreach (ServicesOverviewRO.ServiceDetail s in ro.Services)
-                {
-                    if (s.IsBillable)
-                    {
-                        if (s.ServiceCategory.Contains("Fachleistung"))
-                        {
-                            direktRo.Services.Add(s);
-                            
-                        }
-                        else
-                        {
-                            indirektRo.Services.Add(s);
-                        }
-                    }
-                }
-
-            }
-		    report = AddReportToReport<Stundenzettel67Direkt>(report, direktRo);
-		    report = AddReportToReport<Stundenzettel67>(report, indirektRo);
+			report = AddReportToReport<QuittierungsbelegEGH>(report, eghRo);
+			report = AddReportToReport<Stundenzettel67Direkt>(report, direkt67Ro);
+			report = AddReportToReport<Stundenzettel67>(report, indirekt67Ro);
 
             if (report == null)
                 report = new XtraReport();
+
             return report;
         }
 
@@ -94,7 +105,6 @@ namespace EvangelischeKirchengemeindeBottrop
 	            {
 	                report = new T();
 	                ((T)report).SetReportDataSource(ro);
-
 	            }
 	            else
 	            {

ReportImp/EvangelischeKirchengemeindeBottrop/EvangelischeKirchengemeindeBottrop.csproj

@@ -55,6 +55,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Budgetnachweis.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="Budgetnachweis.designer.cs">
+      <DependentUpon>Budgetnachweis.cs</DependentUpon>
+    </Compile>
     <Compile Include="CustomReportCreator.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="QuittierungsbelegEGH.cs">
@@ -107,6 +113,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Budgetnachweis.resx">
+      <DependentUpon>Budgetnachweis.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="QuittierungsbelegEGH.resx">
       <DependentUpon>QuittierungsbelegEGH.cs</DependentUpon>

ReportImp/EvangelischeKirchengemeindeBottrop/QuittierungsbelegEGH.Designer.cs

@@ -42,7 +42,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell();
             this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox();
             this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand();
@@ -52,7 +51,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow();
             this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell();
@@ -60,11 +58,16 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell();
-            this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell();
             this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell();
             this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components);
             this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule();
             this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand();
+            this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
+            this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel();
             this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel();
@@ -120,12 +123,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox();
             this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel();
             this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField();
-            this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel();
-            this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel();
             ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit();
@@ -175,7 +172,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTable3.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow6});
-            this.xrTable3.SizeF = new System.Drawing.SizeF(735F, 20F);
+            this.xrTable3.SizeF = new System.Drawing.SizeF(734.9999F, 20F);
             this.xrTable3.StylePriority.UseFont = false;
             this.xrTable3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft;
             // 
@@ -188,7 +185,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell2,
             this.xrTableCell15,
             this.xrTableCell12,
-            this.xrTableCell44,
             this.xrTableCell50});
             this.xrTableRow6.Name = "xrTableRow6";
             this.xrTableRow6.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -199,8 +195,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell13.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDate", "{0:dd/MM/yyyy}")});
-            this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell13.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell13.Name = "xrTableCell13";
             this.xrTableCell13.StylePriority.UseBorders = false;
             this.xrTableCell13.StylePriority.UseFont = false;
@@ -215,8 +210,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.StartDateMinutes", "{0:HH:mm}")});
-            this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell14.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell14.Name = "xrTableCell14";
             this.xrTableCell14.StylePriority.UseBorders = false;
             this.xrTableCell14.StylePriority.UseFont = false;
@@ -231,8 +225,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EndDateMinutes", "{0:HH:mm}")});
-            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell10.Name = "xrTableCell10";
             this.xrTableCell10.StylePriority.UseBorders = false;
             this.xrTableCell10.StylePriority.UseFont = false;
@@ -247,8 +240,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice5")});
-            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell2.Name = "xrTableCell2";
             this.xrTableCell2.StylePriority.UseBorders = false;
             this.xrTableCell2.StylePriority.UseFont = false;
@@ -262,8 +254,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell15.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell15.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.CustomerCount", "{0:0}")});
-            this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell15.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell15.Name = "xrTableCell15";
             this.xrTableCell15.StylePriority.UseBorders = false;
             this.xrTableCell15.StylePriority.UseFont = false;
@@ -277,7 +268,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Minutes", "{0:0.##}")});
-            this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell12.Name = "xrTableCell12";
             this.xrTableCell12.StylePriority.UseBorders = false;
             this.xrTableCell12.StylePriority.UseFont = false;
@@ -286,19 +277,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             this.xrTableCell12.Weight = 0.10732323052948757D;
             // 
-            // xrTableCell44
-            // 
-            this.xrTableCell44.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.EmployeeAbbr")});
-            this.xrTableCell44.Name = "xrTableCell44";
-            this.xrTableCell44.StylePriority.UseBorders = false;
-            this.xrTableCell44.StylePriority.UseFont = false;
-            this.xrTableCell44.StylePriority.UsePadding = false;
-            this.xrTableCell44.StylePriority.UseTextAlignment = false;
-            this.xrTableCell44.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
-            this.xrTableCell44.Weight = 0.20202019104791347D;
-            // 
             // xrTableCell50
             // 
             this.xrTableCell50.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] {
@@ -309,16 +287,16 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell50.StylePriority.UsePadding = false;
             this.xrTableCell50.StylePriority.UseTextAlignment = false;
             this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            this.xrTableCell50.Weight = 0.20202019042968572D;
+            this.xrTableCell50.Weight = 0.4040401997428591D;
             // 
             // picSignature
             // 
             this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None;
             this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")});
-            this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
+            this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(3.051758E-05F, 0F);
             this.picSignature.Name = "picSignature";
-            this.picSignature.SizeF = new System.Drawing.SizeF(160F, 20F);
+            this.picSignature.SizeF = new System.Drawing.SizeF(320.0044F, 20F);
             this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage;
             this.picSignature.StylePriority.UseBorders = false;
             this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint);
@@ -335,15 +313,14 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableServiceRecords1.BackColor = System.Drawing.Color.Gainsboro;
             this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None;
-            this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrTableServiceRecords1.Name = "xrTableServiceRecords1";
             this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
             this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] {
             this.xrTableRow2,
             this.xrTableRow1});
-            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(735F, 70F);
+            this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(734.9999F, 70F);
             this.xrTableServiceRecords1.StylePriority.UseBackColor = false;
             this.xrTableServiceRecords1.StylePriority.UseBorders = false;
             this.xrTableServiceRecords1.StylePriority.UseFont = false;
@@ -356,7 +333,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell4,
             this.xrTableCell11,
             this.xrTableCell9,
-            this.xrTableCell28,
             this.xrTableCell48});
             this.xrTableRow2.Name = "xrTableRow2";
             this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -367,8 +343,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell3.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell3.Name = "xrTableCell3";
             this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
             this.xrTableCell3.StylePriority.UseBorders = false;
@@ -383,8 +358,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell4.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell4.Multiline = true;
             this.xrTableCell4.Name = "xrTableCell4";
             this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(4, 4, 0, 0, 100F);
@@ -400,8 +374,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell11.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell11.Name = "xrTableCell11";
             this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(12, 12, 0, 0, 100F);
             this.xrTableCell11.StylePriority.UseBorders = false;
@@ -416,8 +389,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell9.Multiline = true;
             this.xrTableCell9.Name = "xrTableCell9";
             this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -429,32 +401,19 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
             this.xrTableCell9.Weight = 0.23743016759776536D;
             // 
-            // xrTableCell28
-            // 
-            this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell28.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrTableCell28.Name = "xrTableCell28";
-            this.xrTableCell28.StylePriority.UseBorders = false;
-            this.xrTableCell28.StylePriority.UseFont = false;
-            this.xrTableCell28.StylePriority.UseTextAlignment = false;
-            this.xrTableCell28.Text = "Betreuerin / Betreuer";
-            this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell28.Weight = 0.44692737430167595D;
-            // 
             // xrTableCell48
             // 
             this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell48.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell48.Multiline = true;
             this.xrTableCell48.Name = "xrTableCell48";
             this.xrTableCell48.StylePriority.UseBorders = false;
             this.xrTableCell48.StylePriority.UseFont = false;
             this.xrTableCell48.StylePriority.UseTextAlignment = false;
-            this.xrTableCell48.Text = "Unterschrift";
+            this.xrTableCell48.Text = "Unterschrift leistungsberechtigte Person";
             this.xrTableCell48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
-            this.xrTableCell48.Weight = 0.44692737430167606D;
+            this.xrTableCell48.Weight = 0.8938543223801938D;
             // 
             // xrTableRow1
             // 
@@ -464,7 +423,6 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell5,
             this.xrTableCell6,
             this.xrTableCell7,
-            this.xrTableCell43,
             this.xrTableCell49});
             this.xrTableRow1.Name = "xrTableRow1";
             this.xrTableRow1.Weight = 1.223644578313253D;
@@ -473,8 +431,10 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrTableCell1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell1.Name = "xrTableCell1";
             this.xrTableCell1.StylePriority.UseBorders = false;
+            this.xrTableCell1.StylePriority.UseFont = false;
             this.xrTableCell1.Weight = 0.26536312849161997D;
             // 
             // xrTableCell8
@@ -482,8 +442,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell8.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell8.Name = "xrTableCell8";
             this.xrTableCell8.StylePriority.UseBorders = false;
             this.xrTableCell8.StylePriority.UseFont = false;
@@ -497,8 +456,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell5.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell5.Name = "xrTableCell5";
             this.xrTableCell5.StylePriority.UseBorders = false;
             this.xrTableCell5.StylePriority.UseFont = false;
@@ -512,8 +470,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell6.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell6.Multiline = true;
             this.xrTableCell6.Name = "xrTableCell6";
             this.xrTableCell6.StylePriority.UseBorders = false;
@@ -528,8 +485,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell7.BackColor = System.Drawing.Color.Gainsboro;
             this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell7.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrTableCell7.Multiline = true;
             this.xrTableCell7.Name = "xrTableCell7";
             this.xrTableCell7.StylePriority.UseBackColor = false;
@@ -540,29 +496,20 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
             this.xrTableCell7.Weight = 0.23743016759776536D;
             // 
-            // xrTableCell43
-            // 
-            this.xrTableCell43.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell43.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
-            this.xrTableCell43.Name = "xrTableCell43";
-            this.xrTableCell43.StylePriority.UseBorders = false;
-            this.xrTableCell43.StylePriority.UseFont = false;
-            this.xrTableCell43.Weight = 0.44692737430167595D;
-            // 
             // xrTableCell49
             // 
             this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrTableCell49.Font = new DevExpress.Drawing.DXFont("Segoe UI", 8F);
             this.xrTableCell49.Multiline = true;
             this.xrTableCell49.Name = "xrTableCell49";
             this.xrTableCell49.StylePriority.UseBorders = false;
             this.xrTableCell49.StylePriority.UseFont = false;
             this.xrTableCell49.StylePriority.UseTextAlignment = false;
-            this.xrTableCell49.Text = "Klientin / Klient";
+            this.xrTableCell49.Text = "Betreuungskontakte und Fehlkontakte können zeitnah einzeln (in der jeweiligen Zei" +
+    "le) oder gesammelt quittiert werden (s. u.)";
             this.xrTableCell49.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter;
-            this.xrTableCell49.Weight = 0.44692737430167606D;
+            this.xrTableCell49.Weight = 0.8938543223801938D;
             // 
             // bindingSource1
             // 
@@ -598,6 +545,110 @@ namespace EvangelischeKirchengemeindeBottrop
             this.ReportHeader.Name = "ReportHeader";
             this.ReportHeader.StylePriority.UseFont = false;
             // 
+            // xrLabel29
+            // 
+            this.xrLabel29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
+            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 141.9936F);
+            this.xrLabel29.Name = "xrLabel29";
+            this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel29.SizeF = new System.Drawing.SizeF(522.3268F, 30.50001F);
+            this.xrLabel29.StylePriority.UseBackColor = false;
+            this.xrLabel29.StylePriority.UseBorders = false;
+            this.xrLabel29.StylePriority.UseFont = false;
+            this.xrLabel29.StylePriority.UsePadding = false;
+            this.xrLabel29.StylePriority.UseTextAlignment = false;
+            this.xrLabel29.Text = "[Month] [Year]";
+            this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel26
+            // 
+            this.xrLabel26.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.5F);
+            this.xrLabel26.Name = "xrLabel26";
+            this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel26.SizeF = new System.Drawing.SizeF(212.6731F, 26F);
+            this.xrLabel26.StylePriority.UseBackColor = false;
+            this.xrLabel26.StylePriority.UseBorders = false;
+            this.xrLabel26.StylePriority.UseFont = false;
+            this.xrLabel26.StylePriority.UsePadding = false;
+            this.xrLabel26.StylePriority.UseTextAlignment = false;
+            this.xrLabel26.Text = "verantw. Mitarbeitende/r";
+            this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel28
+            // 
+            this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
+            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant", "{0:0.##}")});
+            this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
+            this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 111.5F);
+            this.xrLabel28.Name = "xrLabel28";
+            this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel28.SizeF = new System.Drawing.SizeF(522.3313F, 26F);
+            this.xrLabel28.StylePriority.UseBackColor = false;
+            this.xrLabel28.StylePriority.UseBorders = false;
+            this.xrLabel28.StylePriority.UseFont = false;
+            this.xrLabel28.StylePriority.UsePadding = false;
+            this.xrLabel28.StylePriority.UseTextAlignment = false;
+            this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel27
+            // 
+            this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
+            this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
+            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(776.8888F, 123.875F);
+            this.xrLabel27.Name = "xrLabel27";
+            this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel27.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
+            this.xrLabel27.StylePriority.UseBackColor = false;
+            this.xrLabel27.StylePriority.UseBorders = false;
+            this.xrLabel27.StylePriority.UseFont = false;
+            this.xrLabel27.StylePriority.UsePadding = false;
+            this.xrLabel27.StylePriority.UseTextAlignment = false;
+            this.xrLabel27.Text = "[Month] [Year]";
+            this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel24
+            // 
+            this.xrLabel24.BackColor = System.Drawing.Color.Gainsboro;
+            this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
+            | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F, DevExpress.Drawing.DXFontStyle.Bold);
+            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.00001F);
+            this.xrLabel24.Name = "xrLabel24";
+            this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel24.SizeF = new System.Drawing.SizeF(212.6731F, 30.50001F);
+            this.xrLabel24.StylePriority.UseBackColor = false;
+            this.xrLabel24.StylePriority.UseBorders = false;
+            this.xrLabel24.StylePriority.UseFont = false;
+            this.xrLabel24.StylePriority.UsePadding = false;
+            this.xrLabel24.StylePriority.UseTextAlignment = false;
+            this.xrLabel24.Text = "Leistungserbringer";
+            this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
+            // xrLabel25
+            // 
+            this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
+            | DevExpress.XtraPrinting.BorderSide.Bottom)));
+            this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
+            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 25.00001F);
+            this.xrLabel25.Name = "xrLabel25";
+            this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
+            this.xrLabel25.SizeF = new System.Drawing.SizeF(522.3268F, 30.50001F);
+            this.xrLabel25.StylePriority.UseBackColor = false;
+            this.xrLabel25.StylePriority.UseBorders = false;
+            this.xrLabel25.StylePriority.UseFont = false;
+            this.xrLabel25.StylePriority.UsePadding = false;
+            this.xrLabel25.StylePriority.UseTextAlignment = false;
+            this.xrLabel25.Text = "Evangelische Kirchengemeinde Bottrop, ABW gem. §§ 123 ff. SGB IX";
+            this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
+            // 
             // xrLabel14
             // 
             this.xrLabel14.BackColor = System.Drawing.Color.Gainsboro;
@@ -814,7 +865,7 @@ namespace EvangelischeKirchengemeindeBottrop
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMFehlkontakte", "{0:0.##}")});
-            this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(329F, 20.00002F);
             this.xrLabel20.Name = "xrLabel20";
             this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -830,7 +881,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrLabel21.BackColor = System.Drawing.Color.Gainsboro;
             this.xrLabel21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel21.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(414.9998F, 20.00005F);
             this.xrLabel21.Name = "xrLabel21";
             this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -845,7 +896,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // lblFehlkontakt
             // 
-            this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblFehlkontakt.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.lblFehlkontakt.LocationFloat = new DevExpress.Utils.PointFloat(0F, 40.00005F);
             this.lblFehlkontakt.Name = "lblFehlkontakt";
             this.lblFehlkontakt.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -862,10 +913,12 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrLabel18.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel18.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 214.5F);
             this.xrLabel18.Name = "xrLabel18";
             this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel18.SizeF = new System.Drawing.SizeF(137.3333F, 35.50002F);
+            this.xrLabel18.StylePriority.UseFont = false;
             this.xrLabel18.StylePriority.UseTextAlignment = false;
             this.xrLabel18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
             // 
@@ -881,7 +934,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // lblUnterschriftKlient
             // 
             this.lblUnterschriftKlient.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblUnterschriftKlient.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.lblUnterschriftKlient.LocationFloat = new DevExpress.Utils.PointFloat(49.3611F, 250F);
             this.lblUnterschriftKlient.Name = "lblUnterschriftKlient";
             this.lblUnterschriftKlient.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -891,13 +944,13 @@ namespace EvangelischeKirchengemeindeBottrop
             this.lblUnterschriftKlient.StylePriority.UseFont = false;
             this.lblUnterschriftKlient.StylePriority.UsePadding = false;
             this.lblUnterschriftKlient.StylePriority.UseTextAlignment = false;
-            this.lblUnterschriftKlient.Text = "Datum, Unterschrift Klient/in";
+            this.lblUnterschriftKlient.Text = "Datum, Unterschrift leistungsberechtigte Person";
             this.lblUnterschriftKlient.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // lblUnterschriftMitarbeiter
             // 
             this.lblUnterschriftMitarbeiter.Borders = DevExpress.XtraPrinting.BorderSide.Top;
-            this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.lblUnterschriftMitarbeiter.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.lblUnterschriftMitarbeiter.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 250F);
             this.lblUnterschriftMitarbeiter.Name = "lblUnterschriftMitarbeiter";
             this.lblUnterschriftMitarbeiter.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -907,7 +960,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.lblUnterschriftMitarbeiter.StylePriority.UseFont = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UsePadding = false;
             this.lblUnterschriftMitarbeiter.StylePriority.UseTextAlignment = false;
-            this.lblUnterschriftMitarbeiter.Text = "Datum, verantwortliche/r Mitarbeiter/in";
+            this.lblUnterschriftMitarbeiter.Text = "Datum, Unterschrift Mitarbeitende/r";
             this.lblUnterschriftMitarbeiter.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter;
             // 
             // xrTableAbwesenheiten
@@ -916,8 +969,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrTableAbwesenheiten.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
             | DevExpress.XtraPrinting.BorderSide.Right) 
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableAbwesenheiten.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableAbwesenheiten.LocationFloat = new DevExpress.Utils.PointFloat(170F, 80.00005F);
             this.xrTableAbwesenheiten.Name = "xrTableAbwesenheiten";
             this.xrTableAbwesenheiten.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F);
@@ -945,8 +997,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell16
             // 
-            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell16.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell16.Name = "xrTableCell16";
             this.xrTableCell16.StylePriority.UseBorders = false;
             this.xrTableCell16.StylePriority.UseFont = false;
@@ -958,8 +1009,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell17
             // 
-            this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell17.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell17.Name = "xrTableCell17";
             this.xrTableCell17.StylePriority.UseBorders = false;
             this.xrTableCell17.StylePriority.UseFont = false;
@@ -971,8 +1021,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell18
             // 
-            this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell18.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell18.Name = "xrTableCell18";
             this.xrTableCell18.StylePriority.UseBorders = false;
             this.xrTableCell18.StylePriority.UseFont = false;
@@ -993,8 +1042,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell19
             // 
-            this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell19.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell19.Name = "xrTableCell19";
             this.xrTableCell19.StylePriority.UseFont = false;
             this.xrTableCell19.StylePriority.UseTextAlignment = false;
@@ -1003,8 +1051,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell20
             // 
-            this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell20.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell20.Name = "xrTableCell20";
             this.xrTableCell20.StylePriority.UseFont = false;
             this.xrTableCell20.StylePriority.UseTextAlignment = false;
@@ -1013,8 +1060,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell21
             // 
-            this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell21.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell21.Name = "xrTableCell21";
             this.xrTableCell21.StylePriority.UseFont = false;
             this.xrTableCell21.StylePriority.UseTextAlignment = false;
@@ -1032,8 +1078,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell22
             // 
-            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell22.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell22.Name = "xrTableCell22";
             this.xrTableCell22.StylePriority.UseFont = false;
             this.xrTableCell22.StylePriority.UseTextAlignment = false;
@@ -1042,8 +1087,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell23
             // 
-            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell23.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell23.Name = "xrTableCell23";
             this.xrTableCell23.StylePriority.UseFont = false;
             this.xrTableCell23.StylePriority.UseTextAlignment = false;
@@ -1052,8 +1096,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell24
             // 
-            this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell24.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell24.Name = "xrTableCell24";
             this.xrTableCell24.StylePriority.UseFont = false;
             this.xrTableCell24.StylePriority.UseTextAlignment = false;
@@ -1071,8 +1114,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell25
             // 
-            this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell25.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell25.Name = "xrTableCell25";
             this.xrTableCell25.StylePriority.UseFont = false;
             this.xrTableCell25.StylePriority.UseTextAlignment = false;
@@ -1081,8 +1123,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell26
             // 
-            this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell26.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell26.Name = "xrTableCell26";
             this.xrTableCell26.StylePriority.UseFont = false;
             this.xrTableCell26.StylePriority.UseTextAlignment = false;
@@ -1091,8 +1132,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell27
             // 
-            this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell27.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell27.Name = "xrTableCell27";
             this.xrTableCell27.StylePriority.UseFont = false;
             this.xrTableCell27.StylePriority.UseTextAlignment = false;
@@ -1110,8 +1150,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell29
             // 
-            this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell29.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell29.Name = "xrTableCell29";
             this.xrTableCell29.StylePriority.UseFont = false;
             this.xrTableCell29.StylePriority.UseTextAlignment = false;
@@ -1120,8 +1159,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell30
             // 
-            this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell30.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell30.Name = "xrTableCell30";
             this.xrTableCell30.StylePriority.UseFont = false;
             this.xrTableCell30.StylePriority.UseTextAlignment = false;
@@ -1130,8 +1168,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrTableCell31
             // 
-            this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Arial", 9.75F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] {
-            new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))});
+            this.xrTableCell31.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrTableCell31.Name = "xrTableCell31";
             this.xrTableCell31.StylePriority.UseFont = false;
             this.xrTableCell31.StylePriority.UseTextAlignment = false;
@@ -1174,7 +1211,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrRichText2
             // 
-            this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrRichText2.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrRichText2.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 130F);
             this.xrRichText2.Name = "xrRichText2";
             this.xrRichText2.SerializableRtfString = resources.GetString("xrRichText2.SerializableRtfString");
@@ -1183,7 +1220,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrRichText1
             // 
-            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Arial", 8F);
+            this.xrRichText1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrRichText1.LocationFloat = new DevExpress.Utils.PointFloat(474.4724F, 80.00005F);
             this.xrRichText1.Name = "xrRichText1";
             this.xrRichText1.SerializableRtfString = resources.GetString("xrRichText1.SerializableRtfString");
@@ -1192,7 +1229,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrLabel15
             // 
-            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Underline);
+            this.xrLabel15.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 80.00005F);
             this.xrLabel15.Multiline = true;
             this.xrLabel15.Name = "xrLabel15";
@@ -1208,7 +1245,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrLabel13
             // 
-            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel13.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00004F);
             this.xrLabel13.Name = "xrLabel13";
             this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1223,7 +1260,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             // xrLabel12
             // 
-            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel12.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F);
             this.xrLabel12.Name = "xrLabel12";
             this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1240,7 +1277,7 @@ namespace EvangelischeKirchengemeindeBottrop
             // 
             this.xrLabel10.BackColor = System.Drawing.Color.Gainsboro;
             this.xrLabel10.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(415F, 0F);
             this.xrLabel10.Name = "xrLabel10";
             this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1260,7 +1297,7 @@ namespace EvangelischeKirchengemeindeBottrop
             | DevExpress.XtraPrinting.BorderSide.Bottom)));
             this.xrLabel1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLMoFehlkontakte", "{0:0.##}")});
-            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F);
+            this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F, DevExpress.Drawing.DXFontStyle.Bold);
             this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(329F, 0F);
             this.xrLabel1.Name = "xrLabel1";
             this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
@@ -1287,11 +1324,13 @@ namespace EvangelischeKirchengemeindeBottrop
             this.xrLabel17.BackColor = System.Drawing.Color.Transparent;
             this.xrLabel17.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
             new DevExpress.XtraReports.UI.XRBinding("Text", null, "EmployeeSignatureDate", "{0:dd.MM.yyyy}")});
+            this.xrLabel17.Font = new DevExpress.Drawing.DXFont("Segoe UI", 10F);
             this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(398.31F, 214.5F);
             this.xrLabel17.Name = "xrLabel17";
             this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F);
             this.xrLabel17.SizeF = new System.Drawing.SizeF(136.8289F, 35.50002F);
             this.xrLabel17.StylePriority.UseBackColor = false;
+            this.xrLabel17.StylePriority.UseFont = false;
             this.xrLabel17.StylePriority.UseTextAlignment = false;
             this.xrLabel17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.BottomCenter;
             // 
@@ -1302,111 +1341,7 @@ namespace EvangelischeKirchengemeindeBottrop
             this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String;
             this.fieldKontaktArt.Name = "fieldKontaktArt";
             // 
-            // xrLabel24
-            // 
-            this.xrLabel24.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel24.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) 
-            | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel24.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25.00001F);
-            this.xrLabel24.Name = "xrLabel24";
-            this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel24.SizeF = new System.Drawing.SizeF(212.6731F, 30.50001F);
-            this.xrLabel24.StylePriority.UseBackColor = false;
-            this.xrLabel24.StylePriority.UseBorders = false;
-            this.xrLabel24.StylePriority.UseFont = false;
-            this.xrLabel24.StylePriority.UsePadding = false;
-            this.xrLabel24.StylePriority.UseTextAlignment = false;
-            this.xrLabel24.Text = "Leistungserbringer";
-            this.xrLabel24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel25
-            // 
-            this.xrLabel25.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel25.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
-            this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 25.00001F);
-            this.xrLabel25.Name = "xrLabel25";
-            this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel25.SizeF = new System.Drawing.SizeF(522.3268F, 30.50001F);
-            this.xrLabel25.StylePriority.UseBackColor = false;
-            this.xrLabel25.StylePriority.UseBorders = false;
-            this.xrLabel25.StylePriority.UseFont = false;
-            this.xrLabel25.StylePriority.UsePadding = false;
-            this.xrLabel25.StylePriority.UseTextAlignment = false;
-            this.xrLabel25.Text = "Evangelische Kirchengemeinde Bottrop, ABW gem. §§ 123 ff. SGB IX";
-            this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel27
-            // 
-            this.xrLabel27.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right)));
-            this.xrLabel27.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
-            this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(776.8888F, 123.875F);
-            this.xrLabel27.Name = "xrLabel27";
-            this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel27.SizeF = new System.Drawing.SizeF(209.3611F, 30.50001F);
-            this.xrLabel27.StylePriority.UseBackColor = false;
-            this.xrLabel27.StylePriority.UseBorders = false;
-            this.xrLabel27.StylePriority.UseFont = false;
-            this.xrLabel27.StylePriority.UsePadding = false;
-            this.xrLabel27.StylePriority.UseTextAlignment = false;
-            this.xrLabel27.Text = "[Month] [Year]";
-            this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel26
-            // 
-            this.xrLabel26.BackColor = System.Drawing.Color.Gainsboro;
-            this.xrLabel26.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel26.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F, DevExpress.Drawing.DXFontStyle.Bold);
-            this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.5F);
-            this.xrLabel26.Name = "xrLabel26";
-            this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel26.SizeF = new System.Drawing.SizeF(212.6731F, 26F);
-            this.xrLabel26.StylePriority.UseBackColor = false;
-            this.xrLabel26.StylePriority.UseBorders = false;
-            this.xrLabel26.StylePriority.UseFont = false;
-            this.xrLabel26.StylePriority.UsePadding = false;
-            this.xrLabel26.StylePriority.UseTextAlignment = false;
-            this.xrLabel26.Text = "verantw. Mitarbeitende/r";
-            this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel28
-            // 
-            this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
-            new DevExpress.XtraReports.UI.XRBinding("Text", null, "MainAttendant", "{0:0.##}")});
-            this.xrLabel28.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
-            this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 111.5F);
-            this.xrLabel28.Name = "xrLabel28";
-            this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel28.SizeF = new System.Drawing.SizeF(522.3313F, 26F);
-            this.xrLabel28.StylePriority.UseBackColor = false;
-            this.xrLabel28.StylePriority.UseBorders = false;
-            this.xrLabel28.StylePriority.UseFont = false;
-            this.xrLabel28.StylePriority.UsePadding = false;
-            this.xrLabel28.StylePriority.UseTextAlignment = false;
-            this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // xrLabel29
-            // 
-            this.xrLabel29.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) 
-            | DevExpress.XtraPrinting.BorderSide.Bottom)));
-            this.xrLabel29.Font = new DevExpress.Drawing.DXFont("Segoe UI", 12F);
-            this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(212.6731F, 141.9936F);
-            this.xrLabel29.Name = "xrLabel29";
-            this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F);
-            this.xrLabel29.SizeF = new System.Drawing.SizeF(522.3268F, 30.50001F);
-            this.xrLabel29.StylePriority.UseBackColor = false;
-            this.xrLabel29.StylePriority.UseBorders = false;
-            this.xrLabel29.StylePriority.UseFont = false;
-            this.xrLabel29.StylePriority.UsePadding = false;
-            this.xrLabel29.StylePriority.UseTextAlignment = false;
-            this.xrLabel29.Text = "[Month] [Year]";
-            this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft;
-            // 
-            // Quittierungsbeleg
+            // QuittierungsbelegEGH
             // 
             this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] {
             this.Detail,
@@ -1460,7 +1395,6 @@ namespace EvangelischeKirchengemeindeBottrop
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell4;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell11;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell9;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell28;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell48;
         private DevExpress.XtraReports.UI.XRTableRow xrTableRow1;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell1;
@@ -1468,7 +1402,6 @@ namespace EvangelischeKirchengemeindeBottrop
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell5;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell6;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell7;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell43;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell49;
         private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1;
         private DevExpress.XtraReports.UI.XRLabel xrLabel3;
@@ -1484,7 +1417,6 @@ namespace EvangelischeKirchengemeindeBottrop
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell10;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell15;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell12;
-        private DevExpress.XtraReports.UI.XRTableCell xrTableCell44;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell50;
         private DevExpress.XtraReports.UI.XRTableCell xrTableCell2;
         private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt;

ReportImp/EvangelischeKirchengemeindeBottrop/QuittierungsbelegEGH.resx

@@ -118,9 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="xrRichText2.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXAB1AGwAXABmADIAXABmAHMAMgAwAFwAYwBmADEAIABLAHIAYQBuAGsAZQBuAGgAYQB1AHMAYQB1AGYAZQBuAHQAaABhAGwAdABlAH0AXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAdQBsAFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAAYgBlAGsAYQBuAG4AdAAgAG8AZABlAHIAIAB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQBcAHAAYQByAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAGEAYgByAGUAYwBoAG4AdQBuAGcAcwByAGUAbABlAHYAYQBuAHQAfQB7AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFMAZQBnAG8AZQAgAFUASQA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEQAZQBmAGEAdQBsAHQAIABQAGEAcgBhAGcAcgBhAHAAaAAgAEYAbwBuAHQAOwB9AHsAXAAqAFwAYwBzADIAXABzAGIAYQBzAGUAZABvAG4AMQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQAgAEwAaQBuAGUAIABOAHUAbQBiAGUAcgA7AH0AewBcACoAXABjAHMAMwBcAGYAMQBcAGYAcwAyADQAXAB1AGwAXABjAGYAMgAgAEgAeQBwAGUAcgBsAGkAbgBrADsAfQB7AFwAKgBcAHQAcwA0AFwAdABzAHIAbwB3AGQAXABmADEAXABmAHMAMgA0AFwAcQBsAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAGwAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAbAAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBiADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHQAMwBcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAATgBvAHIAbQBhAGwAIABUAGEAYgBsAGUAOwB9AHsAXAAqAFwAdABzADUAXAB0AHMAcgBvAHcAZABcAHMAYgBhAHMAZQBkAG8AbgA0AFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcgBiAHIAZAByAHQAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAbABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgBiAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAHIAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAaABcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgB2AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAcgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZAByADEAMAA4AFwAdABzAHYAZQByAHQAYQBsAHQAXABjAGwAdAB4AGwAcgB0AGIAIABUAGEAYgBsAGUAIABTAGkAbQBwAGwAZQAgADEAOwB9AH0AewBcACoAXABsAGkAcwB0AG8AdgBlAHIAcgBpAGQAZQB0AGEAYgBsAGUAfQBcAG4AbwB1AGkAYwBvAG0AcABhAHQAXABoAHQAbQBhAHUAdABzAHAAXABzAHAAbAB5AHQAdwBuAGkAbgBlAFwAcABhAHIAZABcAHAAbABhAGkAbgBcAHEAbAB7AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxACAASwBlAGkAbgBlACAAfQB7AFwAZgAyAFwAZgBzADIAMABcAGwAYQBuAGcAMQAwADMAMQBcAGwAYQBuAGcAZgBlADEAMAAzADEAXABjAGYAMQAgAEsAcgBhAG4AawBlAG4AaABhAHUAcwBhAHUAZgBlAG4AdABoAGEAbAB0AGUAfQBcAGYAMgBcAGYAcwAyADAAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAIABiAGUAawBhAG4AbgB0ACAAbwBkAGUAcgB9AHsAXABmADIAXABmAHMAMgAwAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxACAAIAB9AHsAXABmADIAXABmAHMAMgAwAFwAbABhAG4AZwAxADAAMwAxAFwAbABhAG4AZwBmAGUAMQAwADMAMQBcAGMAZgAxACAAYQBiAHIAZQBjAGgAbgB1AG4AZwBzAHIAZQBsAGUAdgBhAG4AdAAgAGkAbQAgAEEAYgByAGUAYwBoAG4AdQBuAGcAcwB6AGUAaQB0AHIAYQB1AG0AfQBcAGYAMgBcAGYAcwAyADAAXABsAGEAbgBnADEAMAAzADEAXABsAGEAbgBnAGYAZQAxADAAMwAxAFwAYwBmADEAXABwAGEAcgB9AA==</value>
   </data>
   <data name="xrRichText1.SerializableRtfString" xml:space="preserve">
-    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
+    <value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAFMAZQBnAG8AZQAgAFUASQA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAKgBcAGQAZQBmAHAAYQBwACAAXAB3AGkAZABjAHQAbABwAGEAcgB9AHsAXABzAHQAeQBsAGUAcwBoAGUAZQB0ACAAewBcAHEAbABcAGYAMQBcAGYAcwAyADQAIABOAG8AcgBtAGEAbAA7AH0AewBcACoAXABjAHMAMQBcAGYAMQBcAGYAcwAyADQAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXABmADEAXABmAHMAMgA0AFwAdQBsAFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAaAB0AG0AYQB1AHQAcwBwAFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAyAFwAZgBzADIAMABcAGMAZgAxAFwAcABhAHIAfQA=</value>
   </data>
 </root>

Service/ServiceImplementations/OperationsServiceImp.cs

@@ -1405,15 +1405,24 @@ namespace BeWo.Service.ServiceImplementations
                         list.Add(ValueListEntryType.SupportConceptIndividualGoalCategoryType);
                         list.Add(ValueListEntryType.SupportConceptIndividualGoalType);
 
-                        var dc = new SupportConceptTreeNodeDetailInfoDC();
-
-                        dc.SupportConceptGoals =
-                            MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDCs(
+                        var dc = new SupportConceptTreeNodeDetailInfoDC
+                        {
+                            SupportConceptGoals = MapperFactory.ValueListEntryDC_ValueListEntry.MapToNewDCs(
                                 sc.ValueList.FindByTypes(list)
                                     .Select(e2o => e2o.Entry)
-                                    .Where(e => e.IsActive == ActivationTypeId.Active));
+                                    .Where(e => e.IsActive == ActivationTypeId.Active)),
+                            ServiceAccountings = MapperFactory.ServiceAccountingDC_ServiceAccounting.MapToNewDCs(sc.ServiceAccountings),
+                        };
 
-                        dc.ServiceAccountings = MapperFactory.ServiceAccountingDC_ServiceAccounting.MapToNewDCs(sc.ServiceAccountings);
+                        if(sc.Customer?.Oid.HasValue ?? false)
+                        {
+                            dc.CustomerOid = sc.Customer.Oid.Value;
+                        }
+
+                        if(sc.Oid.HasValue)
+                        {
+                            dc.SupportConceptOid = sc.Oid.Value;
+                        }
 
                         result.Add(dc);
                     }