From 55d2a7a8fc66c9de53081033d3518fa4ff650708 Mon Sep 17 00:00:00 2001 From: Alexandra Date: Fri, 10 Oct 2025 13:58:14 +0200 Subject: [PATCH] =?UTF-8?q?HshNetzwerk/Leistungsnachweise=20-=20Angabe=20K?= =?UTF-8?q?ostentr=C3=A4ger=20erweitert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeistungsnachweisJaErftstadt.Designer.cs | 23 ++++----- .../LeistungsnachweisJaErftstadt.cs | 43 ++++++++++------- .../LeistungsnachweisJaErftstadt.resx | 3 -- .../HshNetzwerk/Properties/licenses.licx | 1 + .../ServicesOverviewReport.Designer.cs | 23 ++++----- .../HshNetzwerk/ServicesOverviewReport.cs | 47 ++++++++----------- .../HshNetzwerk/ServicesOverviewReport.resx | 3 -- 7 files changed, 71 insertions(+), 72 deletions(-) diff --git a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.Designer.cs b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.Designer.cs index d34911a02..d1d54af1c 100644 --- a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.Designer.cs +++ b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.Designer.cs @@ -104,7 +104,7 @@ namespace HshNetzwerk // // Detail // - this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -292,7 +292,7 @@ namespace HshNetzwerk this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1, this.lblHeader}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportHeader.HeightF = 240F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -454,12 +454,12 @@ namespace HshNetzwerk // // lblHeader // - this.lblHeader.Font = new System.Drawing.Font("Arial", 13.5F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 13.5F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(102.0833F, 0F); this.lblHeader.Multiline = true; this.lblHeader.Name = "lblHeader"; this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblHeader.SizeF = new System.Drawing.SizeF(674.9998F, 50F); + this.lblHeader.SizeF = new System.Drawing.SizeF(471.8747F, 50F); this.lblHeader.StylePriority.UseFont = false; this.lblHeader.StylePriority.UseTextAlignment = false; this.lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\nSankt Augustin"; @@ -488,7 +488,7 @@ namespace HshNetzwerk // // topMarginBand1 // - this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 99F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -503,7 +503,7 @@ namespace HshNetzwerk this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4, this.xrTable2}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.ReportFooter.HeightF = 140F; this.ReportFooter.Name = "ReportFooter"; this.ReportFooter.PageBreak = DevExpress.XtraReports.UI.PageBreak.BeforeBandExceptFirstEntry; @@ -668,7 +668,7 @@ namespace HshNetzwerk // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupHeader1.HeightF = 25F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; @@ -692,18 +692,19 @@ namespace HshNetzwerk this.fieldBillableFLS, this.fieldAbrechenbareFLS}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.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.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(75, 70, 99, 36); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 70F, 99F, 36F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.cs b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.cs index 00eb2111c..54800b332 100644 --- a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.cs +++ b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.cs @@ -18,27 +18,43 @@ namespace HshNetzwerk public void SetReportDataSource(ServicesOverviewRO pRO) { cellDatum.Text = String.Format("{0:dd.MM.yyyy}", DateTime.Now); - - this.lblHeader.Text = "Leistungsnachweis"; + lblHeader.Text = "Leistungsnachweis"; if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) { var c2s = pRO.CostBearer2SupportConceptList[0]; - var org = c2s.CostBearer.Organisation; if (org.Name.Contains("Jugendamt")) { - this.lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; - + lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; var name = org.Name.Replace("Jugendamt", "").Trim(); - - this.lblHeader.Text += name; - - + lblHeader.Text += name; + } + else if (org.Name.Contains("Bezirksjugendamt")) + { + lblHeader.Text = "Leistungsnachweis für das Bezirksjugendamt\r\n"; + var name = org.Name.Replace("Bezirksjugendamt", "").Trim(); + lblHeader.Text += name; + } + else if (org.Name.Contains("Landratsamt")) + { + lblHeader.Text = "Leistungsnachweis für das Landratsamt\r\n"; + var name = org.Name.Replace("Landratsamt", "").Trim(); + lblHeader.Text += name; + } + else if (org.Name.StartsWith("JA")) + { + lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; + var name = org.Name.Replace("JA", "").Trim(); + lblHeader.Text += name; + } + else + { + lblHeader.Text = "Leistungsnachweis für "; + lblHeader.Text += org.Name; } - if (c2s.CostBearerContactPerson != null) { cellAsd.Text = c2s.CostBearerContactPerson.FirstNameLastName; @@ -46,13 +62,9 @@ namespace HshNetzwerk } var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); - cellKinder.Text = c.Childs; - - Dictionary empDict = new Dictionary(); String emp = ""; - double gesamtStunden = 0; if (pRO.Services != null) @@ -75,8 +87,6 @@ namespace HshNetzwerk gesamtStunden += stunden; } - - //pRO.Services = servicesBillable; } cellSumme.Text = String.Format("{0:0.00}", gesamtStunden); if (empDict.Count == 1) @@ -86,6 +96,5 @@ namespace HshNetzwerk this.bindingSource1.DataSource = pRO; } - } } diff --git a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.resx b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.resx index 19e908bd3..d58980a38 100644 --- a/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.resx +++ b/ReportImp/HshNetzwerk/LeistungsnachweisJaErftstadt.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - \ No newline at end of file diff --git a/ReportImp/HshNetzwerk/Properties/licenses.licx b/ReportImp/HshNetzwerk/Properties/licenses.licx index e69de29bb..d59547a61 100644 --- a/ReportImp/HshNetzwerk/Properties/licenses.licx +++ b/ReportImp/HshNetzwerk/Properties/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v23.2, Version=23.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs b/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs index 40c711866..2635eb8bd 100644 --- a/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs +++ b/ReportImp/HshNetzwerk/ServicesOverviewReport.Designer.cs @@ -98,7 +98,7 @@ namespace HshNetzwerk // // Detail // - this.Detail.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.Detail.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.Detail.HeightF = 0F; this.Detail.Name = "Detail"; this.Detail.Padding = new DevExpress.XtraPrinting.PaddingInfo(0, 0, 0, 0, 100F); @@ -252,7 +252,7 @@ namespace HshNetzwerk this.ReportHeader.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable1, this.lblHeader}); - this.ReportHeader.Font = new System.Drawing.Font("Arial", 10F); + this.ReportHeader.Font = new DevExpress.Drawing.DXFont("Arial", 10F); this.ReportHeader.HeightF = 240F; this.ReportHeader.Name = "ReportHeader"; this.ReportHeader.StylePriority.UseFont = false; @@ -414,12 +414,12 @@ namespace HshNetzwerk // // lblHeader // - this.lblHeader.Font = new System.Drawing.Font("Arial", 13.5F, ((System.Drawing.FontStyle)((System.Drawing.FontStyle.Bold | System.Drawing.FontStyle.Underline)))); - this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(0F, 0F); + this.lblHeader.Font = new DevExpress.Drawing.DXFont("Arial", 13.5F, ((DevExpress.Drawing.DXFontStyle)((DevExpress.Drawing.DXFontStyle.Bold | DevExpress.Drawing.DXFontStyle.Underline)))); + this.lblHeader.LocationFloat = new DevExpress.Utils.PointFloat(108.3333F, 0F); this.lblHeader.Multiline = true; this.lblHeader.Name = "lblHeader"; this.lblHeader.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.lblHeader.SizeF = new System.Drawing.SizeF(674.9998F, 50F); + this.lblHeader.SizeF = new System.Drawing.SizeF(465.6247F, 50F); this.lblHeader.StylePriority.UseFont = false; this.lblHeader.StylePriority.UseTextAlignment = false; this.lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\nSankt Augustin"; @@ -448,7 +448,7 @@ namespace HshNetzwerk // // topMarginBand1 // - this.topMarginBand1.Font = new System.Drawing.Font("Times New Roman", 9.75F); + this.topMarginBand1.Font = new DevExpress.Drawing.DXFont("Times New Roman", 9.75F); this.topMarginBand1.HeightF = 99F; this.topMarginBand1.Name = "topMarginBand1"; this.topMarginBand1.StylePriority.UseFont = false; @@ -463,7 +463,7 @@ namespace HshNetzwerk this.ReportFooter.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTable4, this.xrTable2}); - this.ReportFooter.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.ReportFooter.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.ReportFooter.HeightF = 140F; this.ReportFooter.KeepTogether = true; this.ReportFooter.Name = "ReportFooter"; @@ -617,7 +617,7 @@ namespace HshNetzwerk // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { this.xrTableServiceRecords1}); - this.GroupHeader1.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Bold); + this.GroupHeader1.Font = new DevExpress.Drawing.DXFont("Arial", 10F, DevExpress.Drawing.DXFontStyle.Bold); this.GroupHeader1.HeightF = 25F; this.GroupHeader1.Name = "GroupHeader1"; this.GroupHeader1.RepeatEveryPage = true; @@ -641,18 +641,19 @@ namespace HshNetzwerk this.fieldBillableFLS, this.fieldAbrechenbareFLS}); this.DataSource = this.bindingSource1; - this.Font = new System.Drawing.Font("Arial", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.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.FormattingRuleSheet.AddRange(new DevExpress.XtraReports.UI.FormattingRule[] { this.formattingRuleStartDate, this.formattingRuleServiceDesc, this.formattingRuleCostBearer, this.formattingRuleEmployeeName}); - this.Margins = new System.Drawing.Printing.Margins(75, 70, 99, 36); + this.Margins = new DevExpress.Drawing.DXMargins(75F, 70F, 99F, 36F); this.PageHeight = 1169; this.PageWidth = 827; this.PaperKind = DevExpress.Drawing.Printing.DXPaperKind.A4; this.SnapGridSize = 9F; - this.Version = "17.1"; + this.Version = "23.2"; ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); diff --git a/ReportImp/HshNetzwerk/ServicesOverviewReport.cs b/ReportImp/HshNetzwerk/ServicesOverviewReport.cs index 2df2e826a..ba3140a53 100644 --- a/ReportImp/HshNetzwerk/ServicesOverviewReport.cs +++ b/ReportImp/HshNetzwerk/ServicesOverviewReport.cs @@ -18,45 +18,42 @@ namespace HshNetzwerk public void SetReportDataSource(ServicesOverviewRO pRO) { cellDatum.Text = String.Format("{0:dd.MM.yyyy}", DateTime.Now); - - this.lblHeader.Text = "Leistungsnachweis"; + lblHeader.Text = "Leistungsnachweis"; if (pRO.CostBearer2SupportConceptList != null && pRO.CostBearer2SupportConceptList.Count > 0) { var c2s = pRO.CostBearer2SupportConceptList[0]; - var org = c2s.CostBearer.Organisation; if (org.Name.Contains("Jugendamt")) { - this.lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; - + lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; var name = org.Name.Replace("Jugendamt", "").Trim(); - - this.lblHeader.Text += name; - - + lblHeader.Text += name; } - if (org.Name.Contains("Bezirksjugendamt")) + else if (org.Name.Contains("Bezirksjugendamt")) { - this.lblHeader.Text = "Leistungsnachweis für das Bezirksjugendamt\r\n"; - + lblHeader.Text = "Leistungsnachweis für das Bezirksjugendamt\r\n"; var name = org.Name.Replace("Bezirksjugendamt", "").Trim(); - - this.lblHeader.Text += name; - - + lblHeader.Text += name; } - if (org.Name.StartsWith("JA")) + else if (org.Name.Contains("Landratsamt")) { - this.lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; - + lblHeader.Text = "Leistungsnachweis für das Landratsamt\r\n"; + var name = org.Name.Replace("Landratsamt", "").Trim(); + lblHeader.Text += name; + } + else if (org.Name.StartsWith("JA")) + { + lblHeader.Text = "Leistungsnachweis für das Jugendamt\r\n"; var name = org.Name.Replace("JA", "").Trim(); - - this.lblHeader.Text += name; - - + lblHeader.Text += name; + } + else + { + lblHeader.Text = "Leistungsnachweis für "; + lblHeader.Text += org.Name; } if (c2s.CostBearerContactPerson != null) @@ -66,10 +63,7 @@ namespace HshNetzwerk } var c = DAOFactory.GenericDAO.LoadByID(pRO.CustomerOid); - cellKinder.Text = c.Childs; - - Dictionary empDict = new Dictionary(); String emp = ""; double gesamtStunden = 0; @@ -103,6 +97,5 @@ namespace HshNetzwerk this.bindingSource1.DataSource = pRO; } - } } diff --git a/ReportImp/HshNetzwerk/ServicesOverviewReport.resx b/ReportImp/HshNetzwerk/ServicesOverviewReport.resx index 19e908bd3..d58980a38 100644 --- a/ReportImp/HshNetzwerk/ServicesOverviewReport.resx +++ b/ReportImp/HshNetzwerk/ServicesOverviewReport.resx @@ -117,7 +117,4 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 21, 17 - \ No newline at end of file