diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs index 2c6aecbcc..cda953d3a 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.Designer.cs @@ -40,29 +40,21 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable3 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow20 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableRow21 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell18 = 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.xrLabel12 = 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.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); + this.xrLabel35 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrLabel34 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel33 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFLSBewilligtProWoche = new DevExpress.XtraReports.UI.XRLabel(); + this.lblFLSBewilligtGesamt = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel32 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel31 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel30 = new DevExpress.XtraReports.UI.XRLabel(); @@ -91,10 +83,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell6 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); @@ -107,11 +99,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -193,100 +185,26 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel10, - this.xrTable3, this.xrLabel12, - this.xrLabel11, - this.lblNotice}); + this.xrLabel11}); this.ReportFooter.Font = new System.Drawing.Font("Verdana", 10F); - this.ReportFooter.HeightF = 209F; + this.ReportFooter.HeightF = 115.2501F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.StylePriority.UseFont = false; // // xrLabel10 // - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 117F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(0F, 23.25001F); 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); this.xrLabel10.StylePriority.UseFont = false; this.xrLabel10.Text = "Mit freundlichen Grüßen"; // - // xrTable3 - // - this.xrTable3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 33F); - this.xrTable3.Name = "xrTable3"; - this.xrTable3.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow20, - this.xrTableRow21, - this.xrTableRow23, - this.xrTableRow24}); - this.xrTable3.SizeF = new System.Drawing.SizeF(650F, 52F); - 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.CanShrink = true; - this.xrTableCell16.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Notice")}); - this.xrTableCell16.Name = "xrTableCell16"; - this.xrTableCell16.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell16.StylePriority.UsePadding = false; - this.xrTableCell16.Text = "xrTableCell1"; - this.xrTableCell16.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.Name = "xrTableCell18"; - this.xrTableCell18.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.Name = "xrTableCell30"; - this.xrTableCell30.Weight = 3D; - // - // xrTableRow24 - // - this.xrTableRow24.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell31}); - this.xrTableRow24.Name = "xrTableRow24"; - this.xrTableRow24.Weight = 0.38095238095238093D; - // - // xrTableCell31 - // - this.xrTableCell31.CanShrink = true; - this.xrTableCell31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "FinalSentence")}); - this.xrTableCell31.Name = "xrTableCell31"; - this.xrTableCell31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell31.StylePriority.UsePadding = false; - this.xrTableCell31.Text = "xrTableCell8"; - this.xrTableCell31.Weight = 3D; - // // xrLabel12 // - this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel12.LocationFloat = new DevExpress.Utils.PointFloat(0F, 98.25007F); this.xrLabel12.Name = "xrLabel12"; this.xrLabel12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel12.SizeF = new System.Drawing.SizeF(225F, 17F); @@ -295,7 +213,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel11 // - this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 192F); + this.xrLabel11.LocationFloat = new DevExpress.Utils.PointFloat(582.9999F, 98.25007F); 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); @@ -304,20 +222,9 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel11.Text = "Anlage"; this.xrLabel11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // - // lblNotice - // - this.lblNotice.CanShrink = true; - this.lblNotice.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Italic); - this.lblNotice.LocationFloat = new DevExpress.Utils.PointFloat(0F, 7.999992F); - 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:"; - // // topMarginBand1 // - this.topMarginBand1.HeightF = 155F; + this.topMarginBand1.HeightF = 134F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -328,9 +235,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel35, this.xrTable2, - this.xrLabel34, - this.xrLabel33, + this.lblFLSBewilligtProWoche, + this.lblFLSBewilligtGesamt, this.xrLabel32, this.xrLabel31, this.xrLabel30, @@ -360,20 +268,31 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 432.375F; + this.GroupHeader1.HeightF = 436.2084F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // + // xrLabel35 + // + this.xrLabel35.LocationFloat = new DevExpress.Utils.PointFloat(554.75F, 168.2917F); + this.xrLabel35.Name = "xrLabel35"; + this.xrLabel35.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel35.SizeF = new System.Drawing.SizeF(123.25F, 22.20834F); + this.xrLabel35.StylePriority.UseFont = false; + this.xrLabel35.StylePriority.UseTextAlignment = false; + this.xrLabel35.Text = "[InvoiceDate]"; + this.xrLabel35.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + // // xrTable2 // this.xrTable2.BorderColor = System.Drawing.Color.Black; - this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 403.9167F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 407.7501F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); - this.xrTable2.SizeF = new System.Drawing.SizeF(649.9998F, 28.45831F); + this.xrTable2.SizeF = new System.Drawing.SizeF(650.0001F, 28.45831F); this.xrTable2.StylePriority.UseBorderColor = false; this.xrTable2.StylePriority.UseBorders = false; // @@ -381,6 +300,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell1, + this.xrTableCell13, this.xrTableCell2, this.xrTableCell3, this.xrTableCell4}); @@ -390,8 +310,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell1 // this.xrTableCell1.BorderColor = System.Drawing.Color.Black; - this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell1.CanShrink = true; this.xrTableCell1.Name = "xrTableCell1"; @@ -401,13 +320,27 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell1.StylePriority.UseFont = false; this.xrTableCell1.StylePriority.UsePadding = false; this.xrTableCell1.Text = "Anzahl"; - this.xrTableCell1.Weight = 0.28835124628067238D; + this.xrTableCell1.Weight = 0.20928719203487828D; + // + // xrTableCell13 + // + this.xrTableCell13.BorderColor = System.Drawing.Color.Black; + this.xrTableCell13.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell13.Multiline = true; + this.xrTableCell13.Name = "xrTableCell13"; + this.xrTableCell13.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell13.StylePriority.UseBorderColor = false; + this.xrTableCell13.StylePriority.UseBorders = false; + this.xrTableCell13.StylePriority.UsePadding = false; + this.xrTableCell13.Text = "\r\n"; + this.xrTableCell13.Weight = 0.079064045014160811D; // // xrTableCell2 // this.xrTableCell2.BorderColor = System.Drawing.Color.Black; - this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell2.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell2.CanShrink = true; this.xrTableCell2.Name = "xrTableCell2"; @@ -419,13 +352,13 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell2.StylePriority.UseTextAlignment = false; this.xrTableCell2.Text = "Faktor"; this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell2.Weight = 0.13953332215382283D; + this.xrTableCell2.Weight = 0.13953334556043887D; // // xrTableCell3 // this.xrTableCell3.BorderColor = System.Drawing.Color.Black; - this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell3.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell3.Name = "xrTableCell3"; this.xrTableCell3.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -435,13 +368,13 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell3.StylePriority.UseTextAlignment = false; this.xrTableCell3.Text = "Betrag"; this.xrTableCell3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell3.Weight = 0.26974355844350961D; + this.xrTableCell3.Weight = 0.26974358115262431D; // // xrTableCell4 // this.xrTableCell4.BorderColor = System.Drawing.Color.Black; - this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell4.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell4.Name = "xrTableCell4"; this.xrTableCell4.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -450,40 +383,41 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Gesamtbetrag"; - this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell4.Weight = 0.26974355844350961D; + this.xrTableCell4.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell4.Weight = 0.26974396720757321D; // - // xrLabel34 + // lblFLSBewilligtProWoche // - this.xrLabel34.BackColor = System.Drawing.Color.Transparent; - this.xrLabel34.CanShrink = true; - this.xrLabel34.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); - this.xrLabel34.LocationFloat = new DevExpress.Utils.PointFloat(0F, 375.4584F); - this.xrLabel34.Name = "xrLabel34"; - this.xrLabel34.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel34.SizeF = new System.Drawing.SizeF(649.9998F, 28.45831F); - this.xrLabel34.StylePriority.UseBackColor = false; - this.xrLabel34.StylePriority.UseFont = false; - this.xrLabel34.Text = "Vom [AccountingStartDateString] bis [AccountingEndDateString] [ApprovedFLSWeekly]" + - " FLS pro Woche Summe bewilligter Stunden FLS: [ApprovedFLS] Std."; - this.xrLabel34.WordWrap = false; + this.lblFLSBewilligtProWoche.BackColor = System.Drawing.Color.Transparent; + this.lblFLSBewilligtProWoche.CanShrink = true; + this.lblFLSBewilligtProWoche.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); + this.lblFLSBewilligtProWoche.LocationFloat = new DevExpress.Utils.PointFloat(0F, 364.7084F); + this.lblFLSBewilligtProWoche.Multiline = true; + this.lblFLSBewilligtProWoche.Name = "lblFLSBewilligtProWoche"; + this.lblFLSBewilligtProWoche.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblFLSBewilligtProWoche.SizeF = new System.Drawing.SizeF(649.9998F, 43.04163F); + this.lblFLSBewilligtProWoche.StylePriority.UseBackColor = false; + this.lblFLSBewilligtProWoche.StylePriority.UseFont = false; + this.lblFLSBewilligtProWoche.Text = "Vom [AccountingStartDateString] bis [AccountingEndDateString]: [ApprovedFLSWeekly" + + "] FLS pro Woche \r\nSumme bewilligter Stunden: [ApprovedFLS]"; + this.lblFLSBewilligtProWoche.WordWrap = false; // - // xrLabel33 + // lblFLSBewilligtGesamt // - this.xrLabel33.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + this.lblFLSBewilligtGesamt.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "ApprovedFLS", "{0:0.00} Std.")}); - this.xrLabel33.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel33.LocationFloat = new DevExpress.Utils.PointFloat(397.9165F, 347.0001F); - this.xrLabel33.Name = "xrLabel33"; - this.xrLabel33.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel33.SizeF = new System.Drawing.SizeF(252.0831F, 28.45825F); - this.xrLabel33.StylePriority.UseFont = false; + this.lblFLSBewilligtGesamt.Font = new System.Drawing.Font("Verdana", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblFLSBewilligtGesamt.LocationFloat = new DevExpress.Utils.PointFloat(397.9164F, 336.2501F); + this.lblFLSBewilligtGesamt.Name = "lblFLSBewilligtGesamt"; + this.lblFLSBewilligtGesamt.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblFLSBewilligtGesamt.SizeF = new System.Drawing.SizeF(252.0831F, 28.45825F); + this.lblFLSBewilligtGesamt.StylePriority.UseFont = false; // // xrLabel32 // this.xrLabel32.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AccountingPeriod")}); - this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(175F, 324.7917F); + this.xrLabel32.LocationFloat = new DevExpress.Utils.PointFloat(174.9999F, 314.0417F); this.xrLabel32.Name = "xrLabel32"; this.xrLabel32.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel32.SizeF = new System.Drawing.SizeF(475.0001F, 22.20837F); @@ -493,7 +427,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel31.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerReferenceNumber")}); - this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(123.25F, 274.125F); + this.xrLabel31.LocationFloat = new DevExpress.Utils.PointFloat(123.2499F, 263.375F); this.xrLabel31.Name = "xrLabel31"; this.xrLabel31.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel31.SizeF = new System.Drawing.SizeF(526.7498F, 22.20837F); @@ -503,7 +437,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel30.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerBirthdayString")}); - this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(123.25F, 251.9169F); + this.xrLabel30.LocationFloat = new DevExpress.Utils.PointFloat(123.2499F, 241.1669F); this.xrLabel30.Name = "xrLabel30"; this.xrLabel30.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel30.SizeF = new System.Drawing.SizeF(526.7498F, 22.20831F); @@ -513,7 +447,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel29.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerFirstName")}); - this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(123.25F, 229.7085F); + this.xrLabel29.LocationFloat = new DevExpress.Utils.PointFloat(123.2499F, 218.9585F); this.xrLabel29.Name = "xrLabel29"; this.xrLabel29.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel29.SizeF = new System.Drawing.SizeF(526.75F, 22.20831F); @@ -523,7 +457,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel28.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "CustomerLastName")}); - this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(123.25F, 207.5F); + this.xrLabel28.LocationFloat = new DevExpress.Utils.PointFloat(123.2499F, 196.75F); this.xrLabel28.Name = "xrLabel28"; this.xrLabel28.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel28.SizeF = new System.Drawing.SizeF(526.7499F, 22.20833F); @@ -534,7 +468,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel27.BackColor = System.Drawing.Color.Transparent; this.xrLabel27.CanShrink = true; this.xrLabel27.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 347.0001F); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(0F, 336.2501F); this.xrLabel27.Name = "xrLabel27"; this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel27.SizeF = new System.Drawing.SizeF(397.9167F, 28.45834F); @@ -545,7 +479,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel26 // - this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 324.7917F); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 314.0417F); this.xrLabel26.Name = "xrLabel26"; this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel26.SizeF = new System.Drawing.SizeF(175F, 22.20834F); @@ -557,7 +491,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel25.BackColor = System.Drawing.Color.Transparent; this.xrLabel25.CanShrink = true; this.xrLabel25.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 296.3334F); + this.xrLabel25.LocationFloat = new DevExpress.Utils.PointFloat(0F, 285.5834F); this.xrLabel25.Name = "xrLabel25"; this.xrLabel25.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel25.SizeF = new System.Drawing.SizeF(650F, 28.45834F); @@ -568,7 +502,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel24 // - this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 274.125F); + this.xrLabel24.LocationFloat = new DevExpress.Utils.PointFloat(0F, 263.375F); this.xrLabel24.Name = "xrLabel24"; this.xrLabel24.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel24.SizeF = new System.Drawing.SizeF(123.25F, 22.20834F); @@ -577,7 +511,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel23 // - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 251.9167F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 241.1667F); this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel23.SizeF = new System.Drawing.SizeF(123.25F, 22.20834F); @@ -586,7 +520,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel22 // - this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 229.7083F); + this.xrLabel22.LocationFloat = new DevExpress.Utils.PointFloat(0F, 218.9583F); this.xrLabel22.Name = "xrLabel22"; this.xrLabel22.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel22.SizeF = new System.Drawing.SizeF(123.25F, 22.20833F); @@ -595,7 +529,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // // xrLabel21 // - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 207.5F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 196.75F); this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel21.SizeF = new System.Drawing.SizeF(123.25F, 22.20834F); @@ -607,10 +541,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel20.BackColor = System.Drawing.Color.Transparent; this.xrLabel20.CanShrink = true; this.xrLabel20.Font = new System.Drawing.Font("Verdana", 10F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 179.0417F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(0F, 168.2917F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(650F, 28.45834F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(291.9999F, 28.45834F); this.xrLabel20.StylePriority.UseBackColor = false; this.xrLabel20.StylePriority.UseFont = false; this.xrLabel20.Text = "Angaben zur betreuten Person:"; @@ -620,7 +554,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel19.CanShrink = true; this.xrLabel19.Font = new System.Drawing.Font("Verdana", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(413.0833F, 147.4584F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(413.0833F, 142.2501F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel19.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -634,7 +568,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrLabel8.CanShrink = true; this.xrLabel8.Font = new System.Drawing.Font("Verdana", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(413.0833F, 130.4584F); + this.xrLabel8.LocationFloat = new DevExpress.Utils.PointFloat(413.0833F, 125.2501F); this.xrLabel8.Name = "xrLabel8"; this.xrLabel8.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel8.ProcessNullValues = DevExpress.XtraReports.UI.ValueSuppressType.SuppressAndShrink; @@ -775,13 +709,13 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTable1 // this.xrTable1.BorderColor = System.Drawing.Color.Black; - this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTable1.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTable1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable1.Name = "xrTable1"; this.xrTable1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2}); - this.xrTable1.SizeF = new System.Drawing.SizeF(649.9998F, 28.45831F); + this.xrTable1.SizeF = new System.Drawing.SizeF(650.0001F, 28.45831F); this.xrTable1.StylePriority.UseBorderColor = false; this.xrTable1.StylePriority.UseBorders = false; // @@ -789,6 +723,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell5, + this.xrTableCell14, this.xrTableCell6, this.xrTableCell7, this.xrTableCell8}); @@ -798,7 +733,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell5 // this.xrTableCell5.BorderColor = System.Drawing.Color.Black; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right))); + this.xrTableCell5.Borders = DevExpress.XtraPrinting.BorderSide.Left; this.xrTableCell5.CanShrink = true; this.xrTableCell5.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.ItemDescription")}); @@ -808,7 +743,22 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell5.StylePriority.UseBorders = false; this.xrTableCell5.StylePriority.UseFont = false; this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.Weight = 0.28835124628067238D; + this.xrTableCell5.Weight = 0.20928719203487828D; + // + // xrTableCell14 + // + this.xrTableCell14.BorderColor = System.Drawing.Color.Black; + this.xrTableCell14.Borders = DevExpress.XtraPrinting.BorderSide.Right; + this.xrTableCell14.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "InvoiceItems.UnitCount", "{0:0.00}")}); + this.xrTableCell14.Name = "xrTableCell14"; + this.xrTableCell14.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); + this.xrTableCell14.StylePriority.UseBorderColor = false; + this.xrTableCell14.StylePriority.UseBorders = false; + this.xrTableCell14.StylePriority.UsePadding = false; + this.xrTableCell14.StylePriority.UseTextAlignment = false; + this.xrTableCell14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell14.Weight = 0.079064045014160811D; // // xrTableCell6 // @@ -825,7 +775,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell6.StylePriority.UsePadding = false; this.xrTableCell6.StylePriority.UseTextAlignment = false; this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell6.Weight = 0.13953332215382283D; + this.xrTableCell6.Weight = 0.13953334556043887D; // // xrTableCell7 // @@ -840,7 +790,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell7.StylePriority.UsePadding = false; this.xrTableCell7.StylePriority.UseTextAlignment = false; this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell7.Weight = 0.26974355844350961D; + this.xrTableCell7.Weight = 0.26974358115262431D; // // xrTableCell8 // @@ -854,12 +804,8 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell8.StylePriority.UseBorders = false; this.xrTableCell8.StylePriority.UsePadding = false; this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableCell8.Weight = 0.26974355844350961D; - // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; + this.xrTableCell8.Weight = 0.26974396720757321D; // // GroupFooter1 // @@ -871,16 +817,16 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTable5, this.xrLabel2}); this.GroupFooter1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupFooter1.HeightF = 184.0834F; + this.GroupFooter1.HeightF = 161.7083F; this.GroupFooter1.Name = "GroupFooter1"; this.GroupFooter1.StylePriority.UseFont = false; // // xrLabel6 // - this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) + this.xrLabel6.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 115.5416F); + this.xrLabel6.LocationFloat = new DevExpress.Utils.PointFloat(0F, 103.0416F); this.xrLabel6.Multiline = true; this.xrLabel6.Name = "xrLabel6"; this.xrLabel6.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -899,6 +845,8 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel5.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); this.xrLabel5.StylePriority.UseFont = false; + this.xrLabel5.StylePriority.UseTextAlignment = false; + this.xrLabel5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // xrLabel4 // @@ -918,11 +866,13 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel3.SizeF = new System.Drawing.SizeF(147.9581F, 22.20834F); this.xrLabel3.StylePriority.UseFont = false; + this.xrLabel3.StylePriority.UseTextAlignment = false; + this.xrLabel3.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; // // xrTable5 // this.xrTable5.BorderColor = System.Drawing.Color.Black; - this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + this.xrTable5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); this.xrTable5.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); this.xrTable5.Name = "xrTable5"; @@ -945,7 +895,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell9 // this.xrTableCell9.BorderColor = System.Drawing.Color.Black; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell9.CanShrink = true; this.xrTableCell9.Name = "xrTableCell9"; @@ -962,7 +912,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell10 // this.xrTableCell10.BorderColor = System.Drawing.Color.Black; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell10.CanShrink = true; this.xrTableCell10.Name = "xrTableCell10"; @@ -978,7 +928,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell11 // this.xrTableCell11.BorderColor = System.Drawing.Color.Black; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell11.Name = "xrTableCell11"; this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); @@ -992,7 +942,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt // xrTableCell12 // this.xrTableCell12.BorderColor = System.Drawing.Color.Black; - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "AmountRecordedFLS", "={0:c}")}); @@ -1002,7 +952,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrTableCell12.StylePriority.UseBorders = false; this.xrTableCell12.StylePriority.UsePadding = false; this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell12.Weight = 0.26974355844350961D; // // xrLabel2 @@ -1014,6 +964,10 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.xrLabel2.StylePriority.UseFont = false; this.xrLabel2.Text = "Höhe der erhaltenen Abschlagszahlungen im Abrechnungszeitraum:"; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.SettlementRO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1029,18 +983,17 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt this.ExportOptions.PrintPreview.DefaultFileName = "Spitzabrechnung"; this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(75, 67, 155, 100); + this.Margins = new System.Drawing.Printing.Margins(75, 66, 134, 100); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; this.Watermark.Image = ((System.Drawing.Image)(resources.GetObject("Spitzabrechnung.Watermark.Image"))); this.Watermark.ImageViewMode = DevExpress.XtraPrinting.Drawing.ImageViewMode.Zoom; - ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1056,18 +1009,8 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.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 xrLabel12; private DevExpress.XtraReports.UI.XRLabel xrLabel11; - private DevExpress.XtraReports.UI.XRTable xrTable3; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow20; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow21; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell18; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow23; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell30; - private DevExpress.XtraReports.UI.XRTableRow xrTableRow24; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell31; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.FormattingRule ruleRateFactorNull; private DevExpress.XtraReports.UI.TopMarginBand topMarginBand1; @@ -1098,8 +1041,8 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel29; private DevExpress.XtraReports.UI.XRLabel xrLabel30; private DevExpress.XtraReports.UI.XRLabel xrLabel31; - private DevExpress.XtraReports.UI.XRLabel xrLabel34; - private DevExpress.XtraReports.UI.XRLabel xrLabel33; + private DevExpress.XtraReports.UI.XRLabel lblFLSBewilligtProWoche; + private DevExpress.XtraReports.UI.XRLabel lblFLSBewilligtGesamt; private DevExpress.XtraReports.UI.XRLabel xrLabel32; private DevExpress.XtraReports.UI.XRTable xrTable2; private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; @@ -1124,5 +1067,8 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt private DevExpress.XtraReports.UI.XRLabel xrLabel4; private DevExpress.XtraReports.UI.XRLabel xrLabel5; private DevExpress.XtraReports.UI.XRLabel xrLabel6; + private DevExpress.XtraReports.UI.XRLabel xrLabel35; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; + private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; } } diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs index c8b518208..683d89027 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport.cs @@ -23,7 +23,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt if (String.IsNullOrEmpty(pRO.Notice)) { - lblNotice.Visible = false; + //lblNotice.Visible = false; } if (pRO.InvoiceItems != null && pRO.InvoiceItems.Count == 1) @@ -60,8 +60,9 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt { foreach (var ii in pRO.InvoiceItems) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:c}", - ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit); + //ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS x {3:c}", + // ii.ItemPeriodStart, ii.ItemPeriodEnd, ii.UnitCount, ii.AmountPerUnit); + ii.ItemDescription = string.Format("Ab {0:MMMM yyyy}:", ii.ItemPeriodStart); } } } @@ -71,10 +72,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt { foreach (var ii in pRO.InvoiceItems) { - ii.ItemDescription = String.Format("{0:dd.MM.yyyy} bis {1:dd.MM.yyyy}: {2:0.##} FLS {3}x {4:c}", - ii.ItemPeriodStart, ii.ItemPeriodEnd, - ii.UnitCount, ii.RateFactor == 0 ? "" : "x " + pRO.RateFactorText2 + " ", - ii.AmountPerUnit); + ii.ItemDescription = string.Format("Ab {0:MMMM yyyy}:", ii.ItemPeriodStart); } } } @@ -97,26 +95,30 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt { itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.AccountingStartDate, pRO.GeleisteteFLSMitStundensatz3), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.AccountingStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRate3, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3 + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatz3 * pRO.RateFactor * pRO.HourlyRate3, + UnitCount = pRO.GeleisteteFLSMitStundensatz3 + }); itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.HourlyRateOldStartDate, pRO.GeleisteteFLSMitStundensatzAlt), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.HourlyRateOldStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRateOld, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld, + UnitCount = pRO.GeleisteteFLSMitStundensatzAlt }); itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.HourlyRateNewStartDate, pRO.GeleisteteFLSMitStundensatzAktuell), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.HourlyRateNewStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRateNew, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew, + UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell }); } @@ -127,18 +129,20 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.HourlyRateOldStartDate, pRO.GeleisteteFLSMitStundensatzAlt), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.HourlyRateOldStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRateOld, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAlt * pRO.RateFactor * pRO.HourlyRateOld, + UnitCount = pRO.GeleisteteFLSMitStundensatzAlt }); itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.HourlyRateNewStartDate, pRO.GeleisteteFLSMitStundensatzAktuell), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.HourlyRateNewStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRateNew, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew, + UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell }); } else @@ -147,10 +151,11 @@ namespace BetreuungsserviceFuerAlltagUndWohnen.Alt pRO.HourlyRateNewStartDate = pRO.AccountingStartDate; itemList.Add(new InvoiceItemDC { - ItemDescription = string.Format("Ab {0:MMMM yyyy}: {1:0.00}", pRO.HourlyRateNewStartDate, pRO.GeleisteteFLSMitStundensatzAktuell), + ItemDescription = string.Format("Ab {0:MMMM yyyy}:", pRO.HourlyRateNewStartDate), RateFactor = pRO.RateFactor == 1 ? 1 : Convert.ToDecimal(pRO.RateFactorText2), AmountPerUnit = pRO.HourlyRateNew, - GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew + GrossAmountTotal = pRO.GeleisteteFLSMitStundensatzAktuell * pRO.RateFactor * pRO.HourlyRateNew, + UnitCount = pRO.GeleisteteFLSMitStundensatzAktuell }); } diff --git a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs index 3ce13177e..f43a1fedc 100644 --- a/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs +++ b/ReportImp/BetreuungsserviceFuerAlltagUndWohnen/SettlementReport2.Designer.cs @@ -270,7 +270,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrLabel_RecipientStreet, this.RecipientPostCodeAndTown}); this.GroupHeader1.Font = new System.Drawing.Font("Verdana", 10F); - this.GroupHeader1.HeightF = 428.2918F; + this.GroupHeader1.HeightF = 439.7501F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.StylePriority.UseFont = false; // @@ -279,7 +279,7 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.xrTable2.BorderColor = System.Drawing.Color.Black; this.xrTable2.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0007629395F, 399.8335F); + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0.0007629395F, 411.2917F); this.xrTable2.Name = "xrTable2"; this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow1}); @@ -452,13 +452,14 @@ namespace BetreuungsserviceFuerAlltagUndWohnen this.lblFLSBewilligtProWoche.CanShrink = true; this.lblFLSBewilligtProWoche.Font = new System.Drawing.Font("Verdana", 10F, System.Drawing.FontStyle.Bold); this.lblFLSBewilligtProWoche.LocationFloat = new DevExpress.Utils.PointFloat(0.0007629395F, 373.4583F); + this.lblFLSBewilligtProWoche.Multiline = true; this.lblFLSBewilligtProWoche.Name = "lblFLSBewilligtProWoche"; this.lblFLSBewilligtProWoche.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblFLSBewilligtProWoche.SizeF = new System.Drawing.SizeF(690.9993F, 26.37509F); + this.lblFLSBewilligtProWoche.SizeF = new System.Drawing.SizeF(690.9993F, 37.8334F); this.lblFLSBewilligtProWoche.StylePriority.UseBackColor = false; this.lblFLSBewilligtProWoche.StylePriority.UseFont = false; - this.lblFLSBewilligtProWoche.Text = "Vom [AccountingStartDate!dd.MM.yyyy] bis [AccountingEndDate!dd.MM.yyyy] [Approved" + - "FLSWeekly!0.00] FLS pro Woche Summe bewilligter Stunden [ApprovedFLS] "; + this.lblFLSBewilligtProWoche.Text = "Vom [AccountingStartDate!dd.MM.yyyy] bis [AccountingEndDate!dd.MM.yyyy]: [Approve" + + "dFLSWeekly!0.00] FLS pro Woche \r\nSumme bewilligter Stunden: [ApprovedFLS] "; this.lblFLSBewilligtProWoche.WordWrap = false; // // xrLabel21