From 0c2e183fe73aed5a17ecaeb9a634ffaff2b7c05d Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 19 Jan 2024 14:34:54 +0100 Subject: [PATCH] KlinikumWerraMeissner/CollectiveBillingReportTab - Format --- .../CollectiveBillingReportTab.Designer.cs | 102 ++++++------- .../CollectiveBillingReportTab.cs | 11 ++ ...llectiveBillingReportTabIntern.Designer.cs | 114 +++++++-------- .../CollectiveBillingReportTabIntern.cs | 15 +- ...CollectiveBillingReportTab_alt.Designer.cs | 134 +++++++++--------- .../CollectiveBillingReportTab_alt.cs | 14 +- 6 files changed, 213 insertions(+), 177 deletions(-) diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs index 6a59247f0..b6d57a02b 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.Designer.cs @@ -33,9 +33,9 @@ namespace KlinikumWerraMeissner this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraumAngabe = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -101,9 +101,9 @@ namespace KlinikumWerraMeissner // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox1, - this.xrLabel2, + this.lblZeitraum, this.xrLabel1, - this.xrLabel3}); + this.lblZeitraumAngabe}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 120.625F; this.ReportHeader.Name = "ReportHeader"; @@ -112,29 +112,29 @@ namespace KlinikumWerraMeissner // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(804.3784F, 0F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(827.2951F, 0F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(244.6215F, 120.625F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // xrLabel2 + // lblZeitraum // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.lblZeitraum.BackColor = System.Drawing.Color.Transparent; + this.lblZeitraum.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 85.62498F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(202.9164F, 25F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Abrechnungsmonat: "; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel2.WordWrap = false; + this.lblZeitraum.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 85.62498F); + this.lblZeitraum.Multiline = true; + this.lblZeitraum.Name = "lblZeitraum"; + this.lblZeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraum.SizeF = new System.Drawing.SizeF(202.9164F, 25F); + this.lblZeitraum.StylePriority.UseBackColor = false; + this.lblZeitraum.StylePriority.UseBorders = false; + this.lblZeitraum.StylePriority.UseFont = false; + this.lblZeitraum.StylePriority.UseTextAlignment = false; + this.lblZeitraum.Text = "Abrechnungsmonat: "; + this.lblZeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblZeitraum.WordWrap = false; // // xrLabel1 // @@ -157,23 +157,23 @@ namespace KlinikumWerraMeissner this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrLabel1.WordWrap = false; // - // xrLabel3 + // lblZeitraumAngabe // - this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.lblZeitraumAngabe.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(259.5866F, 25F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseForeColor = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "[AccountingPeriodStart!MMMM yyyy]"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel3.WordWrap = false; + this.lblZeitraumAngabe.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraumAngabe.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); + this.lblZeitraumAngabe.Name = "lblZeitraumAngabe"; + this.lblZeitraumAngabe.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraumAngabe.SizeF = new System.Drawing.SizeF(259.5866F, 25F); + this.lblZeitraumAngabe.StylePriority.UseBackColor = false; + this.lblZeitraumAngabe.StylePriority.UseBorders = false; + this.lblZeitraumAngabe.StylePriority.UseFont = false; + this.lblZeitraumAngabe.StylePriority.UseForeColor = false; + this.lblZeitraumAngabe.StylePriority.UseTextAlignment = false; + this.lblZeitraumAngabe.Text = "[AccountingPeriodStart!MMMM yyyy]"; + this.lblZeitraumAngabe.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblZeitraumAngabe.WordWrap = false; // // ruleRateFactorNull // @@ -190,7 +190,7 @@ namespace KlinikumWerraMeissner // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 22.08379F; + this.bottomMarginBand1.HeightF = 22F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupFooter @@ -209,7 +209,7 @@ namespace KlinikumWerraMeissner this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1049F, 17F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1071.917F, 17F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -235,7 +235,7 @@ namespace KlinikumWerraMeissner this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Summe"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 1.8669349762482861D; + this.xrTableCell11.Weight = 1.9124077711538772D; // // xrTableCell14 // @@ -250,7 +250,7 @@ namespace KlinikumWerraMeissner this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell9"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.2146318829375416D; + this.xrTableCell14.Weight = 0.21463346001090955D; // // ruleNoticeNull // @@ -288,12 +288,12 @@ namespace KlinikumWerraMeissner // xrTable3 // this.xrTable3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001106262F, 0F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow5}); - this.xrTable3.SizeF = new System.Drawing.SizeF(1049F, 36F); + this.xrTable3.SizeF = new System.Drawing.SizeF(1071.917F, 36F); this.xrTable3.StylePriority.UseBackColor = false; this.xrTable3.StylePriority.UseBorders = false; this.xrTable3.StylePriority.UseFont = false; @@ -337,7 +337,7 @@ namespace KlinikumWerraMeissner this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.Text = "Aktenzeichen"; - this.xrTableCell5.Weight = 0.2759912937317307D; + this.xrTableCell5.Weight = 0.3392391037206392D; // // xrTableCell6 // @@ -446,7 +446,7 @@ namespace KlinikumWerraMeissner this.lblHessen.StylePriority.UseBorders = false; this.lblHessen.StylePriority.UseFont = false; this.lblHessen.Text = "LWV Hessen"; - this.lblHessen.Weight = 0.27599102472007131D; + this.lblHessen.Weight = 0.33923846586768458D; // // xrTableCell44 // @@ -536,12 +536,12 @@ namespace KlinikumWerraMeissner // xrTable2 // this.xrTable2.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001068115F, 0F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1049F, 17F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1071.916F, 17F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -587,7 +587,7 @@ namespace KlinikumWerraMeissner this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.Text = "[ServiceInvoicePeriods.CostBearer2SupportConcept.CustomerReferenceNumber]"; this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell24.Weight = 0.27741008367627817D; + this.xrTableCell24.Weight = 0.34098254080658263D; // // xrTableCell25 // @@ -658,7 +658,7 @@ namespace KlinikumWerraMeissner this.xrTableCell29.StylePriority.UseFont = false; this.xrTableCell29.StylePriority.UseTextAlignment = false; this.xrTableCell29.Text = "xrTableCell17"; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; this.xrTableCell29.Weight = 0.22308437735154907D; // // xrTableCell3 @@ -717,7 +717,7 @@ namespace KlinikumWerraMeissner this.ruleRateFactorNull, this.ruleNoticeNull}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(60, 60, 23, 22); + this.Margins = new System.Drawing.Printing.Margins(43, 49, 23, 22); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -781,9 +781,9 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblZeitraum; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblZeitraumAngabe; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.cs index 0a0d2da6c..26e619766 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab.cs @@ -17,6 +17,17 @@ namespace KlinikumWerraMeissner public void SetReportDataSource(ServiceInvoiceRO pRO) { + if (pRO.AccountingPeriodStart != null && pRO.AccountingPeriodEnd != null) + { + DateTime start = pRO.AccountingPeriodStart; + DateTime end = pRO.AccountingPeriodEnd; + + if (start.Year != end.Year || start.Month != end.Month) + { + lblZeitraum.Text = "Abrechnungszeitraum:"; + lblZeitraumAngabe.Text = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", start, end); + } + } if (pRO.RecipientOrganisation != "LWV Hessen") { diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs index 0faf60d53..9818c123a 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.Designer.cs @@ -33,9 +33,9 @@ namespace KlinikumWerraMeissner this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraumAngabe = new DevExpress.XtraReports.UI.XRLabel(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); @@ -101,9 +101,9 @@ namespace KlinikumWerraMeissner // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrPictureBox1, - this.xrLabel2, + this.lblZeitraum, this.xrLabel1, - this.xrLabel3}); + this.lblZeitraumAngabe}); this.ReportHeader.Font = new System.Drawing.Font("Verdana", 10F); this.ReportHeader.HeightF = 120.625F; this.ReportHeader.Name = "ReportHeader"; @@ -112,29 +112,29 @@ namespace KlinikumWerraMeissner // xrPictureBox1 // this.xrPictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("xrPictureBox1.Image"))); - this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(804.3784F, 0F); + this.xrPictureBox1.LocationFloat = new DevExpress.Utils.PointFloat(824.3785F, 0F); this.xrPictureBox1.Name = "xrPictureBox1"; this.xrPictureBox1.SizeF = new System.Drawing.SizeF(244.6215F, 120.625F); this.xrPictureBox1.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; // - // xrLabel2 + // lblZeitraum // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.lblZeitraum.BackColor = System.Drawing.Color.Transparent; + this.lblZeitraum.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 85.62498F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(202.9164F, 25F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Abrechnungsmonat: "; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel2.WordWrap = false; + this.lblZeitraum.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 85.62498F); + this.lblZeitraum.Multiline = true; + this.lblZeitraum.Name = "lblZeitraum"; + this.lblZeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraum.SizeF = new System.Drawing.SizeF(202.9164F, 25F); + this.lblZeitraum.StylePriority.UseBackColor = false; + this.lblZeitraum.StylePriority.UseBorders = false; + this.lblZeitraum.StylePriority.UseFont = false; + this.lblZeitraum.StylePriority.UseTextAlignment = false; + this.lblZeitraum.Text = "Abrechnungsmonat: "; + this.lblZeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblZeitraum.WordWrap = false; // // xrLabel1 // @@ -157,23 +157,23 @@ namespace KlinikumWerraMeissner this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrLabel1.WordWrap = false; // - // xrLabel3 + // lblZeitraumAngabe // - this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.lblZeitraumAngabe.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(259.5866F, 25F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseForeColor = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "[AccountingPeriodStart!MMMM yyyy]"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel3.WordWrap = false; + this.lblZeitraumAngabe.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraumAngabe.LocationFloat = new DevExpress.Utils.PointFloat(202.9168F, 85.62498F); + this.lblZeitraumAngabe.Name = "lblZeitraumAngabe"; + this.lblZeitraumAngabe.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraumAngabe.SizeF = new System.Drawing.SizeF(235.6283F, 25F); + this.lblZeitraumAngabe.StylePriority.UseBackColor = false; + this.lblZeitraumAngabe.StylePriority.UseBorders = false; + this.lblZeitraumAngabe.StylePriority.UseFont = false; + this.lblZeitraumAngabe.StylePriority.UseForeColor = false; + this.lblZeitraumAngabe.StylePriority.UseTextAlignment = false; + this.lblZeitraumAngabe.Text = "[AccountingPeriodStart!MMMM yyyy]"; + this.lblZeitraumAngabe.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.lblZeitraumAngabe.WordWrap = false; // // ruleRateFactorNull // @@ -190,7 +190,7 @@ namespace KlinikumWerraMeissner // // bottomMarginBand1 // - this.bottomMarginBand1.HeightF = 22.08379F; + this.bottomMarginBand1.HeightF = 22F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // // GroupFooter @@ -209,7 +209,7 @@ namespace KlinikumWerraMeissner this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1049F, 17F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1069.833F, 17F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -235,7 +235,7 @@ namespace KlinikumWerraMeissner this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Summe"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 1.8669349762482861D; + this.xrTableCell11.Weight = 1.9082747528816684D; // // xrTableCell14 // @@ -250,7 +250,7 @@ namespace KlinikumWerraMeissner this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell9"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.2146318829375416D; + this.xrTableCell14.Weight = 0.21463248850836381D; // // ruleNoticeNull // @@ -288,12 +288,12 @@ namespace KlinikumWerraMeissner // xrTable3 // this.xrTable3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0.0001106262F, 0F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1, this.xrTableRow5}); - this.xrTable3.SizeF = new System.Drawing.SizeF(1049F, 36F); + this.xrTable3.SizeF = new System.Drawing.SizeF(1069.833F, 36F); this.xrTable3.StylePriority.UseBackColor = false; this.xrTable3.StylePriority.UseBorders = false; this.xrTable3.StylePriority.UseFont = false; @@ -337,7 +337,7 @@ namespace KlinikumWerraMeissner this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.Text = "Aktenzeichen"; - this.xrTableCell5.Weight = 0.2759912937317307D; + this.xrTableCell5.Weight = 0.33348967262318729D; // // xrTableCell6 // @@ -445,7 +445,7 @@ namespace KlinikumWerraMeissner this.xrTableCell43.Name = "xrTableCell43"; this.xrTableCell43.StylePriority.UseBorders = false; this.xrTableCell43.StylePriority.UseFont = false; - this.xrTableCell43.Weight = 0.27599102472007131D; + this.xrTableCell43.Weight = 0.333489158269841D; // // xrTableCell44 // @@ -536,12 +536,12 @@ namespace KlinikumWerraMeissner // xrTable2 // this.xrTable2.Font = new System.Drawing.Font("Calibri", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0001068115F, 0F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow3}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1049F, 17F); + this.xrTable2.SizeF = new System.Drawing.SizeF(1069.833F, 17F); this.xrTable2.StylePriority.UseBorders = false; this.xrTable2.StylePriority.UseFont = false; this.xrTable2.StylePriority.UsePadding = false; @@ -587,7 +587,7 @@ namespace KlinikumWerraMeissner this.xrTableCell24.StylePriority.UseTextAlignment = false; this.xrTableCell24.Text = "[ServiceInvoicePeriods.CostBearer2SupportConcept.CustomerReferenceNumber]"; this.xrTableCell24.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell24.Weight = 0.27741008367627817D; + this.xrTableCell24.Weight = 0.33520452366581166D; // // xrTableCell25 // @@ -599,7 +599,7 @@ namespace KlinikumWerraMeissner this.xrTableCell25.StylePriority.UseTextAlignment = false; this.xrTableCell25.Text = "[Notice]"; this.xrTableCell25.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell25.Weight = 0.4427094977716719D; + this.xrTableCell25.Weight = 0.44270958243050734D; // // xrTableCell26 // @@ -612,7 +612,7 @@ namespace KlinikumWerraMeissner this.xrTableCell26.StylePriority.UseFont = false; this.xrTableCell26.StylePriority.UseTextAlignment = false; this.xrTableCell26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell26.Weight = 0.38837511824404186D; + this.xrTableCell26.Weight = 0.38837477960870026D; // // xrTableCell27 // @@ -644,7 +644,7 @@ namespace KlinikumWerraMeissner this.xrTableCell28.StylePriority.UsePadding = false; this.xrTableCell28.StylePriority.UseTextAlignment = false; this.xrTableCell28.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell28.Weight = 0.22770685847991415D; + this.xrTableCell28.Weight = 0.2277073664329265D; // // xrTableCell29 // @@ -657,8 +657,8 @@ namespace KlinikumWerraMeissner this.xrTableCell29.StylePriority.UseFont = false; this.xrTableCell29.StylePriority.UseTextAlignment = false; this.xrTableCell29.Text = "xrTableCell17"; - this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell29.Weight = 0.22308437735154907D; + this.xrTableCell29.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; + this.xrTableCell29.Weight = 0.22308331911610668D; // // xrTableCell3 // @@ -671,7 +671,7 @@ namespace KlinikumWerraMeissner this.xrTableCell3.StylePriority.UseFont = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell3.Weight = 0.22192736554549275D; + this.xrTableCell3.Weight = 0.22192821213384667D; // // xrTableCell31 // @@ -685,7 +685,7 @@ namespace KlinikumWerraMeissner this.xrTableCell31.StylePriority.UseFont = false; this.xrTableCell31.StylePriority.UseTextAlignment = false; this.xrTableCell31.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell31.Weight = 0.30005648799550333D; + this.xrTableCell31.Weight = 0.30005589538365557D; // // fieldMonatskontingent // @@ -716,7 +716,7 @@ namespace KlinikumWerraMeissner this.ruleRateFactorNull, this.ruleNoticeNull}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(60, 60, 23, 22); + this.Margins = new System.Drawing.Printing.Margins(43, 47, 23, 22); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -780,9 +780,9 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblZeitraum; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblZeitraumAngabe; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.cs index ab88d54f0..904446610 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTabIntern.cs @@ -20,7 +20,20 @@ namespace KlinikumWerraMeissner { // diese Seite ist nur für interne Zwecke, da sie eine Aufschlüsselung nach Mitarbeiteranteil in der Bewilligung brauchen // dann wird das InvoiceItem entsprechend der MA gesplittet... - pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastNameFirstName.CompareTo(b.Customer.LastNameFirstName)); + + if (pRO.AccountingPeriodStart != null && pRO.AccountingPeriodEnd != null) + { + DateTime start = pRO.AccountingPeriodStart; + DateTime end = pRO.AccountingPeriodEnd; + + if (start.Year != end.Year || start.Month != end.Month) + { + lblZeitraum.Text = "Abrechnungszeitraum:"; + lblZeitraumAngabe.Text = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", start, end); + } + } + + pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastNameFirstName.CompareTo(b.Customer.LastNameFirstName)); foreach (var sip in pRO.ServiceInvoicePeriods) { diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs index acf39eaa9..835d12c1b 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.Designer.cs @@ -47,9 +47,9 @@ namespace KlinikumWerraMeissner this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleNoticeNull = new DevExpress.XtraReports.UI.FormattingRule(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraumAngabe = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblZeitraum = new DevExpress.XtraReports.UI.XRLabel(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -75,10 +75,10 @@ namespace KlinikumWerraMeissner this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.fieldMonatskontingent = new DevExpress.XtraReports.UI.CalculatedField(); this.feldEurStd = new DevExpress.XtraReports.UI.CalculatedField(); this.feldEurMin = new DevExpress.XtraReports.UI.CalculatedField(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); @@ -133,7 +133,7 @@ namespace KlinikumWerraMeissner this.xrTable1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable1.SizeF = new System.Drawing.SizeF(1069F, 25F); + this.xrTable1.SizeF = new System.Drawing.SizeF(1087.75F, 25F); this.xrTable1.StylePriority.UseBorders = false; this.xrTable1.StylePriority.UseFont = false; this.xrTable1.StylePriority.UsePadding = false; @@ -164,7 +164,7 @@ namespace KlinikumWerraMeissner this.xrTableCell11.StylePriority.UseTextAlignment = false; this.xrTableCell11.Text = "Summe"; this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 1.0120102804894069D; + this.xrTableCell11.Weight = 1.0814620384016671D; // // cellTotalPerMonth // @@ -175,28 +175,28 @@ namespace KlinikumWerraMeissner this.cellTotalPerMonth.StylePriority.UseFont = false; this.cellTotalPerMonth.StylePriority.UseTextAlignment = false; this.cellTotalPerMonth.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.cellTotalPerMonth.Weight = 0.16866847461491152D; + this.cellTotalPerMonth.Weight = 0.14882531418465272D; // // xrTableCell21 // this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell21.Name = "xrTableCell21"; this.xrTableCell21.StylePriority.UseBorders = false; - this.xrTableCell21.Weight = 0.16866864933872641D; + this.xrTableCell21.Weight = 0.15874661494553985D; // // xrTableCell20 // this.xrTableCell20.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell20.Name = "xrTableCell20"; this.xrTableCell20.StylePriority.UseBorders = false; - this.xrTableCell20.Weight = 0.1686682859962807D; + this.xrTableCell20.Weight = 0.158746857173837D; // // xrTableCell22 // this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.StylePriority.UseBorders = false; - this.xrTableCell22.Weight = 0.16866840711042927D; + this.xrTableCell22.Weight = 0.16866828599628073D; // // xrTableCell13 // @@ -218,7 +218,7 @@ namespace KlinikumWerraMeissner this.xrTableCell14.StylePriority.UseTextAlignment = false; this.xrTableCell14.Text = "xrTableCell9"; this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell14.Weight = 0.26590076598820739D; + this.xrTableCell14.Weight = 0.273342019276263D; // // ruleNoticeNull // @@ -229,9 +229,9 @@ namespace KlinikumWerraMeissner // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel3, + this.lblZeitraumAngabe, this.xrLabel1, - this.xrLabel2, + this.lblZeitraum, this.xrPictureBox1, this.xrTable5}); this.Page1.Font = new System.Drawing.Font("Arial", 10F); @@ -240,23 +240,23 @@ namespace KlinikumWerraMeissner this.Page1.StylePriority.UseBorders = false; this.Page1.StylePriority.UseFont = false; // - // xrLabel3 + // lblZeitraumAngabe // - this.xrLabel3.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.lblZeitraumAngabe.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel3.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(183.6671F, 88.43749F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(255.4996F, 25F); - this.xrLabel3.StylePriority.UseBackColor = false; - this.xrLabel3.StylePriority.UseBorders = false; - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.StylePriority.UseForeColor = false; - this.xrLabel3.StylePriority.UseTextAlignment = false; - this.xrLabel3.Text = "[AccountingPeriodStart!MMMM yyyy]"; - this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrLabel3.WordWrap = false; + this.lblZeitraumAngabe.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraumAngabe.LocationFloat = new DevExpress.Utils.PointFloat(195.1255F, 88.43749F); + this.lblZeitraumAngabe.Name = "lblZeitraumAngabe"; + this.lblZeitraumAngabe.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraumAngabe.SizeF = new System.Drawing.SizeF(189.8746F, 25F); + this.lblZeitraumAngabe.StylePriority.UseBackColor = false; + this.lblZeitraumAngabe.StylePriority.UseBorders = false; + this.lblZeitraumAngabe.StylePriority.UseFont = false; + this.lblZeitraumAngabe.StylePriority.UseForeColor = false; + this.lblZeitraumAngabe.StylePriority.UseTextAlignment = false; + this.lblZeitraumAngabe.Text = "[AccountingPeriodStart!MMMM yyyy]"; + this.lblZeitraumAngabe.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblZeitraumAngabe.WordWrap = false; // // xrLabel1 // @@ -279,24 +279,24 @@ namespace KlinikumWerraMeissner this.xrLabel1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrLabel1.WordWrap = false; // - // xrLabel2 + // lblZeitraum // - this.xrLabel2.BackColor = System.Drawing.Color.Transparent; - this.xrLabel2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.lblZeitraum.BackColor = System.Drawing.Color.Transparent; + this.lblZeitraum.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel2.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 88.43749F); - this.xrLabel2.Multiline = true; - this.xrLabel2.Name = "xrLabel2"; - this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel2.SizeF = new System.Drawing.SizeF(183.6667F, 25F); - this.xrLabel2.StylePriority.UseBackColor = false; - this.xrLabel2.StylePriority.UseBorders = false; - this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.StylePriority.UseTextAlignment = false; - this.xrLabel2.Text = "Abrechnungsmonat: "; - this.xrLabel2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrLabel2.WordWrap = false; + this.lblZeitraum.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold); + this.lblZeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0.0003814697F, 88.43749F); + this.lblZeitraum.Multiline = true; + this.lblZeitraum.Name = "lblZeitraum"; + this.lblZeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblZeitraum.SizeF = new System.Drawing.SizeF(195.1251F, 25F); + this.lblZeitraum.StylePriority.UseBackColor = false; + this.lblZeitraum.StylePriority.UseBorders = false; + this.lblZeitraum.StylePriority.UseFont = false; + this.lblZeitraum.StylePriority.UseTextAlignment = false; + this.lblZeitraum.Text = "Abrechnungsmonat: "; + this.lblZeitraum.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.lblZeitraum.WordWrap = false; // // xrPictureBox1 // @@ -315,7 +315,7 @@ namespace KlinikumWerraMeissner this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable5.SizeF = new System.Drawing.SizeF(1069F, 60F); + this.xrTable5.SizeF = new System.Drawing.SizeF(1087.75F, 60F); this.xrTable5.StylePriority.UseBackColor = false; this.xrTable5.StylePriority.UseBorders = false; this.xrTable5.StylePriority.UseFont = false; @@ -364,7 +364,7 @@ namespace KlinikumWerraMeissner this.xrTableCell6.Name = "xrTableCell6"; this.xrTableCell6.StylePriority.UseFont = false; this.xrTableCell6.Text = "Datum Betreuungsbeginn \r\nBetreuungsende"; - this.xrTableCell6.Weight = 0.41398657628581281D; + this.xrTableCell6.Weight = 0.510583616701743D; // // xrTableCell4 // @@ -372,7 +372,7 @@ namespace KlinikumWerraMeissner this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.StylePriority.UseFont = false; this.xrTableCell4.Text = "Wochen-minuten"; - this.xrTableCell4.Weight = 0.23459239987341454D; + this.xrTableCell4.Weight = 0.20699329362119892D; // // xrTableCell2 // @@ -380,7 +380,7 @@ namespace KlinikumWerraMeissner this.xrTableCell2.Name = "xrTableCell2"; this.xrTableCell2.StylePriority.UseFont = false; this.xrTableCell2.Text = "Vergütung /Stunde"; - this.xrTableCell2.Weight = 0.23459239987341451D; + this.xrTableCell2.Weight = 0.2207928467473067D; // // xrTableCell5 // @@ -388,7 +388,7 @@ namespace KlinikumWerraMeissner this.xrTableCell5.Name = "xrTableCell5"; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.Text = "Vergütung /Minute"; - this.xrTableCell5.Weight = 0.23459240755939881D; + this.xrTableCell5.Weight = 0.220792854433291D; // // xrTableCell15 // @@ -419,7 +419,7 @@ namespace KlinikumWerraMeissner this.xrTableCell16.StylePriority.UseBorders = false; this.xrTableCell16.StylePriority.UseFont = false; this.xrTableCell16.Text = "Summe Monat"; - this.xrTableCell16.Weight = 0.36982805014973674D; + this.xrTableCell16.Weight = 0.38017754654274133D; // // DetailReport // @@ -448,7 +448,7 @@ namespace KlinikumWerraMeissner this.xrTable6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); this.xrTable6.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow25}); - this.xrTable6.SizeF = new System.Drawing.SizeF(1069F, 25F); + this.xrTable6.SizeF = new System.Drawing.SizeF(1087.75F, 25F); this.xrTable6.StylePriority.UseBorders = false; this.xrTable6.StylePriority.UseFont = false; this.xrTable6.StylePriority.UsePadding = false; @@ -482,7 +482,7 @@ namespace KlinikumWerraMeissner this.xrTableCell42.StylePriority.UseTextAlignment = false; this.xrTableCell42.Text = "[CustomerLastname], [CustomerFirstname]"; this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell42.Weight = 0.63804325567464015D; + this.xrTableCell42.Weight = 0.63804321334521752D; // // xrTableCell8 // @@ -495,7 +495,7 @@ namespace KlinikumWerraMeissner this.xrTableCell8.StylePriority.UseTextAlignment = false; this.xrTableCell8.Text = "xrTableCell8"; this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell8.Weight = 0.36063308538356881D; + this.xrTableCell8.Weight = 0.3606331277129915D; // // xrTableCell3 // @@ -503,10 +503,10 @@ namespace KlinikumWerraMeissner this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.StylePriority.UseBorders = false; this.xrTableCell3.StylePriority.UseTextAlignment = false; - this.xrTableCell3.Text = "[ServiceInvoicePeriods.CostBearer2SupportConcept.StartDate!dd.MM.yyyy] - [Service" + - "InvoicePeriods.CostBearer2SupportConcept.EndDate!dd.MM.yyyy]"; + this.xrTableCell3.Text = "[CostBearer2SupportConcept.StartDate!dd.MM.yyyy] - [CostBearer2SupportConcept.End" + + "Date!dd.MM.yyyy]"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell3.Weight = 0.416115147214893D; + this.xrTableCell3.Weight = 0.51320868362041394D; // // xrTableCell45 // @@ -521,7 +521,7 @@ namespace KlinikumWerraMeissner this.xrTableCell45.StylePriority.UseTextAlignment = false; this.xrTableCell45.Text = "xrTableCell45"; this.xrTableCell45.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell45.Weight = 0.23579857363687051D; + this.xrTableCell45.Weight = 0.20805741504728323D; // // xrTableCell9 // @@ -535,7 +535,7 @@ namespace KlinikumWerraMeissner this.xrTableCell9.StylePriority.UseTextAlignment = false; this.xrTableCell9.Text = "64,96 €"; this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell9.Weight = 0.2357985948015818D; + this.xrTableCell9.Weight = 0.22192825890096846D; // // xrTableCell10 // @@ -545,7 +545,7 @@ namespace KlinikumWerraMeissner this.xrTableCell10.Name = "xrTableCell10"; this.xrTableCell10.StylePriority.UseBorders = false; this.xrTableCell10.Text = "0,1547 €"; - this.xrTableCell10.Weight = 0.23579857726436962D; + this.xrTableCell10.Weight = 0.22192826252846762D; // // xrTableCell17 // @@ -557,7 +557,7 @@ namespace KlinikumWerraMeissner this.xrTableCell17.StylePriority.UseTextAlignment = false; this.xrTableCell17.Text = "xrTableCell17"; this.xrTableCell17.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell17.Weight = 0.23579860813646483D; + this.xrTableCell17.Weight = 0.23579841765406284D; // // xrTableCell19 // @@ -580,11 +580,7 @@ namespace KlinikumWerraMeissner this.xrTableCell18.StylePriority.UseBorders = false; this.xrTableCell18.StylePriority.UseTextAlignment = false; this.xrTableCell18.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell18.Weight = 0.37172958357901664D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + this.xrTableCell18.Weight = 0.38213244132803331D; // // fieldMonatskontingent // @@ -605,6 +601,10 @@ namespace KlinikumWerraMeissner "ds.SupportConceptApprovalPeriod.ApprovedBEPerInterval], 4)"; this.feldEurMin.Name = "feldEurMin"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); + // // Sammelrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -626,7 +626,7 @@ namespace KlinikumWerraMeissner this.ruleRateFactorNull, this.ruleNoticeNull}); this.Landscape = true; - this.Margins = new System.Drawing.Printing.Margins(50, 50, 40, 15); + this.Margins = new System.Drawing.Printing.Margins(40, 40, 40, 15); this.PageHeight = 827; this.PageWidth = 1169; this.PaperKind = System.Drawing.Printing.PaperKind.A4; @@ -685,9 +685,9 @@ namespace KlinikumWerraMeissner private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.CalculatedField feldEurStd; private DevExpress.XtraReports.UI.CalculatedField feldEurMin; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; + private DevExpress.XtraReports.UI.XRLabel lblZeitraumAngabe; private DevExpress.XtraReports.UI.XRLabel xrLabel1; - private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRLabel lblZeitraum; private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; } } diff --git a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.cs b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.cs index 6a70592b1..b3042d6e4 100644 --- a/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.cs +++ b/ReportImp/KlinikumWerraMeissner/CollectiveBillingReportTab_alt.cs @@ -17,7 +17,19 @@ namespace KlinikumWerraMeissner public void SetReportDataSource(ServiceInvoiceRO pRO) { - decimal totalPerMonth = 0; + if (pRO.AccountingPeriodStart != null && pRO.AccountingPeriodEnd != null) + { + DateTime start = pRO.AccountingPeriodStart; + DateTime end = pRO.AccountingPeriodEnd; + + if (start.Year != end.Year || start.Month != end.Month) + { + lblZeitraum.Text = "Abrechnungszeitraum:"; + lblZeitraumAngabe.Text = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", start, end); + } + } + + decimal totalPerMonth = 0; pRO.ServiceInvoicePeriods.Sort((a, b) => a.Customer.LastNameFirstName.CompareTo(b.Customer.LastNameFirstName)); DateTime abrechnungsMonatEnde = pRO.AccountingPeriodEnd;