From 0059be3f5a9aa3c92cbe024003eae22ea55c3dcc Mon Sep 17 00:00:00 2001
From: Waldi <waldemar.ruppel@beyondsoft.de>
Date: Tue, 31 Jan 2017 08:50:18 +0100
Subject: [PATCH] up to date

---
 BeWo/Core/BeWoUtils.cs                   | 36 ++++++++++++++++++++----
 BeWo/View/Detail/ServiceRecordView2.xaml | 10 +++----
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs
index 73799e4c2..ff9af618e 100644
--- a/BeWo/Core/BeWoUtils.cs
+++ b/BeWo/Core/BeWoUtils.cs
@@ -1514,12 +1514,13 @@ namespace BeWo.Core
                                         vm.StartTime == null ? vm.DateAndTime.Value.Minute : vm.StartDate.Value.Minute,
                                         vm.StartTime == null ? vm.DateAndTime.Value.Second : vm.StartDate.Value.Second);
 
-                //muss noch bearbeitet werden 
-                if (BeWoApp.AppSettings.IsEndDateVisible)
+                //muss noch bearbeitet werden weil alt eversion || eine unterscheidung zwischen stunden und minuten abfragen 
+
+                if(vm.DurationInStunden == ZeiterfassungsDauer.Minuten)
                 {
-                    if (vm.EndTime.Value.Day != vm.DateAndTime.Value.Day)
+                    if (vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitEndDatum)
                     {
-                        dc.End = vm.EndTime.Value;
+                        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD));
                     }
                     else
                     {
@@ -1528,10 +1529,35 @@ namespace BeWo.Core
                 }
                 else
                 {
-                    dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration));
+                    if (vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitEndDatum)
+                    {
+                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.DurationSTD));
+                    }
+                    else 
+                    {
+                        dc.End = dc.Start.Value.AddHours(Convert.ToDouble(vm.Duration));
+                    }
                 }
 
 
+                //if (vm.ServiceRecordFormat != ServiceRecordFormate.ZeiterfassungMitEndDatum)
+                //{
+
+                //    if (vm.EndTime.Value.Day != vm.DateAndTime.Value.Day)
+                //    {
+                //        dc.End = vm.EndTime.Value;
+                //    }
+                //    else
+                //    {
+                //        dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.DurationSTD));
+                //    }
+                //}
+                //else
+                //{
+                //    dc.End = dc.Start.Value.AddMinutes(Convert.ToDouble(vm.Duration)); // --> das muss doch reichen 
+                //}
+                //##############################################
+
             }
             else
             {
diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml b/BeWo/View/Detail/ServiceRecordView2.xaml
index d5e66826c..9c106687b 100644
--- a/BeWo/View/Detail/ServiceRecordView2.xaml
+++ b/BeWo/View/Detail/ServiceRecordView2.xaml
@@ -678,11 +678,11 @@
                                                             <ColumnDefinition MinWidth="60" />
                                                         </Grid.ColumnDefinitions>
                                                         <Grid.RowDefinitions>
-															                            <RowDefinition Height="Auto" />
-															                            <RowDefinition Height="Auto" />
-                                                          <RowDefinition Height="Auto" />
-                                                          <RowDefinition Height="Auto" />
-														                            </Grid.RowDefinitions>
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                            <RowDefinition Height="Auto" />
+                                                        </Grid.RowDefinitions>
 
 
                                                         <Label Grid.Column="0" Grid.Row="0" Content="Startdatum" x:Name="startDatum1" />