From a91599bd9d6f8b36288d3aac9c06923710502a5c Mon Sep 17 00:00:00 2001 From: Kojo Date: Fri, 19 Dec 2025 10:45:01 +0100 Subject: [PATCH 1/2] =?UTF-8?q?DiakonieKKKleve:=20Auf=20LeistungsnachweisS?= =?UTF-8?q?oziotherapie=20f=C3=BCr=20Einzelterminunterschrift=20Verkn?= =?UTF-8?q?=C3=BCpfung=20repariert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LeistungsnachweisSoziotherapie.cs | 15 +++++----- ...LeistungsnachweisSoziotherapie.designer.cs | 30 +++++++++---------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs index ae2edafbf..66b8a0898 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.cs @@ -1,17 +1,14 @@ using System; -using System.Collections; -using System.ComponentModel; using BS.Shared.Core; using DevExpress.XtraReports.UI; using BeWo.Report.ReportObjects; using BeWo.Report; -using System.Collections.Generic; using BeWo.Data.Access; -using BeWo.Data.Entities; using BeWo.Service.DCEntityMapper; using System.Text.RegularExpressions; using System.IO; - +using BeWo.Data.Entities; + namespace BeWo.DiakonieKKKleve { @@ -30,7 +27,9 @@ namespace BeWo.DiakonieKKKleve if (pRO.Services != null) { foreach (ServicesOverviewRO.ServiceDetail s in pRO.Services) - { + { + ServicesOverviewRO.CreateSignatureString(s); + var serviceRecord = DAOFactory.GenericDAO.LoadByID(s.ServiceRecordOid); pRO.ReferenceNumber = serviceRecord.CostBearer2SupportConcept.CustomerReferenceNumber; if (serviceRecord.CostBearer2SupportConcept.ApprovedStartDate != null) @@ -157,17 +156,17 @@ namespace BeWo.DiakonieKKKleve } } } + private void picSignature_BeforePrint(object sender, System.ComponentModel.CancelEventArgs e) { XRPictureBox xrBox = sender as XRPictureBox; - //var test = this.GetCurrent string base64String = xrBox.Tag as string; if (!String.IsNullOrWhiteSpace(base64String)) { var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; var binData = Convert.FromBase64String(base64Data); System.Drawing.Image img = ByteArrayToImage(binData); - xrBox.Image = BS.Shared.Core.Utils.CropImage(img); + xrBox.Image = Utils.CropImage(img); } else { diff --git a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs index 265f1320d..a4ee3ae63 100644 --- a/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs +++ b/ReportImp/DiakonieKKKleve/LeistungsnachweisSoziotherapie.designer.cs @@ -59,7 +59,6 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell20 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell18 = new DevExpress.XtraReports.UI.XRTableCell(); this.xrTableCell9 = new DevExpress.XtraReports.UI.XRTableCell(); - this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); this.GroupHeader1 = new DevExpress.XtraReports.UI.GroupHeaderBand(); this.GroupFooter1 = new DevExpress.XtraReports.UI.GroupFooterBand(); this.xrLabel3 = new DevExpress.XtraReports.UI.XRLabel(); @@ -99,6 +98,7 @@ namespace BeWo.DiakonieKKKleve this.xrLabel1 = new DevExpress.XtraReports.UI.XRLabel(); this.fieldArt = new DevExpress.XtraReports.UI.CalculatedField(); this.fieldGroup = new DevExpress.XtraReports.UI.CalculatedField(); + this.picSignature = new DevExpress.XtraReports.UI.XRPictureBox(); ((System.ComponentModel.ISupportInitialize)(this.xrTableServiceRecords1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.xrTable3)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bindingSource1)).BeginInit(); @@ -371,18 +371,6 @@ namespace BeWo.DiakonieKKKleve this.xrTableCell9.TextAlignment = DevExpress.XtraPrinting.TextAlignment.MiddleLeft; this.xrTableCell9.Weight = 0.22406316231377763D; // - // picSignature - // - this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; - this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { - new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); - this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0.0004882813F, 0F); - this.picSignature.Name = "picSignature"; - this.picSignature.SizeF = new System.Drawing.SizeF(167.458F, 25F); - this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; - this.picSignature.StylePriority.UseBorders = false; - this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); - // // GroupHeader1 // this.GroupHeader1.Controls.AddRange(new DevExpress.XtraReports.UI.XRControl[] { @@ -764,6 +752,18 @@ namespace BeWo.DiakonieKKKleve this.fieldGroup.FieldType = DevExpress.XtraReports.UI.FieldType.Decimal; this.fieldGroup.Name = "fieldGroup"; // + // picSignature + // + this.picSignature.Borders = DevExpress.XtraPrinting.BorderSide.None; + this.picSignature.DataBindings.AddRange(new DevExpress.XtraReports.UI.XRBinding[] { + new DevExpress.XtraReports.UI.XRBinding("Tag", null, "Services.Signature")}); + this.picSignature.LocationFloat = new DevExpress.Utils.PointFloat(0F, 2.999987F); + this.picSignature.Name = "picSignature"; + this.picSignature.SizeF = new System.Drawing.SizeF(177.4581F, 20F); + this.picSignature.Sizing = DevExpress.XtraPrinting.ImageSizeMode.ZoomImage; + this.picSignature.StylePriority.UseBorders = false; + this.picSignature.BeforePrint += new DevExpress.XtraReports.UI.BeforePrintEventHandler(this.picSignature_BeforePrint); + // // LeistungsnachweisSoziotherapie // this.Bands.AddRange(new DevExpress.XtraReports.UI.Band[] { @@ -867,8 +867,8 @@ namespace BeWo.DiakonieKKKleve private DevExpress.XtraReports.UI.XRTableCell xrTableCell19; private DevExpress.XtraReports.UI.XRTableCell xrTableCell20; private DevExpress.XtraReports.UI.XRLabel cellGesamtGruppe; - private DevExpress.XtraReports.UI.XRPictureBox picSignature; private DevExpress.XtraReports.UI.XRLabel xrLabel3; - private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRPictureBox xrPictureBox1; + private DevExpress.XtraReports.UI.XRPictureBox picSignature; } } From 4fb294db47c97074868ad924ab45ea8b50caba9a Mon Sep 17 00:00:00 2001 From: Rene Evertz Date: Fri, 19 Dec 2025 10:55:34 +0100 Subject: [PATCH 2/2] Falsches Build Setting --- BeWo/BeWo.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BeWo/BeWo.csproj b/BeWo/BeWo.csproj index 5b079bc18..11c0889e1 100644 --- a/BeWo/BeWo.csproj +++ b/BeWo/BeWo.csproj @@ -3563,7 +3563,7 @@ - +