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

bugfixing

Browse Source
This commit is contained in:
Christian
2017-06-11 15:50:31 +02:00
parent 8a1101bbf0
commit cf90774667
711 changed files with 117180 additions and 126876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -329,9 +329,14 @@ namespace BeWo.View.Detail
RoundedDHeader.Header = "Minuten";
DutationInSTDHeader.Visible = false;
if (Settings.LetzteZeiterfassungsDauer == ZeiterfassungsDauer.Stunden)
{
RoundedDHeader.Header = "Stunden";
}
if (Settings.IsZeiterfassungInStdMin)
{
MinSTDOhneEnd.Visibility = Visibility.Visible;
MinStdDauerLabel.SetValue(Grid.ColumnProperty, 0);
numerictb_duration.SetValue(Grid.ColumnProperty, 1);
@@ -871,7 +876,7 @@ namespace BeWo.View.Detail
popup_content.Child = serviceRecordEditView;
double height = 500;
double width = 800;
double width = 710;
popup_content.Child = serviceRecordEditView;
@@ -1661,13 +1666,49 @@ namespace BeWo.View.Detail
{
var list = _ViewModel.ServiceRecordsForSelectedCustomer.OrderByDescending(srVM => srVM.DateAndTime).ToList();
foreach (var a in list.Where(a => a.ServiceRecordType == ServiceRecordTypeId.AdditionalService))
bool containsMinutenFormat = false;
bool containsStundenFormat = false;
foreach (var a in list)
{
a.EditAllowed = false;
a.DeleteAllowed = false;
a.Notice = string.Empty;
if (a.ServiceRecordType == ServiceRecordTypeId.AdditionalService)
{
a.EditAllowed = false;
a.DeleteAllowed = false;
a.Notice = string.Empty;
}
if (a.DurationInStunden.HasValue && a.DurationInStunden.Value == ZeiterfassungsDauer.Stunden)
{
containsStundenFormat = true;
}
else
{
containsMinutenFormat = true;
}
}
RoundedDHeader.Header = "Minuten";
DutationInSTDHeader.Visible = false;
if (BeWoApp.AppSettings.LetzteZeiterfassungsDauer == ZeiterfassungsDauer.Stunden)
{
RoundedDHeader.Header = "Stunden";
}
if (containsStundenFormat && containsMinutenFormat)
{
RoundedDHeader.Header = "Dauer";
DutationInSTDHeader.Visible = true;
DutationInSTDHeader.VisibleIndex = RoundedDHeader.VisibleIndex + 1;
}
else if (containsMinutenFormat)
{
RoundedDHeader.Header = "Minuten";
}
else if (containsStundenFormat)
{
RoundedDHeader.Header = "Stunden";
}
srListBox.ItemsSource = list;
//###Bars
srGridControl.ItemsSource = list;