From 4eb695e70bbd9dff5a2aa7611e231bae0184dfe4 Mon Sep 17 00:00:00 2001 From: Kojo Date: Tue, 3 Dec 2024 19:24:36 +0100 Subject: [PATCH] =?UTF-8?q?KirschbaumManz:=20Silvester=20und=20Rosenmontag?= =?UTF-8?q?=20zur=20Liste=20der=20Feiertage=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KirschbaumManz/KirschbaumManz.csproj | 435 +++++++++--------- .../Service/CustomVacationService.cs | 20 + 2 files changed, 238 insertions(+), 217 deletions(-) create mode 100644 ReportImp/KirschbaumManz/Service/CustomVacationService.cs diff --git a/ReportImp/KirschbaumManz/KirschbaumManz.csproj b/ReportImp/KirschbaumManz/KirschbaumManz.csproj index 803e70b03..4b3a7f9d6 100644 --- a/ReportImp/KirschbaumManz/KirschbaumManz.csproj +++ b/ReportImp/KirschbaumManz/KirschbaumManz.csproj @@ -1,218 +1,219 @@ - - - - - Debug - AnyCPU - {56602D65-47F7-4175-A065-A044FE7F6C81} - Library - Properties - KirschbaumManz - 7584236951_Reports - v4.7.2 - 512 - - - - true - full - false - ..\..\CustomerDlls\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - ..\..\CustomerDlls\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Component - - - FLSGroupReport.cs - - - Component - - - FLSListReport.cs - - - Component - - - InvoiceCustomerReport.cs - - - Component - - - LeistungsnachweisSoziotherapie.cs - - - Component - - - Mitarbeiterarbeitszeitkonto.cs - - - Component - - - Mitarbeiterstundenkonto.cs - - - Component - - - MitarbeiterstundenkontoJahr.cs - - - - Component - - - QuittierungsbelegKerpen.cs - - - Component - - - QuittierungsbelegMitDatum.cs - - - Component - - - ServiceInvoiceReport.cs - - - Component - - - SettlementReport.cs - - - Component - - - SettlementReport2.cs - - - Component - - - Teamstundenkonto.cs - - - - - - FLSGroupReport.cs - Designer - - - FLSListReport.cs - Designer - - - InvoiceCustomerReport.cs - Designer - - - LeistungsnachweisSoziotherapie.cs - - - Mitarbeiterarbeitszeitkonto.cs - - - Mitarbeiterstundenkonto.cs - Designer - - - MitarbeiterstundenkontoJahr.cs - Designer - - - - QuittierungsbelegKerpen.cs - Designer - - - QuittierungsbelegMitDatum.cs - Designer - - - ServiceInvoiceReport.cs - Designer - - - SettlementReport.cs - Designer - - - SettlementReport2.cs - Designer - - - Teamstundenkonto.cs - - - - - {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} - Data - - - {40D8B312-EA64-49E3-A31A-5E57ED4D5654} - Report - - - {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} - Service - - - {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} - Shared - - - - - - + + + + + Debug + AnyCPU + {56602D65-47F7-4175-A065-A044FE7F6C81} + Library + Properties + KirschbaumManz + 7584236951_Reports + v4.7.2 + 512 + + + + true + full + false + ..\..\CustomerDlls\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + ..\..\CustomerDlls\ + TRACE + prompt + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Component + + + FLSGroupReport.cs + + + Component + + + FLSListReport.cs + + + Component + + + InvoiceCustomerReport.cs + + + Component + + + LeistungsnachweisSoziotherapie.cs + + + Component + + + Mitarbeiterarbeitszeitkonto.cs + + + Component + + + Mitarbeiterstundenkonto.cs + + + Component + + + MitarbeiterstundenkontoJahr.cs + + + + Component + + + QuittierungsbelegKerpen.cs + + + Component + + + QuittierungsbelegMitDatum.cs + + + Component + + + ServiceInvoiceReport.cs + + + + Component + + + SettlementReport.cs + + + Component + + + SettlementReport2.cs + + + Component + + + Teamstundenkonto.cs + + + + + + FLSGroupReport.cs + Designer + + + FLSListReport.cs + Designer + + + InvoiceCustomerReport.cs + Designer + + + LeistungsnachweisSoziotherapie.cs + + + Mitarbeiterarbeitszeitkonto.cs + + + Mitarbeiterstundenkonto.cs + Designer + + + MitarbeiterstundenkontoJahr.cs + Designer + + + + QuittierungsbelegKerpen.cs + Designer + + + QuittierungsbelegMitDatum.cs + Designer + + + ServiceInvoiceReport.cs + Designer + + + SettlementReport.cs + Designer + + + SettlementReport2.cs + Designer + + + Teamstundenkonto.cs + + + + + {B0D73E3D-4AE7-4024-93A6-DB1F46D7CCEE} + Data + + + {40D8B312-EA64-49E3-A31A-5E57ED4D5654} + Report + + + {094331c3-ecee-4c89-bbfd-4c9ded89f0ef} + Service + + + {2F50B83D-A3F0-4EC4-979A-3F9B7E3D8ED4} + Shared + + + + + + \ No newline at end of file diff --git a/ReportImp/KirschbaumManz/Service/CustomVacationService.cs b/ReportImp/KirschbaumManz/Service/CustomVacationService.cs new file mode 100644 index 000000000..59fa5ee10 --- /dev/null +++ b/ReportImp/KirschbaumManz/Service/CustomVacationService.cs @@ -0,0 +1,20 @@ +using BeWo.Service.Plugins; +using BS.Shared.DataContracts; +using System; +using System.Collections.Generic; + +namespace KirschbaumManz.Service +{ + public class CustomVacationService : VacationService + { + public override List GetFeiertage(int year, string bundesland) + { + var list = base.GetFeiertage(year, bundesland); + DateTime osterSonntag = GetOsterSonntag(year); + list.Add(new FeiertagDC { Datum = osterSonntag.AddDays(-48), Name = "Rosenmontag" }); + list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 31), Name = "Silvester" }); + + return list; + } + } +}