diff --git a/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs b/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs index 28de5ccf3..bc5434da8 100644 --- a/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs +++ b/ReportImp/VSDHammReports/LeistungsnachweisJAHamm.cs @@ -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); + //} } } } diff --git a/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs b/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs index d466577b6..2e4408ef0 100644 --- a/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs +++ b/ReportImp/VSDHammReports/QuittierungsbelegJAHamm.cs @@ -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); + //} } } }