diff --git a/ReportImp/KollegiumEv/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/KollegiumEv/CustomMitarbeiterstundenkontoBerechnung.cs index 09d868122..aed8cc4c5 100644 --- a/ReportImp/KollegiumEv/CustomMitarbeiterstundenkontoBerechnung.cs +++ b/ReportImp/KollegiumEv/CustomMitarbeiterstundenkontoBerechnung.cs @@ -4,7 +4,7 @@ using System.Linq; using BeWo.Data.Entities; using BeWo.Report.ReportObjects; using BS.Shared.Core; - +using BS.Shared.DataContracts; namespace KollegiumEv { @@ -33,5 +33,6 @@ namespace KollegiumEv return false; return base.IstAnrechenbareAbsenceTime(item); } - } + + } } diff --git a/ReportImp/KollegiumEv/Service/CustomVacationService.cs b/ReportImp/KollegiumEv/Service/CustomVacationService.cs index 07b694042..9314d4a2e 100644 --- a/ReportImp/KollegiumEv/Service/CustomVacationService.cs +++ b/ReportImp/KollegiumEv/Service/CustomVacationService.cs @@ -1,4 +1,5 @@ using BeWo.Service.Plugins; +using BS.Shared.DataContracts; using System; using System.Collections.Generic; using System.Linq; @@ -34,5 +35,14 @@ namespace KollegiumEv.Service { return end.Value; } + + public override List GetFeiertage(int year, string bundesland) + { + var list = base.GetFeiertage(year, bundesland); + + list.Add(new FeiertagDC() { Datum = new DateTime(year, 12, 31), Name = "Silvester" }); + + return list; + } } }