From 80e40fbc2391b4c317581f6007c4f071af2d9dc0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 16 Mar 2022 12:04:45 +0100 Subject: [PATCH] Show Template name in Report --- MultiTool.Shared/Report/ReportGenerator.vb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/MultiTool.Shared/Report/ReportGenerator.vb b/MultiTool.Shared/Report/ReportGenerator.vb index c2e6d3e..56a53c4 100644 --- a/MultiTool.Shared/Report/ReportGenerator.vb +++ b/MultiTool.Shared/Report/ReportGenerator.vb @@ -10,7 +10,6 @@ Imports MultiTool.Shared.Templates Public Class ReportGenerator(Of TReport As IReport) Inherits BaseClass - Private ReadOnly Database As MSSQLServer Private ReadOnly TemplateConfig As TemplateConfig Private ReadOnly GeneralConfig As GeneralConfig Private ReadOnly Patterns As Patterns @@ -32,7 +31,7 @@ Public Class ReportGenerator(Of TReport As IReport) Return oFilePath End Function - Public Function GenerateReport(pDocument As Document) As TReport + Public Function GenerateReport(pDocument As Document, pTemplate As Template) As TReport Dim oMapperConfig As New Mapper(LogConfig) Dim oHeadMapper = oMapperConfig.GetMapper(Of ReportHead)(New Dictionary(Of String, String) From { @@ -57,7 +56,7 @@ Public Class ReportGenerator(Of TReport As IReport) }) Dim oSQLConfig = TemplateConfig.Items. - Where(Function(item) item.Function.Name = "SQL"). + Where(Function(item) item.Function.Name = Constants.FUNCTION_SQL). ToList() FillFieldValuesFromSQL(pDocument, oSQLConfig) @@ -71,7 +70,7 @@ Public Class ReportGenerator(Of TReport As IReport) ToList() Dim oReportHead = oHeadMapper.Map(Of Dictionary(Of String, FieldValue), ReportHead)(oHeadRow) - oReportHead.Title = "EDI Bestellung (orders)" + oReportHead.Title = pTemplate.Name oReportHead.Subtitle = "Schaum" oReportHead.Filename = pDocument.FileName