diff --git a/ReportImp/TranskulturellesBetreuungsbuero/Quittierungsbeleg.cs b/ReportImp/TranskulturellesBetreuungsbuero/Quittierungsbeleg.cs index 553323f23..cbf76951d 100644 --- a/ReportImp/TranskulturellesBetreuungsbuero/Quittierungsbeleg.cs +++ b/ReportImp/TranskulturellesBetreuungsbuero/Quittierungsbeleg.cs @@ -4,8 +4,11 @@ using System.Drawing; using System.IO; using System.Linq; using System.Text.RegularExpressions; +using BeWo.Data.Access; +using BeWo.Data.Entities; using BeWo.Report; using BeWo.Report.ReportObjects; +using BeWo.Service.DCEntityMapper; using BS.Shared.Core; using DevExpress.XtraReports.UI; @@ -88,6 +91,10 @@ namespace TranskulturellesBetreuungsbuero int index = 1; foreach (var at in pRo.Abwesenheiten) { + // Nach Serverlieferung einkommentieren + //var ent = DAOFactory.GenericDAO.GetByID(at.Oid.Value); + //at.Notice = ent.Notice; + DevExpress.XtraReports.UI.XRTableRow row = null; if (index < xrTableAbwesenheiten.Rows.Count) { @@ -113,7 +120,7 @@ namespace TranskulturellesBetreuungsbuero } row.Cells[2].Text = String.Format("{0:0}", days); - row.Cells[3].Text = String.Format("{0:0}", at.AbsenceReason.Description); + row.Cells[3].Text = String.Format("{0:0}", at.Notice); index++; } @@ -135,7 +142,7 @@ namespace TranskulturellesBetreuungsbuero { var base64Data = Regex.Match(base64String, @"data:image/(?.+?),(?.+)").Groups["data"].Value; var binData = Convert.FromBase64String(base64Data); - Image img = ByteArrayToImage(binData); + System.Drawing.Image img = ByteArrayToImage(binData); xrBox.Image = Utils.CropImage(img); } else @@ -144,11 +151,11 @@ namespace TranskulturellesBetreuungsbuero } } - public Image ByteArrayToImage(byte[] byteArrayIn) + public System.Drawing.Image ByteArrayToImage(byte[] byteArrayIn) { using(var memoryStream = new MemoryStream(byteArrayIn)) { - return Image.FromStream(memoryStream); + return System.Drawing.Image.FromStream(memoryStream); } } }