diff --git a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs index acff9f5a8..cd0d49475 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/CustomReportCreator.cs @@ -349,6 +349,10 @@ namespace LebenshilfeFrankfurtOder newRo.TotalGefahreneKilometer = ro.TotalGefahreneKilometer; newRo.SupportConceptCostBearer = ro.SupportConceptCostBearer; newRo.Mandator = ro.Mandator; + newRo.CustomerSignature = ro.CustomerSignature; + newRo.CustomerSignatureDate = ro.CustomerSignatureDate; + newRo.EmployeeSignatureDate = ro.EmployeeSignatureDate; + newRo.EmployeeSignature = ro.EmployeeSignature; return newRo; } diff --git a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs index 20a99ee44..4d27590b4 100644 --- a/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs +++ b/ReportImp/LebenshilfeFrankfurtOder/LeistungsnachweisAbw.cs @@ -1,8 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Drawing; -using System.Linq; -using System.Text; using BeWo.Data.Access; using BeWo.Data.Entities; using BeWo.Report; @@ -16,6 +11,13 @@ using DevExpress.Entity.Model.Metadata; using DevExpress.XtraPrinting; using DevExpress.XtraReports.UI; using LebenshilfeFrankfurtOder.Utils; +using System; +using System.Collections.Generic; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; namespace LebenshilfeFrankfurtOder { @@ -182,6 +184,31 @@ namespace LebenshilfeFrankfurtOder // lblKvNummer.Text = kvnummer; //} } + 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); + } + else + { + xrBox.Image = null; + } + } + + public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) + { + using (var memoryStream = new MemoryStream(byteArrayIn)) + { + return System.Drawing.Image.FromStream(memoryStream); + } + } } }