diff --git a/BeWo/Core/BeWoUtils.cs b/BeWo/Core/BeWoUtils.cs index fa8373a64..2e75f16ed 100644 --- a/BeWo/Core/BeWoUtils.cs +++ b/BeWo/Core/BeWoUtils.cs @@ -1562,7 +1562,7 @@ namespace BeWo.Core var StartDatetime = new DateTime(dates.Year, dates.Month, 1, 0, 0, 0); dc.Start = StartDatetime; - dc.End = StartDatetime.AddMinutes((double)vm.DurationMonthYearGes*60); + dc.End = StartDatetime.AddHours((double)vm.DurationMonthYearGes); } diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml b/BeWo/View/Detail/ServiceRecordEditView.xaml index 3491610b7..501e8e712 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml @@ -104,7 +104,7 @@ - + diff --git a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs index a2103331d..25539c289 100644 --- a/BeWo/View/Detail/ServiceRecordEditView.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordEditView.xaml.cs @@ -219,11 +219,13 @@ namespace BeWo.View.Detail GridMitEnddatum.Visibility = Visibility.Collapsed; numerictb_distance.SetValue(WidthProperty,(double)93); - numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right); - lblDistance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Left); + numerictb_distance.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Right); + lblDistance.SetValue(Grid.ColumnProperty, 0); + lblDistance.SetValue(Grid.ColumnSpanProperty , 2); + - } + } else { GridOhneEnddatum.Visibility = Visibility.Visible; diff --git a/BeWo/View/Detail/ServiceRecordView2.xaml.cs b/BeWo/View/Detail/ServiceRecordView2.xaml.cs index bbe510bea..0e7b1aeb7 100644 --- a/BeWo/View/Detail/ServiceRecordView2.xaml.cs +++ b/BeWo/View/Detail/ServiceRecordView2.xaml.cs @@ -682,7 +682,7 @@ namespace BeWo.View.Detail var lDC = vm.CommitToDataContract(); ServiceFacade.DoOperationsServiceAsync(s => s.DeleteServiceRecord(lDC.ServiceRecordOid.Value, lDC.ServiceRecordVersion.Value), RefreshGrid); - SetSelectedServiceRecordVM(vm); + // gridServiceRecordsSelection.UpdateLayout(); // gridServiceRecordsSelection.DataSource = ViewModel.VMList; } @@ -1057,7 +1057,8 @@ namespace BeWo.View.Detail { var selected = GetSelectedServiceRecordFromListBox(); ViewModel.RefreshServiceRecordsForSelectedTreeNode(); - SetSelectedServiceRecordVM(selected); + SetSelectedServiceRecordVM(selected); + }); } diff --git a/BeWo/ViewModel/ServiceRecordVM.cs b/BeWo/ViewModel/ServiceRecordVM.cs index 291189f3a..0f0581e8e 100644 --- a/BeWo/ViewModel/ServiceRecordVM.cs +++ b/BeWo/ViewModel/ServiceRecordVM.cs @@ -2024,11 +2024,12 @@ namespace BeWo.ViewModel var StartDatetime = new DateTime(dates.Year, dates.Month,1,0,0,0); pDataContract.Start = StartDatetime; - pDataContract.End = StartDatetime.AddMinutes((double)DurationMonthYearGes*60); + + pDataContract.End = StartDatetime.AddHours((double)DurationMonthYearGes); if (_DurationMonthYearGes != 0) { - RoundedDuration = DurationMonthYearGes.Value * 60; + RoundedDuration = DurationMonthYearGes.Value; } _DurationSTD = 0; @@ -2036,7 +2037,7 @@ namespace BeWo.ViewModel ServiceRecordFormat = ServiceRecordFormate.ZeiterfassungMitMonatJahr; - _DurationInStunden = ZeiterfassungsDauer.Minuten; + _DurationInStunden = ZeiterfassungsDauer.Stunden; } else { @@ -2147,7 +2148,7 @@ namespace BeWo.ViewModel //var duration = 0; decimal duration = 0; - if (_Duration.HasValue) + if (_DurationMonthYearGes.HasValue) { duration = _DurationMonthYearGes.Value; }