From d5a0cd38b58ac3d889b582d0473f12434f225dee Mon Sep 17 00:00:00 2001 From: Christian Date: Mon, 18 Oct 2021 00:43:47 +0200 Subject: [PATCH 01/15] cb bugfixing V3.5 --- BeWo/BeWoApp.xaml.cs | 4 +- BeWo/Scheduler/View/NewSchedulerView.xaml.cs | 6 ++ BeWo/Scheduler/View/RequestAnswerView.xaml | 6 +- BeWo/Scheduler/View/RequestAnswerView.xaml.cs | 71 ++++++++++++++----- BeWo/View/Controls/DPCtrlIst.cs | 3 + BeWo/View/Controls/DPCtrlSaldo.cs | 3 + BeWo/View/Controls/DPCtrlSoll.cs | 8 ++- BeWo/View/Controls/DPCtrlUrlaubKrankheit.cs | 3 + BeWo/View/Controls/DPCtrlWeek.cs | 2 + .../Detail/Report/DienstplanerView.xaml.cs | 3 +- Host/Host.csproj.user | 2 +- .../ReportServiceImp.cs | 4 +- Service/Plugins/PluginLoader.cs | 6 +- Service/Plugins/VacationService.cs | 20 +++--- Shared/DataContracts/DienstZeileDC.cs | 3 +- 15 files changed, 102 insertions(+), 42 deletions(-) diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 16ba83807..71a42c46e 100644 --- a/BeWo/BeWoApp.xaml.cs +++ b/BeWo/BeWoApp.xaml.cs @@ -48,8 +48,8 @@ namespace BeWo public static LoginControl LoginControl; public static MainControl MainControl; - public static string ShortVersion = "3.4"; - public static string Version = "Version 3.4"; + public static string ShortVersion = "3.5"; + public static string Version = "Version 3.5"; public static int RenderTier = 0; diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index d540530fc..b87fc506c 100644 --- a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs +++ b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs @@ -53,6 +53,8 @@ namespace BeWo.Scheduler.View { public partial class NewSchedulerView : INotifyPropertyChanged { + private bool _disableUpdateRequestString = false; + private bool _IsEmployeeBrushVisible; public bool IsEmployeeBrushVisible @@ -1007,6 +1009,10 @@ namespace BeWo.Scheduler.View public void UpdateRequestString() { + if (_disableUpdateRequestString) + { + return; + } ServiceFacade.DoResourceServiceSync(r => _Liste = r.GetAllOpenAppointmentsForEmployee(BeWoApp.LoggedOnEmployee.EmployeeOid.Value)); var count = 0; diff --git a/BeWo/Scheduler/View/RequestAnswerView.xaml b/BeWo/Scheduler/View/RequestAnswerView.xaml index 584f5d278..9a9a97615 100644 --- a/BeWo/Scheduler/View/RequestAnswerView.xaml +++ b/BeWo/Scheduler/View/RequestAnswerView.xaml @@ -152,7 +152,7 @@ -