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

fix auch wenns keiner is, ich nenns so.

Browse Source
This commit is contained in:
Waldi
2017-02-21 12:41:12 +01:00
parent 96e6549cbe
commit 4f618a5efc
5 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BeWo/Core/BeWoUtils.cs
View File

@@ -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);
}

2
BeWo/View/Detail/ServiceRecordEditView.xaml
View File

@@ -104,7 +104,7 @@
<!--################################################################ Start Der Grid Für Die Zeiterfassungsarten ################################################################-->
<!--########################################## Grid Bereich für Original #####################-->
<Grid Grid.Column="0" Grid.Row="5" ColumnSpan="2" x:Name="GridOhneEnddatum">
<Grid Grid.Column="0" Grid.Row="5" ColumnSpan="2" x:Name="GridOhneEnddatum" Visibility="Visible">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="62" />

8
BeWo/View/Detail/ServiceRecordEditView.xaml.cs
View File

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

5
BeWo/View/Detail/ServiceRecordView2.xaml.cs
View File

@@ -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);
});
}

9
BeWo/ViewModel/ServiceRecordVM.cs
View File

@@ -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;
}