From 1fd6040f583887938033b8e6d000664c4c6f626d Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Wed, 30 Sep 2020 19:23:42 +0200
Subject: [PATCH 1/6] =?UTF-8?q?Kilometerauswertung=20f=C3=BCr=20Mitarbeite?=
 =?UTF-8?q?r=20Ressourcencheck=20ist=20jetzt=20korrekt=20Weiterentwicklung?=
 =?UTF-8?q?=20der=20Quittierungsbelege=20f=C3=BCr=20die=20Mobilversion?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModel/SchedulerAppointmentListVM.cs   |   2 +-
 BeWo/ServiceProxy/Generated.cs                |  42 ++++
 .../KilometerauslastungsView.xaml             |  29 ++-
 .../KilometerauslastungsView.xaml.cs          | 198 +++++++++++++-----
 .../Controllers/ReportController.cs           |   9 +
 BeWoPlanerMobil/Models/AbstractModel.cs       |   2 +-
 .../Service/ASPHibernateSessionManager.cs     |  14 +-
 BeWoPlanerMobil/Web.config                    |  15 +-
 Data/Access/SearchDAO.cs                      | 161 +++++++++++---
 Data/Data.csproj                              |   2 +-
 Data/DefaultHibernateSessionManager.cs        |   8 +-
 Data/Entities/ConfirmationReceiptSignature.cs |   7 +
 .../ConfirmationReceiptSignature.hbm.xml      |   7 +-
 Data/WCFHibernateSessionManager.cs            |   8 +-
 Report/AbstractReportCreator.cs               |   4 +
 Report/DefaultReportCreator.cs                |  18 ++
 Report/Report.csproj                          |  21 ++
 .../KilometerauswertungsListRO.cs             |   4 +-
 .../ServiceContracts/IReportService.cs        |   8 +
 .../ReportServiceImp.cs                       |  18 ++
 ...ignatureDC_ConfirmationReceiptSignature.cs |  31 ++-
 Service/ServiceContracts/IEmployeeService.cs  |   4 +
 .../ServiceContracts/IOperationsService.cs    |   4 +
 .../EmployeeServiceImp.cs                     |  14 ++
 .../OperationsServiceImp.cs                   |  12 ++
 25 files changed, 530 insertions(+), 112 deletions(-)

diff --git a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
index d394c3857..ea4088b68 100644
--- a/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
+++ b/BeWo/Scheduler/ViewModel/SchedulerAppointmentListVM.cs
@@ -645,7 +645,7 @@ namespace BeWo.Scheduler.ViewModel
         {
             var unavailableResources = new List<ResourceDC>();
 
-            ServiceFacade.DoResourceServiceSync(s => unavailableResources = s.CheckResourceAvailability(vm.Start, vm.End, vm.ResourceList.Select(resource => resource.ResourceOid.Value).ToList(), null));
+            ServiceFacade.DoResourceServiceSync(s => unavailableResources = s.CheckResourceAvailability(vm.Start, vm.End, vm.ResourceList.Select(resource => resource.ResourceOid.Value).ToList(), vm.DataContract?.SchedulerAppointmentOid));
 
             if(unavailableResources.Any())
             {
diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 056bdfa79..139824b9a 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -291,6 +291,11 @@ namespace BeWo.ServiceProxy
             "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactCustomerDC> GetActiveCompactCustomersForEmployee(System.Nullable<long> employeeOid);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeesForEmployee", ReplyAction="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeesForEmployeeResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/GetActiveCompactEmployeesForEmployeeBeWoFault" +
+            "Fault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid);
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IEmployeeService/ArchiveEmployee", ReplyAction="http://tempuri.org/IEmployeeService/ArchiveEmployeeResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IEmployeeService/ArchiveEmployeeBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void ArchiveEmployee(long pOid, long pVersion);
@@ -742,6 +747,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetActiveCompactCustomersForEmployee(employeeOid);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.Compact.CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid)
+        {
+            return base.Channel.GetActiveCompactEmployeesForEmployee(employeeOid);
+        }
+        
         public void ArchiveEmployee(long pOid, long pVersion)
         {
             base.Channel.ArchiveEmployee(pOid, pVersion);
@@ -4823,6 +4833,12 @@ namespace BeWo.ServiceProxy
             "cordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetConfirmationReceiptSignaturesByServiceRecord(long serviceRecordOid);
         
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignatures", ReplyAction="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignaturesR" +
+            "esponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignaturesB" +
+            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConnfirConfirmationReceiptSignatures();
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDC", ReplyAction="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCResponse" +
             "")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateIsChatActiveCustomerAPPCodeDCBeWoFaul" +
@@ -5873,6 +5889,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetConfirmationReceiptSignaturesByServiceRecord(serviceRecordOid);
         }
         
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConnfirConfirmationReceiptSignatures()
+        {
+            return base.Channel.GetAllConnfirConfirmationReceiptSignatures();
+        }
+        
         public void UpdateIsChatActiveCustomerAPPCodeDC(long customerOid, int activeType)
         {
             base.Channel.UpdateIsChatActiveCustomerAPPCodeDC(customerOid, activeType);
@@ -7520,6 +7541,17 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CheckForAnyServiceRecordsWithDistanceValuesBeWo" +
             "FaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         bool CheckForAnyServiceRecordsWithDistanceValues(System.Collections.Generic.List<long> customerOids, BS.Shared.Core.DateTimeSpan span);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IReportService/CreateEmployeeKilometerauswertung", ReplyAction="http://tempuri.org/IReportService/CreateEmployeeKilometerauswertungResponse")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateEmployeeKilometerauswertungBeWoFaultFault" +
+            "", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.IO.MemoryStream CreateEmployeeKilometerauswertung(long employeeOid, System.DateTime range);
+        
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IReportService/CreateKilometerauswertungForAllEmployees", ReplyAction="http://tempuri.org/IReportService/CreateKilometerauswertungForAllEmployeesRespons" +
+            "e")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IReportService/CreateKilometerauswertungForAllEmployeesBeWoFau" +
+            "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.IO.MemoryStream CreateKilometerauswertungForAllEmployees(System.Collections.Generic.List<long> employeeOids, System.DateTime rangeDate);
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
@@ -7610,6 +7642,16 @@ namespace BeWo.ServiceProxy
         {
             return base.Channel.CheckForAnyServiceRecordsWithDistanceValues(customerOids, span);
         }
+        
+        public System.IO.MemoryStream CreateEmployeeKilometerauswertung(long employeeOid, System.DateTime range)
+        {
+            return base.Channel.CreateEmployeeKilometerauswertung(employeeOid, range);
+        }
+        
+        public System.IO.MemoryStream CreateKilometerauswertungForAllEmployees(System.Collections.Generic.List<long> employeeOids, System.DateTime rangeDate)
+        {
+            return base.Channel.CreateKilometerauswertungForAllEmployees(employeeOids, rangeDate);
+        }
     }
     
     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
diff --git a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
index d450db3a1..196780da9 100644
--- a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
+++ b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml
@@ -13,6 +13,8 @@
       xmlns:dxb="http://schemas.devexpress.com/winfx/2008/xaml/bars"
       xmlns:dxpbars="http://schemas.devexpress.com/winfx/2008/xaml/printing/bars"
       d:DesignHeight="450" d:DesignWidth="800"
+
+      Initialized="KilometerauslastungsView_OnInitialized"
       Width="Auto" Height="Auto" d:DataContext="{d:DesignData KilometerauslastungsView}">
 
     <GroupBox Style="{StaticResource ObjectEditGroupBox}" Header="Kilometerauswertung">
@@ -29,22 +31,28 @@
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
                 <RowDefinition Height="*" />
             </Grid.RowDefinitions>
 
-            <CheckBox Grid.Column="0" Grid.Row="0" Margin="3" x:Name="AllCustomersCheckBox" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="Alle Klienten" Checked="AllCustomersCheckBox_OnCheckedChanged" Unchecked="AllCustomersCheckBox_OnCheckedChanged"></CheckBox>
+            <RadioButton x:Name="CustomerKmReportRadioButton" Grid.Column="0" Grid.Row="0" Margin="3" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="Nach Klient" GroupName="ReportTypeRadioGroup" Checked="ToggleButton_OnChecked" />
+            <RadioButton x:Name="EmployeeKmReportRadioButton" Grid.Column="1" Grid.Row="0" Margin="3" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="Nach Mitarbeiter" GroupName="ReportTypeRadioGroup" Checked="ToggleButton_OnChecked" />
 
-            <controls:PopUpEdit Grid.Column="1" Visibility="{Binding ElementName=AllCustomersCheckBox, Path=IsChecked, Converter={StaticResource BoolVisibilityConverter}, ConverterParameter=false}" Text="{Binding Path=SelectedCustomer.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="3" Grid.Row="0" Margin="3" PopUpClick="PopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
+            <CheckBox Grid.Column="0" Grid.Row="1" Margin="3" x:Name="AllCustomersCheckBox" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="Alle Klienten" Checked="AllCustomersCheckBox_OnCheckedChanged" Unchecked="AllCustomersCheckBox_OnCheckedChanged" />
+            <controls:PopUpEdit Grid.Column="1" x:Name="CustomerPopUpEdit" Visibility="{Binding Path=CustomerPopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedCustomer.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="3" Grid.Row="1" Margin="3" PopUpClick="CustomersPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
 
-            <Label Grid.Column="0" Grid.Row="1" Margin="3" Content="Monat:" />
-            <ComboBox Height="22" x:Name="ComboBoxMonth" ItemsSource="{Binding Path=MonthNames, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedMonthIndex, UpdateSourceTrigger=PropertyChanged}"  Grid.Row="1" Grid.Column="1" Margin="3" HorizontalAlignment="Left" Width="90" />
+            <CheckBox Grid.Column="0" Grid.Row="1" Margin="3" x:Name="AllEmployeesCheckBox" VerticalAlignment="Center" VerticalContentAlignment="Center" Content="Alle Mitarbeiter" Checked="AllEmployeesCheckBox_OnChecked" Unchecked="AllEmployeesCheckBox_OnChecked" Visibility="Collapsed" />
+            <controls:PopUpEdit Grid.Column="1" x:Name="EmployeePopUpEdit"  Visibility="{Binding Path=EmployeePopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Text="{Binding Path=SelectedEmployee.SimpleDescription, UpdateSourceTrigger=PropertyChanged, Mode=OneWay}" Grid.ColumnSpan="3" Grid.Row="1" Margin="3" PopUpClick="EmployeesPopUpEdit_OnPopUpClick" Height="22" Cursor="Arrow" DeleteButtonVisibility="Collapsed" HorizontalAlignment="Stretch" />
 
-            <Label Grid.Column="2" Grid.Row="1" Margin="3" Content="Jahr:" />
-            <ComboBox Height="22" x:Name="ComboBoxYear" ItemsSource="{Binding Path=Years, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedYearIndex, UpdateSourceTrigger=PropertyChanged}" Grid.Row="1" Grid.Column="3" Margin="3" Width="90"></ComboBox>
+            <Label Grid.Column="0" Grid.Row="2" Margin="3" Content="Monat:" />
+            <ComboBox Height="22" x:Name="ComboBoxMonth" ItemsSource="{Binding Path=MonthNames, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedMonthIndex, UpdateSourceTrigger=PropertyChanged}"  Grid.Row="2" Grid.Column="1" Margin="3" HorizontalAlignment="Left" Width="90" />
 
-            <Button x:Name="ButtonGenerate" HorizontalAlignment="Left" Click="ButtonGenerate_OnClick" Grid.Column="0" Grid.Row="2" Margin="2,15,2,2" Content="Erstellen" Height="22" IsEnabled="{Binding Path=IsCreateButtonEnabled, UpdateSourceTrigger=PropertyChanged}" />
+            <Label Grid.Column="2" Grid.Row="2" Margin="3" Content="Jahr:" />
+            <ComboBox Height="22" x:Name="ComboBoxYear" ItemsSource="{Binding Path=Years, UpdateSourceTrigger=PropertyChanged}" SelectedIndex="{Binding Path=SelectedYearIndex, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="3" Margin="3" Width="90"></ComboBox>
 
-            <dxp:DocumentPreviewControl x:Name="DocumentPreviewControl" Grid.Row="4" Grid.ColumnSpan="5" Grid.Column="0" Visibility="Collapsed" CommandBarStyle="Bars">
+            <Button x:Name="ButtonGenerate" HorizontalAlignment="Left" Click="ButtonGenerate_OnClick" Grid.Column="0" Grid.Row="3" Margin="2,15,2,2" Content="Erstellen" Height="22" IsEnabled="{Binding Path=IsCreateButtonEnabled, UpdateSourceTrigger=PropertyChanged}" />
+
+            <dxp:DocumentPreviewControl x:Name="DocumentPreviewControl" Grid.Row="5" Grid.ColumnSpan="5" Grid.Column="0" Visibility="Collapsed" CommandBarStyle="Bars">
                 <dxp:DocumentPreviewControl.CommandProvider>
                     <dxp:DocumentCommandProvider>
                         <dxp:DocumentCommandProvider.Actions>
@@ -67,9 +75,12 @@
                 </dxp:DocumentPreviewControl.CommandProvider>
             </dxp:DocumentPreviewControl>
 
-            <Popup x:Name="CustomerSearchViewPopup" Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="5" Margin="10" StaysOpen="False" Placement="MousePoint" Width="400">
+            <Popup x:Name="CustomerSearchViewPopup" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="5" Margin="10" StaysOpen="False" Placement="MousePoint" Width="400">
                 <localSearchView:CustomerSearchView ItemSelected="CustomerSearchViewPopup_CustomerSelected" />
             </Popup>
+            <Popup x:Name="EmployeeSearchViewPopup" Visibility="{Binding Path=EmployeePopUpEditVisibility, UpdateSourceTrigger=PropertyChanged}" Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="5" Margin="10" StaysOpen="False" Placement="MousePoint" Width="400">
+                <localSearchView:EmployeeSearchView ItemSelected="EmployeeSearchViewPopup_EmployeeSelected" x:Name="EmployeeSearchView" />
+            </Popup>
         </Grid>
     </GroupBox>
 </localView:BeWoView>
diff --git a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
index 780ceb39b..b82242660 100644
--- a/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
+++ b/BeWo/View/Report/Kilometerauswertung/KilometerauslastungsView.xaml.cs
@@ -6,13 +6,10 @@ using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Windows;
+using System.Windows.Controls;
 using BeWo.Annotations;
-using BeWo.Core;
-using BeWo.Core.Service;
 using BeWo.ServiceProxy;
-using BS.Shared;
 using BS.Shared.Core;
-using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using ChatController.Utilities.Extensions;
 using DevExpress.Xpf.Core;
@@ -22,11 +19,24 @@ namespace BeWo.View.Report.Kilometerauswertung
 {
     public partial class KilometerauslastungsView : INotifyPropertyChanged
     {
-        public bool IsCreateButtonEnabled => _ShouldDoListReport || _SelectedCustomer != null;
+        public bool IsCreateButtonEnabled => ShouldDoListReport || _ReportType == KilometerauslastungsType.Customer && _SelectedCustomer != null || _ReportType == KilometerauslastungsType.Employee && _SelectedEmployee != null;
 
         private List<CompactCustomerDC> AllCustomers { get; set; } = new List<CompactCustomerDC>();
 
-        private bool _ShouldDoListReport;
+        private List<CompactEmployeeDC> AllEmployees { get; set; } = new List<CompactEmployeeDC>();
+
+        public bool ShouldDoListReport
+        {
+            get
+            {
+                if(_ReportType == KilometerauslastungsType.Customer)
+                {
+                    return AllCustomersCheckBox.IsChecked.HasValue && AllCustomersCheckBox.IsChecked.Value;
+                }
+
+                return AllEmployeesCheckBox.IsChecked.HasValue && AllEmployeesCheckBox.IsChecked.Value;
+            }
+        }
 
         private CompactCustomerDC _SelectedCustomer;
         public CompactCustomerDC SelectedCustomer
@@ -49,6 +59,27 @@ namespace BeWo.View.Report.Kilometerauswertung
             }
         }
 
+        private CompactEmployeeDC _SelectedEmployee;
+        public CompactEmployeeDC SelectedEmployee
+        {
+            get => _SelectedEmployee;
+
+            set
+            {
+                if(!Equals(_SelectedEmployee, value))
+                {
+                    _SelectedEmployee = value;
+
+                    if(value != null)
+                    {
+                        OnPropertyChanged(nameof(IsCreateButtonEnabled));
+                    }
+
+                    OnPropertyChanged(nameof(SelectedEmployee));
+                }
+            }
+        }
+
         public List<string> MonthNames => DateTimeFormatInfo.CurrentInfo?.MonthNames.Where(s => !string.IsNullOrEmpty(s)).ToList();
 
         private int _SelectedMonthIndex;
@@ -102,6 +133,9 @@ namespace BeWo.View.Report.Kilometerauswertung
             }
         }
 
+        private KilometerauslastungsType _ReportType = KilometerauslastungsType.Customer;
+
+
         public KilometerauslastungsView()
         {
             InitializeComponent();
@@ -114,28 +148,23 @@ namespace BeWo.View.Report.Kilometerauswertung
 
             InitYearComboBox();
 
-            ServiceFacade.DoCustomerServiceAsync(s => s.GetAllActiveCustomersCompact(false, BeWoApp.LoggedOnEmployeeOid), allCustomers =>
+            ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactCustomersForEmployee(BeWoApp.LoggedOnEmployeeOid), allCustomers =>
             {
                 this.Dispatch(() =>
                 {
-                    if(BeWoApp.LoggedOnUser.HasRight(UserRightType.ViewAll) || BeWoApp.LoggedOnUser.HasRight(UserRightType.CustomerView_View))
-                    {
-                        AllCustomers = allCustomers;
-                    }
-                    else
-                    {
-                        if(BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyTeams))
-                        {
-                            AllCustomers = allCustomers.Where(customer => customer.IsRelatedToTeam || customer.IsRelatedToEmployee).ToList();
-                        }
-                        else if(BeWoApp.LoggedOnUser.HasRight(UserRightType.Customer_ViewMyCustomers))
-                        {
-                            AllCustomers = allCustomers.Where(customer => customer.IsRelatedToEmployee).ToList();
-                        }
-                    }
+                    AllCustomers = allCustomers;
                 });
             });
 
+            ServiceFacade.DoEmployeeServiceAsync(s => s.GetActiveCompactEmployeesForEmployee(BeWoApp.LoggedOnEmployeeOid.Value), allEmployees =>
+            {
+                this.Dispatch(() =>
+                {
+                    AllEmployees = allEmployees;
+                });
+            });
+
+            // DevExpress 
             ThemeManager.SetTheme(BeWoApp.CurrentBeWo.MainWindow, Theme.Office2010Black);
 
             Unloaded += delegate
@@ -156,11 +185,16 @@ namespace BeWo.View.Report.Kilometerauswertung
             Years = years;
         }
 
-        private void PopUpEdit_OnPopUpClick(object sender, RoutedEventArgs e)
+        private void CustomersPopUpEdit_OnPopUpClick(object sender, RoutedEventArgs e)
         {
             CustomerSearchViewPopup.IsOpen = true;
         }
 
+        private void EmployeesPopUpEdit_OnPopUpClick(object sender, RoutedEventArgs e)
+        {
+            EmployeeSearchViewPopup.IsOpen = true;
+        }
+
         private void CustomerSearchViewPopup_CustomerSelected(object sender, EventArgs<CompactCustomerDC> e)
         {
             SelectedCustomer = e.Data;
@@ -181,30 +215,28 @@ namespace BeWo.View.Report.Kilometerauswertung
 
             var rangeDate = new DateTime(selectedYear, SelectedMonthIndex + 1, 1);
 
-            //var end = rangeDate.AddMonths(1).AddDays(-1);
-
-            //var timeSpan = new DateTimeSpan(rangeDate, end);
-
-            //var customerOids = _ShouldDoListReport ? AllCustomers.Select(customer => customer.CustomerOid).ToList() : new List<long> {SelectedCustomer.CustomerOid};
-
-            //ServiceFacade.DoReportServiceAsync(rs => rs.CheckForAnyServiceRecordsWithDistanceValues(customerOids, timeSpan), hasAny =>
-            //{
-            //    if(hasAny)
-            //    {
-                    if(_ShouldDoListReport)
-                    {
-                        ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertungForAllCustomers(AllCustomers.Select(customer => customer.CustomerOid).ToList(), rangeDate), ShowReport, true);
-                    }
-                    else
-                    {
-                        ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport, true);
-                    }
-           //     }
-           //     else
-           //     {
-           //         this.Dispatch(() => { MessageBox.Show("Der ausgewählte Zeitraum enthält keinerlei Buchungen mit Angaben zu gefahreren Kilometern", "Kilometerauswertung", MessageBoxButton.OK, MessageBoxImage.Warning); });
-           //     }
-           // });
+            if(ShouldDoListReport)
+            {
+                if(_ReportType == KilometerauslastungsType.Customer)
+                {
+                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertungForAllCustomers(AllCustomers.Select(customer => customer.CustomerOid).ToList(), rangeDate), ShowReport, true);
+                }
+                else
+                {
+                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertungForAllEmployees(AllEmployees.Select(employee => employee.EmployeeOid).ToList(), rangeDate), ShowReport, true);
+                }
+            }
+            else
+            {
+                if(_ReportType == KilometerauslastungsType.Customer)
+                {
+                    ServiceFacade.DoReportServiceAsync(s => s.CreateKilometerauswertung(SelectedCustomer.CustomerOid, rangeDate), ShowReport, true);
+                }
+                else
+                {
+                    ServiceFacade.DoReportServiceAsync(s => s.CreateEmployeeKilometerauswertung(SelectedEmployee.EmployeeOid, rangeDate), ShowReport, true);
+                }
+            }
         }
 
         private void ShowReport(MemoryStream reportStream)
@@ -237,8 +269,78 @@ namespace BeWo.View.Report.Kilometerauswertung
 
         private void AllCustomersCheckBox_OnCheckedChanged(object sender, RoutedEventArgs e)
         {
-            _ShouldDoListReport = AllCustomersCheckBox.IsChecked.HasValue && AllCustomersCheckBox.IsChecked.Value;
+            CustomerPopUpEdit.Visibility = ShouldDoListReport ? Visibility.Hidden : Visibility.Visible;
+            EmployeePopUpEdit.Visibility = Visibility.Collapsed;
+
             OnPropertyChanged(nameof(IsCreateButtonEnabled));
+            OnPropertyChanged(nameof(ShouldDoListReport));
+        }
+
+        private void ToggleButton_OnChecked(object sender, RoutedEventArgs e)
+        {
+            var radioButton = (RadioButton) sender;
+            
+            switch(radioButton.Name)
+            {
+                case "CustomerKmReportRadioButton":
+                    _ReportType = KilometerauslastungsType.Customer;
+                    break;
+                case "EmployeeKmReportRadioButton":
+                    _ReportType = KilometerauslastungsType.Employee;
+                    break;
+            }
+
+            SetVisibilityValues();
+        }
+
+        private void AllEmployeesCheckBox_OnChecked(object sender, RoutedEventArgs e)
+        {
+            EmployeePopUpEdit.Visibility = ShouldDoListReport ? Visibility.Hidden : Visibility.Visible;
+            CustomerPopUpEdit.Visibility = Visibility.Collapsed;
+
+            OnPropertyChanged(nameof(IsCreateButtonEnabled));
+            OnPropertyChanged(nameof(ShouldDoListReport));
+        }
+
+        private void EmployeeSearchViewPopup_EmployeeSelected(object sender, EventArgs<CompactEmployeeDC> e)
+        {
+            SelectedEmployee = e.Data;
+            EmployeeSearchViewPopup.IsOpen = false;
+        }
+
+        private void SetVisibilityValues()
+        {
+            if(_ReportType == KilometerauslastungsType.Customer)
+            {
+                EmployeeSearchViewPopup.Visibility = Visibility.Collapsed;
+                AllEmployeesCheckBox.Visibility = Visibility.Collapsed;
+                EmployeePopUpEdit.Visibility = Visibility.Collapsed;
+
+                CustomerSearchViewPopup.Visibility = Visibility.Visible;
+                AllCustomersCheckBox.Visibility = Visibility.Visible;
+                CustomerSearchViewPopup.Visibility = Visibility.Visible;
+            }
+            else
+            {
+                CustomerSearchViewPopup.Visibility = Visibility.Collapsed;
+                AllCustomersCheckBox.Visibility = Visibility.Collapsed;
+                CustomerSearchViewPopup.Visibility = Visibility.Collapsed;
+
+                EmployeeSearchViewPopup.Visibility = Visibility.Visible;
+                AllEmployeesCheckBox.Visibility = Visibility.Visible;
+                EmployeePopUpEdit.Visibility = Visibility.Visible;
+            }
+        }
+
+        private void KilometerauslastungsView_OnInitialized(object sender, EventArgs e)
+        {
+            CustomerKmReportRadioButton.IsChecked = true;
         }
     }
+
+    public enum KilometerauslastungsType
+    {
+        Customer,
+        Employee
+    }
 }
diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs
index 32fb3b662..a9595476d 100644
--- a/BeWoPlanerMobil/Controllers/ReportController.cs
+++ b/BeWoPlanerMobil/Controllers/ReportController.cs
@@ -1,11 +1,13 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
+using BeWo.Data.Entities;
 using BeWo.Report.ReportObjects;
 using BeWoPlanerMobil.Models;
 using BeWoPlanerMobil.Service;
 using BeWoPlanerMobil.Util;
 using BS.Shared.Core;
+using BS.Shared.DataContracts;
 using BS.Shared.Extensions;
 
 namespace BeWoPlanerMobil.Controllers
@@ -60,6 +62,13 @@ namespace BeWoPlanerMobil.Controllers
 
             Model.Customers = customers;
 
+            var kek = new ConfirmationReceiptSignatureDC();
+
+            OperationsService.InsertConfirmationReceiptSignature(kek);
+
+            var alle = OperationsService.GetAllConfirmationReceiptSignatures();
+
+
             var test = OperationsService.GetConfirmationReceiptSignaturesByEmployee(1, new DateTimeSpan(new DateTime(2020, 1, 1), new DateTime(2020, 2, 1)));
 
             return View(Model);
diff --git a/BeWoPlanerMobil/Models/AbstractModel.cs b/BeWoPlanerMobil/Models/AbstractModel.cs
index ae2f01d23..8b19a7b88 100644
--- a/BeWoPlanerMobil/Models/AbstractModel.cs
+++ b/BeWoPlanerMobil/Models/AbstractModel.cs
@@ -34,6 +34,6 @@ namespace BeWoPlanerMobil.Models
         public static string TimeOfLastAction { get; set; }
 
         public static bool HasRightToInsertRessourceAppointments => MobileSessionFacade.CheckForUserRight(UserRightType.KalenderRessourcentermineAnlegen) || MobileSessionFacade.CheckForUserRight(UserRightType.CreateAll);
-        public static bool IsAllowedToSeeBills => false;// MobileSessionFacade.CheckForUserRight(UserRightType.Analysis_ServiceOverview_View);
+        public static bool IsAllowedToSeeBills => false;//MobileSessionFacade.CheckForUserRight(UserRightType.Analysis_ServiceOverview_View);
     }
 }
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
index 05c14d29a..89dca3c82 100644
--- a/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
+++ b/BeWoPlanerMobil/Service/ASPHibernateSessionManager.cs
@@ -13,9 +13,12 @@ using BeWo.Service.ServiceImplementations;
 
 using BS.Shared;
 using BS.Shared.Core;
-
+using log4net.Appender;
+using log4net.Layout;
+using log4net.Repository.Hierarchy;
 using NHibernate;
 using Configuration = NHibernate.Cfg.Configuration;
+using LogManager = log4net.LogManager;
 
 namespace BeWoPlanerMobil.Service
 {
@@ -36,7 +39,14 @@ namespace BeWoPlanerMobil.Service
 
 					if (!_SessionFactories.ContainsKey(MobileSessionFacade.Tenant))
 					{
-						var serverPath = HttpContext.Current.Server.MapPath("");
+#if DEBUG
+                        var hierarchy = (Hierarchy)LogManager.GetRepository();
+                        var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
+                        logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
+                        hierarchy.Configured = true;
+#endif
+
+                        var serverPath = HttpContext.Current.Server.MapPath("");
 
 						serverPath = Path.Combine(serverPath, ConfigurationManager.AppSettings.Get("MultitenancyPath"));
 						serverPath = Path.Combine(serverPath, MobileSessionFacade.Tenant + ".config");
diff --git a/BeWoPlanerMobil/Web.config b/BeWoPlanerMobil/Web.config
index 7e18327d4..87523fa97 100644
--- a/BeWoPlanerMobil/Web.config
+++ b/BeWoPlanerMobil/Web.config
@@ -18,7 +18,7 @@
     </sources>
   </system.diagnostics>
   <log4net debug="true">
-    <appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
+    <!--<appender name="logFile" type="log4net.Appender.RollingFileAppender,log4net">
       <param name="File" value="logs\mobilelog.txt" />
       <param name="AppendToFile" value="true" />
       <param name="RollingStyle" value="Date" />
@@ -27,10 +27,19 @@
       <layout type="log4net.Layout.PatternLayout,log4net">
         <param name="ConversionPattern" value="%d [%t] %-5p %c - %m%n" />
       </layout>
-    </appender>
+    </appender>-->
+      <appender name="DebugSQL" type="log4net.Appender.TraceAppender">
+          <layout type="log4net.Layout.PatternLayout">
+              <conversionPattern value="%date [%thread] %-5level %logger [%property{NDC}] - %message%newline" />
+          </layout>
+      </appender>
+      <logger name="NHibernnate.SQL" additivity="false">
+          <level value="DEBUG" />
+          <appender-ref ref="DebugSQL" />
+      </logger>
     <root>
       <priority value="INFO" />
-      <appender-ref ref="logFile" />
+      <appender-ref ref="DebugSQL" />
     </root>
   </log4net>
   <system.webServer>
diff --git a/Data/Access/SearchDAO.cs b/Data/Access/SearchDAO.cs
index bbaac8c1e..69c970405 100644
--- a/Data/Access/SearchDAO.cs
+++ b/Data/Access/SearchDAO.cs
@@ -2119,16 +2119,17 @@ namespace BeWo.Data.Access
 
         public static string ToSql(ICriteria criteria)
         {
-            var c = (CriteriaImpl)criteria;
-            var s = (SessionImpl)c.Session;
-            var factory = (ISessionFactoryImplementor)s.SessionFactory;
-            var implementors = factory.GetImplementors(c.EntityOrClassName);
-            var loader = new CriteriaLoader(
-                (IOuterJoinLoadable)factory.GetEntityPersister(implementors[0]),
-                factory,
-                c,
-                implementors[0],
-                s.EnabledFilters);
+            var criteriaImpl = (CriteriaImpl) criteria;
+            var sessionImpl = (SessionImpl) criteriaImpl.Session;
+            var factory = (ISessionFactoryImplementor) sessionImpl.SessionFactory;
+            var implementors = factory.GetImplementors(criteriaImpl.EntityOrClassName);
+
+            if(implementors.Length == 0)
+            {
+                return "No entity or class name found!";
+            }
+
+            var loader = new CriteriaLoader((IOuterJoinLoadable)factory.GetEntityPersister(implementors[0]), factory, criteriaImpl, implementors[0], sessionImpl.EnabledFilters);
 
             return loader.SqlString.ToString();
         }
@@ -3434,22 +3435,13 @@ namespace BeWo.Data.Access
 
         public IList<ConfirmationReceiptSignature> GetConfirmationReceiptSignaturesByEmployee(long employeeOid, DateTimeSpan timeSpan)
         {
-            /*
-             * var detachedCriteria1 = DetachedCriteria.For<Employee2SchedulerAppointment>()
-                    .Add(Restrictions.In(Employee2SchedulerAppointment.PropertyName_Employee + ".Oid", pSelectedEmployees))
-                    .SetProjection(Projections.Property(Employee2SchedulerAppointment.PropertyName_SchedulerAppointment));
-                var employee2SchedCrit = Subqueries.PropertyIn(BeWoEntityBase.PropertyName_Oid, detachedCriteria1);
-             */
+            var liste = CreateCriteria<ConfirmationReceiptSignature>()
+                            .Add(Restrictions.Eq(nameof(BeWoEntityBase.IsActive), ActivationTypeId.Active))
+                            .Add(Restrictions.Eq(nameof(ConfirmationReceiptSignature.EmployeeOid), employeeOid))
+                            .CreateAlias(nameof(ConfirmationReceiptSignature.ServiceRecords), "s", JoinType.InnerJoin)
+                                .Add(CreateBetweenDateTimesCriterion(timeSpan.StartDateTime, timeSpan.EndDateTime, "s.Start", "s.End")).List<ConfirmationReceiptSignature>();
 
-            var between = CreateBetweenDateTimesCriterion(timeSpan.StartDateTime, timeSpan.EndDateTime, nameof(ServiceRecord.Start), nameof(ServiceRecord.End));
-
-            var criteria = CreateCriteriaIsActive<ConfirmationReceiptSignature>()
-                .Add(Restrictions.Eq(nameof(ConfirmationReceiptSignature.EmployeeOid), employeeOid))
-                .CreateCriteria(nameof(ConfirmationReceiptSignature.ServiceRecords), JoinType.InnerJoin).Add(between);
-
-            var mySql = ToSql(criteria);
-
-            return criteria.List<ConfirmationReceiptSignature>();
+            return liste;
         }
 
         public List<ConfirmationReceiptSignature> GetConfirmationReceiptSignaturesByServiceRecord(long serviceRecordOid)
@@ -3459,5 +3451,124 @@ namespace BeWo.Data.Access
 
             return null;
         }
+
+        public IList<ServiceRecord> FindEmployeeServiceRecordsForKilometerauswertung(long employeeOid, DateTimeSpan timeSpan)
+        {
+            var lCriteria = CreateCriteria<ServiceRecord>()
+                .Add(Restrictions.Eq(nameof(ServiceRecord.EmployeeOid), employeeOid))
+                .Add(Restrictions.IsNotNull(nameof(ServiceRecord.DistanceInMeter)));
+
+            var orCriteria = Restrictions.Or(
+                Restrictions.Between(nameof(ServiceRecord.Start), timeSpan.StartDateTime, timeSpan.EndDateTime),
+                Restrictions.Between(nameof(ServiceRecord.End), timeSpan.StartDateTime, timeSpan.EndDateTime));
+
+            orCriteria = Restrictions.Or(orCriteria,
+                Restrictions.And(
+                    Restrictions.Le(nameof(ServiceRecord.Start), timeSpan.EndDateTime),
+                    Restrictions.Ge(nameof(ServiceRecord.End), timeSpan.StartDateTime)));
+
+            lCriteria.Add(orCriteria);
+
+            lCriteria.Add(Restrictions.Eq(nameof(ServiceRecord.ServiceRecordType), ServiceRecordTypeId.DefaultActivity));
+
+            return lCriteria.List<ServiceRecord>();
+        }
+
+        public Dictionary<long, List<ServiceRecord>> FindListOfEmployeeServiceRecordsForKilometerauswertung(List<long> employeeOids, DateTimeSpan span)
+        {
+            var lCriteria = CreateCriteria<ServiceRecord>()
+                .Add(Restrictions.In(nameof(ServiceRecord.EmployeeOid), employeeOids))
+                .Add(Restrictions.IsNotNull(nameof(ServiceRecord.DistanceInMeter)));
+
+            var orCriteria = Restrictions.Or(
+                Restrictions.Between(nameof(ServiceRecord.Start), span.StartDateTime, span.EndDateTime),
+                Restrictions.Between(nameof(ServiceRecord.End), span.StartDateTime, span.EndDateTime));
+
+            orCriteria = Restrictions.Or(orCriteria,
+                Restrictions.And(
+                    Restrictions.Le(nameof(ServiceRecord.Start), span.EndDateTime),
+                    Restrictions.Ge(nameof(ServiceRecord.End), span.StartDateTime)));
+
+            lCriteria.Add(orCriteria);
+
+            lCriteria.Add(Restrictions.Eq(nameof(ServiceRecord.ServiceRecordType), ServiceRecordTypeId.DefaultActivity));
+
+            var allServiceRecords = lCriteria.List<ServiceRecord>().ToList();
+
+            var result = new Dictionary<long, List<ServiceRecord>>();
+
+            foreach(var serviceRecord in allServiceRecords)
+            {
+                result.AddOrUpdateValueInDictionary(serviceRecord.EmployeeOid.Value, new List<ServiceRecord> { serviceRecord });
+            }
+
+            return result;
+        }
+
+        public IList<Employee> GetAllActiveEmployeesForEmployee(long? employeeOid)
+        {
+            ApplicationUser user;
+
+            if(employeeOid.HasValue)
+            {
+                var employee = CreateCriteria<Employee>().Add(Restrictions.Eq(nameof(Employee.Oid), employeeOid)).UniqueResult<Employee>();
+                user = FindUserForEmployee(employee);
+            }
+            else
+            {
+                if(LoggedInUserOperationContextExt.Current != null && LoggedInUserOperationContextExt.Current.User != null)
+                {
+                    user = LoggedInUserOperationContextExt.Current.User;
+                }
+                else
+                {
+                    user = SessionFacade.LoggedInUser;
+                }
+            }
+
+            if(user.Employee.Oid == null)
+            {
+                return new List<Employee>();
+            }
+
+            var rights = new List<UserRightType>();
+
+            user.UserGroups.DoForEach(s => s.Rights.DoForEach(right => rights.AddIfNotIn(right.RightType)));
+
+            var lCriteria = CreateCriteriaIsActive<Employee>();
+
+            if(rights.Contains(UserRightType.ViewAll) || rights.Contains(UserRightType.CustomerView_View))
+            {
+                return lCriteria.List<Employee>().ToList();
+            }
+
+            var result = new List<Employee>();
+
+            if(rights.Contains(UserRightType.Employee_AllowViewOwnEmployees))
+            {
+                result.AddIfNotIn(user.Employee);
+            }
+
+            if(rights.Contains(UserRightType.Employee_AllowViewOwnTeam))
+            {
+                var leadingTeams = user.Employee.LeadingTeams;
+                leadingTeams.DoForEach(team =>
+                {
+                    result.AddIfNotIn(team.Leader);
+
+                    result.AddRangeIfElementsNotIn(team.MemberList);
+                });
+
+                var teams = FindTeamsOfEmployee(user.Employee.Oid.Value);
+                teams.DoForEach(team =>
+                {
+                    result.AddIfNotIn(team.Leader);
+
+                    result.AddRangeIfElementsNotIn(team.MemberList);
+                });
+            }
+
+            return result;
+        }
     }
 }
diff --git a/Data/Data.csproj b/Data/Data.csproj
index 535612a0c..360b478cf 100644
--- a/Data/Data.csproj
+++ b/Data/Data.csproj
@@ -607,7 +607,7 @@
     <EmbeddedResource Include="Mappings\Dienst.hbm.xml">
       <SubType>Designer</SubType>
     </EmbeddedResource>
-    <Content Include="Mappings\ConfirmationReceiptSignature.hbm.xml" />
+    <EmbeddedResource Include="Mappings\ConfirmationReceiptSignature.hbm.xml" />
     <Content Include="Mappings\DeletionHistory.hbm.xml" />
     <EmbeddedResource Include="Mappings\FlexibleReportLayout.hbm.xml">
       <SubType>Designer</SubType>
diff --git a/Data/DefaultHibernateSessionManager.cs b/Data/DefaultHibernateSessionManager.cs
index 6d5ba9d4f..b17f7a958 100644
--- a/Data/DefaultHibernateSessionManager.cs
+++ b/Data/DefaultHibernateSessionManager.cs
@@ -54,10 +54,10 @@ namespace BeWo.Data
                     {
 #if DEBUG
                         //TODO: wieder einkommentieren!
-                        //var hierarchy = (Hierarchy)LogManager.GetRepository();
-                        //var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
-                        //logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
-                        //hierarchy.Configured = true;
+                        var hierarchy = (Hierarchy)LogManager.GetRepository();
+                        var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
+                        logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
+                        hierarchy.Configured = true;
 #endif
 
                         var baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
diff --git a/Data/Entities/ConfirmationReceiptSignature.cs b/Data/Entities/ConfirmationReceiptSignature.cs
index 68b841c8b..102810e5c 100644
--- a/Data/Entities/ConfirmationReceiptSignature.cs
+++ b/Data/Entities/ConfirmationReceiptSignature.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using BS.Shared;
 
 namespace BeWo.Data.Entities
 {
@@ -48,5 +49,11 @@ namespace BeWo.Data.Entities
                 }
             }
         }
+
+        public ConfirmationReceiptSignature()
+        {
+            _Tid = TableID.ConfirmationReceiptSignature;
+        }
+
     }
 }
diff --git a/Data/Mappings/ConfirmationReceiptSignature.hbm.xml b/Data/Mappings/ConfirmationReceiptSignature.hbm.xml
index 4230413de..d1c99e430 100644
--- a/Data/Mappings/ConfirmationReceiptSignature.hbm.xml
+++ b/Data/Mappings/ConfirmationReceiptSignature.hbm.xml
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 
 <hibernate-mapping xmlns="urn:nhibernate-mapping-2.2">
-    <class name="BeWo.Data.Entities.ConfirmationReceiptSignature, BeWo.Data" table="ConfirmationReceiptSignature">
+    <class name="BeWo.Data.Entities.ConfirmationReceiptSignature, BeWo.Data" table="confirmationreceiptsignature">
         <id name="Oid" column ="Oid" unsaved-value="null">
             <generator class="identity" />
         </id>
         <version type="Int64" column="Version" name="Version" />
-        <property name="ServiceRecordOid" column="ServiceRecordOid" />
         <property name="InsTs" />
         <property name="InsUser" />
         <property column="Tid" type="BS.Shared.TableID, BS.Shared" name="_Tid" access="field" />
@@ -17,8 +16,8 @@
         <property name="SignatureImage" column="SignatureImage" />
         <property name="EmployeeOid" />
 
-        <bag name="ServiceRecords" table="ConfirmationSignature2ServiceRecord" generic="true" cascade="none" batch-size="250">
-            <key column="ConfirmationSignatureOid" />
+        <bag name="ServiceRecords" table="ConfirmationReceiptSignature2ServiceRecord" generic="true" cascade="none" batch-size="250">
+            <key column="ConfirmationReceiptSignatureOid" />
             <many-to-many column="ServiceRecordOid" class="BeWo.Data.Entities.ServiceRecord, BeWo.Data" />
         </bag>
     </class>
diff --git a/Data/WCFHibernateSessionManager.cs b/Data/WCFHibernateSessionManager.cs
index 7ffaaec53..729d4f501 100644
--- a/Data/WCFHibernateSessionManager.cs
+++ b/Data/WCFHibernateSessionManager.cs
@@ -47,10 +47,10 @@ namespace BeWo.Data
                     {
 #if DEBUG
                         //TODO: wieder einkommentieren!
-                        //var hierarchy = (Hierarchy)LogManager.GetRepository();
-                        //var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
-                        //logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
-                        //hierarchy.Configured = true;
+                        var hierarchy = (Hierarchy)LogManager.GetRepository();
+                        var logger = (Logger)hierarchy.GetLogger("NHibernate.SQL");
+                        logger.AddAppender(new TraceAppender { Layout = new SimpleLayout() });
+                        hierarchy.Configured = true;
 #endif
                         _SessionFactories[MultitenancyOperationContextExt.Current.Tenant] = new Configuration().Configure(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Multitenancy\" + MultitenancyOperationContextExt.Current.Tenant + ".config")).BuildSessionFactory();
                     }
diff --git a/Report/AbstractReportCreator.cs b/Report/AbstractReportCreator.cs
index 50858ac37..d4613cf1c 100644
--- a/Report/AbstractReportCreator.cs
+++ b/Report/AbstractReportCreator.cs
@@ -80,5 +80,9 @@ namespace BeWo.Report
 
         public abstract XtraReport CreateKilometerauswertungForAllCustomers(List<long> customerOids, DateTime rangeDate);
 
+        public abstract XtraReport CreateEmployeeKilometerauswertung(long employeeOid, DateTime range);
+
+        public abstract XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate);
+
     }
 }
\ No newline at end of file
diff --git a/Report/DefaultReportCreator.cs b/Report/DefaultReportCreator.cs
index d66dc8a3f..2a73b9d2b 100644
--- a/Report/DefaultReportCreator.cs
+++ b/Report/DefaultReportCreator.cs
@@ -874,5 +874,23 @@ namespace BeWo.Report
 
             return report as XtraReport;
         }
+
+        public override XtraReport CreateEmployeeKilometerauswertung(long employeeOid, DateTime range)
+        {
+            var report = FindReportImp<EmployeeKilometerauswertungsRO>();
+
+			report.SetReportDataSource(EmployeeKilometerauswertungsRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDC(DAOFactory.GenericDAO.LoadByID<Employee>(employeeOid)), range));
+
+			return report as XtraReport;
+        }
+
+        public override XtraReport CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate)
+        {
+            var report = FindReportImp<EmployeeKilometerauswertungsListRO>();
+
+			report.SetReportDataSource(EmployeeKilometerauswertungsListRO.Create(MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<Employee>(employeeOids)), rangeDate));
+
+            return report as XtraReport;
+        }
     }
 }
\ No newline at end of file
diff --git a/Report/Report.csproj b/Report/Report.csproj
index 5d321464a..e38e6ed3c 100644
--- a/Report/Report.csproj
+++ b/Report/Report.csproj
@@ -185,12 +185,24 @@
     <Compile Include="DefaultReports\AdditionalServiceBookingReport.Designer.cs">
       <DependentUpon>AdditionalServiceBookingReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="DefaultReports\EmployeeKilometerauswertungsListReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DefaultReports\EmployeeKilometerauswertungsListReport.Designer.cs">
+      <DependentUpon>EmployeeKilometerauswertungsListReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="DefaultReports\KilometerauswertungsListReport.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="DefaultReports\KilometerauswertungsListReport.Designer.cs">
       <DependentUpon>KilometerauswertungsListReport.cs</DependentUpon>
     </Compile>
+    <Compile Include="DefaultReports\EmployeeKilometerauswertungsReport.cs">
+      <SubType>Component</SubType>
+    </Compile>
+    <Compile Include="DefaultReports\EmployeeKilometerauswertungsReport.designer.cs">
+      <DependentUpon>EmployeeKilometerauswertungsReport.cs</DependentUpon>
+    </Compile>
     <Compile Include="DefaultReports\KilometerauswertungsReport.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -416,6 +428,8 @@
     <Compile Include="ReportObjects\AssessmentSheetRO.cs" />
     <Compile Include="ReportObjects\AuslastungBerechnung.cs" />
     <Compile Include="ReportObjects\EmployeeDataRO.cs" />
+    <Compile Include="ReportObjects\EmployeeKilometerauswertungsListRO.cs" />
+    <Compile Include="ReportObjects\EmployeeKilometerauswertungsRO.cs" />
     <Compile Include="ReportObjects\MitarbeiterstundenkontoBerechnungTagesansicht.cs" />
     <Compile Include="ReportObjects\KalenderRO.cs" />
     <Compile Include="ReportObjects\FinanceRO.cs" />
@@ -454,10 +468,17 @@
     <EmbeddedResource Include="DefaultReports\AdditionalServiceBookingReport.resx">
       <DependentUpon>AdditionalServiceBookingReport.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="DefaultReports\EmployeeKilometerauswertungsListReport.resx">
+      <DependentUpon>EmployeeKilometerauswertungsListReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="DefaultReports\KilometerauswertungsListReport.resx">
       <DependentUpon>KilometerauswertungsListReport.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="DefaultReports\EmployeeKilometerauswertungsReport.resx">
+      <DependentUpon>EmployeeKilometerauswertungsReport.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="DefaultReports\KilometerauswertungsReport.resx">
       <DependentUpon>KilometerauswertungsReport.cs</DependentUpon>
     </EmbeddedResource>
diff --git a/Report/ReportObjects/KilometerauswertungsListRO.cs b/Report/ReportObjects/KilometerauswertungsListRO.cs
index d98251c7c..7acbd2026 100644
--- a/Report/ReportObjects/KilometerauswertungsListRO.cs
+++ b/Report/ReportObjects/KilometerauswertungsListRO.cs
@@ -45,7 +45,7 @@ namespace BeWo.Report.ReportObjects
 
                 if(customer != null)
                 {
-                    var customer2KilometerauswertungsEntry = new Customer2KilometerauswertungsEntry(customer, customerOid2Servicerecords.Value);
+                    var customer2KilometerauswertungsEntry = new Customer2KilometerauswertungsEntry(customer, customerOid2Servicerecords.Value.OrderBy(serviceRecord => serviceRecord.Start));
                     Customer2Entries.Add(customer2KilometerauswertungsEntry);
                 }
             }
@@ -62,7 +62,7 @@ namespace BeWo.Report.ReportObjects
 
         public int TotalDistanceInMeters { get; set; }
 
-        public Customer2KilometerauswertungsEntry(CompactCustomerDC customer, List<ServiceRecord> serviceRecords)
+        public Customer2KilometerauswertungsEntry(CompactCustomerDC customer, IEnumerable<ServiceRecord> serviceRecords)
         {
             Customer = customer;
 
diff --git a/ReportService/ServiceContracts/IReportService.cs b/ReportService/ServiceContracts/IReportService.cs
index 5f5c129a9..d7b940787 100644
--- a/ReportService/ServiceContracts/IReportService.cs
+++ b/ReportService/ServiceContracts/IReportService.cs
@@ -9,6 +9,7 @@ using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
+using DevExpress.Data.Mask;
 
 namespace ReportingService.ServiceContracts
 {
@@ -59,5 +60,12 @@ namespace ReportingService.ServiceContracts
         [OperationContract]
 		bool CheckForAnyServiceRecordsWithDistanceValues(List<long> customerOids, DateTimeSpan span);
 
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+		MemoryStream CreateEmployeeKilometerauswertung(long employeeOid, DateTime range);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+		MemoryStream CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate);
     }
 }
\ No newline at end of file
diff --git a/ReportService/ServiceImplementations/ReportServiceImp.cs b/ReportService/ServiceImplementations/ReportServiceImp.cs
index a20793ee5..e338380df 100644
--- a/ReportService/ServiceImplementations/ReportServiceImp.cs
+++ b/ReportService/ServiceImplementations/ReportServiceImp.cs
@@ -228,5 +228,23 @@ namespace ReportingService.ServiceImplementations
         {
             return DAOFactory.SearchDAO.CheckForAnyServiceRecordsWithDistanceValues(customerOids, span);
         }
+
+        public MemoryStream CreateEmployeeKilometerauswertung(long employeeOid, DateTime range)
+        {
+            var reportCreator = GetReportCreator();
+
+            var report = reportCreator.CreateEmployeeKilometerauswertung(employeeOid, range);
+
+            return report == null ? null : CreateReportStream(report);
+        }
+
+		public MemoryStream CreateKilometerauswertungForAllEmployees(List<long> employeeOids, DateTime rangeDate)
+        {
+            var reportCreator = GetReportCreator();
+
+            var report = reportCreator.CreateKilometerauswertungForAllEmployees(employeeOids, rangeDate);
+
+			return report == null ? null : CreateReportStream(report);
+		}
 	} 
 }
\ No newline at end of file
diff --git a/Service/DCEntityMapper/ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs b/Service/DCEntityMapper/ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs
index b9fedd84f..bf18daa2b 100644
--- a/Service/DCEntityMapper/ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs
+++ b/Service/DCEntityMapper/ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.Linq;
+using BeWo.Data.Access;
 using BeWo.Data.Entities;
 using BS.Shared.DataContracts;
 
@@ -12,8 +9,9 @@ namespace BeWo.Service.DCEntityMapper
     {
         public override ConfirmationReceiptSignatureDC MergeWithDC(ConfirmationReceiptSignature pEntity, ConfirmationReceiptSignatureDC pDataContract)
         {
+            pDataContract.ConfirmationReceiptSignatureOid = pEntity.Oid;
+            pDataContract.ConfirmationReceiptSignatureVersion = pEntity.Version;
             pDataContract.SignatureImage = pEntity.SignatureImage;
-
             pDataContract.EmployeeOid = pEntity.EmployeeOid;
 
             pDataContract.ServiceRecords = MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(pEntity.ServiceRecords);
@@ -23,12 +21,29 @@ namespace BeWo.Service.DCEntityMapper
 
         public override ConfirmationReceiptSignature MergeWithEntity(ConfirmationReceiptSignatureDC pDataContract, ConfirmationReceiptSignature pEntity)
         {
-            throw new NotImplementedException();
+            ConcurrencyCheck(pDataContract.ConfirmationReceiptSignatureVersion, pEntity);
+
+            pEntity.Oid = pDataContract.ConfirmationReceiptSignatureOid;
+            pEntity.Version = pDataContract.ConfirmationReceiptSignatureVersion;
+            pEntity.SignatureImage = pDataContract.SignatureImage;
+            pEntity.EmployeeOid = pDataContract.EmployeeOid;
+
+            if(pDataContract.ServiceRecords != null)
+            {
+                pEntity.ServiceRecords = DAOFactory.GenericDAO.LoadByIDs<ServiceRecord>(pDataContract.ServiceRecords.Select(s => s.ServiceRecordOid.Value));
+            }
+
+            return pEntity;
         }
 
         protected override bool AreDCAndEntityEqual(ConfirmationReceiptSignatureDC pDC, ConfirmationReceiptSignature pEntity)
         {
-            throw new NotImplementedException();
+            if(pDC.ConfirmationReceiptSignatureOid == null)
+            {
+                return false;
+            }
+
+            return pDC.ConfirmationReceiptSignatureOid == pEntity.Oid;
         }
     }
 }
diff --git a/Service/ServiceContracts/IEmployeeService.cs b/Service/ServiceContracts/IEmployeeService.cs
index e9d3d695e..d8c1f47c9 100644
--- a/Service/ServiceContracts/IEmployeeService.cs
+++ b/Service/ServiceContracts/IEmployeeService.cs
@@ -383,5 +383,9 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<CompactCustomerDC> GetActiveCompactCustomersForEmployee(long? employeeOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 23f15d84c..c71befb08 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -931,5 +931,9 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<ConfirmationReceiptSignatureDC> GetConfirmationReceiptSignaturesByServiceRecord(long serviceRecordOid);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<ConfirmationReceiptSignatureDC> GetAllConfirmationReceiptSignatures();
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/EmployeeServiceImp.cs b/Service/ServiceImplementations/EmployeeServiceImp.cs
index 62e86e513..00dbd6f86 100644
--- a/Service/ServiceImplementations/EmployeeServiceImp.cs
+++ b/Service/ServiceImplementations/EmployeeServiceImp.cs
@@ -1645,5 +1645,19 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(exception);
             }
         }
+
+        public List<CompactEmployeeDC> GetActiveCompactEmployeesForEmployee(long employeeOid) 
+        {
+            try
+            {
+                var employees = DAOFactory.SearchDAO.GetAllActiveEmployeesForEmployee(employeeOid);
+
+                return MapperFactory.CompactEmployeeDC_Employee.MapToNewDCs(employees);
+            }
+            catch(Exception exception)
+            {
+                throw Utils.CreateBeWoFaultException(exception);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index eb0f2f9f7..bb57f4e01 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -6088,5 +6088,17 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(exception);
             }
         }
+
+        public List<ConfirmationReceiptSignatureDC> GetAllConfirmationReceiptSignatures()
+        {
+            try
+            {
+                return MapperFactory.ConfirmationReceiptSignatureDC_ConfirmationReceiptSignature.MapToNewDCs(DAOFactory.GenericDAO.GetAllActive<ConfirmationReceiptSignature>());
+            }
+            catch(Exception exception)
+            {
+                throw Utils.CreateBeWoFaultException(exception);
+            }
+        }
     }
 }

From 23553e158429ad4d16f725d164b9c06e44cc4a6f Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Thu, 1 Oct 2020 11:45:48 +0200
Subject: [PATCH 2/6] x

---
 BeWoPlanerMobil/Controllers/MainController.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index e2c896231..340e63a79 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -1743,6 +1743,8 @@ namespace BeWoPlanerMobil.Controllers
             var bookAfterSettlementInvoice     = MobileSessionFacade.CheckForUserRight(UserRightType.BookServiceRecordAfterSettlementInvoice);
             var bookServiceRecordOutOfSupportConcept = MobileSessionFacade.CheckForUserRight(UserRightType.BookServiceRecordOutOfSupportConcept);
 
+            // TODO: Prüfen, ob Stunden übertragbar sind. Wenn nicht, prüfen, ob nach Ausreizung des FLS-Zeitraums die Anzahl der FLS pro Zeitraum überschritten werden darf!
+
             var newResult = new ValidationResult();
             var exitLoop  = false;
             foreach (var sr2V in validationResults)

From 091c29ddf7f2a313600d80936fd591437d3e4b37 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Thu, 1 Oct 2020 14:33:10 +0200
Subject: [PATCH 3/6] Merge

---
 BeWo/ServiceProxy/Generated.cs | 34 +++++++++++++++++-----------------
 Host/Multitenancy/demo.config  |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/BeWo/ServiceProxy/Generated.cs b/BeWo/ServiceProxy/Generated.cs
index 48af73cb6..de796b4d9 100644
--- a/BeWo/ServiceProxy/Generated.cs
+++ b/BeWo/ServiceProxy/Generated.cs
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     Dieser Code wurde von einem Tool generiert.
-//     Laufzeitversion:4.0.30319.42000
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
 //
-//     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-//     der Code erneut generiert wird.
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -3523,24 +3523,24 @@ namespace BeWo.ServiceProxy
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateBeWoFoldersBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateBeWoFolders(System.Collections.Generic.List<BS.Shared.DataContracts.BeWoFolderDC> dcs);
         
-        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadDocument) übereinstimmt.
+        // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadDocument)
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadDocument", ReplyAction="http://tempuri.org/IStreamingService/UploadDocumentResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadResult UploadDocument(BeWo.ServiceProxy.UploadPackage request);
         
-        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UpdatePackage) von Nachricht "UpdatePackage" nicht mit dem Standardwert (UpdateDocument) übereinstimmt.
+        // CODEGEN: Generating message contract since the wrapper name (UpdatePackage) of message UpdatePackage does not match the default value (UpdateDocument)
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UpdateDocument", ReplyAction="http://tempuri.org/IStreamingService/UpdateDocumentResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UpdateDocumentBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadResult UpdateDocument(BeWo.ServiceProxy.UpdatePackage request);
         
-        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadChatPackage) von Nachricht "UploadChatPackage" nicht mit dem Standardwert (CreateNewSpeziallStreamChatMessagesDC) übereinstimmt.
+        // CODEGEN: Generating message contract since the wrapper name (UploadChatPackage) of message UploadChatPackage does not match the default value (CreateNewSpeziallStreamChatMessagesDC)
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDC", ReplyAction="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCRespons" +
             "e")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/CreateNewSpeziallStreamChatMessagesDCBeWoFau" +
             "ltFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadChatResult CreateNewSpeziallStreamChatMessagesDC(BeWo.ServiceProxy.UploadChatPackage request);
         
-        // CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (UploadPackage) von Nachricht "UploadPackage" nicht mit dem Standardwert (UploadImportFile) übereinstimmt.
+        // CODEGEN: Generating message contract since the wrapper name (UploadPackage) of message UploadPackage does not match the default value (UploadImportFile)
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IStreamingService/UploadImportFile", ReplyAction="http://tempuri.org/IStreamingService/UploadImportFileResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IStreamingService/UploadImportFileBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         BeWo.ServiceProxy.UploadImportFileResult UploadImportFile(BeWo.ServiceProxy.UploadPackage request);
@@ -4860,13 +4860,12 @@ namespace BeWo.ServiceProxy
             "cordBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetConfirmationReceiptSignaturesByServiceRecord(long serviceRecordOid);
         
-
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignatures", ReplyAction="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignaturesR" +
-            "esponse")]
-        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllConnfirConfirmationReceiptSignaturesB" +
-            "eWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
-        System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConnfirConfirmationReceiptSignatures();
-
+        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/GetAllConfirmationReceiptSignatures", ReplyAction="http://tempuri.org/IOperationsService/GetAllConfirmationReceiptSignaturesResponse" +
+            "")]
+        [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/GetAllConfirmationReceiptSignaturesBeWoFaul" +
+            "tFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
+        System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConfirmationReceiptSignatures();
+        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IOperationsService/UpdateDienst", ReplyAction="http://tempuri.org/IOperationsService/UpdateDienstResponse")]
         [System.ServiceModel.FaultContractAttribute(typeof(BeWo.ServiceProxy.BeWoFault), Action="http://tempuri.org/IOperationsService/UpdateDienstBeWoFaultFault", Name="BeWoFault", Namespace="http://schemas.datacontract.org/2004/07/BeWo.Service.ServiceContracts")]
         void UpdateDienst(System.Collections.Generic.List<BS.Shared.DataContracts.DienstInfoDC> dienste);
@@ -5957,10 +5956,11 @@ namespace BeWo.ServiceProxy
             return base.Channel.GetConfirmationReceiptSignaturesByServiceRecord(serviceRecordOid);
         }
         
-        public System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConnfirConfirmationReceiptSignatures()
+        public System.Collections.Generic.List<BS.Shared.DataContracts.ConfirmationReceiptSignatureDC> GetAllConfirmationReceiptSignatures()
         {
-            return base.Channel.GetAllConnfirConfirmationReceiptSignatures();
+            return base.Channel.GetAllConfirmationReceiptSignatures();
         }
+        
         public void UpdateDienst(System.Collections.Generic.List<BS.Shared.DataContracts.DienstInfoDC> dienste)
         {
             base.Channel.UpdateDienst(dienste);
diff --git a/Host/Multitenancy/demo.config b/Host/Multitenancy/demo.config
index fc0645ed6..9bd275e8f 100644
--- a/Host/Multitenancy/demo.config
+++ b/Host/Multitenancy/demo.config
@@ -17,7 +17,7 @@
 
 
           <property name="connection.connection_string">
-              Server=localhost;Password=root;User ID=root; Initial Catalog=bewodemo
+              Server=localhost;Password=root;User ID=root; Initial Catalog=1111111111
           </property>
 
           <property name="dialect">

From 31fc428189c0bb84403d6634c5e11970595968ba Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Tue, 6 Oct 2020 18:26:04 +0200
Subject: [PATCH 4/6] Neue Unterschriftenfunktion und Lizenzanzeige in der
 Mobilversion

---
 BeWoPlanerMobil/BeWoPlanerMobil.csproj        |   3 +-
 BeWoPlanerMobil/Scripts/mobileUtils.js        |  26 ++
 BeWoPlanerMobil/Scripts/signature.js          | 267 +++++-------------
 BeWoPlanerMobil/Scripts/utils/trimCanvas.js   |  86 ++++++
 .../Scripts/view-scripts/report.js            |   2 +-
 BeWoPlanerMobil/Util/SignatureUtils.cs        |   2 +
 BeWoPlanerMobil/Views/Main/Main.cshtml        |  21 +-
 BeWoPlanerMobil/Views/Shared/_Layout.cshtml   |   9 +
 8 files changed, 216 insertions(+), 200 deletions(-)
 create mode 100644 BeWoPlanerMobil/Scripts/utils/trimCanvas.js

diff --git a/BeWoPlanerMobil/BeWoPlanerMobil.csproj b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
index 1787173a3..2c6c5aff7 100644
--- a/BeWoPlanerMobil/BeWoPlanerMobil.csproj
+++ b/BeWoPlanerMobil/BeWoPlanerMobil.csproj
@@ -386,6 +386,7 @@
     <Content Include="Scripts\umd\popper-utils.min.js" />
     <Content Include="Scripts\umd\popper.js" />
     <Content Include="Scripts\umd\popper.min.js" />
+    <Content Include="Scripts\utils\trimCanvas.js" />
     <Content Include="Scripts\utils\dateUtils.js" />
     <Content Include="Scripts\view-scripts\report.js" />
     <Content Include="Scripts\view-scripts\scheduler.js" />
@@ -606,7 +607,7 @@
     <VisualStudio>
       <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
         <WebProjectProperties>
-          <UseIIS>False</UseIIS>
+          <UseIIS>True</UseIIS>
           <AutoAssignPort>False</AutoAssignPort>
           <DevelopmentServerPort>8808</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
diff --git a/BeWoPlanerMobil/Scripts/mobileUtils.js b/BeWoPlanerMobil/Scripts/mobileUtils.js
index 631035788..eef179a6f 100644
--- a/BeWoPlanerMobil/Scripts/mobileUtils.js
+++ b/BeWoPlanerMobil/Scripts/mobileUtils.js
@@ -109,4 +109,30 @@ function hasEmptyRequiredFields(form) {
     });
 
     return count > 0;
+}
+
+function showAboutPopup() {
+    var text = "SignaturePad:<br/>Copyright (c) 2018 Szymon Nowak<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<br/>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
+
+    $("#popupTitle").text("Copyrights");
+    $("#popupMessage").html(text);
+
+    $("#messagePopup").modal(
+        {
+            backdrop: "static",
+            keyboard: false
+        }
+    );
+}
+
+function cloneCanvas(oldCanvas) {
+    var newCanvas = document.createElement("canvas");
+    var context = newCanvas.getContext("2d");
+
+    newCanvas.width = oldCanvas.width;
+    newCanvas.height = oldCanvas.height;
+
+    context.drawImage(oldCanvas, 0, 0);
+
+    return newCanvas;
 }
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Scripts/signature.js b/BeWoPlanerMobil/Scripts/signature.js
index 4438db68e..7b6e826d1 100644
--- a/BeWoPlanerMobil/Scripts/signature.js
+++ b/BeWoPlanerMobil/Scripts/signature.js
@@ -1,135 +1,31 @@
-class Signature {
-    constructor() {
-        this.color = "#000000";
-        this.sign = false;
-        this.beginSign = false;
-        this.lineWidth = 2;
-        this.canvas = document.getElementById("sketch-pad");
-        this.offsetLeft = this.canvas.offsetLeft;
-        this.offsetRight = this.canvas.offsetRight;
-        this.context = this.canvas.getContext("2d");
-        this.context.lineJoin = "round";
-        this.context.lineCap = "round";
-        this.onCanvasMouseDown();
-        this.onCanvasMouseUp();
-        this.onCanvasMouseMove();
-        this.onCanvasTouchStart();
-        this.onCanvasTouchMove();
-        this.onCanvasTouchEnd();
-        this.createSignature();
-        this.clearCanvas();
-        this.resetCanvas();
-    }
+// Blendet das Popup mit der gespeicherten Unterschrift wieder aus
+function hideSignature() {
+    $("#signature-img-popup").modal("hide");
 
-    updateMousePosition(mX, mY) {
-        var rect = this.canvas.getBoundingClientRect();
-        var scaleX = this.canvas.width / rect.width;
-        var scaleY = this.canvas.height / rect.height;
-        this.cursorX = (mX - rect.left) * scaleX;
-        this.cursorY = (mY - rect.top) * scaleY;
-    }
+    var url = getResetSignatureImageUrl();
 
-    onCanvasMouseDown() {
-        this.canvas.addEventListener("mousedown", ({ clientX, clientY }) => {
-            $("body").addClass("stop-scrolling");
-            $("body").bind("touchmove",
-                function(e) {
-                    e.preventDefault();
-                });
+    $.get(url);
+}
 
-            this.sign = true;
-            this.updateMousePosition(clientX, clientY);
-        }, false);
-    }
+function resizeCanvas() {
+    if($("#sketch-pad").length !== 0) {
+        var rowWidth = $("#canvas-row").innerWidth();
+        var canvasWidth = $("#sketch-pad").innerWidth();
 
-    onCanvasMouseUp() {
-        this.canvas.addEventListener("mouseup", () => {
-            $("body").removeClass("stop-scrolling");
-            $("body").unbind("touchmove");
+        var newWidth = rowWidth;
 
-            this.sign = false;
-            this.beginSign = false;
-        }, false);
-    }
-
-    onCanvasMouseMove() {
-        this.canvas.addEventListener("mousemove", ({ clientX, clientY }) => {
-            if (this.sign) {
-                this.updateMousePosition(clientX, clientY);
-                this.createSignature();
-            }
-        });
-    }
-
-    onCanvasTouchStart() {
-        this.canvas.addEventListener("touchstart", (e) => {
-            var touch = e.touches[0];
-            var mouseEvent = new MouseEvent("mousedown", { clientX: touch.clientX, clientY: touch.clientY });
-
-            this.canvas.dispatchEvent(mouseEvent);
-        }, false);
-    }
-
-    onCanvasTouchMove() {
-        this.canvas.addEventListener("touchmove", (e) => {
-            var touch = e.touches[0];
-            var mouseEvent = new MouseEvent("mousemove", { clientX: touch.clientX, clientY: touch.clientY });
-
-            this.canvas.dispatchEvent(mouseEvent);
-        }, false);
-    }
-
-    onCanvasTouchEnd() {
-        this.canvas.addEventListener("touchend", (e) => {
-            var mouseEvent = new MouseEvent("mouseup", {});
-
-            this.canvas.dispatchEvent(mouseEvent);
-        }, false);
-    }
-
-    createSignature() {
-        if (!this.beginSign) {
-            this.context.beginPath();
-            this.context.moveTo(this.cursorX, this.cursorY);
-            this.beginSign = true;
-        } else {
-            this.context.lineTo(this.cursorX, this.cursorY);
-            this.context.strokeStyle = this.color;
-            this.context.lineWidth = this.lineWidth;
-            this.context.stroke();
+        if(newWidth !== canvasWidth) {
+            $("#sketch-pad").prop("width", newWidth);
         }
     }
-
-    clearCanvas() {
-        this.context.clearRect(0, 0, this.canvas.width, this.canvas.height);
-    }
-
-    resetCanvas() {
-        document.getElementById("clear-canvas-btn").addEventListener("click",
-            () => {
-                this.clearCanvas();
-            });
-    }
 }
 
-document.addEventListener("DOMContentLoaded", event => {
-    if ($("#sketch-pad").length !== 0) {
-        new Signature();
-    }
-});
-
-document.addEventListener("DOMContentLoaded", event => {
-    if ($("#report-sketch-pad").length !== 0) {
-        new Signature();
-    }
-});
-
-function prepareSigningPopup(serviceRecordOid) {
+function initializeSignature(selectedServiceRecordOid) {
     $("#main-container, #checkbox-container").hide();
     $("#signature-container").addClass("d-block");
 
-    $.get(getSelectedRecordInformationUrlWithOid(), { oid: serviceRecordOid }).done(function(jsonServiceRecord) {
-        if (jsonServiceRecord === "SessionTimeout") {
+    $.get(getSelectedRecordInformationUrlWithOid(), { oid: selectedServiceRecordOid }).done(function(jsonServiceRecord) {
+        if(jsonServiceRecord === "SessionTimeout") {
             window.location.href = getRedirectLink();
             return;
         }
@@ -154,79 +50,64 @@ function prepareSigningPopup(serviceRecordOid) {
         $("#signature-employee").text(record.Employee.FirstName + " " + record.Employee.LastName);
         $("#signature-date-time").text(datum + " " + startDate + " - " + endDate);
 
-        $("#service-record-oid-holder").val(serviceRecordOid);
-
         resizeCanvas();
+
+        var canvas = document.getElementById("sketch-pad");
+
+        var signaturePad = new SignaturePad(canvas, { backgroundColor: "rgba(255, 255, 255, 0)" });
+
+        var saveButton = document.getElementById("save-signature-btn");
+        var clearButton = document.getElementById("clear-canvas-btn");
+        var cancelButton = document.getElementById("cancel-signature-btn");
+
+        saveButton.addEventListener("click", function(event) {
+            var url = getSetSelectedSignatureUrl();
+            var date = moment(new Date());
+
+            var clonedCanvas = trimCanvas(cloneCanvas(document.getElementById("sketch-pad")));
+
+            var context = clonedCanvas.getContext("2d");
+            context.globalCompositeOperation = "destination-over";
+            context.fillStyle = "white";
+            context.fillRect(0, 0, clonedCanvas.width, clonedCanvas.height);
+
+            var dataUrl = clonedCanvas.toDataURL("image/png");
+
+            var formattedDate = date.format("DD.MM.YYYY HH:mm:ss");
+
+            showSpinner();
+
+            $.post(url, { blob: dataUrl, timeStamp: formattedDate, serviceRecordOid: selectedServiceRecordOid }).done(function(json) {
+                hideSpinner();
+
+                if(isEmptyOrSpaces(json)) {
+                    $("#signature-container").removeClass("d-block");
+                    $("#main-container, #checkbox-container").show();
+                    showMessagePopupWithCallback("Unterschrift", "Die Unterschrift wurde erfolgreich gespeichert.", function() {
+                        showSpinner();
+                        location.reload();
+                    }, true);
+                } else {
+                    showMessagePopup("Fehler", json);
+                    signaturePad.clear();
+                }
+            });
+        });
+
+        clearButton.addEventListener("click", function(event) {
+            signaturePad.clear();
+        });
+
+        cancelButton.addEventListener("click", function(event) {
+            showMessagePopupWithCallback("Unterschrift", "Sind Sie sicher, dass Sie die Unterschrift nicht speichern möchten?",
+                function() {
+                    $("#signature-container, #checkbox-container").removeClass("d-block");
+                    $("#main-container").show();
+
+                    signaturePad.clear();
+
+                    $.get(getResetSignatureImageUrl());
+                }, false);
+        });
     });
-}
-
-function saveSignature() {
-    var url = getSetSelectedSignatureUrl();
-    var date = moment(new Date());
-
-    var canvas = document.getElementById("sketch-pad");
-    var context = canvas.getContext("2d");
-    context.globalCompositeOperation = "destination-over";
-    context.fillStyle = "white";
-    context.fillRect(0, 0, canvas.width, canvas.height);
-
-    var dataUrl = document.getElementById("sketch-pad").toDataURL();
-    
-    var formattedDate = date.format("DD.MM.YYYY HH:mm:ss");
-
-    var serviceRecordOid = $("#service-record-oid-holder").val();
-
-    showSpinner();
-
-    $.post(url, { blob: dataUrl, timeStamp: formattedDate, serviceRecordOid: serviceRecordOid }).done(function(json) {
-        hideSpinner();
-
-        if (isEmptyOrSpaces(json)) {
-            $("#signature-container").removeClass("d-block");
-            $("#main-container, #checkbox-container").show();
-            showMessagePopupWithCallback("Unterschrift", "Die Unterschrift wurde erfolgreich gespeichert.", function() {
-                showSpinner();
-                location.reload();
-            }, true);
-        } else {
-            showMessagePopup("Fehler", json);
-            new Signature();
-        }
-    });
-}
-
-function confirmCancellation() {
-    showMessagePopupWithCallback("Unterschrift", "Sind Sie sicher, dass Sie die Unterschrift nicht speichern möchten?",
-        function() {
-            $("#signature-container, #checkbox-container").removeClass("d-block");
-            $("#main-container").show();
-
-            var canvas = document.getElementById("sketch-pad");
-            var context = canvas.getContext("2d");
-            context.clearRect(0, 0, canvas.width, canvas.height);
-
-            $.get(getResetSignatureImageUrl());
-        }, false);
-}
-
-function hideSignature() {
-    $("#signature-img-popup").modal("hide");
-
-    var url = getResetSignatureImageUrl();
-
-    $.get(url);
-}
-
-function resizeCanvas() {
-    if($("#sketch-pad").length !== 0) {
-        var rowWidth = $("#canvas-row").innerWidth();
-        var canvasWidth = $("#sketch-pad").innerWidth();
-
-        var newWidth = rowWidth;
-
-        if(newWidth !== canvasWidth) {
-            $("#sketch-pad").prop("width", newWidth);
-            new Signature();
-        }
-    }
 }
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Scripts/utils/trimCanvas.js b/BeWoPlanerMobil/Scripts/utils/trimCanvas.js
new file mode 100644
index 000000000..52d12d929
--- /dev/null
+++ b/BeWoPlanerMobil/Scripts/utils/trimCanvas.js
@@ -0,0 +1,86 @@
+function trimCanvas(canvas) {
+    var context = canvas.getContext("2d");
+
+    var imgWidth = canvas.width;
+    var imgHeight = canvas.height;
+
+    var imgData = context.getImageData(0, 0, imgWidth, imgHeight).data;
+
+    // get the corners of the relevant content (everything that's not white)
+    var cropTop = scanY(true, imgWidth, imgHeight, imgData);
+    var cropBottom = scanY(false, imgWidth, imgHeight, imgData);
+    var cropLeft = scanX(true, imgWidth, imgHeight, imgData);
+    var cropRight = scanX(false, imgWidth, imgHeight, imgData);
+
+    // + 1 is needed because this is a difference, there are n + 1 pixels in
+    // between the two numbers inclusive
+    var cropXDiff = (cropRight - cropLeft) + 1;
+    var cropYDiff = (cropBottom - cropTop) + 1;
+
+    // get the relevant data from the calculated coordinates
+    var trimmedData = context.getImageData(cropLeft, cropTop, cropXDiff, cropYDiff);
+
+    // set the trimmed width and height
+    canvas.width = cropXDiff;
+    canvas.height = cropYDiff;
+    // clear the canvas
+    context.clearRect(0, 0, cropXDiff, cropYDiff);
+    // place the trimmed data into the cleared canvas to create
+    // a new, trimmed canvas
+    context.putImageData(trimmedData, 0, 0);
+    return canvas; // for chaining
+}
+
+// returns the RGBA values of an x, y coord of imgData
+function getRGBA(x, y, imgWidth, imgData) {
+    return {
+        red: imgData[(imgWidth * y + x) * 4],
+        green: imgData[(imgWidth * y + x) * 4 + 1],
+        blue: imgData[(imgWidth * y + x) * 4 + 2],
+        alpha: imgData[(imgWidth * y + x) * 4 + 3]
+    }
+}
+
+function getAlpha(x, y, imgWidth, imgData) {
+    return getRGBA(x, y, imgWidth, imgData).alpha;
+}
+
+// finds the first y coord in imgData that is not white
+function scanY(fromTop, imgWidth, imgHeight, imgData) {
+    var offset = fromTop ? 1 : -1;
+    var firstCol = fromTop ? 0 : imgHeight - 1;
+
+    // loop through each row
+    for(var y = firstCol; fromTop ? (y < imgHeight) : (y > -1); y += offset) {
+        // loop through each column
+        for(var x = 0; x < imgWidth; x++) {
+            // if not white, return col
+            if(getAlpha(x, y, imgWidth, imgData)) {
+                return y;
+            }
+        }
+    }
+
+    // the whole image is white already
+    return null
+}
+
+// finds the first x coord in imgData that is not white
+function scanX(fromLeft, imgWidth, imgHeight, imgData) {
+    var offset = fromLeft ? 1 : -1;
+    var firstRow = fromLeft ? 0 : imgWidth - 1;
+
+    // loop through each column
+    for(var x = firstRow; fromLeft ? (x < imgWidth) : (x > -1); x += offset) {
+        // loop through each row
+        for(var y = 0; y < imgHeight; y++) {
+            // if not white, return row
+            if(getAlpha(x, y, imgWidth, imgData)) {
+                return x;
+            }
+        }
+    }
+
+    // the whole image is white already
+    return null;
+}
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Scripts/view-scripts/report.js b/BeWoPlanerMobil/Scripts/view-scripts/report.js
index 047fcafcf..470c0ec31 100644
--- a/BeWoPlanerMobil/Scripts/view-scripts/report.js
+++ b/BeWoPlanerMobil/Scripts/view-scripts/report.js
@@ -8,7 +8,7 @@
 
     $("#report-info-column").html("Unterschrift für erbrachte Leistungen von " + customer + " im " + month + " " + year);
 
-    resizeCanvas();
+    //resizeCanvas();
 }
 
 function saveReportSignature() {
diff --git a/BeWoPlanerMobil/Util/SignatureUtils.cs b/BeWoPlanerMobil/Util/SignatureUtils.cs
index 3eced152c..e543647a4 100644
--- a/BeWoPlanerMobil/Util/SignatureUtils.cs
+++ b/BeWoPlanerMobil/Util/SignatureUtils.cs
@@ -1,7 +1,9 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
+using System.Linq;
 
 namespace BeWoPlanerMobil.Util
 {
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 9a40de2f3..37e878e16 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -81,7 +81,7 @@
             );
         }
 
-        resizeCanvas();
+        //resizeCanvas();
 
         @if (Model != null && Model.IsInEditingMode)
         {
@@ -680,7 +680,7 @@
                                                         @if(Model.ShowSignature && !serviceRecord.SignatureOid.HasValue)
                                                         {
                                                             <div class="col-auto">
-                                                                <button type="button" class="btn btn-primary" onclick="prepareSigningPopup(@serviceRecord.ServiceRecordOid)">
+                                                                <button type="button" class="btn btn-primary" onclick="initializeSignature(@serviceRecord.ServiceRecordOid)">
                                                                     <span class="fas fa-signature"></span>
                                                                 </button>
                                                             </div>
@@ -1467,11 +1467,22 @@
         <div class="row">
             <div class="col">
                 <h4 class="d-inline">Unterschrift</h4>
-                <button type="button" class="btn btn-primary float-right" onclick="confirmCancellation()">
+                <button type="button" class="btn btn-primary float-right" id="cancel-signature-btn">
                     <span class="fas fa-times-circle"></span>
                 </button>
             </div>
         </div>
+        @if(Html.IsInDebugMode())
+        {
+            <div class="row">
+                <div class="col text-secondary">
+                    Debuginfo:
+                </div>
+                <div class="col" id="debug-info">
+
+                </div>
+            </div>
+        }
         <div class="row">
             <div class="col text-secondary">
                 Hilfeplan:
@@ -1515,12 +1526,12 @@
 
         <div class="row mt-3" id="canvas-row">
             <div class="canvas-container" id="canvas-container">
-                <canvas id="sketch-pad" width="500" height="200" class="bg-white rounded" style="border: 1px solid #343A40;"></canvas>
+                <canvas id="sketch-pad" width="500" height="200" class="bg-white" style="border: 1px solid #343A40;"></canvas>
             </div>
         </div>
         <div class="row">
             <div class="col-12">
-                <button type="button" class="btn btn-primary float-right" onclick="saveSignature()">Speichern</button>
+                <button type="button" class="btn btn-primary float-right" id="save-signature-btn">Speichern</button>
                 <button type="button" class="btn btn-secondary float-right mr-3" id="clear-canvas-btn">Neu</button>
             </div>
         </div>
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index d5a4f5a1b..a469c5b9b 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -33,6 +33,8 @@
     <script src="~/Scripts/view-scripts/scheduler.js"></script>
     <script src="~/Scripts/utils/dateUtils.js"></script>
     <script src="~/Scripts/view-scripts/report.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/signature_pad@2.3.2/dist/signature_pad.min.js"></script>
+    <script src="~/Scripts/utils/trimCanvas.js"></script>
     
     <script>
         $(document).ready(function() {
@@ -166,6 +168,13 @@
                             </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>
+                            Über
+                        </button>
+                    </li>
                 </ul>
             </div>
         </div>

From 045ba8593cd4b40a89823ef398005e1ccc3f0489 Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Wed, 7 Oct 2020 19:42:17 +0200
Subject: [PATCH 5/6] =?UTF-8?q?Unterschriftenfeld=20f=C3=BCllt=20im=20quer?=
 =?UTF-8?q?gehaltenen=20Handy=20nur=20noch=2085%=20der=20Breite=20aus,=20s?=
 =?UTF-8?q?odass=20man=20mit=20den=20R=C3=A4ndern=20neben=20dem=20Feld=20s?=
 =?UTF-8?q?crollen=20kann.=20Optimierung=20der=20Gr=C3=B6=C3=9Fen=C3=A4nde?=
 =?UTF-8?q?rung=20des=20Unterschriftenfelds?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/AbstractBaseController.cs     |  2 +-
 .../Controllers/CustomerController.cs         |  8 +--
 BeWoPlanerMobil/Controllers/MainController.cs | 69 +++++++++----------
 .../Controllers/ReportController.cs           | 33 +++++++--
 .../Controllers/SchedulerController.cs        | 14 ++--
 BeWoPlanerMobil/Scripts/signature.js          | 34 ++++++---
 .../Scripts/view-scripts/report.js            | 43 +++++++++++-
 BeWoPlanerMobil/Util/QuittierungsbelegItem.cs | 10 +--
 BeWoPlanerMobil/Views/Main/Main.cshtml        | 13 +---
 BeWoPlanerMobil/Views/Report/Report.cshtml    | 12 ++--
 .../ServiceContracts/IOperationsService.cs    | 13 ++--
 .../OperationsServiceImp.cs                   | 12 ++++
 12 files changed, 175 insertions(+), 88 deletions(-)

diff --git a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs
index a496c42f1..d827ac189 100644
--- a/BeWoPlanerMobil/Controllers/AbstractBaseController.cs
+++ b/BeWoPlanerMobil/Controllers/AbstractBaseController.cs
@@ -16,7 +16,7 @@ namespace BeWoPlanerMobil.Controllers
         protected readonly IValueListService ValueListService   = new MobileSessionFacade().ValueListService;
         protected readonly IResourceService KalenderService     = new MobileSessionFacade().ResourceService;
         protected readonly IUserService UserService             = new MobileSessionFacade().UserService;
-        protected const string _LeerzeichenFuerGetMethoden = " ";
+        protected const string _LeerzeichenFuerGetMethoden      = " ";
 
         protected static readonly log4net.ILog Log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
 
diff --git a/BeWoPlanerMobil/Controllers/CustomerController.cs b/BeWoPlanerMobil/Controllers/CustomerController.cs
index 62e64c6a9..38ab51864 100644
--- a/BeWoPlanerMobil/Controllers/CustomerController.cs
+++ b/BeWoPlanerMobil/Controllers/CustomerController.cs
@@ -23,7 +23,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (!MobileSessionFacade.IsUserLoggedIn())
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                     return null;
                 }
 
@@ -46,7 +46,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             InitViewModel();
@@ -77,7 +77,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer"))
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             InitViewModel();
@@ -99,7 +99,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model == null)
                 {
-                    return RedirectToActionPermanent("Index", "Login");
+                    return Logout();
                 }
 
                 var selectedCustomerOidString = formCollection[FormCollectionConstants.SelectedCustomerOidKey];
diff --git a/BeWoPlanerMobil/Controllers/MainController.cs b/BeWoPlanerMobil/Controllers/MainController.cs
index 340e63a79..71cdd3fdd 100644
--- a/BeWoPlanerMobil/Controllers/MainController.cs
+++ b/BeWoPlanerMobil/Controllers/MainController.cs
@@ -2,11 +2,9 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
-using System.IO;
 using System.Linq;
 using System.Text;
 using System.Web.Mvc;
-using System.Web.UI.WebControls.WebParts;
 using System.Windows.Forms;
 using BeWo.Service.ServiceImplementations;
 
@@ -240,7 +238,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var newValue = "true,false" == collection[FormCollectionConstants.ShowOnlyOwnSupportConceptsKey];
@@ -256,7 +254,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var newValue = "true,false" == pCollection[FormCollectionConstants.ShowExpiredSupportConceptsKey];
@@ -271,7 +269,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var userSettings = GetUser().Settings;
@@ -356,7 +354,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if((!Model.CostBearer2SupportConceptOid.HasValue || Model.CostBearer2SupportConceptOid.Value > 0) && Model.SelectedSupportConcept == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return null;
             }
 
@@ -457,7 +455,7 @@ namespace BeWoPlanerMobil.Controllers
 
             var settings = user?.SettingList.FirstOrDefault(f => f.Type.Equals(SettingsType.ApplicationSettings));
 
-            return settings != null ? MobileUtils.GetSettingValue(settings.Value, key) : null;
+            return settings != null ? GetSettingValue(settings.Value, key) : null;
         }
 
         [Authorize]
@@ -467,7 +465,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model == null)
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                     return _LeerzeichenFuerGetMethoden;
                 }
 
@@ -494,7 +492,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model == null)
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                     return _LeerzeichenFuerGetMethoden;
                 }
 
@@ -530,6 +528,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null || string.IsNullOrWhiteSpace(Model.SignatureImage))
             {
+                Logout();
                 return;
             }
 
@@ -572,8 +571,8 @@ namespace BeWoPlanerMobil.Controllers
 	    {
 	        if (Model == null)
 	        {
-	            RedirectToActionPermanent("Index", "Login");
-	            return _LeerzeichenFuerGetMethoden;
+                Logout();
+                return _LeerzeichenFuerGetMethoden;
 	        }
 
             try
@@ -599,7 +598,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -613,7 +612,7 @@ namespace BeWoPlanerMobil.Controllers
                 var textbausteine = OperationsService.GetAllTextModules();
                 foreach (var tm in textbausteine)
                 {
-                    if (String.IsNullOrWhiteSpace(tm.Text))
+                    if (string.IsNullOrWhiteSpace(tm.Text))
                     {
                         tm.Text = tm.Name;
                     }
@@ -667,7 +666,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -684,7 +683,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if(Model == null)
                 {
-                    return RedirectToActionPermanent("Index", "Login");
+                    return Logout();
                 }
 
                 string doku1;
@@ -1304,7 +1303,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
 		    long? cb2ScOid = Convert.ToInt64(formCollection[FormCollectionConstants.CostBearer2SupportConceptOidKey]);
@@ -1373,7 +1372,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             Model.ServiceRecordOidToDelete = long.Parse(formCollection[FormCollectionConstants.ServiceRecordOidHolderKey]);
@@ -1400,7 +1399,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -1431,7 +1430,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -1445,7 +1444,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var zeitraum = int.Parse(formCollection[FormCollectionConstants.RecordsKey]);
@@ -1465,7 +1464,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return;
             }
 
@@ -1498,7 +1497,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var oidString = formCollection[FormCollectionConstants.ServiceRecordOidHolder2Key];
@@ -1547,7 +1546,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -1565,7 +1564,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -1579,7 +1578,7 @@ namespace BeWoPlanerMobil.Controllers
         { 
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -1869,7 +1868,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model == null)
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                     return _LeerzeichenFuerGetMethoden;
                 }
 
@@ -1960,7 +1959,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var isInGroupBookingMode = "true,false" == pFormCollection[FormCollectionConstants.IsInGroupBookingModeKey];
@@ -1980,7 +1979,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return;
             }
 
@@ -2038,7 +2037,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             Model.NewServiceRecord = new ServiceRecordDC();
@@ -2074,7 +2073,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -2144,7 +2143,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -2171,7 +2170,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
@@ -2200,7 +2199,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var isParsingSuccessful2 = long.TryParse(pFormCollection[FormCollectionConstants.ServiceRecordOidHolder2Key], out var serviceRecordOid);
@@ -2241,7 +2240,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if(Model == null)
                 {
-                    return RedirectToActionPermanent("Index", "Login");
+                    return Logout();
                 }
 
                 if(Model.SelectedConceptCostBearerRelations.Count == 1)
@@ -2464,7 +2463,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
             try
             {
diff --git a/BeWoPlanerMobil/Controllers/ReportController.cs b/BeWoPlanerMobil/Controllers/ReportController.cs
index a9595476d..fcc1de20b 100644
--- a/BeWoPlanerMobil/Controllers/ReportController.cs
+++ b/BeWoPlanerMobil/Controllers/ReportController.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using System.Web.Mvc;
-using BeWo.Data.Entities;
+using System.Web.Razor.Parser.SyntaxTree;
 using BeWo.Report.ReportObjects;
 using BeWoPlanerMobil.Models;
 using BeWoPlanerMobil.Service;
@@ -55,7 +55,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeScheduler)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             var customers = EmployeeService.GetActiveCompactCustomersForEmployee(null);
@@ -134,11 +134,36 @@ namespace BeWoPlanerMobil.Controllers
 
         [Authorize]
         [HttpPost]
-        public ActionResult CreateEmployeeSignatureForServiceOverview(FormCollection formCollection)
+        public string CreateEmployeeSignatureForServiceOverview(string base64SignatureString, string date)
         {
+            if(Model == null)
+            {
+                Logout();
+            }
 
+            var confirmationReceiptSignature = new ConfirmationReceiptSignatureDC();
 
-            return RedirectToActionPermanent("Report");
+            var serviceRecordOids = Model.QuittierungsbelegItems.Select(item => item.ServiceRecordOid).ToList();
+            var serviceRecords = OperationsService.GetServiceRecordsByIds(serviceRecordOids);
+
+            confirmationReceiptSignature.ServiceRecords = serviceRecords;
+            confirmationReceiptSignature.EmployeeOid = Model.Employee.EmployeeOid;
+
+            using(var signatureBitmap = SignatureUtils.Base64StringToBitmap(base64SignatureString.Split(',')[1]))
+            {
+                var isValid = SignatureUtils.ValidateSignature(signatureBitmap);
+
+                if(!isValid)
+                {
+                    return MobileUtils.SerializeObject("Das Unterschriftenfeld darf nicht leer sein.");
+                }
+
+                confirmationReceiptSignature.SignatureImage = base64SignatureString;
+
+                OperationsService.InsertConfirmationReceiptSignature(confirmationReceiptSignature);
+            }
+
+            return _LeerzeichenFuerGetMethoden;
         }
     }
 }
\ No newline at end of file
diff --git a/BeWoPlanerMobil/Controllers/SchedulerController.cs b/BeWoPlanerMobil/Controllers/SchedulerController.cs
index a9f99f4e1..68e941a83 100644
--- a/BeWoPlanerMobil/Controllers/SchedulerController.cs
+++ b/BeWoPlanerMobil/Controllers/SchedulerController.cs
@@ -27,7 +27,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (!MobileSessionFacade.IsUserLoggedIn())
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                     return null;
                 }
 
@@ -50,7 +50,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (!MobileSessionFacade.IsUserLoggedIn() || Request.Browser.Browser.Equals("InternetExplorer") || !AbstractModel.IsAllowedToSeeScheduler)
             {
-                return RedirectToActionPermanent("Index", "Login");
+                return Logout();
             }
 
             if(AbstractModel.HasRightToInsertRessourceAppointments)
@@ -187,7 +187,7 @@ namespace BeWoPlanerMobil.Controllers
             {
                 if (Model == null)
                 {
-                    RedirectToActionPermanent("Index", "Login");
+                    Logout();
                 }
 
                 var rawStartDate = formCollection[FormCollectionConstants.AppointmentStartDateKey];
@@ -258,7 +258,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
             }
 
             Model.SelectedDate = Model.SelectedDate.AddDays(-1);
@@ -278,7 +278,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
             }
 
             Model.SelectedDate = Model.SelectedDate.AddDays(1);
@@ -297,7 +297,7 @@ namespace BeWoPlanerMobil.Controllers
         public ActionResult SelectSchedulerDate(FormCollection formCollection) {
             if (Model == null)
             {
-                RedirectToActionPermanent("Index", "Login");
+                Logout();
             }
 
             var rawSchedulerDate = formCollection[FormCollectionConstants.AppointmentSchedulerDateKey];
@@ -349,6 +349,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if (Model == null)
             {
+                Logout();
                 return null;
             }
 
@@ -394,6 +395,7 @@ namespace BeWoPlanerMobil.Controllers
         {
             if(Model == null)
             {
+                Logout();
                 return _LeerzeichenFuerGetMethoden;
             }
 
diff --git a/BeWoPlanerMobil/Scripts/signature.js b/BeWoPlanerMobil/Scripts/signature.js
index 7b6e826d1..1a39a25d7 100644
--- a/BeWoPlanerMobil/Scripts/signature.js
+++ b/BeWoPlanerMobil/Scripts/signature.js
@@ -7,15 +7,31 @@ function hideSignature() {
     $.get(url);
 }
 
-function resizeCanvas() {
-    if($("#sketch-pad").length !== 0) {
-        var rowWidth = $("#canvas-row").innerWidth();
-        var canvasWidth = $("#sketch-pad").innerWidth();
+function resizeCanvas(sketchPadId, canvasRoId) {
+    if($(sketchPadId).length !== 0) {
+        var rowWidth = $(canvasRoId).innerWidth();
+        var canvasWidth = $(sketchPadId).innerWidth();
 
-        var newWidth = rowWidth;
+        var h = $(window).height();
+        var w = $(window).width();
 
-        if(newWidth !== canvasWidth) {
-            $("#sketch-pad").prop("width", newWidth);
+        var isInPortraitMode = h > w;
+
+        var newWidth = rowWidth * (isInPortraitMode === true ? 1.0 : 0.85);
+
+        var parsedNewWidth = parseInt(newWidth, 10);
+        var parsedCanvasWidth = parseInt(canvasWidth, 10);
+
+        var isMinDifferenceMet = false;
+
+        if (parsedCanvasWidth > parsedNewWidth) {
+            isMinDifferenceMet = parsedCanvasWidth - parsedNewWidth > 4;
+        } else {
+            isMinDifferenceMet = parsedNewWidth - parsedCanvasWidth > 4;
+        }
+
+        if(isMinDifferenceMet) {
+            $(sketchPadId).prop("width", newWidth);
         }
     }
 }
@@ -50,7 +66,7 @@ function initializeSignature(selectedServiceRecordOid) {
         $("#signature-employee").text(record.Employee.FirstName + " " + record.Employee.LastName);
         $("#signature-date-time").text(datum + " " + startDate + " - " + endDate);
 
-        resizeCanvas();
+        resizeCanvas("#sketch-pad", "#canvas-row");
 
         var canvas = document.getElementById("sketch-pad");
 
@@ -110,4 +126,4 @@ function initializeSignature(selectedServiceRecordOid) {
                 }, false);
         });
     });
-}
\ No newline at end of file
+}
diff --git a/BeWoPlanerMobil/Scripts/view-scripts/report.js b/BeWoPlanerMobil/Scripts/view-scripts/report.js
index 470c0ec31..839764426 100644
--- a/BeWoPlanerMobil/Scripts/view-scripts/report.js
+++ b/BeWoPlanerMobil/Scripts/view-scripts/report.js
@@ -1,4 +1,4 @@
-function prepareReportSignature() {
+function initializeReportSignature() {
     $("#report-form-container").hide();
     $("#report-signature-container").addClass("d-block");
 
@@ -8,7 +8,46 @@
 
     $("#report-info-column").html("Unterschrift für erbrachte Leistungen von " + customer + " im " + month + " " + year);
 
-    //resizeCanvas();
+    resizeCanvas("#report-sketch-pad", "#report-canvas-row");
+
+    var canvas = document.getElementById("report-sketch-pad");
+
+    var signaturePad = new SignaturePad(canvas, { backgroundColor: "rgba(255, 255, 255, 0)" });
+
+    var saveButton = document.getElementById("save-report-signature-btn");
+    var clearButton = document.getElementById("clear-report-canvas-btn");
+    var cancelButton = document.getElementById("cancel-report-signature-btn");
+
+    saveButton.addEventListener("click", function(event) {
+        var clonedCanvas = trimCanvas(cloneCanvas(document.getElementById("report-sketch-pad")));
+
+        var context = clonedCanvas.getContext("2d");
+        context.globalCompositeOperation = "destination-over";
+        context.fillStyle = "white";
+        context.fillRect(0, 0, clonedCanvas.width, clonedCanvas.height);
+
+        var dataUrl = clonedCanvas.toDataURL("image/png");
+
+        var date = moment(new Date());
+        var formattedDate = date.format("DD.MM.YYYY HH:mm:ss");
+    });
+
+    clearButton.addEventListener("click", function(event) {
+        signaturePad.clear();
+    });
+
+    cancelButton.addEventListener("click", function(event) {
+        showMessagePopupWithCallback("Unterschrift", "Sind Sie sicher, dass Sie die Unterschrift nicht speichern möchten?",
+            function() {
+                $("#report-signature-container").removeClass("d-block");
+                $("#report-form-container").show();
+
+                signaturePad.clear();
+
+                //TODO: Notwendigkeit prüfen
+                //$.get(getResetSignatureImageUrl());
+            }, false);
+    });
 }
 
 function saveReportSignature() {
diff --git a/BeWoPlanerMobil/Util/QuittierungsbelegItem.cs b/BeWoPlanerMobil/Util/QuittierungsbelegItem.cs
index 161dbe61c..1d607d4cd 100644
--- a/BeWoPlanerMobil/Util/QuittierungsbelegItem.cs
+++ b/BeWoPlanerMobil/Util/QuittierungsbelegItem.cs
@@ -17,13 +17,15 @@ namespace BeWoPlanerMobil.Util
 
         public string Employees { get; set; }
 
+        public long ServiceRecordOid { get; set; }
         
         public QuittierungsbelegItem(ServicesOverviewRO.ServiceDetail serviceDetail)
         {
-            Kontaktart     = serviceDetail.IsGroup ? "GR" : "E";
-            CustomersCount = serviceDetail.CustomerCount;
-            Minutes        = serviceDetail.Minutes;
-            Employees      = serviceDetail.EmployeeAbbr;
+            Kontaktart       = serviceDetail.IsGroup ? "GR" : "E";
+            CustomersCount   = serviceDetail.CustomerCount;
+            Minutes          = serviceDetail.Minutes;
+            Employees        = serviceDetail.EmployeeAbbr;
+            ServiceRecordOid = serviceDetail.ServiceRecordOid;
 
             DateTimeString = $"{serviceDetail.StartDate:dd.MM.yyyy HH:mm} - {serviceDetail.EndDate:HH:mm}";
 
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 37e878e16..190374409 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -138,7 +138,7 @@
     }(jQuery));
 
     $(window).resize(function() {
-        resizeCanvas();
+        resizeCanvas("#sketch-pad", "#canvas-row");
     });
 
     function getSetServiceRecordEmployeeUrl() {
@@ -1472,17 +1472,6 @@
                 </button>
             </div>
         </div>
-        @if(Html.IsInDebugMode())
-        {
-            <div class="row">
-                <div class="col text-secondary">
-                    Debuginfo:
-                </div>
-                <div class="col" id="debug-info">
-
-                </div>
-            </div>
-        }
         <div class="row">
             <div class="col text-secondary">
                 Hilfeplan:
diff --git a/BeWoPlanerMobil/Views/Report/Report.cshtml b/BeWoPlanerMobil/Views/Report/Report.cshtml
index 973ed1905..f90c1579d 100644
--- a/BeWoPlanerMobil/Views/Report/Report.cshtml
+++ b/BeWoPlanerMobil/Views/Report/Report.cshtml
@@ -119,7 +119,7 @@ Info:
                                 <!-- Abstandshalter -->
                             </div>
                             <div class="ml-3 bd-highlight">
-                                <button type="button" class="btn btn-primary" id="signature-button" onclick="prepareReportSignature()">Unterschreiben</button>
+                                <button type="button" class="btn btn-primary" id="signature-button" onclick="initializeReportSignature()">Unterschreiben</button>
                             </div>
                         </div>
                     }
@@ -134,20 +134,20 @@ Info:
         <div class="row">
             <div class="col">
                 <h4 class="d-inline" id="report-info-column">Unterschrift</h4>
-                <button type="button" class="btn btn-primary float-right" onclick="confirmReportSignatureCancellation()">
+                <button type="button" class="btn btn-primary float-right" id="cancel-report-signature-btn">
                     <span class="fas fa-times-circle"></span>
                 </button>
             </div>
         </div>
-        <div class="row mt-3" id="canvas-row">
+        <div class="row mt-3" id="report-canvas-row">
             <div class="canvas-container" id="canvas-container">
-                <canvas id="sketch-pad" width="500" heigh="200" style="border: 1px solid #343A40" class="bg-white rounded"></canvas>
+                <canvas id="report-sketch-pad" width="500" heigh="200" style="border: 1px solid #343A40" class="bg-white rounded"></canvas>
             </div>
         </div>
         <div class="row">
             <div class="col-12">
-                <button type="button" class="btn btn-primary float-right" onclick="saveReportSignature()">Speichern</button>
-                <button type="button" class="btn btn-secondary float-right mr-3" id="clear-canvas-btn">Neu</button>
+                <button type="button" class="btn btn-primary float-right" id="save-report-signature-btn">Speichern</button>
+                <button type="button" class="btn btn-secondary float-right mr-3" id="clear-report-canvas-btn">Neu</button>
             </div>
         </div>
     </div>
diff --git a/Service/ServiceContracts/IOperationsService.cs b/Service/ServiceContracts/IOperationsService.cs
index 774b8c713..d30d51070 100644
--- a/Service/ServiceContracts/IOperationsService.cs
+++ b/Service/ServiceContracts/IOperationsService.cs
@@ -1,12 +1,11 @@
-using System;
-using System.Collections.Generic;
-using System.ServiceModel;
-using BeWo.Data.Entities;
-using BS.Shared;
+using BS.Shared;
 using BS.Shared.Core;
 using BS.Shared.DataContracts;
 using BS.Shared.DataContracts.Compact;
 using BS.Shared.DataContracts.Reports;
+using System;
+using System.Collections.Generic;
+using System.ServiceModel;
 
 namespace BeWo.Service.ServiceContracts
 {
@@ -971,5 +970,9 @@ namespace BeWo.Service.ServiceContracts
         [FaultContract(typeof(BeWoFault))]
         [OperationContract]
         List<AbsenceTimeDC> GetAbsenceTimeVacationByWohnheim(long wohnId, int year, int month);
+
+        [FaultContract(typeof(BeWoFault))]
+        [OperationContract]
+        List<ServiceRecordDC> GetServiceRecordsByIds(List<long> serviceRecordOids);
     }
 }
\ No newline at end of file
diff --git a/Service/ServiceImplementations/OperationsServiceImp.cs b/Service/ServiceImplementations/OperationsServiceImp.cs
index 5e631bc42..8009b16fa 100644
--- a/Service/ServiceImplementations/OperationsServiceImp.cs
+++ b/Service/ServiceImplementations/OperationsServiceImp.cs
@@ -6383,5 +6383,17 @@ namespace BeWo.Service.ServiceImplementations
                 throw Utils.CreateBeWoFaultException(exception);
             }
         }
+
+        public List<ServiceRecordDC> GetServiceRecordsByIds(List<long> serviceRecordOids)
+        {
+            try
+            {
+                return MapperFactory.ServiceRecordDC_ServiceRecord.MapToNewDCs(DAOFactory.GenericDAO.LoadByIDs<ServiceRecord>(serviceRecordOids));
+            }
+            catch(Exception exception)
+            {
+                throw Utils.CreateBeWoFaultException(exception);
+            }
+        }
     }
 }

From 1f43e8986b02d897403ab26123a6aee9c4a0a53e Mon Sep 17 00:00:00 2001
From: Lyndon Jetten <lyndon.jetten@beyondsoft.de>
Date: Thu, 8 Oct 2020 18:32:20 +0200
Subject: [PATCH 6/6] =?UTF-8?q?Bug=20mit=20Popups=20behoben=20Speichern-Bu?=
 =?UTF-8?q?tton=20bei=20der=20Unterschriftenfunktion=20ist=20jetzt=20?=
 =?UTF-8?q?=C3=BCber=20dem=20Canvas=20Canvas-Inhalt=20wird=20beim=20drehen?=
 =?UTF-8?q?=20beibehalten.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BeWoPlanerMobil/Scripts/mobileUtils.js       | 23 +++++++++++++++++---
 BeWoPlanerMobil/Scripts/signature.js         | 13 +++++++++++
 BeWoPlanerMobil/Scripts/view-scripts/main.js |  4 ++--
 BeWoPlanerMobil/Views/Main/Main.cshtml       | 12 +++++-----
 BeWoPlanerMobil/Views/Shared/_Layout.cshtml  |  2 +-
 5 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/BeWoPlanerMobil/Scripts/mobileUtils.js b/BeWoPlanerMobil/Scripts/mobileUtils.js
index eef179a6f..ead4d658b 100644
--- a/BeWoPlanerMobil/Scripts/mobileUtils.js
+++ b/BeWoPlanerMobil/Scripts/mobileUtils.js
@@ -13,6 +13,9 @@ function hideSpinner() {
 
 function showMessagePopup(title, message) {
     $("#popupTitle").text(title);
+    if(message !== null) {
+        $("#modal-body").html("<p id=\"popupMessage\"></p>");
+    }
     $("#popupMessage").text(message);
 
     $("#messagePopup").modal(
@@ -25,6 +28,11 @@ function showMessagePopup(title, message) {
 
 function showMessagePopupWithCallback(title, message, callback, executeCallbackByBothButtons) {
     $("#popupTitle").text(title);
+
+    if (message !== null) {
+        $("#modal-body").html("<p id=\"popupMessage\"></p>");
+    }
+
     $("#popupMessage").text(message);
 
     $("#message-popup-ok-btn").on("click", function() {
@@ -32,8 +40,7 @@ function showMessagePopupWithCallback(title, message, callback, executeCallbackB
     });
 
     if (executeCallbackByBothButtons === true) {
-        $("#message-popup-close-btn").on("click",
-            function() {
+        $("#message-popup-close-btn").on("click", function() {
                 callback();
             });
     }
@@ -85,6 +92,9 @@ function isInArray(value, array) {
 
 function showMessagePopupWithHtml(title, html) {
     $("#popupTitle").text(title);
+    if(message !== null) {
+        $("#modal-body").html("<p id=\"popupMessage\"></p>");
+    }
     $("#popupMessage").html(html);
 
     $("#messagePopup").modal(
@@ -112,10 +122,17 @@ function hasEmptyRequiredFields(form) {
 }
 
 function showAboutPopup() {
+    // Auf deutsch?
     var text = "SignaturePad:<br/>Copyright (c) 2018 Szymon Nowak<br/><br/>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the \"Software\"), to deal in the Software without restriction, including without limitation the rights<br/>to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:<br/>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.<br/>THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.";
 
+    $("#message-popup-ok-btn").unbind();
+    $("#message-popup-close-btn").unbind();
+
     $("#popupTitle").text("Copyrights");
-    $("#popupMessage").html(text);
+
+    $("#modal-body").html("<p id=\"popupMessage\"></p>");
+
+    $("#modal-body").html(text);
 
     $("#messagePopup").modal(
         {
diff --git a/BeWoPlanerMobil/Scripts/signature.js b/BeWoPlanerMobil/Scripts/signature.js
index 1a39a25d7..157bc6e71 100644
--- a/BeWoPlanerMobil/Scripts/signature.js
+++ b/BeWoPlanerMobil/Scripts/signature.js
@@ -31,7 +31,20 @@ function resizeCanvas(sketchPadId, canvasRoId) {
         }
 
         if(isMinDifferenceMet) {
+            console.log("changing canvas size");
+            var sourceCanvas = document.getElementById(sketchPadId.split("#")[1]);
+            var canvasContext = sourceCanvas.getContext("2d");
+            var imageData = sourceCanvas.toDataURL("image/png");
+
             $(sketchPadId).prop("width", newWidth);
+
+            var img = new Image;
+
+            img.onload = function() {
+                canvasContext.drawImage(img, 0, 0);
+            };
+
+            img.src = imageData;
         }
     }
 }
diff --git a/BeWoPlanerMobil/Scripts/view-scripts/main.js b/BeWoPlanerMobil/Scripts/view-scripts/main.js
index 110a1c2b9..dec9a148e 100644
--- a/BeWoPlanerMobil/Scripts/view-scripts/main.js
+++ b/BeWoPlanerMobil/Scripts/view-scripts/main.js
@@ -363,7 +363,7 @@ function validateForm(form) {
     if(isValid === false) {
         hideSpinner();
         $("#messagePopup .modal-body").html('<div class="alert alert-danger" role="alert">' + errorMessage + "</div>");
-
+        
         showMessagePopupWithCallback("Fehler", null, function() {
             $("#messagePopup .modal-body").html();
         }, true);
@@ -385,7 +385,7 @@ function validateForm(form) {
                 var kannTrotzdemGespeichertWerden = message.KannTrotzdemGespeichertWerden;
                 
                 var background = kannTrotzdemGespeichertWerden ? "alert-warning" : "alert-danger";
-
+                
                 $("#messagePopup .modal-body").html('<div class="alert ' + background + '" role="alert">' + message.Message + "</div>");
 
                 showMessagePopupWithCallback("Fehler", null, function() {
diff --git a/BeWoPlanerMobil/Views/Main/Main.cshtml b/BeWoPlanerMobil/Views/Main/Main.cshtml
index 190374409..887faf18d 100644
--- a/BeWoPlanerMobil/Views/Main/Main.cshtml
+++ b/BeWoPlanerMobil/Views/Main/Main.cshtml
@@ -1512,18 +1512,18 @@
 
             </div>
         </div>
-
-        <div class="row mt-3" id="canvas-row">
-            <div class="canvas-container" id="canvas-container">
-                <canvas id="sketch-pad" width="500" height="200" class="bg-white" style="border: 1px solid #343A40;"></canvas>
-            </div>
-        </div>
         <div class="row">
             <div class="col-12">
                 <button type="button" class="btn btn-primary float-right" id="save-signature-btn">Speichern</button>
                 <button type="button" class="btn btn-secondary float-right mr-3" id="clear-canvas-btn">Neu</button>
             </div>
         </div>
+        <div class="row mt-3" id="canvas-row">
+            <div class="canvas-container" id="canvas-container">
+                <canvas id="sketch-pad" width="500" height="200" class="bg-white" style="border: 1px solid #343A40;"></canvas>
+            </div>
+        </div>
+
         <input type="hidden" id="service-record-oid-holder" />
     </div>
 </div>
diff --git a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
index a469c5b9b..d9f082e3b 100644
--- a/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
+++ b/BeWoPlanerMobil/Views/Shared/_Layout.cshtml
@@ -202,7 +202,7 @@
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
-            <div class="modal-body">
+            <div class="modal-body" id="modal-body">
                 <p id="popupMessage"></p>
             </div>
             <div class="modal-footer">