diff --git a/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs b/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs index 61117ef80..9a481da98 100644 --- a/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs +++ b/ReportImp/HausDuelken/Invoicing/CustomInvoiceCreation.cs @@ -38,11 +38,43 @@ namespace HausDuelken.Invoicing return ii; } - public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc) + public override void SetServiceInvoicePeriods(ServiceInvoice invoice, CostBearer2SupportConcept costBearer2SupportConcept, + DateTimeSpan invoicePeriod, List serviceRecords) + { + base.SetServiceInvoicePeriods(invoice, costBearer2SupportConcept, invoicePeriod, serviceRecords); + + IList newSipList = new List(); + Dictionary key2Sip = new Dictionary(); + + foreach (var sip in invoice.ServiceInvoicePeriodList) + { + foreach (var ii in sip.InvoiceItemList) + { + var key = String.Format("{0}{1}", ii.ItemDescription, ii.AmountTotal ?? 0); + + if (!key2Sip.ContainsKey(key)) + { + ServiceInvoicePeriod newsip = new ServiceInvoicePeriod(); + newsip.InvoiceItemList = new List(); + newsip.Start = sip.Start; + newsip.End = sip.End; + newsip.SupportConceptApprovalPeriod = sip.SupportConceptApprovalPeriod; + + key2Sip.Add(key, newsip); + newSipList.Add(newsip); + } + key2Sip[key].InvoiceItemList.Add(ii); + } + } + + invoice.ServiceInvoicePeriodList = newSipList; + } + + + public override void CreateFixedAmounts(ServiceInvoicePeriod serviceInvoicePeriod, SupportConceptApprovalPeriodDC supportConceptApprovalPeriod, CostBearer2SupportConcept cb2sc) { var calc = PluginLoader.FindClass(_SpecificID) ?? Calculations.GetInstance(_SpecificID); var data = calc.GetFixedBillingData(supportConceptApprovalPeriod, serviceInvoicePeriod.Start, serviceInvoicePeriod.End); - foreach (var billingData in data) { serviceInvoicePeriod.InvoiceItemList.Add(new InvoiceItem diff --git a/ReportImp/HausDuelken/Invoicing/CustomInvoiceFactory.cs b/ReportImp/HausDuelken/Invoicing/CustomInvoiceFactory.cs index 15818613e..a504c05e1 100644 --- a/ReportImp/HausDuelken/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/HausDuelken/Invoicing/CustomInvoiceFactory.cs @@ -13,7 +13,7 @@ namespace HausDuelken.Invoicing foreach (var item in supportConcepts2ServiceRecords) { var csc = item.Key; - if (csc.AllCostBearerNames.Contains("stationär")) + if (csc.AllCostBearerNames.ToLower().Contains("stationär")) { return new CustomStationaerInvoiceCreation(); } diff --git a/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.Designer.cs b/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.Designer.cs index dddb4b96a..28ed56208 100644 --- a/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.Designer.cs +++ b/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.Designer.cs @@ -55,12 +55,17 @@ namespace HausDuelken this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); + this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand(); + this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.lblAbrechnungszeitraum = new DevExpress.XtraReports.UI.XRLabel(); @@ -90,19 +95,13 @@ namespace HausDuelken this.xrTableCell19 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); - this.ReportHeader1 = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell21 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell23 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow5 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -245,6 +244,8 @@ namespace HausDuelken this.xrTableCell1.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell1.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "ServiceInvoicePeriods.ApprovalPeriod")}); this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell1.Name = "xrTableCell1"; this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); @@ -253,7 +254,6 @@ namespace HausDuelken this.xrTableCell1.StylePriority.UseFont = false; this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.StylePriority.UseTextAlignment = false; - this.xrTableCell1.Text = "01.01.2023 - 31.12.2023"; this.xrTableCell1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell1.Weight = 0.7215658771264295D; // @@ -334,17 +334,16 @@ namespace HausDuelken this.GroupFooter2.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel2, this.xrTable3, - this.xrLabel3, this.xrLabel4, this.xrLabel5, this.xrLabel7}); - this.GroupFooter2.HeightF = 214.6875F; + this.GroupFooter2.HeightF = 206.3541F; this.GroupFooter2.Name = "GroupFooter2"; // // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 115.625F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 85.41666F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -354,12 +353,11 @@ namespace HausDuelken // xrTable3 // this.xrTable3.Font = new System.Drawing.Font("Verdana", 10F); - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 69.79166F); + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 43.33331F); this.xrTable3.Name = "xrTable3"; this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow2, - this.xrTableRow3}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 26F); + this.xrTableRow2}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 16F); this.xrTable3.StylePriority.UseFont = false; // // xrTableRow2 @@ -367,7 +365,7 @@ namespace HausDuelken this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell11}); this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.38095238095238093D; + this.xrTableRow2.Weight = 0.13133386518229145D; // // xrTableCell11 // @@ -381,28 +379,6 @@ namespace HausDuelken this.xrTableCell11.Text = "xrTableCell1"; this.xrTableCell11.Weight = 3D; // - // xrTableRow3 - // - this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell13}); - this.xrTableRow3.Name = "xrTableRow3"; - this.xrTableRow3.Weight = 0.23809523809523808D; - // - // xrTableCell13 - // - this.xrTableCell13.Name = "xrTableCell13"; - this.xrTableCell13.Weight = 3D; - // - // xrLabel3 - // - this.xrLabel3.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Italic); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 44.79167F); - this.xrLabel3.Name = "xrLabel3"; - this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel3.SizeF = new System.Drawing.SizeF(250F, 17F); - this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abschließende Bemerkungen:"; - // // xrLabel4 // this.xrLabel4.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -421,7 +397,7 @@ namespace HausDuelken // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 148.1459F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 161.0626F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -431,13 +407,139 @@ namespace HausDuelken // xrLabel7 // this.xrLabel7.Font = new System.Drawing.Font("Calibri", 7F); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 166.4375F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.3542F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(175F, 17F); this.xrLabel7.StylePriority.UseFont = false; this.xrLabel7.Text = "Haus Dülken - Verwaltung"; // + // ReportHeader1 + // + this.ReportHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrTable4}); + this.ReportHeader1.HeightF = 25F; + this.ReportHeader1.Name = "ReportHeader1"; + // + // xrTable4 + // + this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable4.Name = "xrTable4"; + this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow4}); + this.xrTable4.SizeF = new System.Drawing.SizeF(682.1249F, 25F); + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell9, + this.xrTableCell12, + this.xrTableCell21, + this.xrTableCell22, + this.xrTableCell23}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 1D; + // + // xrTableCell9 + // + this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell9.StylePriority.UseBackColor = false; + this.xrTableCell9.StylePriority.UseBorderColor = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UsePadding = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "Zeitraum"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell9.Weight = 0.72156566949148049D; + // + // xrTableCell12 + // + this.xrTableCell12.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell12.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell12.StylePriority.UseBackColor = false; + this.xrTableCell12.StylePriority.UseBorderColor = false; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.Text = "Leistung"; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell12.Weight = 0.88607774655564531D; + // + // xrTableCell21 + // + this.xrTableCell21.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell21.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell21.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell21.Name = "xrTableCell21"; + this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell21.StylePriority.UseBackColor = false; + this.xrTableCell21.StylePriority.UseBorderColor = false; + this.xrTableCell21.StylePriority.UseBorders = false; + this.xrTableCell21.StylePriority.UseFont = false; + this.xrTableCell21.StylePriority.UsePadding = false; + this.xrTableCell21.StylePriority.UseTextAlignment = false; + this.xrTableCell21.Text = "Anzahl der Tage"; + this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell21.Weight = 0.46621119337015837D; + // + // xrTableCell22 + // + this.xrTableCell22.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell22.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell22.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell22.Name = "xrTableCell22"; + this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell22.StylePriority.UseBackColor = false; + this.xrTableCell22.StylePriority.UseBorderColor = false; + this.xrTableCell22.StylePriority.UseBorders = false; + this.xrTableCell22.StylePriority.UseFont = false; + this.xrTableCell22.StylePriority.UsePadding = false; + this.xrTableCell22.StylePriority.UseTextAlignment = false; + this.xrTableCell22.Text = "Betrag pro Tag"; + this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell22.Weight = 0.44110112807615792D; + // + // xrTableCell23 + // + this.xrTableCell23.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell23.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell23.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell23.Name = "xrTableCell23"; + this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); + this.xrTableCell23.StylePriority.UseBackColor = false; + this.xrTableCell23.StylePriority.UseBorderColor = false; + this.xrTableCell23.StylePriority.UseBorders = false; + this.xrTableCell23.StylePriority.UseFont = false; + this.xrTableCell23.StylePriority.UsePadding = false; + this.xrTableCell23.StylePriority.UseTextAlignment = false; + this.xrTableCell23.Text = "Gesamt"; + this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell23.Weight = 0.50775492139825817D; + // // bindingSource1 // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); @@ -454,13 +556,13 @@ namespace HausDuelken this.xrLabel23, this.xrLabel24, this.xrTable1}); - this.GroupHeader1.HeightF = 354.0833F; + this.GroupHeader1.HeightF = 394.7083F; this.GroupHeader1.Name = "GroupHeader1"; // // lblAbrechnungszeitraum // this.lblAbrechnungszeitraum.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 322.5F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 363.125F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -471,7 +573,7 @@ namespace HausDuelken // xrLabel18 // this.xrLabel18.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 152.2083F); + this.xrLabel18.LocationFloat = new DevExpress.Utils.PointFloat(450.7083F, 160.5416F); this.xrLabel18.Name = "xrLabel18"; this.xrLabel18.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel18.SizeF = new System.Drawing.SizeF(246.2917F, 23F); @@ -483,7 +585,7 @@ namespace HausDuelken // xrLabel19 // this.xrLabel19.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 297.5F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 338.125F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -495,7 +597,7 @@ namespace HausDuelken this.xrLabel20.BackColor = System.Drawing.Color.Transparent; this.xrLabel20.CanShrink = true; this.xrLabel20.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 195F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.5F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel20.SizeF = new System.Drawing.SizeF(682.1249F, 20F); @@ -509,13 +611,14 @@ namespace HausDuelken this.xrLabel21.BackColor = System.Drawing.Color.Transparent; this.xrLabel21.CanShrink = true; this.xrLabel21.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 227.5F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel21.SizeF = new System.Drawing.SizeF(682.1249F, 20F); this.xrLabel21.StylePriority.UseBackColor = false; this.xrLabel21.StylePriority.UseFont = false; - this.xrLabel21.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]"; + this.xrLabel21.Text = "Abrechnung Betreuungsleistungen für [CustomerSalutation] [CustomerName]; geb. [Cu" + + "stomerBirthdate!dd.MM.yyyy]"; this.xrLabel21.WordWrap = false; // // xrLabel22 @@ -523,15 +626,14 @@ namespace HausDuelken this.xrLabel22.BackColor = System.Drawing.Color.Transparent; this.xrLabel22.CanShrink = true; this.xrLabel22.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 235F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 247.5F); this.xrLabel22.Multiline = true; this.xrLabel22.Name = "xrLabel22"; this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel22.SizeF = new System.Drawing.SizeF(682.1249F, 20F); + this.xrLabel22.SizeF = new System.Drawing.SizeF(682.1249F, 40.83336F); this.xrLabel22.StylePriority.UseBackColor = false; this.xrLabel22.StylePriority.UseFont = false; - this.xrLabel22.Text = "[CustomerReferenceNumber]"; - this.xrLabel22.WordWrap = false; + this.xrLabel22.Text = "[CustomerReferenceNumber]; Bewilligte Leistungen: [ApprovalDate]"; // // xrLabel23 // @@ -571,8 +673,9 @@ namespace HausDuelken this.xrTableRow17, this.xrTableRow18, this.xrTableRow19, - this.xrTableRow20}); - this.xrTable1.SizeF = new System.Drawing.SizeF(245.5208F, 135F); + this.xrTableRow20, + this.xrTableRow5}); + this.xrTable1.SizeF = new System.Drawing.SizeF(245.5208F, 150F); this.xrTable1.StylePriority.UseFont = false; // // xrTableRow9 @@ -732,131 +835,19 @@ namespace HausDuelken this.xrTableCell20.Text = "Internet: www.haus-duelken.de"; this.xrTableCell20.Weight = 1D; // - // ReportHeader1 + // xrTableRow5 // - this.ReportHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrTable4}); - this.ReportHeader1.HeightF = 25F; - this.ReportHeader1.Name = "ReportHeader1"; + this.xrTableRow5.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell3}); + this.xrTableRow5.Name = "xrTableRow5"; + this.xrTableRow5.Weight = 0.099337748344370841D; // - // xrTable4 + // xrTableCell3 // - this.xrTable4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.xrTable4.Name = "xrTable4"; - this.xrTable4.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow4}); - this.xrTable4.SizeF = new System.Drawing.SizeF(682.1249F, 25F); - // - // xrTableRow4 - // - this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell9, - this.xrTableCell12, - this.xrTableCell21, - this.xrTableCell22, - this.xrTableCell23}); - this.xrTableRow4.Name = "xrTableRow4"; - this.xrTableRow4.Weight = 1D; - // - // xrTableCell9 - // - this.xrTableCell9.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell9.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell9.StylePriority.UseBackColor = false; - this.xrTableCell9.StylePriority.UseBorderColor = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "Zeitraum"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell9.Weight = 0.72156566949148049D; - // - // xrTableCell12 - // - this.xrTableCell12.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell12.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell12.StylePriority.UseBackColor = false; - this.xrTableCell12.StylePriority.UseBorderColor = false; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UsePadding = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.Text = "Leistung"; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell12.Weight = 0.88607774655564531D; - // - // xrTableCell21 - // - this.xrTableCell21.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell21.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell21.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell21.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell21.Name = "xrTableCell21"; - this.xrTableCell21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell21.StylePriority.UseBackColor = false; - this.xrTableCell21.StylePriority.UseBorderColor = false; - this.xrTableCell21.StylePriority.UseBorders = false; - this.xrTableCell21.StylePriority.UseFont = false; - this.xrTableCell21.StylePriority.UsePadding = false; - this.xrTableCell21.StylePriority.UseTextAlignment = false; - this.xrTableCell21.Text = "Anzahl der Tage"; - this.xrTableCell21.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell21.Weight = 0.46621119337015837D; - // - // xrTableCell22 - // - this.xrTableCell22.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell22.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell22.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell22.Name = "xrTableCell22"; - this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell22.StylePriority.UseBackColor = false; - this.xrTableCell22.StylePriority.UseBorderColor = false; - this.xrTableCell22.StylePriority.UseBorders = false; - this.xrTableCell22.StylePriority.UseFont = false; - this.xrTableCell22.StylePriority.UsePadding = false; - this.xrTableCell22.StylePriority.UseTextAlignment = false; - this.xrTableCell22.Text = "Betrag pro Tag"; - this.xrTableCell22.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell22.Weight = 0.44110112807615792D; - // - // xrTableCell23 - // - this.xrTableCell23.BackColor = System.Drawing.Color.Gainsboro; - this.xrTableCell23.BorderColor = System.Drawing.Color.DarkGray; - this.xrTableCell23.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell23.Font = new System.Drawing.Font("Calibri", 11F); - this.xrTableCell23.Name = "xrTableCell23"; - this.xrTableCell23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 2, 2, 100F); - this.xrTableCell23.StylePriority.UseBackColor = false; - this.xrTableCell23.StylePriority.UseBorderColor = false; - this.xrTableCell23.StylePriority.UseBorders = false; - this.xrTableCell23.StylePriority.UseFont = false; - this.xrTableCell23.StylePriority.UsePadding = false; - this.xrTableCell23.StylePriority.UseTextAlignment = false; - this.xrTableCell23.Text = "Gesamt"; - this.xrTableCell23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell23.Weight = 0.50775492139825817D; + this.xrTableCell3.Name = "xrTableCell3"; + this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell3.StylePriority.UsePadding = false; + this.xrTableCell3.Weight = 1D; // // ServiceInvoiceReportStationaer // @@ -879,9 +870,9 @@ namespace HausDuelken this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -941,9 +932,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel7; @@ -955,5 +943,7 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell21; private DevExpress.XtraReports.UI.XRTableCell xrTableCell22; private DevExpress.XtraReports.UI.XRTableCell xrTableCell23; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow5; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; } } diff --git a/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.cs b/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.cs index 91a755a08..65e6a9c56 100644 --- a/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.cs +++ b/ReportImp/HausDuelken/ServiceInvoiceReportStationaer.cs @@ -3,6 +3,8 @@ using BeWo.Report.ReportObjects; using BeWo.Report; using DevExpress.XtraReports.UI; using BS.Shared.Core; +using System.Collections.Generic; +using System.Linq; namespace HausDuelken { @@ -26,6 +28,9 @@ namespace HausDuelken { lblAbrechnungszeitraum.Text = String.Format("hiermit berechnen wir für den Zeitraum {0:MMMM yyyy} - {1:MMMM yyyy} folgende erbrachte Tätigkeiten:", start, end); } + + Dictionary cats = new Dictionary(); + pRO.ApprovalDate = null; foreach (var sip in pRO.ServiceInvoicePeriods) { @@ -34,6 +39,22 @@ namespace HausDuelken sip.ApprovedAmount = sip.ServiceInvoiceItems[0].GrossAmount; sip.ApprovedHours = sip.ServiceInvoiceItems.Count; sip.Notice = sip.ServiceInvoiceItems[0].ServiceDescription; + var first = sip.ServiceInvoiceItems.OrderBy(i => i.AccountingPeriodStart).FirstOrDefault(); + var last = sip.ServiceInvoiceItems.OrderBy(i => i.AccountingPeriodStart).LastOrDefault(); + sip.ApprovalPeriod = String.Format("{0:dd.MM.yyyy} - {1:dd.MM.yyyy}", first.AccountingPeriodStart, last.AccountingPeriodEnd); + } + + if (sip.SupportConceptApprovalPeriod != null && sip.SupportConceptApprovalPeriod.ServiceCategory != null) + { + if (!cats.ContainsKey(sip.SupportConceptApprovalPeriod.ServiceCategory.Name)) + { + if (pRO.ApprovalDate != null) + { + pRO.ApprovalDate += ", "; + } + pRO.ApprovalDate += sip.SupportConceptApprovalPeriod.ServiceCategory.Name; + cats.Add(sip.SupportConceptApprovalPeriod.ServiceCategory.Name, sip.SupportConceptApprovalPeriod.ServiceCategory.Name); + } } } diff --git a/ReportImp/HausDuelken/SettlementReport.Designer.cs b/ReportImp/HausDuelken/SettlementReport.Designer.cs index 255b0f8ca..a03f29c37 100644 --- a/ReportImp/HausDuelken/SettlementReport.Designer.cs +++ b/ReportImp/HausDuelken/SettlementReport.Designer.cs @@ -76,6 +76,21 @@ namespace HausDuelken this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel7 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); @@ -117,27 +132,13 @@ namespace HausDuelken this.xrTableRow36 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell57 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell58 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow13 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow14 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -181,7 +182,7 @@ namespace HausDuelken // xrTable1 // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 367.3333F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 412.125F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow9, @@ -316,7 +317,7 @@ namespace HausDuelken // xrLabel6 // this.xrLabel6.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 300.3333F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 345.125F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -327,7 +328,7 @@ namespace HausDuelken // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 267.3333F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 312.125F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -622,15 +623,149 @@ namespace HausDuelken this.xrLabel11, this.lblNotice}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209.0001F; + this.ReportFooter.HeightF = 255.8751F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow20, + this.xrTableRow13, + this.xrTableRow14, + this.xrTableRow21, + this.xrTableRow22, + this.xrTableRow23, + this.xrTableRow24}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow20 + // + this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16}); + this.xrTableRow20.Name = "xrTableRow20"; + this.xrTableRow20.Weight = 0.38095238095238093D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.Text = "xrTableCell1"; + this.xrTableCell16.Weight = 3D; + // + // xrTableRow13 + // + this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell10}); + this.xrTableRow13.Name = "xrTableRow13"; + this.xrTableRow13.Weight = 0.23809523809523808D; + // + // xrTableCell10 + // + this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.Weight = 3D; + // + // xrTableRow14 + // + this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell12}); + this.xrTableRow14.Name = "xrTableRow14"; + this.xrTableRow14.Weight = 0.38095238095238088D; + // + // xrTableCell12 + // + this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UsePadding = false; + this.xrTableCell12.Weight = 3D; + // + // xrTableRow21 + // + this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18}); + this.xrTableRow21.Name = "xrTableRow21"; + this.xrTableRow21.Weight = 0.23809523809523808D; + // + // xrTableCell18 + // + this.xrTableCell18.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.Weight = 3D; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.38095238095238088D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.Text = "xrTableCell4"; + this.xrTableCell29.Weight = 3D; + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell30}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 0.23809523809523803D; + // + // xrTableCell30 + // + this.xrTableCell30.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseFont = false; + this.xrTableCell30.Weight = 3D; + // + // xrTableRow24 + // + this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell31}); + this.xrTableRow24.Name = "xrTableRow24"; + this.xrTableRow24.Weight = 0.38095238095238088D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); + this.xrTableCell31.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.Text = "xrTableCell8"; + this.xrTableCell31.Weight = 3D; + // // xrLabel9 // this.xrLabel9.Font = new System.Drawing.Font("Calibri", 7F); - this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 182F); + this.xrLabel9.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207F); this.xrLabel9.Name = "xrLabel9"; this.xrLabel9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel9.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -640,7 +775,7 @@ namespace HausDuelken // xrLabel7 // this.xrLabel7.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 163.7084F); + this.xrLabel7.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.7084F); this.xrLabel7.Name = "xrLabel7"; this.xrLabel7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel7.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -660,14 +795,14 @@ namespace HausDuelken // xrLabel11 // this.xrLabel11.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(554.8752F, 192.0001F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 238.8751F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UseTextAlignment = false; this.xrLabel11.Text = "Anlage"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // lblNotice // @@ -749,6 +884,7 @@ namespace HausDuelken // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, this.xrLabel12, this.xrLabel1, this.xrLabel_RecipientContactPerson, @@ -764,7 +900,7 @@ namespace HausDuelken this.xrTable1, this.xrLabel8}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 435.3333F; + this.GroupHeader1.HeightF = 480.125F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -1080,139 +1216,19 @@ namespace HausDuelken this.xrTableCell58.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell58.Weight = 0.21685899000901443D; // - // xrTable3 + // xrLabel17 // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow13, - this.xrTableRow14, - this.xrTableRow21, - this.xrTableRow22, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow13 - // - this.xrTableRow13.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell10}); - this.xrTableRow13.Name = "xrTableRow13"; - this.xrTableRow13.Weight = 0.23809523809523808D; - // - // xrTableCell10 - // - this.xrTableCell10.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.Weight = 3D; - // - // xrTableRow14 - // - this.xrTableRow14.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell12}); - this.xrTableRow14.Name = "xrTableRow14"; - this.xrTableRow14.Weight = 0.38095238095238088D; - // - // xrTableCell12 - // - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrTableCell12.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UsePadding = false; - this.xrTableCell12.Weight = 3D; - // - // xrTableRow21 - // - this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell18}); - this.xrTableRow21.Name = "xrTableRow21"; - this.xrTableRow21.Weight = 0.23809523809523808D; - // - // xrTableCell18 - // - this.xrTableCell18.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.StylePriority.UseFont = false; - this.xrTableCell18.Weight = 3D; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UseFont = false; - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell30}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 0.23809523809523803D; - // - // xrTableCell30 - // - this.xrTableCell30.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.StylePriority.UseFont = false; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238088D; - // - // xrTableCell31 - // - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UseFont = false; - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(3.178914E-05F, 242F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 35.74995F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Bewilligte Leistungen: [ApprovedFLS]"; // // Spitzabrechnung // @@ -1236,10 +1252,10 @@ namespace HausDuelken this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1348,5 +1364,6 @@ namespace HausDuelken private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/HausDuelken/SettlementReport.cs b/ReportImp/HausDuelken/SettlementReport.cs index bddf8bff1..2b6521de9 100644 --- a/ReportImp/HausDuelken/SettlementReport.cs +++ b/ReportImp/HausDuelken/SettlementReport.cs @@ -4,6 +4,7 @@ using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; using BS.Shared.DataContracts; namespace HausDuelken @@ -24,7 +25,22 @@ namespace HausDuelken lblNotice.Visible = false; } - if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1) + pRO.ApprovedFLS = null; + foreach (var ap in pRO.Approvals) + { + if (ap.DetailDescription != null) + { + { + if (pRO.ApprovedFLS != null) + { + pRO.ApprovedFLS += ", \n "; + } + pRO.ApprovedFLS += String.Format("{0:0.00} {1}", ap.MaxApprovedUnitCount, ap.DetailDescription); + } + } + } + + if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1) { var ii = pRO.InvoiceItems[0]; if ((ii.ItemDescription == "Spitzabrechung" || ii.ItemDescription == "Spitzabrechnung") && ii.GrossAmountTotal == null && ii.RateFactor == null) diff --git a/ReportImp/HausDuelken/SettlementReport2.Designer.cs b/ReportImp/HausDuelken/SettlementReport2.Designer.cs index 1766970c1..27197d272 100644 --- a/ReportImp/HausDuelken/SettlementReport2.Designer.cs +++ b/ReportImp/HausDuelken/SettlementReport2.Designer.cs @@ -31,12 +31,14 @@ namespace HausDuelken.Alt { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Spitzabrechnung)); + DevExpress.XtraReports.UI.XRSummary xrSummary1 = new DevExpress.XtraReports.UI.XRSummary(); this.Detail = new DevExpress.XtraReports.UI.DetailBand(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrPictureBox1 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.rowErbrachteLeistung = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell22 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.ruleRateFactorNull = new DevExpress.XtraReports.UI.FormattingRule(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); @@ -48,11 +50,25 @@ namespace HausDuelken.Alt this.xrLabel_RecipientContactPerson = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel8 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); - this.lblNotice = new DevExpress.XtraReports.UI.XRLabel(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); this.xrLabel12 = new DevExpress.XtraReports.UI.XRLabel(); @@ -61,6 +77,7 @@ namespace HausDuelken.Alt this.xrPictureBox2 = new DevExpress.XtraReports.UI.XRPictureBox(); this.xrLabel16 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel9 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable6 = new DevExpress.XtraReports.UI.XRTable(); @@ -90,11 +107,17 @@ namespace HausDuelken.Alt this.xrTableRow33 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell53 = new DevExpress.XtraReports.UI.XRTableCell(); + this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.Zwischensumme = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable5 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow30 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableRow31 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell49 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -111,28 +134,13 @@ namespace HausDuelken.Alt this.xrTableRow37 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell59 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell60 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell29 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow23 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell30 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow24 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell31 = new DevExpress.XtraReports.UI.XRTableCell(); - this.GroupHeader2 = new DevExpress.XtraReports.UI.GroupHeaderBand(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -163,34 +171,52 @@ namespace HausDuelken.Alt // this.xrTable1.BorderColor = System.Drawing.SystemColors.ControlLight; this.xrTable1.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 386.3749F); + this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 428.0417F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.rowErbrachteLeistung}); - this.xrTable1.SizeF = new System.Drawing.SizeF(650F, 17F); + this.xrTable1.SizeF = new System.Drawing.SizeF(649.9968F, 17F); this.xrTable1.StylePriority.UseBorderColor = false; this.xrTable1.StylePriority.UseFont = false; // // rowErbrachteLeistung // this.rowErbrachteLeistung.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell22}); + this.xrTableCell22, + this.xrTableCell11}); this.rowErbrachteLeistung.Name = "rowErbrachteLeistung"; this.rowErbrachteLeistung.Weight = 0.085D; // // xrTableCell22 // - this.xrTableCell22.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell22.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell22.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell22.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell22.Name = "xrTableCell22"; this.xrTableCell22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell22.StylePriority.UseBackColor = false; this.xrTableCell22.StylePriority.UseBorderColor = false; this.xrTableCell22.StylePriority.UseBorders = false; this.xrTableCell22.StylePriority.UseFont = false; this.xrTableCell22.Text = "Erbrachte Leistungen:"; - this.xrTableCell22.Weight = 1D; + this.xrTableCell22.Weight = 0.83602576622596159D; + // + // xrTableCell11 + // + this.xrTableCell11.BackColor = System.Drawing.Color.Gainsboro; + this.xrTableCell11.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBackColor = false; + this.xrTableCell11.StylePriority.UseBorderColor = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.Text = "Betrag"; + this.xrTableCell11.Weight = 0.16396925706129806D; // // ruleRateFactorNull // @@ -202,19 +228,21 @@ namespace HausDuelken.Alt // this.xrLabel6.BackColor = System.Drawing.Color.Transparent; this.xrLabel6.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 301.3749F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 343.0416F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel6.SizeF = new System.Drawing.SizeF(650F, 85F); this.xrLabel6.StylePriority.UseBackColor = false; this.xrLabel6.StylePriority.UseFont = false; + this.xrLabel6.StylePriority.UseTextAlignment = false; this.xrLabel6.Text = resources.GetString("xrLabel6.Text"); + this.xrLabel6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopJustify; // // xrLabel5 // this.xrLabel5.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 268.375F); + this.xrLabel5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 310.0417F); this.xrLabel5.Name = "xrLabel5"; this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(317F, 17F); @@ -248,7 +276,7 @@ namespace HausDuelken.Alt this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerFirstName] [CustomerLa" + - "stName]"; + "stName], geb. [CustomerBirthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // RecipientPostCodeAndTown @@ -318,18 +346,151 @@ namespace HausDuelken.Alt this.xrLabel2, this.xrLabel8, this.xrLabel10, - this.xrLabel11, - this.lblNotice}); + this.xrLabel11}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 244.8333F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // + // xrTable3 + // + this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable3.Name = "xrTable3"; + this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow20, + this.xrTableRow1, + this.xrTableRow2, + this.xrTableRow21, + this.xrTableRow22, + this.xrTableRow23, + this.xrTableRow24}); + this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F); + this.xrTable3.StylePriority.UseFont = false; + // + // xrTableRow20 + // + this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell16}); + this.xrTableRow20.Name = "xrTableRow20"; + this.xrTableRow20.Weight = 0.38095238095238093D; + // + // xrTableCell16 + // + this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); + this.xrTableCell16.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell16.Name = "xrTableCell16"; + this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell16.StylePriority.UseFont = false; + this.xrTableCell16.StylePriority.UsePadding = false; + this.xrTableCell16.Text = "xrTableCell1"; + this.xrTableCell16.Weight = 3D; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell1}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Weight = 0.23809523809523808D; + // + // xrTableCell1 + // + this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell1.Name = "xrTableCell1"; + this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell1.StylePriority.UseFont = false; + this.xrTableCell1.StylePriority.UsePadding = false; + this.xrTableCell1.Weight = 3D; + // + // xrTableRow2 + // + this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell2}); + this.xrTableRow2.Name = "xrTableRow2"; + this.xrTableRow2.Weight = 0.38095238095238088D; + // + // xrTableCell2 + // + this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); + this.xrTableCell2.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell2.Name = "xrTableCell2"; + this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell2.StylePriority.UseFont = false; + this.xrTableCell2.StylePriority.UsePadding = false; + this.xrTableCell2.Weight = 3D; + // + // xrTableRow21 + // + this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell18}); + this.xrTableRow21.Name = "xrTableRow21"; + this.xrTableRow21.Weight = 0.23809523809523808D; + // + // xrTableCell18 + // + this.xrTableCell18.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell18.Name = "xrTableCell18"; + this.xrTableCell18.StylePriority.UseFont = false; + this.xrTableCell18.Weight = 3D; + // + // xrTableRow22 + // + this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell29}); + this.xrTableRow22.Name = "xrTableRow22"; + this.xrTableRow22.Weight = 0.38095238095238088D; + // + // xrTableCell29 + // + this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); + this.xrTableCell29.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell29.Name = "xrTableCell29"; + this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell29.StylePriority.UseFont = false; + this.xrTableCell29.StylePriority.UsePadding = false; + this.xrTableCell29.Text = "xrTableCell4"; + this.xrTableCell29.Weight = 3D; + // + // xrTableRow23 + // + this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell30}); + this.xrTableRow23.Name = "xrTableRow23"; + this.xrTableRow23.Weight = 0.23809523809523803D; + // + // xrTableCell30 + // + this.xrTableCell30.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell30.Name = "xrTableCell30"; + this.xrTableCell30.StylePriority.UseFont = false; + this.xrTableCell30.Weight = 3D; + // + // xrTableRow24 + // + this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell31}); + this.xrTableRow24.Name = "xrTableRow24"; + this.xrTableRow24.Weight = 0.38095238095238088D; + // + // xrTableCell31 + // + this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); + this.xrTableCell31.Font = new System.Drawing.Font("Calibri", 12F); + this.xrTableCell31.Name = "xrTableCell31"; + this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell31.StylePriority.UseFont = false; + this.xrTableCell31.StylePriority.UsePadding = false; + this.xrTableCell31.Text = "xrTableCell8"; + this.xrTableCell31.Weight = 3D; + // // xrLabel2 // this.xrLabel2.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 173.7084F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 170.5833F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -339,7 +500,7 @@ namespace HausDuelken.Alt // xrLabel8 // this.xrLabel8.Font = new System.Drawing.Font("Calibri", 7F); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(0F, 188.8751F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -349,7 +510,7 @@ namespace HausDuelken.Alt // xrLabel10 // this.xrLabel10.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 127F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 102F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel10.SizeF = new System.Drawing.SizeF(175F, 17F); @@ -359,25 +520,14 @@ namespace HausDuelken.Alt // xrLabel11 // this.xrLabel11.Font = new System.Drawing.Font("Calibri", 12F); - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(0F, 215.3333F); this.xrLabel11.Name = "xrLabel11"; this.xrLabel11.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel11.SizeF = new System.Drawing.SizeF(67F, 17F); this.xrLabel11.StylePriority.UseFont = false; this.xrLabel11.StylePriority.UseTextAlignment = false; this.xrLabel11.Text = "Anlage"; - this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); - this.lblNotice.Name = "lblNotice"; - this.lblNotice.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblNotice.SizeF = new System.Drawing.SizeF(250F, 25F); - this.lblNotice.StylePriority.UseFont = false; - this.lblNotice.Text = "Abschließende Bemerkungen:"; + this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; // // topMarginBand1 // @@ -448,6 +598,7 @@ namespace HausDuelken.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel17, this.xrLabel_RecipientContactPerson, this.xrLabel9, this.xrLabel13, @@ -463,10 +614,24 @@ namespace HausDuelken.Alt this.xrLabel6, this.xrTable1}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 403.3749F; + this.GroupHeader1.HeightF = 445.0417F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel17 + // + this.xrLabel17.BackColor = System.Drawing.Color.Transparent; + this.xrLabel17.CanShrink = true; + this.xrLabel17.Font = new System.Drawing.Font("Calibri", 12F, System.Drawing.FontStyle.Bold); + this.xrLabel17.LocationFloat = new DevExpress.Utils.PointFloat(0F, 243.0417F); + this.xrLabel17.Multiline = true; + this.xrLabel17.Name = "xrLabel17"; + this.xrLabel17.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel17.SizeF = new System.Drawing.SizeF(650F, 35.74995F); + this.xrLabel17.StylePriority.UseBackColor = false; + this.xrLabel17.StylePriority.UseFont = false; + this.xrLabel17.Text = "Bewilligte Leistungen: [ApprovedFLS]"; + // // xrLabel9 // this.xrLabel9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -692,7 +857,8 @@ namespace HausDuelken.Alt // this.DetailReport.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { this.Detail1, - this.GroupHeader2}); + this.GroupHeader2, + this.Zwischensumme}); this.DetailReport.DataMember = "InvoiceItems"; this.DetailReport.DataSource = this.bindingSource1; this.DetailReport.Level = 0; @@ -705,6 +871,8 @@ namespace HausDuelken.Alt this.Detail1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Detail1.HeightF = 17F; this.Detail1.Name = "Detail1"; + this.Detail1.SortFields.AddRange(new DevExpress.XtraReports.UI.GroupField[] { + new DevExpress.XtraReports.UI.GroupField("PeriodStartDate", DevExpress.XtraReports.UI.XRColumnSortOrder.Ascending)}); this.Detail1.StylePriority.UseFont = false; // // xrTable4 @@ -727,7 +895,7 @@ namespace HausDuelken.Alt // // xrTableCell52 // - this.xrTableCell52.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell52.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell52.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell52.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.DetailDescription")}); @@ -738,11 +906,11 @@ namespace HausDuelken.Alt this.xrTableCell52.StylePriority.UseBorders = false; this.xrTableCell52.StylePriority.UseFont = false; this.xrTableCell52.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell52.Weight = 0.78314100999098568D; + this.xrTableCell52.Weight = 0.83602576622596159D; // // xrTableCell53 // - this.xrTableCell53.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell53.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell53.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell53.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -756,7 +924,96 @@ namespace HausDuelken.Alt this.xrTableCell53.StylePriority.UseTextAlignment = false; this.xrTableCell53.Text = "xrTableCell10"; this.xrTableCell53.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell53.Weight = 0.21685899000901443D; + this.xrTableCell53.Weight = 0.16397423377403847D; + // + // 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.xrTable2}); + this.Zwischensumme.HeightF = 34F; + this.Zwischensumme.Name = "Zwischensumme"; + this.Zwischensumme.Visible = false; + // + // xrTable2 + // + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow3, + this.xrTableRow4}); + this.xrTable2.SizeF = new System.Drawing.SizeF(650F, 34F); + this.xrTable2.StylePriority.UseFont = false; + // + // xrTableRow3 + // + this.xrTableRow3.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell4, + this.xrTableCell5}); + this.xrTableRow3.Name = "xrTableRow3"; + this.xrTableRow3.Weight = 0.40476190476190466D; + // + // xrTableCell4 + // + this.xrTableCell4.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell4.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell4.Name = "xrTableCell4"; + this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell4.StylePriority.UseBorderColor = false; + this.xrTableCell4.StylePriority.UseBorders = false; + this.xrTableCell4.StylePriority.UseFont = false; + this.xrTableCell4.StylePriority.UsePadding = false; + this.xrTableCell4.Text = "Zwischensumme [ItemDescription]:"; + this.xrTableCell4.Weight = 2.5080772986778848D; + // + // xrTableCell5 + // + this.xrTableCell5.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.GrossAmountTotal")}); + this.xrTableCell5.Font = new System.Drawing.Font("Calibri", 11F); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderColor = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + xrSummary1.FormatString = "{0:c}"; + xrSummary1.Running = DevExpress.XtraReports.UI.SummaryRunning.Group; + this.xrTableCell5.Summary = xrSummary1; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell5.Weight = 0.4919227013221153D; + // + // xrTableRow4 + // + this.xrTableRow4.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell8}); + this.xrTableRow4.Name = "xrTableRow4"; + this.xrTableRow4.Weight = 0.40476190476190466D; + // + // xrTableCell8 + // + this.xrTableCell8.BorderColor = System.Drawing.Color.DarkGray; + this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell8.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderColor = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.Weight = 3D; // // bindingSource1 // @@ -767,7 +1024,7 @@ namespace HausDuelken.Alt this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable5}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.GroupFooter1.HeightF = 132F; + this.GroupFooter1.HeightF = 115F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // @@ -777,34 +1034,15 @@ namespace HausDuelken.Alt this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable5.Name = "xrTable5"; this.xrTable5.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow30, this.xrTableRow31, this.xrTableRow32, this.xrTableRow34, this.xrTableRow35, this.xrTableRow36, this.xrTableRow37}); - this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 132F); + this.xrTable5.SizeF = new System.Drawing.SizeF(650F, 115F); this.xrTable5.StylePriority.UseBorderColor = false; // - // xrTableRow30 - // - this.xrTableRow30.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell48}); - this.xrTableRow30.Name = "xrTableRow30"; - this.xrTableRow30.Weight = 0.085D; - // - // xrTableCell48 - // - this.xrTableCell48.BorderColor = System.Drawing.SystemColors.ControlLight; - this.xrTableCell48.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell48.Name = "xrTableCell48"; - this.xrTableCell48.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell48.StylePriority.UseBorderColor = false; - this.xrTableCell48.StylePriority.UseBorders = false; - this.xrTableCell48.Weight = 1D; - // // xrTableRow31 // this.xrTableRow31.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { @@ -815,18 +1053,21 @@ namespace HausDuelken.Alt // // xrTableCell49 // + this.xrTableCell49.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell49.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell49.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell49.Name = "xrTableCell49"; this.xrTableCell49.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell49.StylePriority.UseBorderColor = false; this.xrTableCell49.StylePriority.UseBorders = false; this.xrTableCell49.StylePriority.UseFont = false; this.xrTableCell49.StylePriority.UsePadding = false; this.xrTableCell49.Text = "Gesamtforderung:"; - this.xrTableCell49.Weight = 0.78314100999098546D; + this.xrTableCell49.Weight = 0.83602576622596136D; // // xrTableCell50 // + this.xrTableCell50.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell50.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell50.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -834,13 +1075,14 @@ namespace HausDuelken.Alt this.xrTableCell50.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell50.Name = "xrTableCell50"; this.xrTableCell50.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell50.StylePriority.UseBorderColor = false; this.xrTableCell50.StylePriority.UseBorders = false; this.xrTableCell50.StylePriority.UseFont = false; this.xrTableCell50.StylePriority.UsePadding = false; this.xrTableCell50.StylePriority.UseTextAlignment = false; this.xrTableCell50.Text = "xrTableCell9"; this.xrTableCell50.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell50.Weight = 0.21685899000901443D; + this.xrTableCell50.Weight = 0.16397423377403847D; // // xrTableRow32 // @@ -851,9 +1093,11 @@ namespace HausDuelken.Alt // // xrTableCell51 // + this.xrTableCell51.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell51.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell51.Name = "xrTableCell51"; + this.xrTableCell51.StylePriority.UseBorderColor = false; this.xrTableCell51.StylePriority.UseBorders = false; this.xrTableCell51.Weight = 1D; // @@ -867,7 +1111,7 @@ namespace HausDuelken.Alt // // xrTableCell54 // - this.xrTableCell54.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell54.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell54.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell54.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell54.Name = "xrTableCell54"; @@ -876,11 +1120,11 @@ namespace HausDuelken.Alt this.xrTableCell54.StylePriority.UseBorders = false; this.xrTableCell54.StylePriority.UseFont = false; this.xrTableCell54.Text = "abzüglich der geleisteten Abschlagszahlung:"; - this.xrTableCell54.Weight = 0.78314100999098568D; + this.xrTableCell54.Weight = 0.83602576622596159D; // // xrTableCell55 // - this.xrTableCell55.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell55.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell55.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell55.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -894,7 +1138,7 @@ namespace HausDuelken.Alt this.xrTableCell55.StylePriority.UseTextAlignment = false; this.xrTableCell55.Text = "xrTableCell10"; this.xrTableCell55.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell55.Weight = 0.21685899000901443D; + this.xrTableCell55.Weight = 0.16397423377403847D; // // xrTableRow35 // @@ -906,18 +1150,21 @@ namespace HausDuelken.Alt // // xrTableCell56 // + this.xrTableCell56.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell56.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell56.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell56.Name = "xrTableCell56"; this.xrTableCell56.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell56.StylePriority.UseBorderColor = false; this.xrTableCell56.StylePriority.UseBorders = false; this.xrTableCell56.StylePriority.UseFont = false; this.xrTableCell56.StylePriority.UsePadding = false; this.xrTableCell56.Text = "abzüglich Eigenanteil:"; - this.xrTableCell56.Weight = 0.78314100999098568D; + this.xrTableCell56.Weight = 0.83602576622596159D; // // xrTableCell57 // + this.xrTableCell57.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell57.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell57.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -925,13 +1172,14 @@ namespace HausDuelken.Alt this.xrTableCell57.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell57.Name = "xrTableCell57"; this.xrTableCell57.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell57.StylePriority.UseBorderColor = false; this.xrTableCell57.StylePriority.UseBorders = false; this.xrTableCell57.StylePriority.UseFont = false; this.xrTableCell57.StylePriority.UsePadding = false; this.xrTableCell57.StylePriority.UseTextAlignment = false; this.xrTableCell57.Text = "xrTableCell15"; this.xrTableCell57.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell57.Weight = 0.21685899000901443D; + this.xrTableCell57.Weight = 0.16397423377403847D; // // xrTableRow36 // @@ -942,7 +1190,7 @@ namespace HausDuelken.Alt // // xrTableCell58 // - this.xrTableCell58.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell58.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell58.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell58.Name = "xrTableCell58"; @@ -961,7 +1209,7 @@ namespace HausDuelken.Alt // // xrTableCell59 // - this.xrTableCell59.BorderColor = System.Drawing.SystemColors.ControlLight; + this.xrTableCell59.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell59.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell59.Font = new System.Drawing.Font("Calibri", 11F); this.xrTableCell59.Name = "xrTableCell59"; @@ -970,10 +1218,11 @@ namespace HausDuelken.Alt this.xrTableCell59.StylePriority.UseBorders = false; this.xrTableCell59.StylePriority.UseFont = false; this.xrTableCell59.Text = "Restforderung:"; - this.xrTableCell59.Weight = 0.78314100999098568D; + this.xrTableCell59.Weight = 0.83602576622596159D; // // xrTableCell60 // + this.xrTableCell60.BorderColor = System.Drawing.Color.DarkGray; this.xrTableCell60.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell60.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -987,148 +1236,7 @@ namespace HausDuelken.Alt this.xrTableCell60.StylePriority.UseTextAlignment = false; this.xrTableCell60.Text = "xrTableCell17"; this.xrTableCell60.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; - this.xrTableCell60.Weight = 0.21685899000901443D; - // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 25F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow1, - this.xrTableRow2, - this.xrTableRow21, - this.xrTableRow22, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 94F); - this.xrTable3.StylePriority.UseFont = false; - // - // xrTableRow20 - // - this.xrTableRow20.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell16}); - this.xrTableRow20.Name = "xrTableRow20"; - this.xrTableRow20.Weight = 0.38095238095238093D; - // - // xrTableCell16 - // - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UseFont = false; - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.Weight = 3D; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell1}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Weight = 0.23809523809523808D; - // - // xrTableCell1 - // - this.xrTableCell1.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell1.Name = "xrTableCell1"; - this.xrTableCell1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell1.StylePriority.UseFont = false; - this.xrTableCell1.StylePriority.UsePadding = false; - this.xrTableCell1.Weight = 3D; - // - // xrTableRow2 - // - this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell2}); - this.xrTableRow2.Name = "xrTableRow2"; - this.xrTableRow2.Weight = 0.38095238095238088D; - // - // xrTableCell2 - // - this.xrTableCell2.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FehlkontakteString")}); - this.xrTableCell2.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UseFont = false; - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.Weight = 3D; - // - // xrTableRow21 - // - this.xrTableRow21.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell18}); - this.xrTableRow21.Name = "xrTableRow21"; - this.xrTableRow21.Weight = 0.23809523809523808D; - // - // xrTableCell18 - // - this.xrTableCell18.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell18.Name = "xrTableCell18"; - this.xrTableCell18.StylePriority.UseFont = false; - this.xrTableCell18.Weight = 3D; - // - // xrTableRow22 - // - this.xrTableRow22.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell29}); - this.xrTableRow22.Name = "xrTableRow22"; - this.xrTableRow22.Weight = 0.38095238095238088D; - // - // xrTableCell29 - // - this.xrTableCell29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "AbsenceTimes")}); - this.xrTableCell29.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell29.Name = "xrTableCell29"; - this.xrTableCell29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell29.StylePriority.UseFont = false; - this.xrTableCell29.StylePriority.UsePadding = false; - this.xrTableCell29.Text = "xrTableCell4"; - this.xrTableCell29.Weight = 3D; - // - // xrTableRow23 - // - this.xrTableRow23.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell30}); - this.xrTableRow23.Name = "xrTableRow23"; - this.xrTableRow23.Weight = 0.23809523809523803D; - // - // xrTableCell30 - // - this.xrTableCell30.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell30.Name = "xrTableCell30"; - this.xrTableCell30.StylePriority.UseFont = false; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238088D; - // - // xrTableCell31 - // - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Font = new System.Drawing.Font("Calibri", 12F); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UseFont = false; - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; - // - // 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"; + this.xrTableCell60.Weight = 0.16397423377403847D; // // Spitzabrechnung // @@ -1147,17 +1255,18 @@ namespace HausDuelken.Alt this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(90, 40, 32, 100); + this.Margins = new System.Drawing.Printing.Margins(90, 39, 32, 100); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1177,7 +1286,6 @@ namespace HausDuelken.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel_RecipientContactPerson; private DevExpress.XtraReports.UI.XRLabel xrLabel1; private DevExpress.XtraReports.UI.ReportFooterBand ReportFooter; - private DevExpress.XtraReports.UI.XRLabel lblNotice; private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRTable xrTable1; private DevExpress.XtraReports.UI.XRTableRow rowErbrachteLeistung; @@ -1196,8 +1304,6 @@ namespace HausDuelken.Alt private DevExpress.XtraReports.UI.XRTableCell xrTableCell53; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRTable xrTable5; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow30; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.XRTableRow xrTableRow31; private DevExpress.XtraReports.UI.XRTableCell xrTableCell49; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; @@ -1260,5 +1366,14 @@ namespace HausDuelken.Alt private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.GroupHeaderBand GroupHeader2; + private DevExpress.XtraReports.UI.GroupFooterBand Zwischensumme; + private DevExpress.XtraReports.UI.XRTable xrTable2; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow3; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell5; + private DevExpress.XtraReports.UI.XRTableRow xrTableRow4; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; + private DevExpress.XtraReports.UI.XRLabel xrLabel17; } } diff --git a/ReportImp/HausDuelken/SettlementReport2.cs b/ReportImp/HausDuelken/SettlementReport2.cs index 40463bf4e..bbdd85cc1 100644 --- a/ReportImp/HausDuelken/SettlementReport2.cs +++ b/ReportImp/HausDuelken/SettlementReport2.cs @@ -5,6 +5,11 @@ using System.ComponentModel; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; +using BeWo.Service.DCEntityMapper; +using BeWo.Data.Access; +using BeWo.Data.Entities; +using System.Collections.Generic; +using System.Text.RegularExpressions; namespace HausDuelken.Alt { @@ -17,21 +22,43 @@ namespace HausDuelken.Alt public void SetReportDataSource(Settlement2RO pRO) { - if (String.IsNullOrEmpty(pRO.Notice)) - { - lblNotice.Visible = false; - } + Dictionary cats = new Dictionary(); + var invoiceBase = MapperFactory.InvoiceBaseDC_InvoiceBase.MapToNewDC(DAOFactory.GenericDAO.GetByID(pRO.InvoiceBaseOid.Value)); + var sc = invoiceBase.SupportConceptCostBearerRelDc; + pRO.ApprovedFLS = null; + foreach (var ap in sc.ApprovalPeriodList) + { + if (ap.ServiceCategory != null) + { + { + if (pRO.ApprovedFLS != null) + { + pRO.ApprovedFLS += ", \n"; + } + pRO.ApprovedFLS += String.Format("{0:0.00} {1}", ap.ApprovedBETotal, ap.ServiceCategory.Name); + } + } + } - decimal rateFactor = 1; + decimal rateFactor = 1; - foreach (var ii in pRO.InvoiceItems) - { - if (ii.RateFactor.HasValue) - { - rateFactor = (100 + ii.RateFactor.Value) / 100; - } - } - pRO.RateFactor = (double)rateFactor; + foreach (var ii in pRO.InvoiceItems) + { + if (ii.RateFactor.HasValue) + { + rateFactor = (100 + ii.RateFactor.Value) / 100; + } + if (pRO.FehlkontakteString != null && ii.RateFactor == 0) + { + Zwischensumme.Visible = true; + if (ii.ItemDescription != null) + { + ii.DetailDescription = Regex.Replace(ii.DetailDescription, ii.ItemDescription, "Fehlkontakte"); + } + ii.ItemDescription = "Fehlkontakte"; + } + } + pRO.RateFactor = (double)rateFactor; this.bindingSource1.DataSource = pRO; }