ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up to date

Browse Source
This commit is contained in:
Waldi
2017-01-31 08:50:18 +01:00
parent 3b9f21e09a
commit 0059be3f5a
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
BeWo/Core/BeWoUtils.cs
View File

@@ -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
{

10
BeWo/View/Detail/ServiceRecordView2.xaml
View File

@@ -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" />