diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.Designer.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.Designer.cs index 841a3c58d..12f8c22d2 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.Designer.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.Designer.cs @@ -31,6 +31,7 @@ namespace SuchtkrankenhilfeOstfriesland { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Quittierungsbeleg)); + DevExpress.XtraReports.UI.XRWatermark xrWatermark1 = new DevExpress.XtraReports.UI.XRWatermark(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); @@ -64,7 +65,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell32 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -77,7 +77,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel29 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel28 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblBewilligtStart = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel25 = new DevExpress.XtraReports.UI.XRLabel(); this.lblBewilligtFls = new DevExpress.XtraReports.UI.XRLabel(); @@ -117,12 +117,13 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.wennGruppeAnzPersonen = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktLeer)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktEmden)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktAurich)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -611,10 +612,6 @@ namespace SuchtkrankenhilfeOstfriesland this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell17.Weight = 0.43354225312913885D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); - // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -635,7 +632,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel31, this.xrLabel30, this.xrLabel29, - this.xrLabel28, + this.lblBewilligtStart, this.xrLabel27, this.xrLabel25, this.lblBewilligtFls, @@ -819,22 +816,20 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel29.Text = "Gesamtbudget / Restbudget"; this.xrLabel29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // - // xrLabel28 + // lblBewilligtStart // - this.xrLabel28.BackColor = System.Drawing.Color.Transparent; - this.xrLabel28.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedStartDate", "{0:MMMM yyyy}")}); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(614.5723F, 115.909F); - this.xrLabel28.Name = "xrLabel28"; - this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel28.SizeF = new System.Drawing.SizeF(98.39288F, 17.42421F); - this.xrLabel28.StylePriority.UseBackColor = false; - this.xrLabel28.StylePriority.UseBorders = false; - this.xrLabel28.StylePriority.UseFont = false; - this.xrLabel28.StylePriority.UsePadding = false; - this.xrLabel28.StylePriority.UseTextAlignment = false; - this.xrLabel28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.lblBewilligtStart.BackColor = System.Drawing.Color.Transparent; + this.lblBewilligtStart.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right))); + this.lblBewilligtStart.LocationFloat = new DevExpress.Utils.PointFloat(614.5723F, 115.909F); + this.lblBewilligtStart.Name = "lblBewilligtStart"; + this.lblBewilligtStart.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.lblBewilligtStart.SizeF = new System.Drawing.SizeF(98.39288F, 17.42421F); + this.lblBewilligtStart.StylePriority.UseBackColor = false; + this.lblBewilligtStart.StylePriority.UseBorders = false; + this.lblBewilligtStart.StylePriority.UseFont = false; + this.lblBewilligtStart.StylePriority.UsePadding = false; + this.lblBewilligtStart.StylePriority.UseTextAlignment = false; + this.lblBewilligtStart.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; // // xrLabel27 // @@ -866,7 +861,7 @@ namespace SuchtkrankenhilfeOstfriesland this.xrLabel25.StylePriority.UseForeColor = false; this.xrLabel25.StylePriority.UsePadding = false; this.xrLabel25.StylePriority.UseTextAlignment = false; - this.xrLabel25.Text = "Beginn 6 Monatszeitraum (\"flexible Leistungserbringung\")"; + this.xrLabel25.Text = "Beginn des Bewilligungszeitraums"; this.xrLabel25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // lblBewilligtFls @@ -1384,6 +1379,10 @@ namespace SuchtkrankenhilfeOstfriesland this.wennGruppeAnzPersonen.Expression = "Iif([CustomerCount] > 1,[CustomerCount],\'\')"; this.wennGruppeAnzPersonen.Name = "wennGruppeAnzPersonen"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // Quittierungsbeleg // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1409,12 +1408,14 @@ namespace SuchtkrankenhilfeOstfriesland this.PageWidth = 1169; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.Version = "23.2"; + xrWatermark1.Id = "Watermark1"; + this.Watermarks.Add(xrWatermark1); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktLeer)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktEmden)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.lblKontaktAurich)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1459,7 +1460,7 @@ namespace SuchtkrankenhilfeOstfriesland private DevExpress.XtraReports.UI.XRLabel lblBewilligtFls; private DevExpress.XtraReports.UI.XRLabel xrLabel25; private DevExpress.XtraReports.UI.XRLabel xrLabel27; - private DevExpress.XtraReports.UI.XRLabel xrLabel28; + private DevExpress.XtraReports.UI.XRLabel lblBewilligtStart; private DevExpress.XtraReports.UI.XRLabel xrLabel29; private DevExpress.XtraReports.UI.XRLabel xrLabel30; private DevExpress.XtraReports.UI.XRLabel xrLabel31; diff --git a/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.cs b/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.cs index d79aa8173..a0f4292d4 100644 --- a/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.cs +++ b/ReportImp/SuchtkrankenhilfeOstfriesland/Quittierungsbeleg.cs @@ -31,6 +31,16 @@ namespace SuchtkrankenhilfeOstfriesland //StackTrace stackTrace = new StackTrace(); //Debug.WriteLine(stackTrace.GetFrame(1).GetMethod().Name); + if (pRO.Costbearer.Contains("ab 01.09.2023")) + { + pRO.Costbearer = pRO.Costbearer.Remove(pRO.Costbearer.IndexOf("ab 01.09.2023"), 13); + } + else if (pRO.Costbearer.Contains("bis 31.08.2023")) + { + pRO.Costbearer = pRO.Costbearer.Remove(pRO.Costbearer.IndexOf("bis 31.08.2023"), 14); + + } + var customer = DAOFactory.GenericDAO.GetByID(pRO.CustomerOid); if (customer != null) { @@ -129,10 +139,15 @@ namespace SuchtkrankenhilfeOstfriesland { if (scap.ServiceCategory != null && pRO.Services.Count > 0) { - if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ServiceCategory.Name == pRO.Services[0].ServiceCategory) + var start = scap.StartDate == null ? pRO.StartDate : scap.StartDate; + var end = scap.EndDate == null ? pRO.EndDate : scap.EndDate; + + if (scap.ApprovedBEPerInterval.HasValue && scap.ApprovedBEInterval.HasValue && scap.ServiceCategory.Name == pRO.Services[0].ServiceCategory && + pRO.StartDate >= start && pRO.StartDate <= end) { lblBewilligtFls.Text = String.Format("{0:0.00}", scap.ApprovedBEPerInterval.Value); pRO.ApprovedFLSTotal = Convert.ToDecimal((scap.EndDate.Value - scap.StartDate.Value).TotalDays / 7) * scap.ApprovedBEPerInterval.Value; + lblBewilligtStart.Text = string.Format("{0:dd.MM.yyyy}", scap.StartDate); } else lblBewilligtFls.Text = string.Format("{0:0.00}", pRO.ApprovedFLSPerWeekTotal);