ownSoft/BeWoPlaner
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MH: Feiertage für Niedersachsen + Anpassunf Bundesland für Suchtkr. Ostfriesland

Browse Source
This commit is contained in:
Marcel Hirschle
2023-10-23 17:10:32 +02:00
parent 69536c6fae
commit 2a6079cedc
6 changed files with 734 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

814
ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

35
ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.cs
View File

@@ -8,6 +8,7 @@ using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using BS.Shared.Extensions;
using DevExpress.XtraReports.UI;
namespace SuchtkrankenhilfeOstfriesland
@@ -21,6 +22,35 @@ namespace SuchtkrankenhilfeOstfriesland
public void SetReportDataSource(ServicesOverviewRO pRO)
{
if (pRO.StartDate.Date < new DateTime(2023, 09, 01))
{
tableMitAnfahrt.Visible = false;
xrTable3.Visible = false;
lblStrichMitAnfahrt.Visible = false;
lblFLSInMinMitAnfahrt.Visible = false;
lblSummeMitAnfahrt.Visible = false;
tableOhneAnfahrt.Visible = true;
xrTable1.Visible = true;
lblStrichOhneAnfahrt.Visible = true;
lblFLSInMinOhneAnfahrt.Visible = true;
lblSummeOhneAnfahrt.Visible = true;
}
else
{
tableMitAnfahrt.Visible = true;
xrTable3.Visible = true;
lblStrichMitAnfahrt.Visible = true;
lblFLSInMinMitAnfahrt.Visible = true;
lblSummeMitAnfahrt.Visible = true;
tableOhneAnfahrt.Visible = false;
xrTable1.Visible = false;
lblStrichOhneAnfahrt.Visible = false;
lblFLSInMinOhneAnfahrt.Visible = false;
lblSummeOhneAnfahrt.Visible = false;
}
var customer = DAOFactory.GenericDAO.GetByID<Customer>(pRO.CustomerOid);
if (customer != null)
{
@@ -51,6 +81,11 @@ namespace SuchtkrankenhilfeOstfriesland
foreach (var sd in pRO.Services)
{
if (!sd.GefahreneKilometer.IsNullOrEmpty())
sd.Notice4 = "x";
else
sd.Notice4 = " ";
if (sd.IsBillable || sd.ServiceDescription.ToLower().Contains("fehlkontakt"))
{
ServicesOverviewRO.CreateSignatureString(sd);

2
ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.resx
View File

@@ -136,7 +136,7 @@
<value>ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEsAZQBpAG4AZQAgAH0AewBcAHUAbABcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgAEcAcgB1AHAAcABlAG4AYQBuAGcAZQBiAG8AdABlAH0AewBcAGYAMgBcAGYAcwAyADAAXABjAGYAMQAgACAAaQBtACAAQQBiAHIAZQBjAGgAbgB1AG4AZwBzAHoAZQBpAHQAcgBhAHUAbQB9AFwAZgAxAFwAZgBzADIANABcAGMAZgAxAFwAcABhAHIAfQA=</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="QuittierungsbelegAurich.Watermark.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="Quittierungsbeleg.Watermark.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsN
DhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQU

14
ReportImp/SuchtkrankenhilfeOstfriesland/Service/CustomVacationService.cs Normal file
View File

@@ -0,0 +1,14 @@
using BeWo.Service.Plugins;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SuchtkrankenhilfeOstfriesland.Service
{
public class CustomVacationService : VacationService
{
public override string Bundesland { get => "Niedersachsen"; }
}
}

1
ReportImp/SuchtkrankenhilfeOstfriesland/SuchtkrankenhilfeOstfriesland.csproj
View File

@@ -75,6 +75,7 @@
<Compile Include="Quittierungsbeleg.Designer.cs">
<DependentUpon>Quittierungsbeleg.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="SettlementReportMitBriefpapier.cs">
<SubType>Component</SubType>
</Compile>

4
Service/Plugins/VacationService.cs
View File

@@ -77,8 +77,6 @@ namespace BeWo.Service.Plugins
public virtual List<FeiertagDC> GetFeiertage(int year, String bundesland)
{
List<FeiertagDC> list = new List<FeiertagDC>();
list.Add(new FeiertagDC { Datum = new DateTime(year, 1, 1), Name = "Neujahr" });
@@ -105,7 +103,7 @@ namespace BeWo.Service.Plugins
list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 25), Name = "1. Weihnachtstag" });
list.Add(new FeiertagDC { Datum = new DateTime(year, 12, 26), Name = "2. Weihnachtstag" });
if (year == 2017 || bundesland.ToLower() == "brandenburg")
if (year == 2017 || bundesland.ToLower() == "brandenburg" || bundesland.ToLower() == "niedersachsen")
list.Add(new FeiertagDC { Datum = new DateTime(year, 10, 31), Name = "Reformationstag" });
DateTime osterSonntag = GetOsterSonntag(year);