From 445c9804ed651e47bb90891862bc79edc5e12f53 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 26 Nov 2021 08:00:44 +0100 Subject: [PATCH 1/2] Bewegt Korrektur --- .../LeistungsnachweisMitUhrzeit.Designer.cs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.Designer.cs b/ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.Designer.cs index ab8eede98..027bbc4b2 100644 --- a/ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.Designer.cs +++ b/ReportImp/BewegtSystemischeBeratung/LeistungsnachweisMitUhrzeit.Designer.cs @@ -84,7 +84,6 @@ namespace BewegtSystemischeBeratung this.fieldBillableFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldAbrechenbareFLS = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGruppe = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -124,8 +123,7 @@ namespace BewegtSystemischeBeratung this.xrTableCell10, this.xrTableCell6, this.xrTableCell8, - this.xrTableCell4, - this.xrTableCell2}); + this.xrTableCell4}); this.xrTableRow2.Name = "xrTableRow2"; this.xrTableRow2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableRow2.StylePriority.UseTextAlignment = false; @@ -171,7 +169,7 @@ namespace BewegtSystemischeBeratung this.xrTableCell4.StylePriority.UsePadding = false; this.xrTableCell4.StylePriority.UseTextAlignment = false; this.xrTableCell4.Text = "Leistung"; - this.xrTableCell4.Weight = 0.780349376142226D; + this.xrTableCell4.Weight = 1.0242085572534365D; // // DetailReport // @@ -684,14 +682,6 @@ namespace BewegtSystemischeBeratung this.fieldGruppe.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldGruppe.Name = "fieldGruppe"; // - // xrTableCell2 - // - this.xrTableCell2.Name = "xrTableCell2"; - this.xrTableCell2.Padding = new DevExpress.XtraPrinting.PaddingInfo(5, 2, 0, 0, 100F); - this.xrTableCell2.StylePriority.UsePadding = false; - this.xrTableCell2.Text = "xrTableCell2"; - this.xrTableCell2.Weight = 0.24385918111121055D; - // // LeistungsnachweisMitUhrzeit // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -781,6 +771,5 @@ namespace BewegtSystemischeBeratung private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRLabel lblBewilligtEinheit; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; } } From dbdff096e540be9a035acef8b54b4a2bee5bd675 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 29 Nov 2021 16:10:15 +0100 Subject: [PATCH 2/2] RatPlusTat Selbstzahler und Caritas Frankfurt --- .../ServicesOverviewReport.Designer.cs | 423 +++++++++-------- .../ServicesOverviewReport.Designer.cs | 449 ++++++++++-------- .../CarlSonnenscheinHaus.csproj | 40 ++ .../AlltagsunterstuetzungsInvoiceCreation.cs | 33 +- .../Invoicing/CustomInvoiceFactory.cs | 4 +- .../QuittierungsbelegPflegekasse.Designer.cs | 20 +- .../QuittierungsbelegPflegekasse.cs | 2 + .../RatPlusTat/RatPlusTatReportCreator.cs | 12 +- .../RechungAlltagsunterstuetzung.Designer.cs | 38 +- .../RechungAlltagsunterstuetzung.cs | 13 +- .../RatPlusTat/RechungAssistenz.Designer.cs | 6 +- 11 files changed, 602 insertions(+), 438 deletions(-) diff --git a/ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs b/ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs index 8947c4927..ca254f3e5 100644 --- a/ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/CaritasFrankfurt2Reports/ServicesOverviewReport.Designer.cs @@ -55,6 +55,16 @@ namespace BeWo.CaritasFrankfurt2Reports this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = 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.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -89,21 +99,13 @@ namespace BeWo.CaritasFrankfurt2Reports this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = 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.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.FLSinStunden = new DevExpress.XtraReports.UI.CalculatedField(); + this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -464,11 +466,194 @@ namespace BeWo.CaritasFrankfurt2Reports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel13, + this.xrLabel14, this.xrTable2, this.xrTable1}); - this.GroupFooter1.HeightF = 72.49998F; + this.GroupFooter1.HeightF = 149.5833F; this.GroupFooter1.Name = "GroupFooter1"; // + // xrTable2 + // + this.xrTable2.BorderColor = System.Drawing.Color.Black; + this.xrTable2.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable2.SizeF = new System.Drawing.SizeF(1000.88F, 30F); + this.xrTable2.StylePriority.UseBorderDashStyle = false; + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell8, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell11, + this.xrTableCell12}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow1.Weight = 1.5D; + // + // xrTableCell5 + // + this.xrTableCell5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.BorderWidth = 1F; + this.xrTableCell5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderDashStyle = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseBorderWidth = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Summe in FLS"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.13888891227400624D; + // + // xrTableCell6 + // + this.xrTableCell6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.BorderWidth = 1F; + this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorderDashStyle = false; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseBorderWidth = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 0.19050506073629323D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.BorderWidth = 1F; + this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderDashStyle = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseBorderWidth = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 0.18828290327157191D; + // + // xrTableCell8 + // + this.xrTableCell8.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell8.BorderWidth = 1F; + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualifiedString")}); + this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderDashStyle = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseBorderWidth = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "xrTableCell22"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell8.Weight = 0.1136362503940269D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.BorderWidth = 1F; + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualifiedString")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderDashStyle = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseBorderWidth = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "xrTableCell23"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.Weight = 0.11363647956542425D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.BorderWidth = 1F; + this.xrTableCell10.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderDashStyle = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseBorderWidth = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell10.Weight = 0.18939394005828933D; + // + // xrTableCell11 + // + this.xrTableCell11.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.BorderWidth = 1F; + this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBorderDashStyle = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseBorderWidth = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell11.Weight = 0.13257544453407574D; + // + // xrTableCell12 + // + this.xrTableCell12.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.BorderWidth = 1F; + this.xrTableCell12.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell12.StylePriority.UseBorderDashStyle = false; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseBorderWidth = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell12.Weight = 0.19681822172070262D; + // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.Color.Black; @@ -628,14 +813,14 @@ namespace BeWo.CaritasFrankfurt2Reports this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel23, this.xrLabel21}); - this.ReportFooter.HeightF = 79.58334F; + this.ReportFooter.HeightF = 89.5833F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.PrintAtBottom = true; // // xrLabel23 // this.xrLabel23.Font = new System.Drawing.Font("Arial", 7.5F); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 29.99999F); this.xrLabel23.Multiline = true; this.xrLabel23.Name = "xrLabel23"; this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -648,7 +833,7 @@ namespace BeWo.CaritasFrankfurt2Reports // xrLabel21 // this.xrLabel21.Font = new System.Drawing.Font("Arial", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); this.xrLabel21.Multiline = true; this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -916,192 +1101,34 @@ namespace BeWo.CaritasFrankfurt2Reports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrTable2 - // - this.xrTable2.BorderColor = System.Drawing.Color.Black; - this.xrTable2.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1000.88F, 30F); - this.xrTable2.StylePriority.UseBorderDashStyle = false; - this.xrTable2.StylePriority.UseBorders = false; - this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell6, - this.xrTableCell7, - this.xrTableCell8, - this.xrTableCell9, - this.xrTableCell10, - this.xrTableCell11, - this.xrTableCell12}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableRow1.Weight = 1.5D; - // - // xrTableCell5 - // - this.xrTableCell5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.BorderWidth = 1F; - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorderDashStyle = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseBorderWidth = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Summe in FLS"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.13888891227400624D; - // - // xrTableCell6 - // - this.xrTableCell6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.BorderWidth = 1F; - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseBorderDashStyle = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseBorderWidth = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 0.19050506073629323D; - // - // xrTableCell7 - // - this.xrTableCell7.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.BorderWidth = 1F; - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderDashStyle = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseBorderWidth = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 0.18828290327157191D; - // - // xrTableCell8 - // - this.xrTableCell8.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.BorderWidth = 1F; - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualifiedString")}); - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseBorderDashStyle = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseBorderWidth = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "xrTableCell22"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.1136362503940269D; - // - // xrTableCell9 - // - this.xrTableCell9.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.BorderWidth = 1F; - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualifiedString")}); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorderDashStyle = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseBorderWidth = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "xrTableCell23"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.Weight = 0.11363647956542425D; - // - // xrTableCell10 - // - this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.BorderWidth = 1F; - this.xrTableCell10.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseBorderDashStyle = false; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseBorderWidth = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell10.Weight = 0.18939394005828933D; - // - // xrTableCell11 - // - this.xrTableCell11.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell11.BorderWidth = 1F; - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell11.StylePriority.UseBorderDashStyle = false; - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseBorderWidth = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 0.13257544453407574D; - // - // xrTableCell12 - // - this.xrTableCell12.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell12.BorderWidth = 1F; - this.xrTableCell12.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell12.StylePriority.UseBorderDashStyle = false; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseBorderWidth = false; - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell12.Weight = 0.19681822172070262D; - // // FLSinStunden // this.FLSinStunden.DataMember = "CostBearer2SupportConceptList.AccountingTransactions"; this.FLSinStunden.Name = "FLSinStunden"; // + // xrLabel13 + // + this.xrLabel13.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrLabel13.LocationFloat = new DevExpress.Utils.PointFloat(0F, 113.7499F); + this.xrLabel13.Name = "xrLabel13"; + this.xrLabel13.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel13.SizeF = new System.Drawing.SizeF(148.9583F, 25F); + this.xrLabel13.StylePriority.UseFont = false; + this.xrLabel13.StylePriority.UseTextAlignment = false; + this.xrLabel13.Text = "Unterschrift Klient*in:"; + this.xrLabel13.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel14 + // + this.xrLabel14.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel14.LocationFloat = new DevExpress.Utils.PointFloat(148.9583F, 108.75F); + this.xrLabel14.Name = "xrLabel14"; + this.xrLabel14.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel14.SizeF = new System.Drawing.SizeF(176.0417F, 25F); + this.xrLabel14.StylePriority.UseBorders = false; + this.xrLabel14.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1125,9 +1152,9 @@ namespace BeWo.CaritasFrankfurt2Reports this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1203,5 +1230,7 @@ namespace BeWo.CaritasFrankfurt2Reports private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.CalculatedField FLSinStunden; + private DevExpress.XtraReports.UI.XRLabel xrLabel13; + private DevExpress.XtraReports.UI.XRLabel xrLabel14; } } diff --git a/ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs b/ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs index f34010ede..3fe8969b5 100644 --- a/ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs +++ b/ReportImp/CaritasFrankfurtReports/ServicesOverviewReport.Designer.cs @@ -55,6 +55,16 @@ namespace BeWo.CaritasFrankfurt2Reports this.xrTableCell17 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); + this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); + this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); + this.xrTableCell5 = 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.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); + this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTable1 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow3 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -66,6 +76,9 @@ namespace BeWo.CaritasFrankfurt2Reports this.xrTableCell25 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell26 = new DevExpress.XtraReports.UI.XRTableCell(); this.ReportFooter = new DevExpress.XtraReports.UI.ReportFooterBand(); + this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel21 = new DevExpress.XtraReports.UI.XRLabel(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); @@ -88,21 +101,10 @@ namespace BeWo.CaritasFrankfurt2Reports this.formattingRuleEmployeeName = new DevExpress.XtraReports.UI.FormattingRule(); this.topMarginBand1 = new DevExpress.XtraReports.UI.TopMarginBand(); this.bottomMarginBand1 = new DevExpress.XtraReports.UI.BottomMarginBand(); - this.xrLabel23 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); - this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); - this.xrTableCell5 = 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.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -463,11 +465,194 @@ namespace BeWo.CaritasFrankfurt2Reports // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel27, + this.xrLabel26, this.xrTable2, this.xrTable1}); - this.GroupFooter1.HeightF = 84.16666F; + this.GroupFooter1.HeightF = 148.75F; this.GroupFooter1.Name = "GroupFooter1"; // + // xrTable2 + // + this.xrTable2.BorderColor = System.Drawing.Color.Black; + this.xrTable2.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; + this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.Top; + this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F); + this.xrTable2.Name = "xrTable2"; + this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { + this.xrTableRow1}); + this.xrTable2.SizeF = new System.Drawing.SizeF(1000.88F, 30F); + this.xrTable2.StylePriority.UseBorderDashStyle = false; + this.xrTable2.StylePriority.UseBorders = false; + this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrTableRow1 + // + this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { + this.xrTableCell5, + this.xrTableCell6, + this.xrTableCell7, + this.xrTableCell8, + this.xrTableCell9, + this.xrTableCell10, + this.xrTableCell11, + this.xrTableCell12}); + this.xrTableRow1.Name = "xrTableRow1"; + this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); + this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + this.xrTableRow1.Weight = 1.5D; + // + // xrTableCell5 + // + this.xrTableCell5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell5.BorderWidth = 1F; + this.xrTableCell5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell5.Name = "xrTableCell5"; + this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell5.StylePriority.UseBorderDashStyle = false; + this.xrTableCell5.StylePriority.UseBorders = false; + this.xrTableCell5.StylePriority.UseBorderWidth = false; + this.xrTableCell5.StylePriority.UseFont = false; + this.xrTableCell5.StylePriority.UsePadding = false; + this.xrTableCell5.StylePriority.UseTextAlignment = false; + this.xrTableCell5.Text = "Summe in FLS"; + this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell5.Weight = 0.13888891227400624D; + // + // xrTableCell6 + // + this.xrTableCell6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell6.BorderWidth = 1F; + this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell6.Name = "xrTableCell6"; + this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell6.StylePriority.UseBorderDashStyle = false; + this.xrTableCell6.StylePriority.UseBorders = false; + this.xrTableCell6.StylePriority.UseBorderWidth = false; + this.xrTableCell6.StylePriority.UseFont = false; + this.xrTableCell6.StylePriority.UsePadding = false; + this.xrTableCell6.StylePriority.UseTextAlignment = false; + this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell6.Weight = 0.19050506073629323D; + // + // xrTableCell7 + // + this.xrTableCell7.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell7.BorderWidth = 1F; + this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell7.Name = "xrTableCell7"; + this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); + this.xrTableCell7.StylePriority.UseBorderDashStyle = false; + this.xrTableCell7.StylePriority.UseBorders = false; + this.xrTableCell7.StylePriority.UseBorderWidth = false; + this.xrTableCell7.StylePriority.UseFont = false; + this.xrTableCell7.StylePriority.UsePadding = false; + this.xrTableCell7.StylePriority.UseTextAlignment = false; + this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell7.Weight = 0.18828290327157191D; + // + // xrTableCell8 + // + this.xrTableCell8.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell8.BorderWidth = 1F; + this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualifiedString")}); + this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell8.Name = "xrTableCell8"; + this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell8.StylePriority.UseBorderDashStyle = false; + this.xrTableCell8.StylePriority.UseBorders = false; + this.xrTableCell8.StylePriority.UseBorderWidth = false; + this.xrTableCell8.StylePriority.UseFont = false; + this.xrTableCell8.StylePriority.UsePadding = false; + this.xrTableCell8.StylePriority.UseTextAlignment = false; + this.xrTableCell8.Text = "xrTableCell22"; + this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell8.Weight = 0.1136362503940269D; + // + // xrTableCell9 + // + this.xrTableCell9.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell9.BorderWidth = 1F; + this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualifiedString")}); + this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell9.Name = "xrTableCell9"; + this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell9.StylePriority.UseBorderDashStyle = false; + this.xrTableCell9.StylePriority.UseBorders = false; + this.xrTableCell9.StylePriority.UseBorderWidth = false; + this.xrTableCell9.StylePriority.UseFont = false; + this.xrTableCell9.StylePriority.UseTextAlignment = false; + this.xrTableCell9.Text = "xrTableCell23"; + this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; + this.xrTableCell9.Weight = 0.11363647956542425D; + // + // xrTableCell10 + // + this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell10.BorderWidth = 1F; + this.xrTableCell10.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell10.Name = "xrTableCell10"; + this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell10.StylePriority.UseBorderDashStyle = false; + this.xrTableCell10.StylePriority.UseBorders = false; + this.xrTableCell10.StylePriority.UseBorderWidth = false; + this.xrTableCell10.StylePriority.UseFont = false; + this.xrTableCell10.StylePriority.UsePadding = false; + this.xrTableCell10.StylePriority.UseTextAlignment = false; + this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell10.Weight = 0.18939394005828933D; + // + // xrTableCell11 + // + this.xrTableCell11.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell11.BorderWidth = 1F; + this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell11.Name = "xrTableCell11"; + this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrTableCell11.StylePriority.UseBorderDashStyle = false; + this.xrTableCell11.StylePriority.UseBorders = false; + this.xrTableCell11.StylePriority.UseBorderWidth = false; + this.xrTableCell11.StylePriority.UseFont = false; + this.xrTableCell11.StylePriority.UsePadding = false; + this.xrTableCell11.StylePriority.UseTextAlignment = false; + this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell11.Weight = 0.13257544453407574D; + // + // xrTableCell12 + // + this.xrTableCell12.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; + this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) + | DevExpress.XtraPrinting.BorderSide.Right) + | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrTableCell12.BorderWidth = 1F; + this.xrTableCell12.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrTableCell12.Name = "xrTableCell12"; + this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrTableCell12.StylePriority.UseBorderDashStyle = false; + this.xrTableCell12.StylePriority.UseBorders = false; + this.xrTableCell12.StylePriority.UseBorderWidth = false; + this.xrTableCell12.StylePriority.UseFont = false; + this.xrTableCell12.StylePriority.UseTextAlignment = false; + this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + this.xrTableCell12.Weight = 0.19681822172070262D; + // // xrTable1 // this.xrTable1.BorderColor = System.Drawing.Color.Black; @@ -627,14 +812,50 @@ namespace BeWo.CaritasFrankfurt2Reports this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel23, this.xrLabel21}); - this.ReportFooter.HeightF = 79.58338F; + this.ReportFooter.HeightF = 89.58336F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.PrintAtBottom = true; // + // xrLabel26 + // + this.xrLabel26.Font = new System.Drawing.Font("Arial", 9.75F); + this.xrLabel26.LocationFloat = new DevExpress.Utils.PointFloat(0F, 111.6667F); + this.xrLabel26.Name = "xrLabel26"; + this.xrLabel26.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel26.SizeF = new System.Drawing.SizeF(148.9583F, 25F); + this.xrLabel26.StylePriority.UseFont = false; + this.xrLabel26.StylePriority.UseTextAlignment = false; + this.xrLabel26.Text = "Unterschrift Klient*in:"; + this.xrLabel26.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // xrLabel27 + // + this.xrLabel27.Borders = DevExpress.XtraPrinting.BorderSide.Bottom; + this.xrLabel27.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.xrLabel27.LocationFloat = new DevExpress.Utils.PointFloat(148.9583F, 106.6668F); + this.xrLabel27.Name = "xrLabel27"; + this.xrLabel27.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel27.SizeF = new System.Drawing.SizeF(176.0417F, 25F); + this.xrLabel27.StylePriority.UseBorders = false; + this.xrLabel27.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // + // xrLabel23 + // + this.xrLabel23.Font = new System.Drawing.Font("Arial", 7.5F); + this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 30.00005F); + this.xrLabel23.Multiline = true; + this.xrLabel23.Name = "xrLabel23"; + this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel23.SizeF = new System.Drawing.SizeF(953.1246F, 59.58331F); + this.xrLabel23.StylePriority.UseFont = false; + this.xrLabel23.StylePriority.UseTextAlignment = false; + this.xrLabel23.Text = resources.GetString("xrLabel23.Text"); + this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; + // // xrLabel21 // this.xrLabel21.Font = new System.Drawing.Font("Arial", 8F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel21.LocationFloat = new DevExpress.Utils.PointFloat(0F, 9.999974F); this.xrLabel21.Multiline = true; this.xrLabel21.Name = "xrLabel21"; this.xrLabel21.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -902,200 +1123,6 @@ namespace BeWo.CaritasFrankfurt2Reports this.bottomMarginBand1.HeightF = 30F; this.bottomMarginBand1.Name = "bottomMarginBand1"; // - // xrLabel23 - // - this.xrLabel23.Font = new System.Drawing.Font("Arial", 7.5F); - this.xrLabel23.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00008F); - this.xrLabel23.Multiline = true; - this.xrLabel23.Name = "xrLabel23"; - this.xrLabel23.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel23.SizeF = new System.Drawing.SizeF(953.1246F, 59.58331F); - this.xrLabel23.StylePriority.UseFont = false; - this.xrLabel23.StylePriority.UseTextAlignment = false; - this.xrLabel23.Text = resources.GetString("xrLabel23.Text"); - this.xrLabel23.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrTable2 - // - this.xrTable2.BorderColor = System.Drawing.Color.Black; - this.xrTable2.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Double; - this.xrTable2.Borders = DevExpress.XtraPrinting.BorderSide.Top; - this.xrTable2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 32F); - this.xrTable2.Name = "xrTable2"; - this.xrTable2.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTable2.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { - this.xrTableRow1}); - this.xrTable2.SizeF = new System.Drawing.SizeF(1000.88F, 30F); - this.xrTable2.StylePriority.UseBorderDashStyle = false; - this.xrTable2.StylePriority.UseBorders = false; - this.xrTable2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - // - // xrTableRow1 - // - this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { - this.xrTableCell5, - this.xrTableCell6, - this.xrTableCell7, - this.xrTableCell8, - this.xrTableCell9, - this.xrTableCell10, - this.xrTableCell11, - this.xrTableCell12}); - this.xrTableRow1.Name = "xrTableRow1"; - this.xrTableRow1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); - this.xrTableRow1.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopLeft; - this.xrTableRow1.Weight = 1.5D; - // - // xrTableCell5 - // - this.xrTableCell5.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell5.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell5.BorderWidth = 1F; - this.xrTableCell5.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell5.Name = "xrTableCell5"; - this.xrTableCell5.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell5.StylePriority.UseBorderDashStyle = false; - this.xrTableCell5.StylePriority.UseBorders = false; - this.xrTableCell5.StylePriority.UseBorderWidth = false; - this.xrTableCell5.StylePriority.UseFont = false; - this.xrTableCell5.StylePriority.UsePadding = false; - this.xrTableCell5.StylePriority.UseTextAlignment = false; - this.xrTableCell5.Text = "Summe in FLS"; - this.xrTableCell5.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell5.Weight = 0.13888891227400624D; - // - // xrTableCell6 - // - this.xrTableCell6.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell6.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell6.BorderWidth = 1F; - this.xrTableCell6.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell6.Name = "xrTableCell6"; - this.xrTableCell6.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell6.StylePriority.UseBorderDashStyle = false; - this.xrTableCell6.StylePriority.UseBorders = false; - this.xrTableCell6.StylePriority.UseBorderWidth = false; - this.xrTableCell6.StylePriority.UseFont = false; - this.xrTableCell6.StylePriority.UsePadding = false; - this.xrTableCell6.StylePriority.UseTextAlignment = false; - this.xrTableCell6.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell6.Weight = 0.19050506073629323D; - // - // xrTableCell7 - // - this.xrTableCell7.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell7.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell7.BorderWidth = 1F; - this.xrTableCell7.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell7.Name = "xrTableCell7"; - this.xrTableCell7.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 3, 0, 0, 100F); - this.xrTableCell7.StylePriority.UseBorderDashStyle = false; - this.xrTableCell7.StylePriority.UseBorders = false; - this.xrTableCell7.StylePriority.UseBorderWidth = false; - this.xrTableCell7.StylePriority.UseFont = false; - this.xrTableCell7.StylePriority.UsePadding = false; - this.xrTableCell7.StylePriority.UseTextAlignment = false; - this.xrTableCell7.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell7.Weight = 0.18828290327157191D; - // - // xrTableCell8 - // - this.xrTableCell8.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell8.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell8.BorderWidth = 1F; - this.xrTableCell8.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSQualifiedString")}); - this.xrTableCell8.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell8.Name = "xrTableCell8"; - this.xrTableCell8.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell8.StylePriority.UseBorderDashStyle = false; - this.xrTableCell8.StylePriority.UseBorders = false; - this.xrTableCell8.StylePriority.UseBorderWidth = false; - this.xrTableCell8.StylePriority.UseFont = false; - this.xrTableCell8.StylePriority.UsePadding = false; - this.xrTableCell8.StylePriority.UseTextAlignment = false; - this.xrTableCell8.Text = "xrTableCell22"; - this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell8.Weight = 0.1136362503940269D; - // - // xrTableCell9 - // - this.xrTableCell9.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell9.BorderWidth = 1F; - this.xrTableCell9.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "TotalFLSUnqualifiedString")}); - this.xrTableCell9.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell9.StylePriority.UseBorderDashStyle = false; - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseBorderWidth = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "xrTableCell23"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleRight; - this.xrTableCell9.Weight = 0.11363647956542425D; - // - // xrTableCell10 - // - this.xrTableCell10.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.BorderWidth = 1F; - this.xrTableCell10.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell10.StylePriority.UseBorderDashStyle = false; - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseBorderWidth = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell10.Weight = 0.18939394005828933D; - // - // xrTableCell11 - // - this.xrTableCell11.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell11.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell11.BorderWidth = 1F; - this.xrTableCell11.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell11.Name = "xrTableCell11"; - this.xrTableCell11.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrTableCell11.StylePriority.UseBorderDashStyle = false; - this.xrTableCell11.StylePriority.UseBorders = false; - this.xrTableCell11.StylePriority.UseBorderWidth = false; - this.xrTableCell11.StylePriority.UseFont = false; - this.xrTableCell11.StylePriority.UsePadding = false; - this.xrTableCell11.StylePriority.UseTextAlignment = false; - this.xrTableCell11.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell11.Weight = 0.13257544453407574D; - // - // xrTableCell12 - // - this.xrTableCell12.BorderDashStyle = DevExpress.XtraPrinting.BorderDashStyle.Solid; - this.xrTableCell12.Borders = ((DevExpress.XtraPrinting.BorderSide)((((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell12.BorderWidth = 1F; - this.xrTableCell12.Font = new System.Drawing.Font("Arial", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrTableCell12.StylePriority.UseBorderDashStyle = false; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseBorderWidth = false; - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - this.xrTableCell12.Weight = 0.19681822172070262D; - // // Stundenzettel // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1117,9 +1144,9 @@ namespace BeWo.CaritasFrankfurt2Reports this.PaperKind = System.Drawing.Printing.PaperKind.A4; this.Version = "17.1"; ((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.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -1194,5 +1221,7 @@ namespace BeWo.CaritasFrankfurt2Reports private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell11; private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; + private DevExpress.XtraReports.UI.XRLabel xrLabel26; + private DevExpress.XtraReports.UI.XRLabel xrLabel27; } } diff --git a/ReportImp/CarlSonnenscheinHaus/CarlSonnenscheinHaus.csproj b/ReportImp/CarlSonnenscheinHaus/CarlSonnenscheinHaus.csproj index 7eb24d526..96b72c104 100644 --- a/ReportImp/CarlSonnenscheinHaus/CarlSonnenscheinHaus.csproj +++ b/ReportImp/CarlSonnenscheinHaus/CarlSonnenscheinHaus.csproj @@ -48,6 +48,24 @@ + + Component + + + Finanzauswertung.cs + + + Component + + + InvoiceCustomerReport.cs + + + Component + + + KassenbuchReport.cs + Component @@ -55,6 +73,12 @@ Quittierungsbeleg.cs + + Component + + + ServiceInvoiceReport.cs + Component @@ -81,11 +105,27 @@ + + Finanzauswertung.cs + Designer + + + InvoiceCustomerReport.cs + Designer + + + KassenbuchReport.cs + Designer + Quittierungsbeleg.cs Designer + + ServiceInvoiceReport.cs + Designer + SettlementReport.cs Designer diff --git a/ReportImp/RatPlusTat/Invoicing/AlltagsunterstuetzungsInvoiceCreation.cs b/ReportImp/RatPlusTat/Invoicing/AlltagsunterstuetzungsInvoiceCreation.cs index 5e4449ecc..7187ad353 100644 --- a/ReportImp/RatPlusTat/Invoicing/AlltagsunterstuetzungsInvoiceCreation.cs +++ b/ReportImp/RatPlusTat/Invoicing/AlltagsunterstuetzungsInvoiceCreation.cs @@ -61,6 +61,8 @@ namespace RatPlusTat.Invoicing if (invoice != null) { invoice.InvoiceBase.InvoiceId = "Alltag"; + if (catName.Contains("Selbstzahlung")) + invoice.InvoiceBase.InvoiceTypeText = "Selbstzahlung"; invoiceList.Add(invoice); invoiceCounter++; } @@ -99,6 +101,33 @@ namespace RatPlusTat.Invoicing base.SetInvoiceBaseData(invoiceCounter, invoice, costBearer, invoicePeriod, supportConceptList); } + public override void SetRecipientInformation(ServiceInvoice serviceInvoice, CostBearer costBearer) + { + if (costBearer.Organisation.InvoiceAddress != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.InvoiceAddress.CopyToNew(); + } + else if (costBearer.Organisation.Address != null) + { + serviceInvoice.InvoiceBase.RecipientAddress = costBearer.Organisation.Address.CopyToNew(); + } + + serviceInvoice.InvoiceBase.RecipientDivision = costBearer.Organisation.Name2; + serviceInvoice.InvoiceBase.RecipientOrganisationOid = costBearer.Organisation.Oid; + serviceInvoice.InvoiceBase.RecipientOrganisation = costBearer.Organisation.Name; + serviceInvoice.InvoiceBase.RecipientContacts = costBearer.Organisation.Contacts.Select(i => i.CopyToNew()).ToList(); + serviceInvoice.InvoiceBase.RecipientCostBearerOid = costBearer.Oid; + + //serviceInvoice.InvoiceBase. = c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)) != null ? c2s.CostBearer.Organisation.Contacts.FirstOrDefault(f => f.Type.Equals(ContactType.business_POBox)).Value : String.Empty; + + if (serviceInvoice.InvoiceBase.CostBearer2SupportConcept != null && + serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson != null) + { + serviceInvoice.InvoiceBase.RecipientPersonFirstName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.FirstName; + serviceInvoice.InvoiceBase.RecipientPersonLastName = serviceInvoice.InvoiceBase.CostBearer2SupportConcept.CostBearerContactPerson.LastName; + } + } + public override void SetServiceInvoicePeriods(ServiceInvoice invoice, CostBearer2SupportConcept costBearer2SupportConcept, DateTimeSpan invoicePeriod, List serviceRecords) { @@ -138,8 +167,8 @@ namespace RatPlusTat.Invoicing public override InvoiceItem CreateInvoiceItem(ServiceRecordDC iServiceRecord, SupportConceptApprovalPeriod scap, Calculations calc) { - if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Betreuung") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderungspflege") - && !iServiceRecord.ServiceDescription.CategoryName.Contains("Umwandlungsanspruch")) + if (!iServiceRecord.ServiceDescription.CategoryName.Contains("Betreuung") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Selbstzahlung") && + !iServiceRecord.ServiceDescription.CategoryName.Contains("Verhinderungspflege") && !iServiceRecord.ServiceDescription.CategoryName.Contains("Umwandlungsanspruch")) return null; var ii = base.CreateInvoiceItem(iServiceRecord, scap, calc); diff --git a/ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs b/ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs index fa3b02aa9..6f7ee3bd6 100644 --- a/ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs +++ b/ReportImp/RatPlusTat/Invoicing/CustomInvoiceFactory.cs @@ -30,8 +30,10 @@ namespace RatPlusTat.Invoicing String cat = sd.Name.ToLower().Trim(); if (cat.IndexOf("assistenz") >= 0) return new CustomAssistenzInvoiceCreation(); - if (cat.Contains("betreuung") || cat.Contains("Umwandlungsanspruch") || cat.Contains("Verhinderungspflege")) + if (cat.Contains("betreuung") || cat.Contains("Umwandlungsanspruch") || cat.Contains("Verhinderungspflege") || cat.Contains("selbst")) return new CustomAlltagsunterstuetzungsInvoiceCreation(); + //if (cat.Contains("selbst")) + // return new CustomSelbstzahlerInvoiceCreation(); } return null; } diff --git a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs index f775ace75..a8ca09d45 100644 --- a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs +++ b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.Designer.cs @@ -58,6 +58,7 @@ namespace RatPlusTat this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell43 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); @@ -88,7 +89,7 @@ namespace RatPlusTat this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.chkSelbstzahler = new DevExpress.XtraReports.UI.XRCheckBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -460,6 +461,10 @@ namespace RatPlusTat this.xrTableCell43.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell43.Weight = 0.55827160530189857D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + // // formattingRuleStartDate // this.formattingRuleStartDate.Condition = "[StartDate2] < [StartDate]"; @@ -647,6 +652,7 @@ namespace RatPlusTat // topMarginBand1 // this.topMarginBand1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.chkSelbstzahler, this.chkAssistenz, this.chkEntlastung, this.chkBeratung, @@ -690,7 +696,7 @@ namespace RatPlusTat this.chkUmwandlung.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.chkUmwandlung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 112.5F); this.chkUmwandlung.Name = "chkUmwandlung"; - this.chkUmwandlung.SizeF = new System.Drawing.SizeF(229.833F, 21.875F); + this.chkUmwandlung.SizeF = new System.Drawing.SizeF(229.4998F, 21.875F); this.chkUmwandlung.StylePriority.UseFont = false; this.chkUmwandlung.Text = "Umwandlungsanspruch"; // @@ -843,9 +849,14 @@ namespace RatPlusTat this.fieldKontaktArt.FieldType = DevExpress.XtraReports.UI.FieldType.String; this.fieldKontaktArt.Name = "fieldKontaktArt"; // - // bindingSource1 + // chkSelbstzahler // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServicesOverviewRO); + this.chkSelbstzahler.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.chkSelbstzahler.LocationFloat = new DevExpress.Utils.PointFloat(229.4998F, 112.5F); + this.chkSelbstzahler.Name = "chkSelbstzahler"; + this.chkSelbstzahler.SizeF = new System.Drawing.SizeF(115.2496F, 21.875F); + this.chkSelbstzahler.StylePriority.UseFont = false; + this.chkSelbstzahler.Text = "Selbstzahler"; // // QuittierungsbelegPflegekasse // @@ -937,5 +948,6 @@ namespace RatPlusTat private DevExpress.XtraReports.UI.XRCheckBox chkUmwandlung; private DevExpress.XtraReports.UI.XRCheckBox chkVerhinderung; private DevExpress.XtraReports.UI.XRLabel xrLabel2; + private DevExpress.XtraReports.UI.XRCheckBox chkSelbstzahler; } } diff --git a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs index 91d46e500..8e93945c0 100644 --- a/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs +++ b/ReportImp/RatPlusTat/QuittierungsbelegPflegekasse.cs @@ -37,6 +37,8 @@ namespace RatPlusTat chkEntlastung.Checked = true; if (sd.ServiceCategory.Contains("Beratung")) chkBeratung.Checked = true; + if (sd.ServiceCategory.Contains("Selbstzahlung")) + chkSelbstzahler.Checked = true; if (sd.ServiceCategory.Contains("Umwandlung")) chkUmwandlung.Checked = true; if (sd.ServiceCategory.Contains("Verhinderung")) diff --git a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs index b92daf003..641234e1c 100644 --- a/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs +++ b/ReportImp/RatPlusTat/RatPlusTatReportCreator.cs @@ -56,16 +56,19 @@ namespace RatPlusTat ServicesOverviewRO bewoRo = ServicesOverviewRO.CopyFromRO(ro); ServicesOverviewRO betreuungRo = ServicesOverviewRO.CopyFromRO(ro); - ServicesOverviewRO umwandlungRo = ServicesOverviewRO.CopyFromRO(ro); + ServicesOverviewRO selbstRo = ServicesOverviewRO.CopyFromRO(ro); + ServicesOverviewRO umwandlungRo = ServicesOverviewRO.CopyFromRO(ro); ServicesOverviewRO verhinderungRo = ServicesOverviewRO.CopyFromRO(ro); ServicesOverviewRO assistenzRo = ServicesOverviewRO.CopyFromRO(ro); bewoRo.TotalFLMBillable = 0; betreuungRo.TotalFLMBillable = 0; + selbstRo.TotalFLMBillable = 0; umwandlungRo.TotalFLMBillable = 0; verhinderungRo.TotalFLMBillable = 0; assistenzRo.TotalFLMBillable = 0; bewoRo.TotalFLS = 0; betreuungRo.TotalFLS = 0; + selbstRo.TotalFLS = 0; umwandlungRo.TotalFLS = 0; verhinderungRo.TotalFLS = 0; assistenzRo.TotalFLS = 0; @@ -104,10 +107,17 @@ namespace RatPlusTat assistenzRo.TotalFLMBillable += s.Minutes; assistenzRo.TotalFLS += s.Minutes / 60; } + else if (s.ServiceCategory.ToLower().Contains("selbst")) + { + selbstRo.Services.Add(s); + selbstRo.TotalFLMBillable += s.Minutes; + selbstRo.TotalFLS += s.Minutes / 60; + } } } report = AddReportToReport(report, bewoRo); report = AddReportToReport(report, betreuungRo); + report = AddReportToReport(report, selbstRo); report = AddReportToReport(report, umwandlungRo); report = AddReportToReport(report, verhinderungRo); report = AddReportToReport(report, assistenzRo); diff --git a/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.Designer.cs b/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.Designer.cs index 26bba87a4..09e2c626d 100644 --- a/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.Designer.cs +++ b/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.Designer.cs @@ -42,7 +42,7 @@ namespace RatPlusTat this.xrLabel13 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel14 = new DevExpress.XtraReports.UI.XRLabel(); this.Page1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); - this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblCustomer = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow4 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell4 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -209,7 +209,7 @@ namespace RatPlusTat // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { - this.xrLabel1, + this.lblCustomer, this.xrTable4, this.xrRichText2, this.xrLabel8, @@ -218,23 +218,23 @@ namespace RatPlusTat this.lblBetreff, this.xrLabel2}); this.Page1.Font = new System.Drawing.Font("Arial", 10F); - this.Page1.HeightF = 341.9516F; + this.Page1.HeightF = 381.535F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // - // xrLabel1 + // lblCustomer // - this.xrLabel1.BackColor = System.Drawing.Color.Transparent; - this.xrLabel1.CanShrink = true; - this.xrLabel1.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 245.62F); - this.xrLabel1.Multiline = true; - this.xrLabel1.Name = "xrLabel1"; - this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 36.62997F); - this.xrLabel1.StylePriority.UseBackColor = false; - this.xrLabel1.StylePriority.UseFont = false; - this.xrLabel1.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown], *[Customer" + + this.lblCustomer.BackColor = System.Drawing.Color.Transparent; + this.lblCustomer.CanShrink = true; + this.lblCustomer.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lblCustomer.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 294.5783F); + this.lblCustomer.Multiline = true; + this.lblCustomer.Name = "lblCustomer"; + this.lblCustomer.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblCustomer.SizeF = new System.Drawing.SizeF(650F, 36.62997F); + this.lblCustomer.StylePriority.UseBackColor = false; + this.lblCustomer.StylePriority.UseFont = false; + this.lblCustomer.Text = "[CustomerName], [CustomerStreet], [CustomerPostalCode] [CustomerTown], *[Customer" + "Birthdate!dd.MM.yyyy]"; // // xrTable4 @@ -433,7 +433,7 @@ namespace RatPlusTat this.xrLabel4.BackColor = System.Drawing.Color.Transparent; this.xrLabel4.CanShrink = true; this.xrLabel4.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 282.25F); + this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 331.2083F); this.xrLabel4.Multiline = true; this.xrLabel4.Name = "xrLabel4"; this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -448,7 +448,7 @@ namespace RatPlusTat this.lblBetreff.BackColor = System.Drawing.Color.Transparent; this.lblBetreff.CanShrink = true; this.lblBetreff.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 228.62F); + this.lblBetreff.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 277.5784F); this.lblBetreff.Multiline = true; this.lblBetreff.Name = "lblBetreff"; this.lblBetreff.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -462,7 +462,7 @@ namespace RatPlusTat this.xrLabel2.BackColor = System.Drawing.Color.Transparent; this.xrLabel2.CanShrink = true; this.xrLabel2.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 192F); + this.xrLabel2.LocationFloat = new DevExpress.Utils.PointFloat(0F, 240.9583F); this.xrLabel2.Name = "xrLabel2"; this.xrLabel2.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 17F); @@ -906,6 +906,6 @@ namespace RatPlusTat private DevExpress.XtraReports.UI.XRTableCell xrTableCell47; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; private DevExpress.XtraReports.UI.XRLabel xrLabel10; - private DevExpress.XtraReports.UI.XRLabel xrLabel1; + private DevExpress.XtraReports.UI.XRLabel lblCustomer; } } diff --git a/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.cs b/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.cs index e6fdb4827..55c605448 100644 --- a/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.cs +++ b/ReportImp/RatPlusTat/RechungAlltagsunterstuetzung.cs @@ -54,7 +54,18 @@ namespace RatPlusTat lblBetreff.Text = "Umwandlungsanspruch nach § 45a Abs. 4 SGB XI"; lblLeistung.Text = "Betreuung lt. Doku"; } - } + if (i.ServiceDescription.Contains("Selbstzahlung")) + { + lblBetreff.Text = "Abrechnungen über Betreuungsleistungen"; + lblLeistung.Text = "Selbstzahlung lt. Doku"; + lblCustomer.Text = ""; + xrTableCell3.Text = ""; + xrTableCell6.Text = ""; + xrTableCell4.Text = pRO.CustomerName; + xrTableCell7.Text = pRO.CustomerStreet; + xrTableCell8.Text = pRO.CustomerPostalCode + " " + pRO.CustomerTown; + } + } } } } diff --git a/ReportImp/RatPlusTat/RechungAssistenz.Designer.cs b/ReportImp/RatPlusTat/RechungAssistenz.Designer.cs index e91fc1cb2..4931bb9ca 100644 --- a/ReportImp/RatPlusTat/RechungAssistenz.Designer.cs +++ b/ReportImp/RatPlusTat/RechungAssistenz.Designer.cs @@ -158,7 +158,7 @@ namespace RatPlusTat // // topMarginBand1 // - this.topMarginBand1.HeightF = 100F; + this.topMarginBand1.HeightF = 99F; this.topMarginBand1.Name = "topMarginBand1"; // // bottomMarginBand1 @@ -464,7 +464,7 @@ namespace RatPlusTat this.xrLabel3.BackColor = System.Drawing.Color.Transparent; this.xrLabel3.CanShrink = true; this.xrLabel3.Font = new System.Drawing.Font("Arial", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0.9999593F, 228.62F); + this.xrLabel3.LocationFloat = new DevExpress.Utils.PointFloat(0F, 228.62F); this.xrLabel3.Multiline = true; this.xrLabel3.Name = "xrLabel3"; this.xrLabel3.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -847,7 +847,7 @@ namespace RatPlusTat this.Font = new System.Drawing.Font("Verdana", 10F); this.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.ruleRateFactorNull}); - this.Margins = new System.Drawing.Printing.Margins(87, 74, 100, 120); + this.Margins = new System.Drawing.Printing.Margins(87, 75, 99, 120); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = System.Drawing.Printing.PaperKind.A4;