diff --git a/.gitignore b/.gitignore index ca28fc5f2..4686b161a 100644 --- a/.gitignore +++ b/.gitignore @@ -556,3 +556,12 @@ /ReportImp/PZDDuesseldorf/obj/Debug /ReportImp/PZDDuesseldorf/obj/Release /ReportImp/LebensWert/obj/Release +/ReportImp/BehindertenhilfeMenden/obj/Debug +/ReportImp/BehindertenhilfeMenden/obj/Release +/ReportImp/ChristopherusHausFamilienhilfe/obj +/ReportImp/RatPlusTat/obj +obj +/BeWoAllReports - Kopie.sln +/BeWoAllReports.sln.BASE.sln +/BeWoAllReports.sln.LOCAL.sln +/BeWoAllReports.sln.REMOTE.sln diff --git a/BeWo.sln b/BeWo.sln index 4c8932489..713b741cb 100644 --- a/BeWo.sln +++ b/BeWo.sln @@ -487,6 +487,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CaritasGuenzburgNeuUlm", "R EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BetreuwoWesel", "ReportImp\BetreuwoWesel\BetreuwoWesel.csproj", "{DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WahlEv", "ReportImp\WahlEv\WahlEv.csproj", "{68BC6F76-7C77-4959-BC88-27696BBA41F5}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|.NET = Debug|.NET @@ -3770,6 +3772,22 @@ Global {DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|x86.ActiveCfg = Release|Any CPU {DF3E1CBE-16A6-4533-8C22-0C43EEFE771B}.Release|x86.Build.0 = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|.NET.ActiveCfg = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|.NET.Build.0 = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|x86.ActiveCfg = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Debug|x86.Build.0 = Debug|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|.NET.ActiveCfg = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|.NET.Build.0 = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|Any CPU.Build.0 = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|x86.ActiveCfg = Release|Any CPU + {68BC6F76-7C77-4959-BC88-27696BBA41F5}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -4009,6 +4027,7 @@ Global {74A81A4F-DEDD-47EE-8023-E331F5552C46} = {D8A691C5-146D-4613-86CC-438F02FE9106} {2C075472-0BEE-46CA-A996-7E0FB2B1A717} = {D8A691C5-146D-4613-86CC-438F02FE9106} {DF3E1CBE-16A6-4533-8C22-0C43EEFE771B} = {D8A691C5-146D-4613-86CC-438F02FE9106} + {68BC6F76-7C77-4959-BC88-27696BBA41F5} = {D8A691C5-146D-4613-86CC-438F02FE9106} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {FBE985BB-9F0F-4DBB-8F94-ABC37A803FF9} diff --git a/BeWo/BeWoApp.xaml.cs b/BeWo/BeWoApp.xaml.cs index 43da3999d..aeb9a8f7f 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; @@ -801,8 +801,12 @@ namespace BeWo { _AppSettings.SchedulerTimelineViewDayCount = result; } - - val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, settings); + val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.SchedulerDayViewDayCount, settings); + if (int.TryParse(val, out result)) + { + _AppSettings.SchedulerDayViewDayCount = result; + } + val = UserSettingsUtils.GetSettingValue(SettingsType.ApplicationSettings, SettingsKeys.LastSelectedServiceRecordTimeInterval, settings); if(int.TryParse(val, out result)) { _AppSettings.LastSelectedServiceRecordTimeInterval = (ServiceRecordTimeInterval)result; diff --git a/BeWo/Core/Config/AppSettings.cs b/BeWo/Core/Config/AppSettings.cs index c052ee94d..f7d668fe7 100644 --- a/BeWo/Core/Config/AppSettings.cs +++ b/BeWo/Core/Config/AppSettings.cs @@ -400,12 +400,12 @@ namespace BeWo.Core.Config private int _SchedulerDayViewDayCount; public int SchedulerDayViewDayCount { - get => _SchedulerDayViewDayCount == 0 ? 10 : _SchedulerDayViewDayCount; + get => _SchedulerDayViewDayCount == 0 ? 5 : _SchedulerDayViewDayCount; set { if(_SchedulerDayViewDayCount != value) { - _SchedulerDayViewDayCount = value > 0 ? value : 10; + _SchedulerDayViewDayCount = value > 0 ? value : 5; IsDirty = true; } } diff --git a/BeWo/Scheduler/View/NewSchedulerView.xaml.cs b/BeWo/Scheduler/View/NewSchedulerView.xaml.cs index b03428a06..4e89464cf 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 @@ -