Rename TemplateConfigItem to FieldConfig

This commit is contained in:
Jonathan Jenne 2022-05-03 15:38:35 +02:00
parent 5accfbe002
commit 8e02ed7159
7 changed files with 14 additions and 14 deletions

View File

@ -343,7 +343,7 @@ Namespace Documents
Return pDocument Return pDocument
End Function 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 For Each oSQLConfigItem In pSQLConfig
' FieldList is a list of fields that will be changed ' FieldList is a list of fields that will be changed
' Example: Setting SQL for Article StorageLocation will invoke the sql for each row ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row

View File

@ -151,7 +151,7 @@
<Compile Include="Winline\Entities\Contact.vb" /> <Compile Include="Winline\Entities\Contact.vb" />
<Compile Include="Winline\Entities\DocumentKind.vb" /> <Compile Include="Winline\Entities\DocumentKind.vb" />
<Compile Include="Winline\Entities\Mandator.vb" /> <Compile Include="Winline\Entities\Mandator.vb" />
<Compile Include="Templates\TemplateConfigItem.vb" /> <Compile Include="Templates\FieldConfig.vb" />
<Compile Include="Winline\WebServiceData.vb" /> <Compile Include="Winline\WebServiceData.vb" />
<Compile Include="XmlData.vb" /> <Compile Include="XmlData.vb" />
</ItemGroup> </ItemGroup>

View File

@ -103,7 +103,7 @@ Public Class ReportGenerator(Of TReport As IReport)
Return oResult Return oResult
End Function 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 For Each oSQLConfigItem In pSQLConfig
' FieldList is a list of fields that will be changed ' FieldList is a list of fields that will be changed
' Example: Setting SQL for Article StorageLocation will invoke the sql for each row ' Example: Setting SQL for Article StorageLocation will invoke the sql for each row

View File

@ -2,7 +2,7 @@
Imports DigitalData.Modules.Language Imports DigitalData.Modules.Language
Namespace Templates Namespace Templates
Public Class TemplateConfigItem Public Class FieldConfig
Public Property Name As String Public Property Name As String
Public Property Table As String Public Property Table As String
Public Property Type As ColumnType Public Property Type As ColumnType

View File

@ -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. ''' Required value from Schema. This value will be written in the ColumnConfig and is not relevant from that point on.
''' </summary> ''' </summary>
Public Property IsRequired As Boolean Public Property IsRequired As Boolean
Public Property Config As TemplateConfigItem Public Property Config As FieldConfig
Public Overrides Function ToString() As String Public Overrides Function ToString() As String
Return Name Return Name

View File

@ -6,9 +6,9 @@ Namespace Templates
''' Class for loading column/field config from database ''' Class for loading column/field config from database
''' </summary> ''' </summary>
Public Class TemplateConfig 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 Get
Return Items. Return Items.
Where(Function(item) item.Function.Name = Constants.FUNCTION_SQL). Where(Function(item) item.Function.Name = Constants.FUNCTION_SQL).
@ -16,7 +16,7 @@ Namespace Templates
End Get End Get
End Property 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. Return Items.
Where(Function(c) c.Name = pName And c.Table = pTable). Where(Function(c) c.Name = pName And c.Table = pTable).
FirstOrDefault() FirstOrDefault()

View File

@ -154,14 +154,14 @@ Namespace Templates
Public Async Function LoadTemplateConfiguration() As Task(Of Boolean) Public Async Function LoadTemplateConfiguration() As Task(Of Boolean)
Try Try
Dim oTable As DataTable = Await Database.GetDatatableAsync(SQL_VWMT_ITEMS) 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 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), .Template = oRow.ItemEx("TEMPLATE_NAME", String.Empty),
.Table = oRow.ItemEx("XML_TABLE", String.Empty), .Table = oRow.ItemEx("XML_TABLE", String.Empty),
.Name = oRow.ItemEx("XML_ITEM", 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), .OrderKey = oRow.ItemEx("ORDER_KEY", 0),
.IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False), .IsReadOnly = oRow.ItemEx("IS_READ_ONLY", False),
.IsVisible = oRow.ItemEx("IS_VISIBLE", True), .IsVisible = oRow.ItemEx("IS_VISIBLE", True),
@ -169,7 +169,7 @@ Namespace Templates
.IsVirtual = oRow.ItemEx("IS_VIRTUAL", False), .IsVirtual = oRow.ItemEx("IS_VIRTUAL", False),
.IsHead = oRow.ItemEx("IS_HEAD", True), .IsHead = oRow.ItemEx("IS_HEAD", True),
.PreferExternalValue = oRow.ItemEx("PREFER_EXTERNAL", True), .PreferExternalValue = oRow.ItemEx("PREFER_EXTERNAL", True),
.[Function] = New TemplateConfigItem.ColumnFunction With { .[Function] = New FieldConfig.ColumnFunction With {
.Id = oRow.ItemEx("FUNCTION_ID", 0), .Id = oRow.ItemEx("FUNCTION_ID", 0),
.Name = oRow.ItemEx("FUNCTION_NAME", String.Empty), .Name = oRow.ItemEx("FUNCTION_NAME", String.Empty),
.Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty) .Params = oRow.ItemEx("FUNCTION_PARAMETERS", String.Empty)
@ -243,10 +243,10 @@ Namespace Templates
For Each oTable In oTemplate.Tables For Each oTable In oTemplate.Tables
For Each oColumn As Template.Column In oTable.Columns 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 If oConfig Is Nothing Then
oConfig = New TemplateConfigItem With { oConfig = New FieldConfig With {
.IsRequired = oColumn.IsRequired, .IsRequired = oColumn.IsRequired,
.Name = oColumn.Name .Name = oColumn.Name
} }