diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 647858098..7cce2fc3e 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -515,6 +515,12 @@ namespace BeWo showMultipleResourceColors = true; } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowAlwaysHoursInEmployeeView); + if (val != null && val.Equals("1")) + { + AppSettings.ShowAlwaysHoursInEmployeeView = true; + } + val = UserSettingsUtils.GetSettingValue(_Mandator.Settings, SettingsKeys.ShowKlientenBetreuungszeiten); if (val != null && val.Equals("1")) { diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index 4959276df..a026c168e 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -144,6 +144,8 @@ namespace BeWo.Core.Config public bool HideServiceRecordInsertedByAndInsertedOn { get; set; } + public bool ShowAlwaysHoursInEmployeeView { get; set; } + public bool ShowAdvisedAttendedFlag { get; set; } public CustomerFilterEnum CustomerFilterInZeiterfassung diff --git a/BeWo/ViewModel/ContractVM.cs b/BeWo/ViewModel/ContractVM.cs index 4f9ebbe92..51638d107 100644 --- a/BeWo/ViewModel/ContractVM.cs +++ b/BeWo/ViewModel/ContractVM.cs @@ -96,6 +96,10 @@ namespace BeWo.ViewModel { get { + if (BeWoApp.AppSettings.ShowAlwaysHoursInEmployeeView) + { + return true; + } if (_MonthlyTotalHours.HasValue && !_WeeklyTotalHours.HasValue) { return false; @@ -108,6 +112,10 @@ namespace BeWo.ViewModel { get { + if (BeWoApp.AppSettings.ShowAlwaysHoursInEmployeeView) + { + return true; + } if (_WeeklyTotalHours.HasValue && !_MonthlyTotalHours.HasValue) { return false; @@ -120,6 +128,10 @@ namespace BeWo.ViewModel { get { + if (BeWoApp.AppSettings.ShowAlwaysHoursInEmployeeView) + { + return true; + } if (_MonthlyFLS.HasValue && !_WeeklyFLS.HasValue) { return false; @@ -132,6 +144,10 @@ namespace BeWo.ViewModel { get { + if (BeWoApp.AppSettings.ShowAlwaysHoursInEmployeeView) + { + return true; + } if (_WeeklyFLS.HasValue && !_MonthlyFLS.HasValue) { return false;