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

MH: VSD Hamm Fix

Browse Source
This commit is contained in:
Marcel Hirschle
2023-01-10 12:27:39 +01:00
parent f240faaad5
commit ee17b14606
2 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs
View File

@@ -114,7 +114,7 @@ namespace VSDHammReports
{
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Any(approval => ap.StartDate <= approval.EndDate && ap.EndDate >= approval.StartDate && ap.StartDate >= approval.StartDate && ap.EndDate <= approval.EndDate && ap.SupportConceptApprovalPeriodOid != approval.SupportConceptApprovalPeriodOid))
{
lblExtraFLS.Visible = true;
if (ap.ApprovedBETotal != null)
@@ -125,6 +125,18 @@ namespace VSDHammReports
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
//if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
//{
// lblExtraFLS.Visible = true;
// 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);
// else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
// lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
// 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);
//}
}
}
}

14
ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs
View File

@@ -89,7 +89,7 @@ namespace VSDHammReports
{
foreach (var ap in pRo.SupportConceptCostBearer.ApprovalPeriodList)
{
if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
if (pRo.SupportConceptCostBearer.ApprovalPeriodList.Any(approval => ap.StartDate <= approval.EndDate && ap.EndDate >= approval.StartDate && ap.StartDate >= approval.StartDate && ap.EndDate <= approval.EndDate && ap.SupportConceptApprovalPeriodOid != approval.SupportConceptApprovalPeriodOid))
{
lblExtraFLS.Visible = true;
if (ap.ApprovedBETotal != null)
@@ -100,6 +100,18 @@ namespace VSDHammReports
else
lblExtraFLS.Text = String.Format("zzgl. Extra FLS vom {0:dd.MM.yy} bis {1:dd.MM.yy}", ap.StartDate, ap.EndDate);
}
//if (ap.StartDate <= pRo.EndDate && ap.EndDate >= pRo.StartDate && ap.StartDate >= pRo.StartDate && ap.EndDate <= pRo.EndDate)
//{
// lblExtraFLS.Visible = true;
// 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);
// else if (ap.ApprovedBEPerInterval != null && ap.ApprovedBEInterval != null)
// lblExtraFLS.Text = String.Format("zzgl. {0:0.##} FLS pro {1} vom {2:dd.MM.yy} bis {3:dd.MM.yy}", ap.ApprovedBEPerInterval,
// 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);
//}
}
}
}