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

CaritasGuenzburgNeuUlm - Vorlagen und Invoicing Modellprojekt ab 26 für alle Kostenträger

Browse Source
This commit is contained in:
Alexandra
2026-02-05 15:27:23 +01:00
parent 6f08909b6d
commit b9e7060445
3 changed files with 43 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ReportImp/CaritasGuenzburgNeuUlm/CaritasGuenzburgNeuUlm.csproj
View File

@@ -111,6 +111,12 @@
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</Compile>
<Compile Include="Service\CustomVacationService.cs" />
<Compile Include="KorridorUebersicht.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="KorridorUebersicht.Designer.cs">
<DependentUpon>KorridorUebersicht.cs</DependentUpon>
</Compile>
<Compile Include="Teamstundenkonto.cs">
<SubType>Component</SubType>
</Compile>
@@ -149,6 +155,10 @@
<EmbeddedResource Include="ServicesOverviewReport.resx">
<DependentUpon>ServicesOverviewReport.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="KorridorUebersicht.resx">
<DependentUpon>KorridorUebersicht.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Teamstundenkonto.resx">
<DependentUpon>Teamstundenkonto.cs</DependentUpon>
</EmbeddedResource>

33
ReportImp/CaritasGuenzburgNeuUlm/CustomReportCreator.cs
View File

@@ -1,13 +1,44 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.IO;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Report;
using BeWo.Report.ReportObjects;
using BS.Shared.Core;
using DevExpress.XtraReports.UI;
namespace CaritasGuenzburgNeuUlm
{
public class CustomReportCreator : DefaultReportCreator
{
public override XtraReport CreateQueryReport(long queryOid, string queryReportId)
{
if (queryOid == 100)
return CreateKorridorUebersicht(queryOid, queryReportId);
return base.CreateQueryReport(queryOid, queryReportId);
}
private XtraReport CreateKorridorUebersicht(long queryOid, string queryReportId)
{
var query = DAOFactory.GenericDAO.LoadByID<Query>(queryOid);
if (query == null)
return new XtraReport();
var path = Path.Combine(TempPath, queryReportId + ".xml");
var table = Utils.XMLDeserialize<DataTable>(path);
var qro = QueryRO.Create(query, table);
var ro = SupportConceptListRO.Create(null, null, null, null, null, false, null, null);
var druck = new KorridorUebersicht();
druck.SetReportDataSource(ro);
return druck;
}
public override XtraReport CreateServiceOverviewAllCustomersReport(int month, int year, long orgaOid, long empOid, long? serviceCategoryOid, int startDay, int endDay)
{
List<ServicesOverviewRO> lROs = ServicesOverviewRO.Create(month, year, orgaOid, empOid, startDay, endDay);
@@ -66,7 +97,7 @@ namespace CaritasGuenzburgNeuUlm
private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid)
{
IBeWoReport<ServicesOverviewRO> report = null;
if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Modellprojekt"))
if (!String.IsNullOrEmpty(ro.Costbearer) && ro.Costbearer.Contains("Modellprojekt") || ro.StartDate >= new DateTime(2026, 1, 1))
{
report = new CaritasGuenzburgNeuUlm.StundenzettelNeu();
}

2
ReportImp/CaritasGuenzburgNeuUlm/Invoicing/CustomInvoiceFactory.cs
View File

@@ -15,7 +15,7 @@ namespace CaritasGuenzburgNeuUlm.Invoicing
{
foreach (var sr in list)
{
if (sr.CostBearer.Name.Contains("Modellprojekt"))
if (sr.CostBearer.Name.Contains("Modellprojekt") || sr.Start.HasValue && sr.Start.Value >= new DateTime(2026, 1, 1))
{
return new CustomInvoiceCreation();
}