From 3e47a76a079bfa07168c67a789ca5b2c45faeab4 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Tue, 23 May 2023 16:38:23 +0200 Subject: [PATCH] PsychosozialeProjekteSaarpfalz/RechnungSozio --- .../RechnungSozio.Designer.cs | 91 +++++++++++++++---- .../RechnungSozio.cs | 16 ++-- 2 files changed, 83 insertions(+), 24 deletions(-) diff --git a/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.Designer.cs b/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.Designer.cs index d472d1878..e0ff395f9 100644 --- a/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.Designer.cs +++ b/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.Designer.cs @@ -64,7 +64,7 @@ namespace PsychosozialeProjekteSaarpfalz this.xrTableCell45 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell46 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblVerguetungsvereinbarung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -90,10 +90,16 @@ namespace PsychosozialeProjekteSaarpfalz this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -242,7 +248,7 @@ namespace PsychosozialeProjekteSaarpfalz // xrLabel15 // this.xrLabel15.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 304.5834F); + this.xrLabel15.LocationFloat = new DevExpress.Utils.PointFloat(0F, 345.8333F); this.xrLabel15.Name = "xrLabel15"; this.xrLabel15.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel15.SizeF = new System.Drawing.SizeF(360.4167F, 16.99998F); @@ -252,7 +258,7 @@ namespace PsychosozialeProjekteSaarpfalz // xrLabel9 // this.xrLabel9.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 176.75F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 191.3333F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(644.0001F, 17F); @@ -478,32 +484,33 @@ namespace PsychosozialeProjekteSaarpfalz // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel5, + this.xrTable4, + this.lblVerguetungsvereinbarung, this.xrLabel1, this.xrTable1, this.xrLabel9, this.xrLabel15}); - this.GroupFooter1.HeightF = 331.5833F; + this.GroupFooter1.HeightF = 362.8333F; this.GroupFooter1.Name = "GroupFooter1"; // - // xrLabel5 + // lblVerguetungsvereinbarung // - this.xrLabel5.BackColor = System.Drawing.Color.Gainsboro; - this.xrLabel5.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 255.2083F); - this.xrLabel5.Multiline = true; - this.xrLabel5.Name = "xrLabel5"; - this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel5.SizeF = new System.Drawing.SizeF(644.0001F, 33.66661F); - this.xrLabel5.StylePriority.UseBackColor = false; - this.xrLabel5.StylePriority.UseFont = false; - this.xrLabel5.Text = "*Dieser Aufstellung/Rechnung liegen die Zahlen der aktullen Vergütungsvereinbarun" + + this.lblVerguetungsvereinbarung.BackColor = System.Drawing.Color.Gainsboro; + this.lblVerguetungsvereinbarung.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblVerguetungsvereinbarung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 269.7917F); + this.lblVerguetungsvereinbarung.Multiline = true; + this.lblVerguetungsvereinbarung.Name = "lblVerguetungsvereinbarung"; + this.lblVerguetungsvereinbarung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblVerguetungsvereinbarung.SizeF = new System.Drawing.SizeF(644.0001F, 33.66661F); + this.lblVerguetungsvereinbarung.StylePriority.UseBackColor = false; + this.lblVerguetungsvereinbarung.StylePriority.UseFont = false; + this.lblVerguetungsvereinbarung.Text = "*Dieser Aufstellung/Rechnung liegen die Zahlen der aktullen Vergütungsvereinbarun" + "g zu Grunde.\t \t \t \r\n"; // // xrLabel1 // this.xrLabel1.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 214.5833F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 229.1667F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel1.SizeF = new System.Drawing.SizeF(644.0001F, 17F); @@ -835,6 +842,48 @@ namespace PsychosozialeProjekteSaarpfalz // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrTable4 + // + this.xrTable4.Font = new System.Drawing.Font("Verdana", 10F); + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 139.25F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow10, + this.xrTableRow14}); + this.xrTable4.SizeF = new System.Drawing.SizeF(644F, 26F); + this.xrTable4.StylePriority.UseFont = false; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.38095238095238093D; + // + // xrTableCell9 + // + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 10F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "xrTableCell1"; + this.xrTableCell9.Weight = 3D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.23809523809523808D; + // + // xrTableCell12 + // + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Weight = 3D; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -858,6 +907,7 @@ namespace PsychosozialeProjekteSaarpfalz ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -919,7 +969,12 @@ namespace PsychosozialeProjekteSaarpfalz private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; private DevExpress.XtraReports.UI.XRTableCell xrTableCell17; - private DevExpress.XtraReports.UI.XRLabel xrLabel5; + private DevExpress.XtraReports.UI.XRLabel lblVerguetungsvereinbarung; private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRTable xrTable4; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow14; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; } } diff --git a/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.cs b/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.cs index 904cf94d8..7bd22f4bd 100644 --- a/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.cs +++ b/ReportImp/PsychosozialeProjekteSaarpfalz/RechnungSozio.cs @@ -44,6 +44,12 @@ namespace PsychosozialeProjekteSaarpfalz } lblSumPausch.Text = String.Format("{0:0.00 €}", sumPauschale); lblSumMin.Text = String.Format("{0:N0} Min", sumMin); + var aokRheinlandPfalz = DAOFactory.GenericDAO.LoadByID(10); + if (!aokRheinlandPfalz.Organisation.Notice.IsNullOrEmpty()) + { + lblVerguetungsvereinbarung.Text = aokRheinlandPfalz.Organisation.Notice.Trim(); + } + this.bindingSource1.DataSource = pRO; } @@ -63,13 +69,11 @@ namespace PsychosozialeProjekteSaarpfalz { if (sip.SupportConceptApprovalPeriod != null && sip.CostBearer2SupportConcept != null) { - if (sip.SupportConceptApprovalPeriod.StartDate.HasValue && - sip.SupportConceptApprovalPeriod.StartDate < start) + if (sip.SupportConceptApprovalPeriod.StartDate.HasValue && sip.SupportConceptApprovalPeriod.StartDate <= start) { start = sip.SupportConceptApprovalPeriod.StartDate.Value; } - if (sip.SupportConceptApprovalPeriod.EndDate.HasValue && - sip.SupportConceptApprovalPeriod.EndDate > end) + if (sip.SupportConceptApprovalPeriod.EndDate.HasValue && sip.SupportConceptApprovalPeriod.EndDate >= end) { end = sip.SupportConceptApprovalPeriod.EndDate.Value; } @@ -87,7 +91,7 @@ namespace PsychosozialeProjekteSaarpfalz CostBearer2SupportConcept c2s = DAOFactory.GenericDAO.LoadByID(c2sdc.CostBearer2SupportConceptOid.Value); IList allServiceRecords = c2s.ServiceRecords; decimal minutenIst = 0; - DateTime endCalc = end.AddDays(1); + DateTime endCalc = scapdc.EndDate.Value.AddDays(1); Dictionary groupBookingDict = new Dictionary(); foreach (var item in allServiceRecords) @@ -96,7 +100,7 @@ namespace PsychosozialeProjekteSaarpfalz { if (item.Start != null) { - if (item.Start >= c2s.StartDate.Value && item.Start.Value < endCalc) + if (item.Start >= scapdc.StartDate.Value && item.Start.Value <= endCalc) { if (item.ServiceDescription != null && item.ServiceDescription.ServiceCategory != null && item.ServiceDescription.ServiceCategory.IsBillable) {