From 819b30f631bf96fc05d0f27e0f8a76ec81ec2148 Mon Sep 17 00:00:00 2001
From: HirschleM <marcel.hirschle@ownsoft.de>
Date: Thu, 21 Nov 2024 14:22:21 +0100
Subject: [PATCH] =?UTF-8?q?MH:=20Haus=20D=C3=BClken=20kein=20Weihnachten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...CustomMitarbeiterstundenkontoBerechnung.cs | 21 ++++++++++++++++++-
 ReportImp/HausDuelken/HausDuelken.csproj      |  2 ++
 .../Service/CustomVacationService.cs          | 20 ++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
index 4b417cf46..84cf42916 100644
--- a/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
+++ b/ReportImp/HausDuelken/CustomMitarbeiterstundenkontoBerechnung.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using BeWo.Data.Entities;
 using BeWo.Report.ReportObjects;
 
@@ -8,7 +9,25 @@ namespace HausDuelken
 {
 	public class CustomMitarbeiterstundenkontoBerechnung : MitarbeiterstundenkontoBerechnung
 	{
-		public override bool ShouldCreateDayDetails()
+        public override List<DateTime> GetFeiertage(int year)
+        {
+            var list = base.GetFeiertage(year);
+
+            if (year >= 2024)
+            {
+                var weihnachten = list.FirstOrDefault(l => l.Date.Date == new DateTime(year, 12, 24));
+                var silvester = list.FirstOrDefault(l => l.Date.Date == new DateTime(year, 12, 31));
+
+                if (weihnachten != null)
+                    list.Remove(weihnachten);
+                if (silvester != null)
+                    list.Remove(silvester);
+            }
+
+            return list;
+        }
+
+        public override bool ShouldCreateDayDetails()
 		{
 			return true;
 		}
diff --git a/ReportImp/HausDuelken/HausDuelken.csproj b/ReportImp/HausDuelken/HausDuelken.csproj
index 7974ae20e..ad5f6d9d9 100644
--- a/ReportImp/HausDuelken/HausDuelken.csproj
+++ b/ReportImp/HausDuelken/HausDuelken.csproj
@@ -31,6 +31,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DevExpress.DataAccess.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Drawing.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Office.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
@@ -39,6 +40,7 @@
     <Reference Include="DevExpress.Printing.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Data.Desktop.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Utils.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Xpo.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.Charts.v23.2.Core, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraCharts.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
diff --git a/ReportImp/HausDuelken/Service/CustomVacationService.cs b/ReportImp/HausDuelken/Service/CustomVacationService.cs
index 0c40ac08c..080597ea2 100644
--- a/ReportImp/HausDuelken/Service/CustomVacationService.cs
+++ b/ReportImp/HausDuelken/Service/CustomVacationService.cs
@@ -1,4 +1,5 @@
 using BeWo.Service.Plugins;
+using BS.Shared.DataContracts;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -16,5 +17,24 @@ namespace HausDuelken.Service
             else
                 return new DateTime(year, 12, 31);
         }
+        public override List<FeiertagDC> GetFeiertage(int year, string bundesland)
+        {
+            var list = base.GetFeiertage(year, bundesland);
+
+            if (year >= 2024)
+            {
+
+                var weihnachten = list.FirstOrDefault(l => l.Name == "Heilig Abend");
+                var silvester = list.FirstOrDefault(l => l.Name == "Silvester");
+
+                if (weihnachten != null)
+                    list.Remove(weihnachten);
+                if (silvester != null)
+                    list.Remove(silvester);
+
+            }
+
+            return list;
+        }
     }
 }