ControlLayout

This commit is contained in:
2020-01-10 11:02:33 +01:00
parent 25b444528d
commit 582e701492
16 changed files with 1700 additions and 1933 deletions

View File

@@ -54,13 +54,13 @@ Public Class clsPatterns
Public Shared Function ReplaceAllValues(input As String, panel As Panel, document As WMObject, prename As Object, surname As Object, shortname As Object, language As Object, email As Object, userId As Object, profileId As Object) As String
Try
Dim result = input
LOGGER.Debug($"ReplaceString BEFORE replacing: [{result}]")
LOGGER.Debug($"inputString BEFORE replacing: [{result}]")
result = ReplaceInternalValues(result)
result = ReplaceControlValues(result, panel)
If Not IsNothing(document) Then result = ReplaceWindreamIndicies(result, document)
result = ReplaceIDBAttributes(result)
result = ReplaceUserValues(result, prename, surname, shortname, language, email, userId, profileId)
LOGGER.Debug($"ReplaceString AFTER replacing: [{result}]")
LOGGER.Debug($"inputString AFTER replacing: [{result}]")
Return result
Catch ex As Exception
LOGGER.Error(ex)
@@ -91,7 +91,7 @@ Public Class clsPatterns
While ContainsPatternAndValue(result, PATTERN_INT, INT_VALUE_DATE)
result = ReplacePattern(result, PATTERN_INT, Now.ToShortDateString)
End While
LOGGER.Debug("sql after ReplaceInternalValues: " & input)
Return result
Catch ex As Exception
LOGGER.Error(ex)
@@ -132,7 +132,7 @@ Public Class clsPatterns
While ContainsPatternAndValue(result, PATTERN_USER, USER_VALUE_PROFILE_ID)
result = ReplacePattern(result, PATTERN_USER, profileId)
End While
LOGGER.Debug("sql after ReplaceUserValues: " & input)
Return result
Catch ex As Exception
LOGGER.Error(ex)
@@ -160,7 +160,7 @@ Public Class clsPatterns
oTryCounter += 1
End While
LOGGER.Debug("sql after ReplaceControlValues: " & input)
Return result
Catch ex As Exception
LOGGER.Error(ex)
@@ -186,7 +186,7 @@ Public Class clsPatterns
End If
oTryCounter += 100
End While
LOGGER.Debug("sql after ReplaceWindreamIndicies: " & input)
Return result
Catch ex As Exception
LOGGER.Error(ex)
@@ -218,11 +218,13 @@ Public Class clsPatterns
End If
If oIDBValue IsNot Nothing Then
result = ReplacePattern(result, PATTERN_IDBA, oIDBValue)
Dim oReplaceValue = "{" + $"#{PATTERN_IDBA}#{indexName}" + "}"
result = result.Replace(oReplaceValue, oIDBValue)
'result = ReplacePattern(result, oReplaceValue, oIDBValue)
End If
oTryCounter += 100
End While
LOGGER.Debug("sql after ReplaceIDBAttributes: " & input)
Return result
Catch ex As Exception
LOGGER.Error(ex)