From 2c1c6e47c7d6dd23c055eeb78ebd22f499acc243 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Mon, 3 Feb 2025 16:19:54 +0100 Subject: [PATCH] FlexibleJugendarbeitFrankfurtEV - Nacharbeiten QB und Rechnung --- .../CustomReportCreator.cs | 2 +- .../LeistungsnachweisHFP.Designer.cs | 77 +++---------------- .../LeistungsnachweisHFP.cs | 7 +- .../LeistungsnachweisOderSpree.Designer.cs | 72 ++++++++--------- .../LeistungsnachweisOderSpree.cs | 4 + .../ServiceInvoiceReport.Designer.cs | 25 +++++- 6 files changed, 78 insertions(+), 109 deletions(-) diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/CustomReportCreator.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/CustomReportCreator.cs index f70693531..7fdc6b6de 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/CustomReportCreator.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/CustomReportCreator.cs @@ -160,7 +160,7 @@ namespace FlexibleJugendarbeitFrankfurtEV private XtraReport CreateServicesOverviewReportForRo(ServicesOverviewRO ro, long? serviceCategoryOid) { IBeWoReport report = null; - if (!String.IsNullOrWhiteSpace(ro.Costbearer) && ro.Costbearer.ToLower().Contains("oder-spree") && ro.Costbearer.Contains("LOS")) + if (!String.IsNullOrWhiteSpace(ro.Costbearer) && (ro.Costbearer.ToLower().Contains("oder-spree") || ro.Costbearer.Contains("LOS"))) { report = new LeistungnachweisOderSpree(); } diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs index 7ec4b596c..4e39952cf 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.Designer.cs @@ -42,7 +42,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow6 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell13 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell11 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell12 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell44 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell50 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell5 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -53,7 +52,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow2 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell3 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell2 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell28 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell48 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell1 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -61,7 +59,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow1 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell7 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell8 = new DevExpress.XtraReports.UI.XRTableCell(); - this.xrTableCell10 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell15 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell16 = new DevExpress.XtraReports.UI.XRTableCell(); @@ -188,7 +185,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow6.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell13, this.xrTableCell11, - this.xrTableCell12, this.xrTableCell44, this.xrTableCell50, this.xrTableCell5, @@ -229,19 +225,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableCell11.TextFormatString = "{0:dddd}"; this.xrTableCell11.Weight = 0.12662989136072941D; // - // xrTableCell12 - // - this.xrTableCell12.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.Notice2", "{0:0.00}")}); - this.xrTableCell12.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrTableCell12.Name = "xrTableCell12"; - this.xrTableCell12.StylePriority.UseBorders = false; - this.xrTableCell12.StylePriority.UseFont = false; - this.xrTableCell12.StylePriority.UsePadding = false; - this.xrTableCell12.StylePriority.UseTextAlignment = false; - this.xrTableCell12.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleCenter; - this.xrTableCell12.Weight = 0.066868393923800951D; - // // xrTableCell44 // this.xrTableCell44.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { @@ -301,7 +284,7 @@ namespace FlexibleJugendarbeitFrankfurtEV this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel46, this.xrTableServiceRecords1}); - this.GroupHeader1.HeightF = 131.2082F; + this.GroupHeader1.HeightF = 131.2083F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; // @@ -328,13 +311,13 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableServiceRecords1.Borders = DevExpress.XtraPrinting.BorderSide.None; this.xrTableServiceRecords1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.007883708F, 85.20822F); + this.xrTableServiceRecords1.LocationFloat = new DevExpress.Utils.PointFloat(0.007883708F, 85.20826F); this.xrTableServiceRecords1.Name = "xrTableServiceRecords1"; this.xrTableServiceRecords1.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); this.xrTableServiceRecords1.Rows.AddRange(new DevExpress.XtraReports.UI.XRTableRow[] { this.xrTableRow2, this.xrTableRow1}); - this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(726.0035F, 46F); + this.xrTableServiceRecords1.SizeF = new System.Drawing.SizeF(725.9957F, 45.99999F); this.xrTableServiceRecords1.StylePriority.UseBackColor = false; this.xrTableServiceRecords1.StylePriority.UseBorders = false; this.xrTableServiceRecords1.StylePriority.UseFont = false; @@ -345,7 +328,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow2.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell3, this.xrTableCell2, - this.xrTableCell9, this.xrTableCell28, this.xrTableCell48, this.xrTableCell1, @@ -388,23 +370,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableCell2.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell2.Weight = 0.26536312849161997D; // - // xrTableCell9 - // - this.xrTableCell9.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) - | DevExpress.XtraPrinting.BorderSide.Right))); - this.xrTableCell9.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell9.Multiline = true; - this.xrTableCell9.Name = "xrTableCell9"; - this.xrTableCell9.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 1, 0, 100F); - this.xrTableCell9.StylePriority.UseBorders = false; - this.xrTableCell9.StylePriority.UseFont = false; - this.xrTableCell9.StylePriority.UsePadding = false; - this.xrTableCell9.StylePriority.UseTextAlignment = false; - this.xrTableCell9.Text = "FK"; - this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell9.Weight = 0.14012804242284987D; - // // xrTableCell28 // this.xrTableCell28.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Top) @@ -473,7 +438,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableRow1.Cells.AddRange(new DevExpress.XtraReports.UI.XRTableCell[] { this.xrTableCell7, this.xrTableCell8, - this.xrTableCell10, this.xrTableCell14, this.xrTableCell15, this.xrTableCell16, @@ -515,22 +479,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrTableCell8.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; this.xrTableCell8.Weight = 0.26536312849161997D; // - // xrTableCell10 - // - this.xrTableCell10.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) - | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrTableCell10.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Regular, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { - new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrTableCell10.Multiline = true; - this.xrTableCell10.Name = "xrTableCell10"; - this.xrTableCell10.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 1, 0, 100F); - this.xrTableCell10.StylePriority.UseBorders = false; - this.xrTableCell10.StylePriority.UseFont = false; - this.xrTableCell10.StylePriority.UsePadding = false; - this.xrTableCell10.StylePriority.UseTextAlignment = false; - this.xrTableCell10.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; - this.xrTableCell10.Weight = 0.14012804242284987D; - // // xrTableCell14 // this.xrTableCell14.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Left | DevExpress.XtraPrinting.BorderSide.Right) @@ -1254,10 +1202,10 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel20.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSUnqualified")}); this.xrLabel20.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(663.605F, 0F); + this.xrLabel20.LocationFloat = new DevExpress.Utils.PointFloat(659.2084F, 0F); this.xrLabel20.Name = "xrLabel20"; this.xrLabel20.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel20.SizeF = new System.Drawing.SizeF(62.39844F, 20F); + this.xrLabel20.SizeF = new System.Drawing.SizeF(66.79504F, 20F); this.xrLabel20.StylePriority.UseBackColor = false; this.xrLabel20.StylePriority.UseBorders = false; this.xrLabel20.StylePriority.UseFont = false; @@ -1276,10 +1224,10 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel19.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.FLSQualified")}); this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(601.1254F, 0F); + this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(591.3006F, 0F); this.xrLabel19.Name = "xrLabel19"; this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(62.47961F, 20F); + this.xrLabel19.SizeF = new System.Drawing.SizeF(67.39435F, 20F); this.xrLabel19.StylePriority.UseBackColor = false; this.xrLabel19.StylePriority.UseBorders = false; this.xrLabel19.StylePriority.UseFont = false; @@ -1538,10 +1486,10 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel10.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { new DevExpress.XtraReports.UI.XRBinding("Text", null, "Services.fieldOPferd")}); this.xrLabel10.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(539.9021F, 0F); + this.xrLabel10.LocationFloat = new DevExpress.Utils.PointFloat(525.2582F, 0F); this.xrLabel10.Name = "xrLabel10"; this.xrLabel10.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel10.SizeF = new System.Drawing.SizeF(61.22327F, 20F); + this.xrLabel10.SizeF = new System.Drawing.SizeF(66.04236F, 20F); this.xrLabel10.StylePriority.UseBackColor = false; this.xrLabel10.StylePriority.UseBorders = false; this.xrLabel10.StylePriority.UseFont = false; @@ -1559,10 +1507,10 @@ namespace FlexibleJugendarbeitFrankfurtEV | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 10F); - this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0.007883708F, 0F); this.xrLabel1.Name = "xrLabel1"; this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel1.SizeF = new System.Drawing.SizeF(539.9022F, 20F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(525.2504F, 20F); this.xrLabel1.StylePriority.UseBackColor = false; this.xrLabel1.StylePriority.UseBorders = false; this.xrLabel1.StylePriority.UseFont = false; @@ -1672,7 +1620,6 @@ namespace FlexibleJugendarbeitFrankfurtEV private DevExpress.XtraReports.UI.XRTable xrTableServiceRecords1; private DevExpress.XtraReports.UI.XRTableRow xrTableRow2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell3; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell9; private DevExpress.XtraReports.UI.XRTableCell xrTableCell28; private DevExpress.XtraReports.UI.XRTableCell xrTableCell48; private DevExpress.XtraReports.UI.GroupFooterBand GroupFooter1; @@ -1682,7 +1629,6 @@ namespace FlexibleJugendarbeitFrankfurtEV private DevExpress.XtraReports.UI.XRTable xrTable3; private DevExpress.XtraReports.UI.XRTableRow xrTableRow6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell13; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell12; private DevExpress.XtraReports.UI.XRTableCell xrTableCell44; private DevExpress.XtraReports.UI.XRTableCell xrTableCell50; private DevExpress.XtraReports.UI.CalculatedField fieldKontaktArt; @@ -1738,7 +1684,6 @@ namespace FlexibleJugendarbeitFrankfurtEV private DevExpress.XtraReports.UI.XRTableRow xrTableRow1; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; private DevExpress.XtraReports.UI.XRTableCell xrTableCell8; - private DevExpress.XtraReports.UI.XRTableCell xrTableCell10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell14; private DevExpress.XtraReports.UI.XRTableCell xrTableCell15; private DevExpress.XtraReports.UI.XRTableCell xrTableCell16; diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs index eb97a283d..3186e50b3 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisHFP.cs @@ -39,8 +39,11 @@ namespace FlexibleJugendarbeitFrankfurtEV if (sd.ServiceDescription.Contains("Fehlkontakt")) { sd.Minutes = 60; - sd.FLSQualified = Math.Round(sd.Minutes / 60, 2, MidpointRounding.AwayFromZero); - sd.Notice2 = "1"; + if (sd.ServiceDescription.Contains("mit Pferd")) + { + sd.FLSQualified = Math.Round(sd.Minutes / 60, 2, MidpointRounding.AwayFromZero); + } + sd.ServiceCategoryAbbr = sd.ServiceDescription; } else if (sd.ServiceDescription.Contains("mit Pferd")) { diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs index 515a20050..20898f75f 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.Designer.cs @@ -65,7 +65,8 @@ namespace FlexibleJugendarbeitFrankfurtEV this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.formattingRuleStartDate = new DevExpress.XtraReports.UI.FormattingRule(); this.ReportHeader = new DevExpress.XtraReports.UI.ReportHeaderBand(); - this.xrLabel19 = new DevExpress.XtraReports.UI.XRLabel(); + this.xrLabel48 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblLeistung = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel24 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel26 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel27 = new DevExpress.XtraReports.UI.XRLabel(); @@ -99,7 +100,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel17 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldKontaktArt = new DevExpress.XtraReports.UI.CalculatedField(); this.FLS = new DevExpress.XtraReports.UI.CalculatedField(); - this.xrLabel48 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -513,7 +513,7 @@ namespace FlexibleJugendarbeitFrankfurtEV // this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrLabel48, - this.xrLabel19, + this.lblLeistung, this.xrLabel24, this.xrLabel26, this.xrLabel27, @@ -529,23 +529,40 @@ namespace FlexibleJugendarbeitFrankfurtEV this.ReportHeader.HeightF = 109.6667F; this.ReportHeader.Name = "ReportHeader"; // - // xrLabel19 + // xrLabel48 // - this.xrLabel19.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) + this.xrLabel48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); + this.xrLabel48.CanGrow = false; + this.xrLabel48.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); + this.xrLabel48.LocationFloat = new DevExpress.Utils.PointFloat(138.3483F, 60.00004F); + this.xrLabel48.Name = "xrLabel48"; + this.xrLabel48.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); + this.xrLabel48.SizeF = new System.Drawing.SizeF(232.9016F, 20.00002F); + this.xrLabel48.StylePriority.UseBackColor = false; + this.xrLabel48.StylePriority.UseBorders = false; + this.xrLabel48.StylePriority.UseFont = false; + this.xrLabel48.StylePriority.UsePadding = false; + this.xrLabel48.StylePriority.UseTextAlignment = false; + this.xrLabel48.Text = "[CostBearer2SupportConceptList.SupportConcept.Customer.DebitorNumber]"; + this.xrLabel48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; + // + // lblLeistung + // + this.lblLeistung.Borders = ((DevExpress.XtraPrinting.BorderSide)(((DevExpress.XtraPrinting.BorderSide.Top | DevExpress.XtraPrinting.BorderSide.Right) | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel19.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold); - this.xrLabel19.ForeColor = System.Drawing.Color.Black; - this.xrLabel19.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); - this.xrLabel19.Multiline = true; - this.xrLabel19.Name = "xrLabel19"; - this.xrLabel19.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel19.SizeF = new System.Drawing.SizeF(742.9446F, 20F); - this.xrLabel19.StylePriority.UseBorders = false; - this.xrLabel19.StylePriority.UseFont = false; - this.xrLabel19.StylePriority.UseForeColor = false; - this.xrLabel19.StylePriority.UseTextAlignment = false; - this.xrLabel19.Text = "EGH Schulbegleitung § 35a"; - this.xrLabel19.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; + this.lblLeistung.Font = new DevExpress.Drawing.DXFont("Calibri", 11F, DevExpress.Drawing.DXFontStyle.Bold); + this.lblLeistung.ForeColor = System.Drawing.Color.Black; + this.lblLeistung.LocationFloat = new DevExpress.Utils.PointFloat(0F, 20.00001F); + this.lblLeistung.Multiline = true; + this.lblLeistung.Name = "lblLeistung"; + this.lblLeistung.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblLeistung.SizeF = new System.Drawing.SizeF(742.9446F, 20F); + this.lblLeistung.StylePriority.UseBorders = false; + this.lblLeistung.StylePriority.UseFont = false; + this.lblLeistung.StylePriority.UseForeColor = false; + this.lblLeistung.StylePriority.UseTextAlignment = false; + this.lblLeistung.Text = "EGH Schulbegleitung § 35a"; + this.lblLeistung.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopCenter; // // xrLabel24 // @@ -1029,23 +1046,6 @@ namespace FlexibleJugendarbeitFrankfurtEV this.FLS.Expression = "Round([Minutes]/60,2)"; this.FLS.Name = "FLS"; // - // xrLabel48 - // - this.xrLabel48.Borders = ((DevExpress.XtraPrinting.BorderSide)((DevExpress.XtraPrinting.BorderSide.Right | DevExpress.XtraPrinting.BorderSide.Bottom))); - this.xrLabel48.CanGrow = false; - this.xrLabel48.Font = new DevExpress.Drawing.DXFont("Calibri", 11F); - this.xrLabel48.LocationFloat = new DevExpress.Utils.PointFloat(138.3483F, 60.00004F); - this.xrLabel48.Name = "xrLabel48"; - this.xrLabel48.Padding = new DevExpress.XtraPrinting.PaddingInfo(3, 2, 0, 0, 100F); - this.xrLabel48.SizeF = new System.Drawing.SizeF(232.9016F, 20.00002F); - this.xrLabel48.StylePriority.UseBackColor = false; - this.xrLabel48.StylePriority.UseBorders = false; - this.xrLabel48.StylePriority.UseFont = false; - this.xrLabel48.StylePriority.UsePadding = false; - this.xrLabel48.StylePriority.UseTextAlignment = false; - this.xrLabel48.Text = "[CostBearer2SupportConceptList.SupportConcept.Customer.DebitorNumber]"; - this.xrLabel48.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; - // // LeistungnachweisOderSpree // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -1142,7 +1142,7 @@ namespace FlexibleJugendarbeitFrankfurtEV private DevExpress.XtraReports.UI.XRTableCell xrTableCell2; private DevExpress.XtraReports.UI.XRTableCell xrTableCell6; private DevExpress.XtraReports.UI.XRTableCell xrTableCell7; - private DevExpress.XtraReports.UI.XRLabel xrLabel19; + private DevExpress.XtraReports.UI.XRLabel lblLeistung; private DevExpress.XtraReports.UI.XRLabel xrLabel15; private DevExpress.XtraReports.UI.XRLabel xrLabel9; private DevExpress.XtraReports.UI.XRLabel xrLabel12; diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.cs index 8c5c712df..cc7d8d452 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/LeistungsnachweisOderSpree.cs @@ -49,6 +49,10 @@ namespace FlexibleJugendarbeitFrankfurtEV { pRo.MainAttendantCommaSeperated = ""; var c2s = pRo.CostBearer2SupportConceptList[0]; + if (c2s.SupportConcept.Customer.CustomerAlias.Contains("AFB")) + { + lblLeistung.Text = "Fachberatung und -betreuung Autismusspektrum"; + } c2s.ApprovalPeriodList = c2s.ApprovalPeriodList.OrderBy(a => a.StartDate).ToList(); foreach (var scap in c2s.ApprovalPeriodList) { diff --git a/ReportImp/FlexibleJugendarbeitFrankfurtEV/ServiceInvoiceReport.Designer.cs b/ReportImp/FlexibleJugendarbeitFrankfurtEV/ServiceInvoiceReport.Designer.cs index 5d970add3..8c4efae4b 100644 --- a/ReportImp/FlexibleJugendarbeitFrankfurtEV/ServiceInvoiceReport.Designer.cs +++ b/ReportImp/FlexibleJugendarbeitFrankfurtEV/ServiceInvoiceReport.Designer.cs @@ -76,6 +76,7 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel11 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel10 = new DevExpress.XtraReports.UI.XRLabel(); this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); + this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); ((System.ComponentModel.ISupportInitialize)(this.xrRichText1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); @@ -165,12 +166,13 @@ namespace FlexibleJugendarbeitFrankfurtEV // Page1 // this.Page1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { + this.xrLabel1, this.lblAdresse, this.xrLabel2, this.xrLabel8, this.lblAbrechnungszeitraum}); this.Page1.Font = new DevExpress.Drawing.DXFont("Verdana", 10F); - this.Page1.HeightF = 284.2917F; + this.Page1.HeightF = 308.0417F; this.Page1.Name = "Page1"; this.Page1.StylePriority.UseFont = false; // @@ -197,8 +199,8 @@ namespace FlexibleJugendarbeitFrankfurtEV this.xrLabel2.SizeF = new System.Drawing.SizeF(650F, 20F); this.xrLabel2.StylePriority.UseBackColor = false; this.xrLabel2.StylePriority.UseFont = false; - this.xrLabel2.Text = "Rechnung NR.: [ServiceInvoicePeriods.CostBearer2SupportConcept.Notice]-[DebitorNu" + - "mber]-[InvoiceNumber]"; + this.xrLabel2.Text = "Rechnung NR.: [ServiceInvoicePeriods.CostBearer2SupportConcept.Notice]-[InvoiceNu" + + "mber]"; this.xrLabel2.WordWrap = false; // // xrLabel8 @@ -219,7 +221,7 @@ namespace FlexibleJugendarbeitFrankfurtEV // lblAbrechnungszeitraum // this.lblAbrechnungszeitraum.Font = new DevExpress.Drawing.DXFont("Arial", 11F); - this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 208.9583F); + this.lblAbrechnungszeitraum.LocationFloat = new DevExpress.Utils.PointFloat(0F, 232.7084F); this.lblAbrechnungszeitraum.Multiline = true; this.lblAbrechnungszeitraum.Name = "lblAbrechnungszeitraum"; this.lblAbrechnungszeitraum.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); @@ -649,6 +651,20 @@ namespace FlexibleJugendarbeitFrankfurtEV // this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.ServiceInvoiceRO); // + // xrLabel1 + // + this.xrLabel1.BackColor = System.Drawing.Color.Transparent; + this.xrLabel1.CanShrink = true; + this.xrLabel1.Font = new DevExpress.Drawing.DXFont("Arial", 11F); + this.xrLabel1.LocationFloat = new DevExpress.Utils.PointFloat(0F, 191.0417F); + this.xrLabel1.Name = "xrLabel1"; + this.xrLabel1.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.xrLabel1.SizeF = new System.Drawing.SizeF(650F, 20F); + this.xrLabel1.StylePriority.UseBackColor = false; + this.xrLabel1.StylePriority.UseFont = false; + this.xrLabel1.Text = "Kennzahl Flexible Jugendarbeit: [DebitorNumber]"; + this.xrLabel1.WordWrap = false; + // // ServiceInvoiceReport // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -724,5 +740,6 @@ namespace FlexibleJugendarbeitFrankfurtEV private DevExpress.XtraReports.UI.XRLabel xrLabel11; private DevExpress.XtraReports.UI.XRLabel xrLabel10; private DevExpress.XtraReports.UI.XRTableCell xrTableCell42; + private DevExpress.XtraReports.UI.XRLabel xrLabel1; } }