From 8e02ed7159eafaedbe8140f42a4d8160001cd25f Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 3 May 2022 15:38:35 +0200 Subject: [PATCH] Rename TemplateConfigItem to FieldConfig --- MultiTool.Common/Documents/DocumentLoader.vb | 2 +- MultiTool.Common/MultiTool.Common.vbproj | 2 +- MultiTool.Common/Report/ReportGenerator.vb | 2 +- .../{TemplateConfigItem.vb => FieldConfig.vb} | 2 +- MultiTool.Common/Templates/Template.vb | 2 +- MultiTool.Common/Templates/TemplateConfig.vb | 6 +++--- MultiTool.Common/Templates/TemplateLoader.vb | 12 ++++++------ 7 files changed, 14 insertions(+), 14 deletions(-) rename MultiTool.Common/Templates/{TemplateConfigItem.vb => FieldConfig.vb} (97%) diff --git a/MultiTool.Common/Documents/DocumentLoader.vb b/MultiTool.Common/Documents/DocumentLoader.vb index 16f6790..8e651a8 100644 --- a/MultiTool.Common/Documents/DocumentLoader.vb +++ b/MultiTool.Common/Documents/DocumentLoader.vb @@ -343,7 +343,7 @@ Namespace Documents Return pDocument End Function - Private Function ApplySQLFunctionForImport(pDocument As Document, pSQLConfig As List(Of TemplateConfigItem)) As Document + Private Function ApplySQLFunctionForImport(pDocument As Document, pSQLConfig As List(Of FieldConfig)) As Document For Each oSQLConfigItem In pSQLConfig ' FieldList is a list of fields that will be changed ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row diff --git a/MultiTool.Common/MultiTool.Common.vbproj b/MultiTool.Common/MultiTool.Common.vbproj index ca9f5a5..6a29107 100644 --- a/MultiTool.Common/MultiTool.Common.vbproj +++ b/MultiTool.Common/MultiTool.Common.vbproj @@ -151,7 +151,7 @@ - + diff --git a/MultiTool.Common/Report/ReportGenerator.vb b/MultiTool.Common/Report/ReportGenerator.vb index 7c214ee..b3a93d7 100644 --- a/MultiTool.Common/Report/ReportGenerator.vb +++ b/MultiTool.Common/Report/ReportGenerator.vb @@ -103,7 +103,7 @@ Public Class ReportGenerator(Of TReport As IReport) Return oResult End Function - Private Function FillFieldValuesFromSQL(pDocument As Document, pSQLConfig As List(Of TemplateConfigItem), pReportFileName As String) As Document + Private Function FillFieldValuesFromSQL(pDocument As Document, pSQLConfig As List(Of FieldConfig), pReportFileName As String) As Document For Each oSQLConfigItem In pSQLConfig ' FieldList is a list of fields that will be changed ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row diff --git a/MultiTool.Common/Templates/TemplateConfigItem.vb b/MultiTool.Common/Templates/FieldConfig.vb similarity index 97% rename from MultiTool.Common/Templates/TemplateConfigItem.vb rename to MultiTool.Common/Templates/FieldConfig.vb index 4c3cff7..3604b24 100644 --- a/MultiTool.Common/Templates/TemplateConfigItem.vb +++ b/MultiTool.Common/Templates/FieldConfig.vb @@ -2,7 +2,7 @@ Imports DigitalData.Modules.Language Namespace Templates - Public Class TemplateConfigItem + Public Class FieldConfig Public Property Name As String Public Property Table As String Public Property Type As ColumnType diff --git a/MultiTool.Common/Templates/Template.vb b/MultiTool.Common/Templates/Template.vb index 7165216..5397f4f 100644 --- a/MultiTool.Common/Templates/Template.vb +++ b/MultiTool.Common/Templates/Template.vb @@ -123,7 +123,7 @@ Namespace Templates ''' Required value from Schema. This value will be written in the ColumnConfig and is not relevant from that point on. ''' Public Property IsRequired As Boolean - Public Property Config As TemplateConfigItem + Public Property Config As FieldConfig Public Overrides Function ToString() As String Return Name diff --git a/MultiTool.Common/Templates/TemplateConfig.vb b/MultiTool.Common/Templates/TemplateConfig.vb index 03fa557..42f2f28 100644 --- a/MultiTool.Common/Templates/TemplateConfig.vb +++ b/MultiTool.Common/Templates/TemplateConfig.vb @@ -6,9 +6,9 @@ Namespace Templates ''' Class for loading column/field config from database ''' Public Class TemplateConfig - Public Property Items As List(Of TemplateConfigItem) + Public Property Items As List(Of FieldConfig) - Public ReadOnly Property SqlItems As List(Of TemplateConfigItem) + Public ReadOnly Property SqlItems As List(Of FieldConfig) Get Return Items. Where(Function(item) item.Function.Name = Constants.FUNCTION_SQL). @@ -16,7 +16,7 @@ Namespace Templates End Get End Property - Public Function GetColumn(pName As String, pTable As String) As TemplateConfigItem + Public Function GetColumn(pName As String, pTable As String) As FieldConfig Return Items. Where(Function(c) c.Name = pName And c.Table = pTable). FirstOrDefault() diff --git a/MultiTool.Common/Templates/TemplateLoader.vb b/MultiTool.Common/Templates/TemplateLoader.vb index 75c003c..97d6550 100644 --- a/MultiTool.Common/Templates/TemplateLoader.vb +++ b/MultiTool.Common/Templates/TemplateLoader.vb @@ -154,14 +154,14 @@ Namespace Templates Public Async Function LoadTemplateConfiguration() As Task(Of Boolean) Try Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWMT_ITEMS) - Dim oItems As New List(Of TemplateConfigItem) + Dim oItems As New List(Of FieldConfig) For Each oRow As DataRow In oTable.Rows - Dim oColumn As New TemplateConfigItem() With { + Dim oColumn As New FieldConfig() With { .Template = oRow.ItemEx("TEMPLATE_NAME", String.Empty), .Table = oRow.ItemEx("XML_TABLE", String.Empty), .Name = oRow.ItemEx("XML_ITEM", String.Empty), - .Type = TemplateConfigItem.ConvertType(ItemEx(oRow, "DATA_TYPE", String.Empty)), + .Type = FieldConfig.ConvertType(ItemEx(oRow, "DATA_TYPE", String.Empty)), .OrderKey = oRow.ItemEx("ORDER_KEY", 0), .IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False), .IsVisible = oRow.ItemEx("IS_VISIBLE", True), @@ -169,7 +169,7 @@ Namespace Templates .IsVirtual = oRow.ItemEx("IS_VIRTUAL", False), .IsHead = oRow.ItemEx("IS_HEAD", True), .PreferExternalValue = oRow.ItemEx("PREFER_EXTERNAL", True), - .[Function] = New TemplateConfigItem.ColumnFunction With { + .[Function] = New FieldConfig.ColumnFunction With { .Id = oRow.ItemEx("FUNCTION_ID", 0), .Name = oRow.ItemEx("FUNCTION_NAME", String.Empty), .Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty) @@ -243,10 +243,10 @@ Namespace Templates For Each oTable In oTemplate.Tables For Each oColumn As Template.Column In oTable.Columns - Dim oConfig As TemplateConfigItem = pTemplateConfig.GetColumn(oColumn.Name, oTable.Name) + Dim oConfig As FieldConfig = pTemplateConfig.GetColumn(oColumn.Name, oTable.Name) If oConfig Is Nothing Then - oConfig = New TemplateConfigItem With { + oConfig = New FieldConfig With { .IsRequired = oColumn.IsRequired, .Name = oColumn.Name }