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

VSDHammReports, BeWoAuxilio und AutismusKoelnBonn

Browse Source
This commit is contained in:
Alexandra
2022-11-04 13:48:34 +01:00
parent 8a303891c6
commit 9273e885b4
8 changed files with 84 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ReportImp/AutismusKoelnBonn/BasisRechnung.Designer.cs generated
View File

@@ -684,6 +684,8 @@ namespace AutismusKoelnBonn
this.xrTableCell40.BorderColor = System.Drawing.Color.Black; this.xrTableCell40.BorderColor = System.Drawing.Color.Black;
this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) this.xrTableCell40.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right)
| DevExpress.XtraPrinting.BorderSide.Bottom))); | DevExpress.XtraPrinting.BorderSide.Bottom)));
this.xrTableCell40.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] {
new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ServiceInvoiceItems.ServiceDescription")});
this.xrTableCell40.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.xrTableCell40.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.xrTableCell40.Name = "xrTableCell40"; this.xrTableCell40.Name = "xrTableCell40";
this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTableCell40.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F);

11
ReportImp/AutismusKoelnBonn/BasisRechnung.cs
View File

@@ -98,8 +98,17 @@ namespace AutismusKoelnBonn
lblTeamKoeln.Visible = false; lblTeamKoeln.Visible = false;
} }
foreach (var sip in pRO.ServiceInvoicePeriods)
{
foreach (var ii in sip.ServiceInvoiceItems)
{
if (ii.ServiceDescription != "Fallpauschale")
ii.ServiceDescription = "Fachleistungsstunden";
}
}
//Anpassungen um die Selbstzahler Rechnung mit abzubilden //Anpassungen um die Selbstzahler Rechnung mit abzubilden
if (pRO.RecipientOrganisation.ToLower() == "selbstzahler") if (pRO.RecipientOrganisation.ToLower() == "selbstzahler")
{ {
lbl1.Visible = false; lbl1.Visible = false;
lbl2.Visible = false; lbl2.Visible = false;

1
ReportImp/BeWoAuxilio/BeWoAuxilio.csproj
View File

@@ -140,6 +140,7 @@
<Compile Include="Teamstundenkonto.designer.cs"> <Compile Include="Teamstundenkonto.designer.cs">
<DependentUpon>Teamstundenkonto.cs</DependentUpon> <DependentUpon>Teamstundenkonto.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="Validation\ServiceRecordValidator.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="InvoiceCustomerReport.resx"> <EmbeddedResource Include="InvoiceCustomerReport.resx">

22
ReportImp/BeWoAuxilio/Validation/ServiceRecordValidator.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BeWo.Data;
using BeWo.Data.Access;
using BeWo.Data.Entities;
using BeWo.Service.DCEntityMapper;
using BeWo.Service.Plugins;
using BS.Shared;
using BS.Shared.DataContracts;
using BS.Shared.Extensions;
namespace BeWoAuxilio.Validation
{
public class CustomServiceRecordValidator : ServiceRecordValidator
{
public override string[] GetIgnoreCategoriesForOverlappingCheck()
{
return new[] { "Arbeitszeit" };
}
}
}

25
ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
View File

@@ -110,20 +110,23 @@ namespace VSDHammReports
{ {
if (pRo.SupportConceptCostBearer.StartDate != null) if (pRo.SupportConceptCostBearer.StartDate != null)
{ {
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList) if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
{ {
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate) foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{ {
lblExtraFLS.Visible = true; if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
if (ap.ApprovedBETotal != null) {
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate); lblExtraFLS.Visible = true;
else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null) if (ap.ApprovedBETotal != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval, lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate); else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
else lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate); ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
} }
} }
} }
} }
} }

23
ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
View File

@@ -85,18 +85,21 @@ namespace VSDHammReports
{ {
if (pRo.SupportConceptCostBearer.StartDate != null) if (pRo.SupportConceptCostBearer.StartDate != null)
{ {
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList) if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
{ {
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate) foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{ {
lblExtraFLS.Visible = true; if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
if (ap.ApprovedBETotal != null) {
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate); lblExtraFLS.Visible = true;
else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null) if (ap.ApprovedBETotal != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval, lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate); else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
else lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate); ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
} }
} }
} }

37
ReportImp/VSDHammReports/ServicesOverviewReport.cs
View File

@@ -61,26 +61,29 @@ namespace VSDHammReports
private void AnzeigeExtraStunden(ServicesOverviewRO pRo) private void AnzeigeExtraStunden(ServicesOverviewRO pRo)
{ {
if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null) if (pRo.SupportConceptCostBearer != null && pRo.SupportConceptCostBearer.CostBearer2SupportConceptOid != null && pRo.SupportConceptCostBearer.ApprovalPeriodList != null)
{ {
if (pRo.SupportConceptCostBearer.StartDate != null) if (pRo.SupportConceptCostBearer.StartDate != null)
{ {
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList) if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Count > 1)
{ {
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate) foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{ {
lblExtraFLS.Visible = true; if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
if (ap.ApprovedBETotal != null) {
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate); lblExtraFLS.Visible = true;
else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null) if (ap.ApprovedBETotal != null)
lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval, lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS vom {1:dd.MM.yy} bis {2:dd.MM.yy}", ap.ApprovedBETotal, ap.StartDate, ap.EndDate);
ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate); else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
else lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate); ap.ApprovedBEInterval != null ? EnumTranslations.SupportConceptApprovalInterval2Translations[(SupportConceptApprovalInterval)ap.ApprovedBEInterval] : null, ap.StartDate, ap.EndDate);
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
} }
} }
} }
} }
} }
} }
} }

4
ReportImp/VSDHammReports/VsdHammReportCreator.cs
View File

@@ -111,8 +111,8 @@ namespace VSDHammReports
{ {
report = new VSDHammReports.QuittierungsbelegJA(); report = new VSDHammReports.QuittierungsbelegJA();
} }
else if (kt.Contains("Jugendamt") || kt.Contains("jugendamt") || kt == "Jugendamt der Stadt Hamm" || kt == "Jugendamt der Stadt Aachen" else if (kt.Contains("Jugendamt") || kt.Contains("jugendamt") || kt.Contains("Jugendamt der Stadt Hamm") || kt == "Jugendamt der Stadt Aachen"
|| kt == "Stadt Hamm Jugendamt Clearing" || kt == "Stadt Hamm Jugendamt Wohnprojekt" || kt == "Jugendamt Ahlen Wohnprojekt" || kt.Contains("Wohnprojekt") || kt == "Stadt Hamm Jugendamt Clearing" || kt == "Jugendamt Ahlen Wohnprojekt" || kt.Contains("Wohnprojekt")
|| function == "Jugendamt") || function == "Jugendamt")
{ {
if (ro.StartDate < new DateTime(2016, 7, 1)) if (ro.StartDate < new DateTime(2016, 7, 1))