AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove Modules.Language from frmValidator

Browse Source
This commit is contained in:
Jonathan Jenne
2023-06-07 10:07:36 +02:00
parent 38afdf9f58
commit 829670e086
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/TaskFlow/frmValidator.vb
View File

@@ -6,8 +6,6 @@ Imports System.Text.RegularExpressions
Imports System.ComponentModel Imports System.ComponentModel
Imports System.Globalization Imports System.Globalization
Imports DigitalData.Controls.LookupGrid Imports DigitalData.Controls.LookupGrid
Imports DigitalData.Modules.Language.Utils
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.Base Imports DigitalData.Modules.Base
Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
Imports DigitalData.Modules.EDMI.API.Constants Imports DigitalData.Modules.EDMI.API.Constants
@@ -911,7 +909,7 @@ Public Class frmValidator
lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM") lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
lookup.Properties.MultiSelect = oMultiselect lookup.Properties.MultiSelect = oMultiselect
If NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then If GenericEx.NotNull(oControlRow.Item("DEFAULT_VALUE"), "") <> "" Then
lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")} lookup.Properties.SelectedValues = New List(Of String) From {oControlRow.Item("DEFAULT_VALUE")}
End If End If
@@ -1466,15 +1464,15 @@ Public Class frmValidator
Dim oControlname2Set = oRow.Item("NAME") Dim oControlname2Set = oRow.Item("NAME")
LOGGER.Debug($"Workin on SetControLValue for {oControlname2Set} ...") LOGGER.Debug($"Workin on SetControLValue for {oControlname2Set} ...")
Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), -1) Dim oConnectionId = GenericEx.NotNull(oRow.Item("CONNECTION_ID"), -1)
Dim oControlDataSql = NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty) Dim oControlDataSql = GenericEx.NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
If oConnectionId = -1 Or oControlDataSql = String.Empty Then If oConnectionId = -1 Or oControlDataSql = String.Empty Then
LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!") LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!")
Exit Sub Exit Sub
End If End If
Dim oSqlCommand = NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty) Dim oSqlCommand = GenericEx.NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True) oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
'Dim oControlDataResult As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId, $"SetControlValues - CTRLID {oControlID}") 'Dim oControlDataResult As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oConnectionId, $"SetControlValues - CTRLID {oControlID}")
@@ -1729,7 +1727,7 @@ Public Class frmValidator
Case GetType(TextEdit).ToString Case GetType(TextEdit).ToString
Try Try
Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0) Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
oValue = Utils.NotNull(Of Object)(oValue, Nothing) oValue = GenericEx.NotNull(Of Object)(oValue, Nothing)
Try Try
'oControl.Text = oValue 'oControl.Text = oValue
DirectCast(oControl, TextEdit).EditValue = oValue DirectCast(oControl, TextEdit).EditValue = oValue
@@ -1852,7 +1850,7 @@ Public Class frmValidator
Case GetType(TextEdit).ToString Case GetType(TextEdit).ToString
Try Try
Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0) Dim oValue As Object = oDTDEPENDING_RESULT.Rows(0).Item(0)
oValue = Utils.NotNull(Of Object)(oValue, Nothing) oValue = GenericEx.NotNull(Of Object)(oValue, Nothing)
Try Try
'oControl.Text = oValue 'oControl.Text = oValue
DirectCast(oControl, TextEdit).EditValue = oValue DirectCast(oControl, TextEdit).EditValue = oValue
@@ -3025,7 +3023,7 @@ Public Class frmValidator
Dim oSourceIndexName As String = oControlRow.Item("INDEX_NAME") Dim oSourceIndexName As String = oControlRow.Item("INDEX_NAME")
' Wenn kein defaultValue existiert, leeren String setzen ' Wenn kein defaultValue existiert, leeren String setzen
Dim oDefaultValue As String = NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty) Dim oDefaultValue As String = GenericEx.NotNull(oControlRow.Item("DEFAULT_VALUE"), String.Empty)
oIndexName = oSourceIndexName oIndexName = oSourceIndexName
oControName = oControl.Name oControName = oControl.Name
Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE") Dim oLoadIndex As Boolean = oControlRow.Item("LOAD_IDX_VALUE")
@@ -3086,9 +3084,9 @@ Public Class frmValidator
'oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString) 'oFormattedValue = ClassFormat.GetFormattedValue(oControl.Name, oValueFromSource, oFormatString)
If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then If Not IsNothing(oFormattedValue) And oFormattedValue <> String.Empty Then
oTextBox.EditValue = NotNull(oFormattedValue, oDefaultValue) oTextBox.EditValue = GenericEx.NotNull(oFormattedValue, oDefaultValue)
Else Else
oTextBox.EditValue = NotNull(oValueFromSource, oDefaultValue) oTextBox.EditValue = GenericEx.NotNull(oValueFromSource, oDefaultValue)
End If End If
Try Try
@@ -4445,8 +4443,8 @@ Public Class frmValidator
End If End If
oControlId = oControlRow.Item("GUID") oControlId = oControlRow.Item("GUID")
Dim oRegexMatch As String = NotNull(oControlRow.Item("REGEX_MATCH"), String.Empty) Dim oRegexMatch As String = GenericEx.NotNull(oControlRow.Item("REGEX_MATCH"), String.Empty)
Dim oRegexMessage As String = NotNull(oControlRow.Item("REGEX_MESSAGE_DE"), String.Empty) Dim oRegexMessage As String = GenericEx.NotNull(oControlRow.Item("REGEX_MESSAGE_DE"), String.Empty)
oControlName = oControlRow.Item("CTRL_NAME") oControlName = oControlRow.Item("CTRL_NAME")
Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA") Dim oOVERWRITE_DATA = oControlRow.Item("OVERWRITE_DATA")
@@ -5267,7 +5265,7 @@ Public Class frmValidator
Dim oValueList As New List(Of String) Dim oValueList As New List(Of String)
For Each item As Object In oRow.ItemArray For Each item As Object In oRow.ItemArray
item = NotNull(item, String.Empty) item = GenericEx.NotNull(item, String.Empty)
' Convert to string using InvariantCulture, so converting back from string does not screw up values ' Convert to string using InvariantCulture, so converting back from string does not screw up values
If TypeOf item IsNot String Then If TypeOf item IsNot String Then
item = String.Format(CultureInfo.InvariantCulture, "{0}", item) item = String.Format(CultureInfo.InvariantCulture, "{0}", item)