From db311b4457eb3c498c6e7f3f3b6cc1c6d866b112 Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 23 Dec 2024 12:10:40 +0100 Subject: [PATCH 1/3] =?UTF-8?q?FaerberReports:=20Auf=20Spitzabrechnung=20G?= =?UTF-8?q?eb.Datum=20Klient=20erg=C3=A4nzt=20und=20bei=20AZ=20Pr=C3=A4fix?= =?UTF-8?q?=20entfernt=20(falls=20vorhanden)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SettlementReport.Designer.cs | 35 ++++++------- ReportImp/FaerberReports/SettlementReport.cs | 5 ++ .../SettlementReport2.Designer.cs | 49 ++++++++++--------- ReportImp/FaerberReports/SettlementReport2.cs | 5 ++ 4 files changed, 53 insertions(+), 41 deletions(-) diff --git a/ReportImp/FaerberReports/SettlementReport.Designer.cs b/ReportImp/FaerberReports/SettlementReport.Designer.cs index 1e32ff108..54ab70b53 100644 --- a/ReportImp/FaerberReports/SettlementReport.Designer.cs +++ b/ReportImp/FaerberReports/SettlementReport.Designer.cs @@ -49,7 +49,7 @@ namespace BeWo.FaerberReport this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAz = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -127,7 +127,7 @@ namespace BeWo.FaerberReport this.xrTable1, this.xrLabel6, this.xrLabel5, - this.xrLabel4, + this.lblAz, this.xrLabel3, this.xrLabel2, this.xrTable2, @@ -329,21 +329,21 @@ namespace BeWo.FaerberReport this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // - // xrLabel4 + // lblAz // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + this.lblAz.BackColor = System.Drawing.Color.Transparent; + this.lblAz.CanShrink = true; + this.lblAz.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; - this.xrLabel4.WordWrap = false; + this.lblAz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F); + this.lblAz.Multiline = true; + this.lblAz.Name = "lblAz"; + this.lblAz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAz.SizeF = new System.Drawing.SizeF(650F, 17F); + this.lblAz.StylePriority.UseBackColor = false; + this.lblAz.StylePriority.UseFont = false; + this.lblAz.Text = "[CustomerReferenceNumberAndDate]"; + this.lblAz.WordWrap = false; // // xrLabel3 // @@ -357,7 +357,8 @@ namespace BeWo.FaerberReport this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -955,7 +956,7 @@ namespace BeWo.FaerberReport private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblAz; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable2; diff --git a/ReportImp/FaerberReports/SettlementReport.cs b/ReportImp/FaerberReports/SettlementReport.cs index af95f300f..f1c0a7a1b 100644 --- a/ReportImp/FaerberReports/SettlementReport.cs +++ b/ReportImp/FaerberReports/SettlementReport.cs @@ -15,6 +15,11 @@ namespace BeWo.FaerberReport public void SetReportDataSource(SettlementRO pRO) { + if (!String.IsNullOrEmpty(pRO.CustomerReferenceNumberAndDate)) + { + pRO.CustomerReferenceNumberAndDate = pRO.CustomerReferenceNumberAndDate.Replace("73.20-", ""); + } + if (pRO.CreatorName != null && pRO.CreatorName.ToLower().Contains("sebastian nellessen")) { lblCreatorDivision.Text = "Inhaber/Geschäftsleitung"; diff --git a/ReportImp/FaerberReports/SettlementReport2.Designer.cs b/ReportImp/FaerberReports/SettlementReport2.Designer.cs index 9bacc726e..2f8c7331b 100644 --- a/ReportImp/FaerberReports/SettlementReport2.Designer.cs +++ b/ReportImp/FaerberReports/SettlementReport2.Designer.cs @@ -49,7 +49,7 @@ namespace BeWo.FaerberReport.Neu this.xrTableCell14 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrLabel6 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel5 = new DevExpress.XtraReports.UI.XRLabel(); - this.xrLabel4 = new DevExpress.XtraReports.UI.XRLabel(); + this.lblAz = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); this.xrLabel2 = new DevExpress.XtraReports.UI.XRLabel(); this.xrTable2 = new DevExpress.XtraReports.UI.XRTable(); @@ -84,7 +84,6 @@ namespace BeWo.FaerberReport.Neu this.xrTableRow34 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell51 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell52 = new DevExpress.XtraReports.UI.XRTableCell(); - this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrTable4 = new DevExpress.XtraReports.UI.XRTable(); this.xrTableRow22 = new DevExpress.XtraReports.UI.XRTableRow(); @@ -105,12 +104,13 @@ namespace BeWo.FaerberReport.Neu this.xrTableRow28 = new DevExpress.XtraReports.UI.XRTableRow(); this.xrTableCell41 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell42 = new DevExpress.XtraReports.UI.XRTableCell(); + this.bindingSource1 = new System.Windows.Forms.BindingSource(this.components); ((System.ComponentModel.ISupportInitialize)(this.xrTable1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this)).BeginInit(); // // Detail @@ -127,7 +127,7 @@ namespace BeWo.FaerberReport.Neu this.xrTable1, this.xrLabel6, this.xrLabel5, - this.xrLabel4, + this.lblAz, this.xrLabel3, this.xrLabel2, this.xrTable2, @@ -329,21 +329,21 @@ namespace BeWo.FaerberReport.Neu this.xrLabel5.StylePriority.UseFont = false; this.xrLabel5.Text = "Sehr geehrte Damen und Herren,"; // - // xrLabel4 + // lblAz // - this.xrLabel4.BackColor = System.Drawing.Color.Transparent; - this.xrLabel4.CanShrink = true; - this.xrLabel4.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { + this.lblAz.BackColor = System.Drawing.Color.Transparent; + this.lblAz.CanShrink = true; + this.lblAz.Font = new DevExpress.Drawing.DXFont("Verdana", 9.75F, DevExpress.Drawing.DXFontStyle.Bold, DevExpress.Drawing.DXGraphicsUnit.Point, new DevExpress.Drawing.DXFontAdditionalProperty[] { new DevExpress.Drawing.DXFontAdditionalProperty("GdiCharSet", ((byte)(0)))}); - this.xrLabel4.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F); - this.xrLabel4.Multiline = true; - this.xrLabel4.Name = "xrLabel4"; - this.xrLabel4.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); - this.xrLabel4.SizeF = new System.Drawing.SizeF(650F, 17F); - this.xrLabel4.StylePriority.UseBackColor = false; - this.xrLabel4.StylePriority.UseFont = false; - this.xrLabel4.Text = "[CustomerReferenceNumberAndDate]"; - this.xrLabel4.WordWrap = false; + this.lblAz.LocationFloat = new DevExpress.Utils.PointFloat(0F, 317F); + this.lblAz.Multiline = true; + this.lblAz.Name = "lblAz"; + this.lblAz.Padding = new DevExpress.XtraPrinting.PaddingInfo(2, 2, 0, 0, 100F); + this.lblAz.SizeF = new System.Drawing.SizeF(650F, 17F); + this.lblAz.StylePriority.UseBackColor = false; + this.lblAz.StylePriority.UseFont = false; + this.lblAz.Text = "[CustomerReferenceNumberAndDate]"; + this.lblAz.WordWrap = false; // // xrLabel3 // @@ -357,7 +357,8 @@ namespace BeWo.FaerberReport.Neu this.xrLabel3.SizeF = new System.Drawing.SizeF(650F, 16F); this.xrLabel3.StylePriority.UseBackColor = false; this.xrLabel3.StylePriority.UseFont = false; - this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName]"; + this.xrLabel3.Text = "Abrechnung Betreuungsleistungen für [Salutation2] [CustomerName], geb. [CustomerB" + + "irthday!dd.MM.yyyy]"; this.xrLabel3.WordWrap = false; // // xrLabel2 @@ -683,10 +684,6 @@ namespace BeWo.FaerberReport.Neu this.xrTableCell52.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell52.Weight = 0.33384615384615385D; // - // bindingSource1 - // - this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); - // // GroupFooter1 // this.GroupFooter1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -916,6 +913,10 @@ namespace BeWo.FaerberReport.Neu this.xrTableCell42.TextAlignment = DevExpress.XtraPrinting.TextAlignment.TopRight; this.xrTableCell42.Weight = 0.33384615384615385D; // + // bindingSource1 + // + this.bindingSource1.DataSource = typeof(BeWo.Report.ReportObjects.Settlement2RO); + // // Spitzabrechnung // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -940,8 +941,8 @@ namespace BeWo.FaerberReport.Neu ((System.ComponentModel.ISupportInitialize)(this.xrTable2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable5)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this)).EndInit(); } @@ -953,7 +954,7 @@ namespace BeWo.FaerberReport.Neu private DevExpress.XtraReports.UI.ReportHeaderBand ReportHeader; private DevExpress.XtraReports.UI.XRLabel xrLabel6; private DevExpress.XtraReports.UI.XRLabel xrLabel5; - private DevExpress.XtraReports.UI.XRLabel xrLabel4; + private DevExpress.XtraReports.UI.XRLabel lblAz; private DevExpress.XtraReports.UI.XRLabel xrLabel3; private DevExpress.XtraReports.UI.XRLabel xrLabel2; private DevExpress.XtraReports.UI.XRTable xrTable2; diff --git a/ReportImp/FaerberReports/SettlementReport2.cs b/ReportImp/FaerberReports/SettlementReport2.cs index 1eda79b0b..c9e4c9c0c 100644 --- a/ReportImp/FaerberReports/SettlementReport2.cs +++ b/ReportImp/FaerberReports/SettlementReport2.cs @@ -13,6 +13,11 @@ namespace BeWo.FaerberReport.Neu public void SetReportDataSource(Settlement2RO pRO) { + if (!String.IsNullOrEmpty(pRO.CustomerReferenceNumberAndDate)) + { + pRO.CustomerReferenceNumberAndDate = pRO.CustomerReferenceNumberAndDate.Replace("73.20-", ""); + } + if (pRO.CreatorName != null && pRO.CreatorName.ToLower().Contains("sebastian nellessen")) { lblCreatorDivision.Text = "Inhaber/Geschäftsleitung"; From 316759aab854d65c356d0d0ca7a685d99df6c0fa Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 23 Dec 2024 12:12:13 +0100 Subject: [PATCH 2/3] BeWoAllReports: Komische preProject-Sektion entfernt --- BeWoAllReports.sln | 4 ---- Host/Host.csproj.user | 4 ++-- Service/Plugins/PluginLoader.cs | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index d1873285f..918a9036e 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -8,10 +8,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{D8A691C5-146D-4613-86CC-438F02FE9106}" - ProjectSection(SolutionItems) = preProject - ReportImp\Intego\Intego.csproj = ReportImp\Intego\Intego.csproj - ReportImp\Wabe\Wabe.csproj = ReportImp\Wabe\Wabe.csproj - EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}" ProjectSection(ProjectDependencies) = postProject diff --git a/Host/Host.csproj.user b/Host/Host.csproj.user index decbb4f1e..5ee002517 100644 --- a/Host/Host.csproj.user +++ b/Host/Host.csproj.user @@ -31,8 +31,8 @@ - True - False + False + True diff --git a/Service/Plugins/PluginLoader.cs b/Service/Plugins/PluginLoader.cs index 29b0ecb3d..3baa1b829 100644 --- a/Service/Plugins/PluginLoader.cs +++ b/Service/Plugins/PluginLoader.cs @@ -50,7 +50,7 @@ namespace BeWo.Service.Plugins //t = "2499262621"; // HPH Bersenbrück //t = "4950382346"; // Holsinger //t = "5973016645"; // Verein Lebensgestaltung Hanau - //t = "7375324044"; // Diakonie KK Kleve + t = "7375324044"; // Diakonie KK Kleve //t = "1441747891"; // BeWo Mobil Köln //t = "5120047701"; // Trialog //t = "3629696651"; // Soziale Dienste Niederrhein (SDN) From 045a5332040f0ea51926192314b87be34bf8dc3c Mon Sep 17 00:00:00 2001 From: Kojo Date: Mon, 23 Dec 2024 12:15:39 +0100 Subject: [PATCH 3/3] BeWoAllReports: Komischen preProject Block entfernt --- BeWoAllReports.sln | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BeWoAllReports.sln b/BeWoAllReports.sln index 918a9036e..d1873285f 100644 --- a/BeWoAllReports.sln +++ b/BeWoAllReports.sln @@ -8,6 +8,10 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Server", "Server", "{FEB0336B-F053-40B6-92DD-7DE56AB9408A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReportImp", "ReportImp", "{D8A691C5-146D-4613-86CC-438F02FE9106}" + ProjectSection(SolutionItems) = preProject + ReportImp\Intego\Intego.csproj = ReportImp\Intego\Intego.csproj + ReportImp\Wabe\Wabe.csproj = ReportImp\Wabe\Wabe.csproj + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BeWo", "BeWo\BeWo.csproj", "{3FEBB560-9275-413A-9767-BB68C44EEBC3}" ProjectSection(ProjectDependencies) = postProject