From 683e87af54623e36e65837592bcf81442a430a46 Mon Sep 17 00:00:00 2001 From: Marcel Hirschle Date: Thu, 14 Dec 2023 14:25:16 +0100 Subject: [PATCH] MH: Forum FK --- .../ForumEV/SettlementReport.Designer.cs | 34 ++- ReportImp/ForumEV/SettlementReport.resx | 4 +- .../ForumEV/SettlementReport2.Designer.cs | 225 ++++++++++-------- ReportImp/ForumEV/SettlementReport2.cs | 2 +- ReportImp/ForumEV/SettlementReport2.resx | 2 +- 5 files changed, 149 insertions(+), 118 deletions(-) diff --git a/ReportImp/ForumEV/SettlementReport.Designer.cs b/ReportImp/ForumEV/SettlementReport.Designer.cs index 2944daf5e..49fc31c66 100644 --- a/ReportImp/ForumEV/SettlementReport.Designer.cs +++ b/ReportImp/ForumEV/SettlementReport.Designer.cs @@ -54,7 +54,6 @@ namespace ForumEV.Alt this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); @@ -81,6 +80,8 @@ namespace ForumEV.Alt this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -88,9 +89,9 @@ namespace ForumEV.Alt ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -248,11 +249,10 @@ namespace ForumEV.Alt this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(509.0417F, 162.875F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(521.3611F, 138.9166F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = resources.GetString("xrLabel3.Text"); - this.xrLabel3.WordWrap = false; // // xrLabel2 // @@ -320,6 +320,7 @@ namespace ForumEV.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, this.xrRichText3, this.xrLabel2, this.xrLabel3, @@ -338,10 +339,6 @@ namespace ForumEV.Alt this.xrRichText3.SizeF = new System.Drawing.SizeF(156.6389F, 129.1667F); this.xrRichText3.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -625,6 +622,24 @@ namespace ForumEV.Alt this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // + // xrLabel4 + // + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 266.6667F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(521.3611F, 39.29153F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; + this.xrLabel4.Text = "[FehlkontakteString]"; + // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -653,9 +668,9 @@ namespace ForumEV.Alt ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -713,5 +728,6 @@ namespace ForumEV.Alt private DevExpress.XtraReports.UI.XRRichText xrRichText6; private DevExpress.XtraReports.UI.XRRichText xrRichText5; private DevExpress.XtraReports.UI.XRRichText xrRichText4; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; } } diff --git a/ReportImp/ForumEV/SettlementReport.resx b/ReportImp/ForumEV/SettlementReport.resx index 56a4ebe93..28c4a7894 100644 --- a/ReportImp/ForumEV/SettlementReport.resx +++ b/ReportImp/ForumEV/SettlementReport.resx @@ -434,9 +434,7 @@ AZ.: [CustomerReferenceNumber] Genehmigte FLS: [ApprovedFLS] -Krankenhausaufenthalte: [AbsenceTimes] - -[FehlkontakteString] +Krankenhausaufenthalte: [AbsenceTimes] ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABNAGkAdABnAGwAaQBlAGQAcwBjAGgAYQBmAHQAZQBuADoAfQBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABEAFAAVwBWACAATgBSAFcAfQBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAWgBlAHIAdABpAGYAaQB6AGkAZQByAHQAIABuAGEAYwBoAH0AXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARABJAE4AIABFAE4AIABJAFMATwAgADkAMAAwADEAIAA6ACAAMgAwADAAOAAgAHUAbgBkAH0AXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATQBBAEEAUwAgAC0AQgBHAFcAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A diff --git a/ReportImp/ForumEV/SettlementReport2.Designer.cs b/ReportImp/ForumEV/SettlementReport2.Designer.cs index d12d2c014..56af3bc88 100644 --- a/ReportImp/ForumEV/SettlementReport2.Designer.cs +++ b/ReportImp/ForumEV/SettlementReport2.Designer.cs @@ -55,13 +55,20 @@ namespace ForumEV this.xrRichText4 = new DevExpress.XtraReports.UI.XRRichText(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.xrRichText3 = new DevExpress.XtraReports.UI.XRRichText(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.DetailReport = new DevExpress.XtraReports.UI.DetailReportBand(); this.Detail1 = new DevExpress.XtraReports.UI.DetailBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow15 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -82,14 +89,8 @@ namespace ForumEV this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); - this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow12 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow10 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); @@ -97,10 +98,10 @@ namespace ForumEV ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -258,11 +259,10 @@ namespace ForumEV this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(509.0417F, 159.75F); + this.xrLabel3.SizeF = new System.Drawing.SizeF(678F, 139.9583F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = resources.GetString("xrLabel3.Text"); - this.xrLabel3.WordWrap = false; // // xrLabel2 // @@ -330,6 +330,7 @@ namespace ForumEV // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel4, this.xrRichText3, this.xrLabel2, this.xrLabel3, @@ -342,16 +343,12 @@ namespace ForumEV // xrRichText3 // this.xrRichText3.Font = new System.Drawing.Font("Arial", 8F); - this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(521.3611F, 66.91666F); + this.xrRichText3.LocationFloat = new DevExpress.Utils.PointFloat(521.3611F, 52.33332F); this.xrRichText3.Name = "xrRichText3"; this.xrRichText3.SerializableRtfString = resources.GetString("xrRichText3.SerializableRtfString"); - this.xrRichText3.SizeF = new System.Drawing.SizeF(156.6389F, 129.1667F); + this.xrRichText3.SizeF = new System.Drawing.SizeF(156.6389F, 75.41669F); this.xrRichText3.StylePriority.UseFont = false; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // DetailReport // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -423,6 +420,93 @@ namespace ForumEV this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell23.Weight = 0.21685899000901443D; // + // GroupHeader2 + // + this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); + this.GroupHeader2.HeightF = 0F; + this.GroupHeader2.Name = "GroupHeader2"; + // + // Zwischensumme + // + this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable6}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; + // + // xrTable6 + // + this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable6.Name = "xrTable6"; + this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow12, + this.xrTableRow10}); + this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F); + this.xrTable6.StylePriority.UseFont = false; + // + // xrTableRow12 + // + this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell10}); + this.xrTableRow12.Name = "xrTableRow12"; + this.xrTableRow12.Weight = 0.40476190476190466D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell9.Weight = 2.3494227482722359D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderColor = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell10.Summary = xrSummary1; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell10.Weight = 0.65057725172776437D; + // + // xrTableRow10 + // + this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell7}); + this.xrTableRow10.Name = "xrTableRow10"; + this.xrTableRow10.Weight = 0.40476190476190466D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderColor = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.Weight = 3D; + // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -638,92 +722,24 @@ namespace ForumEV this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // GroupHeader2 + // xrLabel4 // - this.GroupHeader2.GroupFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { - new DevExpress.XtraReports.UI.GroupField("RateFactor", DevExpress.XtraReports.UI.XRColumnSortOrder.Descending)}); - this.GroupHeader2.HeightF = 0F; - this.GroupHeader2.Name = "GroupHeader2"; + this.xrLabel4.BackColor = System.Drawing.Color.Transparent; + this.xrLabel4.CanShrink = true; + this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrLabel4.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.7083F); + this.xrLabel4.Multiline = true; + this.xrLabel4.Name = "xrLabel4"; + this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel4.SizeF = new System.Drawing.SizeF(678F, 27.83319F); + this.xrLabel4.StylePriority.UseBackColor = false; + this.xrLabel4.StylePriority.UseFont = false; // - // Zwischensumme + // bindingSource1 // - this.Zwischensumme.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable6}); - this.Zwischensumme.HeightF = 34F; - this.Zwischensumme.Name = "Zwischensumme"; - this.Zwischensumme.Visible = false; - // - // xrTable6 - // - this.xrTable6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable6.Name = "xrTable6"; - this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow12, - this.xrTableRow10}); - this.xrTable6.SizeF = new System.Drawing.SizeF(650F, 34F); - this.xrTable6.StylePriority.UseFont = false; - // - // xrTableRow12 - // - this.xrTableRow12.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9, - this.xrTableCell10}); - this.xrTableRow12.Name = "xrTableRow12"; - this.xrTableRow12.Weight = 0.40476190476190466D; - // - // xrTableCell9 - // - this.xrTableCell9.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorderColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.Text = "Zwischensumme [ItemDescription]:"; - this.xrTableCell9.Weight = 2.3494227482722359D; - // - // xrTableCell10 - // - this.xrTableCell10.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseBorderColor = false; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - xrSummary1.FormatString = "{0:c}"; - xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; - this.xrTableCell10.Summary = xrSummary1; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell10.Weight = 0.65057725172776437D; - // - // xrTableRow10 - // - this.xrTableRow10.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell7}); - this.xrTableRow10.Name = "xrTableRow10"; - this.xrTableRow10.Weight = 0.40476190476190466D; - // - // xrTableCell7 - // - this.xrTableCell7.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderColor = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.Weight = 3D; + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); // // Spitzabrechnung // @@ -753,10 +769,10 @@ namespace ForumEV ((System.ComponentModel.ISupportInitialize)(this.xrRichText5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText3)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -822,5 +838,6 @@ namespace ForumEV private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableRow xrTableRow10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; + private DevExpress.XtraReports.UI.XRLabel xrLabel4; } } diff --git a/ReportImp/ForumEV/SettlementReport2.cs b/ReportImp/ForumEV/SettlementReport2.cs index f6151ec59..6598760ca 100644 --- a/ReportImp/ForumEV/SettlementReport2.cs +++ b/ReportImp/ForumEV/SettlementReport2.cs @@ -18,7 +18,7 @@ namespace ForumEV } public void SetReportDataSource(Settlement2RO pRO) - { + { if (pRO.TerminationDate.HasValue) { pRO.AccountingEndDate = pRO.TerminationDate.Value; diff --git a/ReportImp/ForumEV/SettlementReport2.resx b/ReportImp/ForumEV/SettlementReport2.resx index 8f42d76d1..2195de264 100644 --- a/ReportImp/ForumEV/SettlementReport2.resx +++ b/ReportImp/ForumEV/SettlementReport2.resx @@ -436,7 +436,7 @@ Genehmigte FLS: [ApprovedFLS] Krankenhausaufenthalte: [AbsenceTimes] -[FehlkontakteString] + ewBcAHIAdABmADEAXABkAGUAZgBmADAAewBcAGYAbwBuAHQAdABiAGwAewBcAGYAMAAgAEMAYQBsAGkAYgByAGkAOwB9AHsAXABmADEAIABUAGkAbQBlAHMAIABOAGUAdwAgAFIAbwBtAGEAbgA7AH0AewBcAGYAMgAgAEEAcgBpAGEAbAA7AH0AfQB7AFwAYwBvAGwAbwByAHQAYgBsACAAOwBcAHIAZQBkADAAXABnAHIAZQBlAG4AMABcAGIAbAB1AGUAMAAgADsAXAByAGUAZAAwAFwAZwByAGUAZQBuADAAXABiAGwAdQBlADIANQA1ACAAOwB9AHsAXAAqAFwAZABlAGYAYwBoAHAAIABcAGYAMQBcAGYAcwAyADQAfQB7AFwAcwB0AHkAbABlAHMAaABlAGUAdAAgAHsAXABxAGwAXABmADEAXABmAHMAMgA0ACAATgBvAHIAbQBhAGwAOwB9AHsAXAAqAFwAYwBzADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABEAGUAZgBhAHUAbAB0ACAAUABhAHIAYQBnAHIAYQBwAGgAIABGAG8AbgB0ADsAfQB7AFwAKgBcAGMAcwAyAFwAcwBiAGEAcwBlAGQAbwBuADEAXABmADEAXABmAHMAMgA0AFwAYwBmADEAIABMAGkAbgBlACAATgB1AG0AYgBlAHIAOwB9AHsAXAAqAFwAYwBzADMAXAB1AGwAXABmADEAXABmAHMAMgA0AFwAYwBmADIAIABIAHkAcABlAHIAbABpAG4AawA7AH0AewBcACoAXAB0AHMANABcAHQAcwByAG8AdwBkAFwAZgAxAFwAZgBzADIANABcAHEAbABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgBsADMAXAB0AHMAYwBlAGwAbABwAGEAZABkAGwAMQAwADgAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAYgAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwBjAGUAbABsAHAAYQBkAGQAZgB0ADMAXAB0AHMAdgBlAHIAdABhAGwAdABcAGMAbAB0AHgAbAByAHQAYgAgAE4AbwByAG0AYQBsACAAVABhAGIAbABlADsAfQB7AFwAKgBcAHQAcwA1AFwAdABzAHIAbwB3AGQAXABzAGIAYQBzAGUAZABvAG4ANABcAGYAMQBcAGYAcwAyADQAXABxAGwAXAB0AHIAYgByAGQAcgB0AFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGwAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAYgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHIAYgByAGQAcgByAFwAYgByAGQAcgBzAFwAYgByAGQAcgB3ADEAMABcAHQAcgBiAHIAZAByAGgAXABiAHIAZAByAHMAXABiAHIAZAByAHcAMQAwAFwAdAByAGIAcgBkAHIAdgBcAGIAcgBkAHIAcwBcAGIAcgBkAHIAdwAxADAAXAB0AHMAYwBlAGwAbABwAGEAZABkAGYAbAAzAFwAdABzAGMAZQBsAGwAcABhAGQAZABsADEAMAA4AFwAdABzAGMAZQBsAGwAcABhAGQAZABmAHIAMwBcAHQAcwBjAGUAbABsAHAAYQBkAGQAcgAxADAAOABcAHQAcwB2AGUAcgB0AGEAbAB0AFwAYwBsAHQAeABsAHIAdABiACAAVABhAGIAbABlACAAUwBpAG0AcABsAGUAIAAxADsAfQB9AHsAXAAqAFwAbABpAHMAdABvAHYAZQByAHIAaQBkAGUAdABhAGIAbABlAH0AXABuAG8AdQBpAGMAbwBtAHAAYQB0AFwAcwBwAGwAeQB0AHcAbgBpAG4AZQBcAGgAdABtAGEAdQB0AHMAcABcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABNAGkAdABnAGwAaQBlAGQAcwBjAGgAYQBmAHQAZQBuADoAfQBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAewBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAIABEAFAAVwBWACAATgBSAFcAfQBcAGkAXABmADIAXABmAHMAMQA2AFwAYwBmADEAXABwAGEAcgBcAHAAYQByAGQAXABwAGwAYQBpAG4AXABxAGwAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAAWgBlAHIAdABpAGYAaQB6AGkAZQByAHQAIABuAGEAYwBoAH0AXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAARABJAE4AIABFAE4AIABJAFMATwAgADkAMAAwADEAIAA6ACAAMgAwADAAOAAgAHUAbgBkAH0AXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxAFwAcABhAHIAXABwAGEAcgBkAFwAcABsAGEAaQBuAFwAcQBsAHsAXABpAFwAZgAyAFwAZgBzADEANgBcAGMAZgAxACAATQBBAEEAUwAgAC0AQgBHAFcAfQBcAGYAMQBcAGYAcwAyADQAXABjAGYAMQBcAHAAYQByAH0A