This commit is contained in:
2020-04-20 14:36:46 +02:00
parent c6cb81c05b
commit 103619ebac
20 changed files with 1252 additions and 898 deletions

View File

@@ -279,9 +279,9 @@ Public Class frmValidator
If CURRENT_DOC_GUID <> 0 Then
Try
If ItemWorked = False Then
Free_File()
End If
'If ItemWorked = False Then
Free_File()
'End If
Catch ex As Exception
LOGGER.Error(ex)
End Try
@@ -1359,7 +1359,7 @@ Public Class frmValidator
Dim oSqlCommand = IIf(IsDBNull(oFilteredDatatable.Rows(0).Item("SET_CONTROL_DATA")), "", oFilteredDatatable.Rows(0).Item("SET_CONTROL_DATA"))
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
_SetControlValue_in_action = True
Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand)
Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oFilteredDatatable.Rows(0).Item("CONNECTION_ID"))
For Each oRowControl2Set As DataRow In oDTDEPENDING_RESULT.Rows
Try
oControl2Set = oRowControl2Set.Item("Control2Set")
@@ -1383,6 +1383,7 @@ Public Class frmValidator
Catch ex As Exception
btnSave.ForeColor = Color.Black
End Try
Catch ex As Exception
End Try
@@ -1401,9 +1402,19 @@ Public Class frmValidator
LOGGER.Debug($"Got the Control22Set: {oControl2Set}..Setting the values..")
Select Case oControl.GetType.ToString
Case GetType(TextBox).ToString
Dim oTextOption = "Replace"
Try
oTextOption = oRowControl2Set.Item("TextOption")
Catch ex As Exception
oTextOption = "Replace"
End Try
Try
Dim oTEXT = oRowControl2Set.Item("Caption")
oControl.Text = oControl.Text & oTEXT
If oTextOption = "Replace" Then
oControl.Text = oTEXT
Else
oControl.Text = oControl.Text & oTEXT
End If
Catch ex As Exception
End Try
@@ -1420,6 +1431,7 @@ Public Class frmValidator
Catch ex As Exception
oControl.ForeColor = Color.Black
End Try
Case GetType(LookupControl2).ToString
Dim oDependingLookup As LookupControl2 = oControl
oDependingLookup.DataSource = oDTDEPENDING_RESULT
@@ -1470,7 +1482,7 @@ Public Class frmValidator
Dim oSqlCommand = IIf(IsDBNull(oRowDependingControl.Item("SQL_UEBERPRUEFUNG")), "", oRowDependingControl.Item("SQL_UEBERPRUEFUNG"))
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
_dependingControl_in_action = True
Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand)
Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oRowDependingControl.Item("CONNECTION_ID"))
Try
Dim oFound As Boolean = False
'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault()
@@ -1666,7 +1678,7 @@ Public Class frmValidator
Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE"))
oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, CURRENT_WMFILE, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID)
_dependingControl_in_action = True
Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar(oSqlCommand, CONNECTION_STRING)
Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar_ConID(oSqlCommand, oRowEnablingControl.Item("CONNECTION_ID"))
Try
Dim oFound As Boolean = False
'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault()
@@ -3190,6 +3202,9 @@ Public Class frmValidator
Return False
End If
End If
Case "MsgboxStop".ToUpper
MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
Return False
Case "Msgbox".ToUpper
MessageBox.Show(oQuestion, oTitle, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
Return True