diff --git a/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj b/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj index 3893254e3..932b00763 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj +++ b/ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj @@ -110,6 +110,7 @@ Teamstundenkonto.cs + diff --git a/ReportImp/CaritasGuenzburgNeuUlm/Service/CustomVacationService.cs b/ReportImp/CaritasGuenzburgNeuUlm/Service/CustomVacationService.cs index 86adea5d8..57dc76cca 100644 --- a/ReportImp/CaritasGuenzburgNeuUlm/Service/CustomVacationService.cs +++ b/ReportImp/CaritasGuenzburgNeuUlm/Service/CustomVacationService.cs @@ -16,6 +16,8 @@ namespace CaritasGuenzburgNeuUlm.Service { List list = base.GetFeiertage(year, bundesland); list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 31), Name = "Silvester" }); + DateTime osterSonntag = GetOsterSonntag(year); + list.Add(new FeiertagDC { Datum = osterSonntag.AddDays(-47), Name = "Faschingsdienstag" }); return list; } diff --git a/ReportImp/CaritasGuenzburgNeuUlm/Validation/ServiceRecordValidator.cs b/ReportImp/CaritasGuenzburgNeuUlm/Validation/ServiceRecordValidator.cs new file mode 100644 index 000000000..cc0a7a52b --- /dev/null +++ b/ReportImp/CaritasGuenzburgNeuUlm/Validation/ServiceRecordValidator.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +using BeWo.Data.Access; +using BeWo.Data.Entities; +using BeWo.Service.DCEntityMapper; +using BeWo.Service.Plugins; +using BS.Shared; +using BS.Shared.Core; +using BS.Shared.DataContracts; +using BS.Shared.DataContracts.Compact; +using BS.Shared.Extensions; +using BS.Shared.Services; + +namespace CaritasGuenzburgNeuUlm.Validation +{ + public class CustomServiceRecordValidator : ServiceRecordValidator + { + public override string[] GetIgnoreCategoriesForOverlappingCheck() + { + return new[] { "Arbeitszeit" }; + } + } +} \ No newline at end of file