Clean up, fix missing TextEdit
This commit is contained in:
Jonathan Jenne
@@ -83,19 +83,8 @@ Public Class frmValidator
|
||||
Private Property _dependingColumn_in_action As Boolean = False
|
||||
Private Property _SetControlValue_in_action As Boolean = False
|
||||
|
||||
Private Property DTConversations As DataTable
|
||||
Private Property DTDYNAMIC_RIGHTS As DataTable
|
||||
|
||||
Private Property DT_AdditionalSearches_Resultset_Docs As DataTable
|
||||
|
||||
Private Property Right_Conversation_Add As Boolean = False
|
||||
Private Property Right_Conversation_Stop As Boolean = False
|
||||
Private Property Right_Conversation_Message As Boolean = False
|
||||
|
||||
Private Property Conversation_User_Active As Boolean = False
|
||||
Private Property ConversationQUDT_Delete As DataTable
|
||||
Private Property Conversation_initialized As Boolean = False
|
||||
|
||||
Public Property FormLoaded As Boolean = False
|
||||
Private Property ItemWorked As Boolean = False
|
||||
Private Property Override As Boolean = False
|
||||
@@ -104,7 +93,10 @@ Public Class frmValidator
|
||||
Private Property listChangedLookup As New List(Of String)
|
||||
|
||||
Private Property ControlHandleStarted As Boolean = False
|
||||
|
||||
Private Documentloader As Loader
|
||||
Private ControlCreator As ClassControlCreator
|
||||
|
||||
Private Property OperationMode As OperationMode
|
||||
Private ReadOnly Environment As Environment
|
||||
Private AdditionalDocResultsExist As Boolean = False
|
||||
@@ -159,7 +151,7 @@ Public Class frmValidator
|
||||
OperationMode = GetOperationMode()
|
||||
|
||||
Documentloader = New Loader(LOGCONFIG, OperationMode, Environment.Service.Client, Environment.User)
|
||||
|
||||
ControlCreator = New ClassControlCreator(LOGCONFIG)
|
||||
|
||||
PMDelimiter = "~"
|
||||
Override = False
|
||||
@@ -169,8 +161,7 @@ Public Class frmValidator
|
||||
OLD_Document_Path = ""
|
||||
first_control = Nothing
|
||||
me_closing = False
|
||||
'pdfxchange = False
|
||||
'sumatra = False
|
||||
|
||||
FormLoaded = False
|
||||
Attmt_bbtnitmShow.Visibility = BarItemVisibility.Never
|
||||
Attmnt_bbtnitm_LoadonClick.Visibility = BarItemVisibility.Never
|
||||
@@ -617,7 +608,21 @@ Public Class frmValidator
|
||||
End If
|
||||
Dim oValue
|
||||
|
||||
If TypeOf control Is TextEdit Then
|
||||
' Because LookupControl is a subtype of TextEdit,
|
||||
' we need to check for LookupControl first!
|
||||
If TypeOf control Is LookupControl3 Then
|
||||
Try
|
||||
Dim lookup As LookupControl3 = control
|
||||
|
||||
lookup.Properties.DataSource = oDTContent
|
||||
lookup.Properties.ValueMember = oDTContent.Columns.Item(0).ColumnName
|
||||
lookup.Properties.DisplayMember = oDTContent.Columns.Item(0).ColumnName
|
||||
Catch ex As Exception
|
||||
|
||||
LOGGER.Warn("Error in LookUpLoadSQLData: " & ex.Message)
|
||||
End Try
|
||||
|
||||
ElseIf TypeOf control Is TextEdit Then
|
||||
Try
|
||||
Dim firstRow As DataRow = oDTContent.Rows(0)
|
||||
|
||||
@@ -629,7 +634,7 @@ Public Class frmValidator
|
||||
LOGGER.Warn("Error in TextBoxLoadSQLData: " & ex.Message)
|
||||
|
||||
End Try
|
||||
ElseIf TypeOf control Is ComboBox Then
|
||||
ElseIf TypeOf control Is Windows.Forms.ComboBox Then
|
||||
Try
|
||||
Dim oMyComboBox As Windows.Forms.ComboBox = control
|
||||
Dim oselectedIndex = oMyComboBox.SelectedIndex
|
||||
@@ -646,17 +651,7 @@ Public Class frmValidator
|
||||
Catch ex As Exception
|
||||
LOGGER.Warn("Error in ComboBoxLoadSQLData: " & ex.Message)
|
||||
End Try
|
||||
ElseIf TypeOf control Is LookupControl3 Then
|
||||
Try
|
||||
Dim lookup As LookupControl3 = control
|
||||
|
||||
lookup.Properties.DataSource = oDTContent
|
||||
lookup.Properties.ValueMember = oDTContent.Columns.Item(0).ColumnName
|
||||
lookup.Properties.DisplayMember = oDTContent.Columns.Item(0).ColumnName
|
||||
Catch ex As Exception
|
||||
|
||||
LOGGER.Warn("Error in LookUpLoadSQLData: " & ex.Message)
|
||||
End Try
|
||||
ElseIf TypeOf control Is GridControl Then
|
||||
Try
|
||||
Dim dataGridView As GridControl = control
|
||||
@@ -761,8 +756,6 @@ Public Class frmValidator
|
||||
|
||||
Dim oTabIndexCounter As Integer = 0
|
||||
|
||||
ClassControlCreator.Logger = LOGCONFIG.GetLoggerFor("ControlCreator")
|
||||
|
||||
For Each oControlRow As DataRow In DT_CONTROLS.Rows
|
||||
Dim oMyControl As Control
|
||||
Dim oControlID = oControlRow.Item("GUID")
|
||||
@@ -774,7 +767,7 @@ Public Class frmValidator
|
||||
oControlInfo = ClassControlCreator.PREFIX_TEXTBOX & "#" & oControlInfo
|
||||
LOGGER.Debug($"[{oControlInfo}] - TXT Try to create control...")
|
||||
|
||||
Dim txt As TextEdit = ClassControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
Dim txt As TextEdit = ControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
AddHandler txt.GotFocus, AddressOf OnTextBoxFocus
|
||||
AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus
|
||||
AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp
|
||||
@@ -786,15 +779,15 @@ Public Class frmValidator
|
||||
End Try
|
||||
Case "LBL"
|
||||
oControlInfo = "LBL#" & oControlInfo
|
||||
oMyControl = ClassControlCreator.CreateExistingLabel(oControlRow, False)
|
||||
oMyControl = ControlCreator.CreateExistingLabel(oControlRow, False)
|
||||
Case "CMB"
|
||||
oControlInfo = "CMB#" & oControlInfo
|
||||
LOGGER.Debug($"[{oControlInfo}] - CMB Try to create control...")
|
||||
If oControlRow.Item("READ_ONLY") Then
|
||||
Dim cmbReadonly = ClassControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
Dim cmbReadonly = ControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
oMyControl = cmbReadonly
|
||||
Else
|
||||
Dim oComboBox = ClassControlCreator.CreateExistingCombobox(oControlRow, False)
|
||||
Dim oComboBox = ControlCreator.CreateExistingCombobox(oControlRow, False)
|
||||
|
||||
AddHandler oComboBox.SelectedValueChanged, AddressOf OnCmbselectedIndex
|
||||
AddHandler oComboBox.GotFocus, Sub(sender As Control, e As EventArgs)
|
||||
@@ -878,10 +871,10 @@ Public Class frmValidator
|
||||
|
||||
Case "DTP"
|
||||
oControlInfo = "DTP#" & oControlInfo
|
||||
oMyControl = ClassControlCreator.CreateExistingDatepicker(oControlRow, False)
|
||||
oMyControl = ControlCreator.CreateExistingDatepicker(oControlRow, False)
|
||||
|
||||
Case "DGV"
|
||||
Dim dgv = ClassControlCreator.CreateExistingDataGridView(oControlRow, False)
|
||||
Dim dgv = ControlCreator.CreateExistingDataGridView(oControlRow, False)
|
||||
|
||||
AddHandler dgv.RowValidating, AddressOf onDGVRowValidating
|
||||
|
||||
@@ -893,10 +886,10 @@ Public Class frmValidator
|
||||
Dim oReadonly = oControlRow.Item("READ_ONLY")
|
||||
|
||||
If oMultiselect = False And oReadonly = True Then
|
||||
Dim lookupReadonly = ClassControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
Dim lookupReadonly = ControlCreator.CreateExistingTextbox(oControlRow, False)
|
||||
oMyControl = lookupReadonly
|
||||
Else
|
||||
Dim lookup As LookupControl3 = ClassControlCreator.CreateExistingLookupControl(oControlRow, False)
|
||||
Dim lookup As LookupControl3 = ControlCreator.CreateExistingLookupControl(oControlRow, False)
|
||||
|
||||
lookup.Properties.PreventDuplicates = oControlRow.Item("VKT_PREVENT_MULTIPLE_VALUES")
|
||||
lookup.Properties.AllowAddNewValues = oControlRow.Item("VKT_ADD_ITEM")
|
||||
@@ -958,7 +951,7 @@ Public Class frmValidator
|
||||
|
||||
Case "CHK"
|
||||
oControlInfo = "CHK#" & oControlInfo
|
||||
oMyControl = ClassControlCreator.CreateExisingCheckbox(oControlRow, False)
|
||||
oMyControl = ControlCreator.CreateExisingCheckbox(oControlRow, False)
|
||||
|
||||
Dim mycheckbox As CheckBox = oMyControl
|
||||
AddHandler mycheckbox.CheckedChanged, AddressOf onCheckBox_CheckedChange
|
||||
@@ -977,7 +970,7 @@ Public Class frmValidator
|
||||
Continue For
|
||||
End If
|
||||
|
||||
Dim oGrid = ClassControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False)
|
||||
Dim oGrid = ControlCreator.CreateExistingGridControl(oControlRow, oFilteredDatatable, False)
|
||||
|
||||
AddHandler oGrid.ProcessGridKey, Sub(ByVal _sender As Object, ByVal e As KeyEventArgs)
|
||||
If e.KeyCode = Keys.Tab Then
|
||||
@@ -1001,9 +994,9 @@ Public Class frmValidator
|
||||
oMyControl = oGrid
|
||||
Case "LINE"
|
||||
|
||||
oMyControl = ClassControlCreator.CreateExistingLine(oControlRow, False)
|
||||
oMyControl = ControlCreator.CreateExistingLine(oControlRow, False)
|
||||
Case "BUTTON"
|
||||
Dim obutton = ClassControlCreator.CreateExistingButton(oControlRow, False)
|
||||
Dim obutton = ControlCreator.CreateExistingButton(oControlRow, False)
|
||||
|
||||
AddHandler obutton.Click, AddressOf onCustomButtonClick
|
||||
oMyControl = obutton
|
||||
@@ -1056,7 +1049,7 @@ Public Class frmValidator
|
||||
Case GetType(DevExpress.XtraEditors.TextEdit)
|
||||
inctrl.Text = ""
|
||||
Case GetType(System.Windows.Forms.ComboBox)
|
||||
Dim cmb As ComboBox = inctrl
|
||||
Dim cmb As Windows.Forms.ComboBox = inctrl
|
||||
cmb.SelectedIndex = -1
|
||||
Case GetType(System.Windows.Forms.DataGridView)
|
||||
Dim dgv As DataGridView = inctrl
|
||||
@@ -1097,7 +1090,7 @@ Public Class frmValidator
|
||||
|
||||
SetControlValues_FromControl(oTextbox)
|
||||
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
End Sub
|
||||
|
||||
Private Function GetControlID(ByVal PROFILEID As Integer, Controlname As String)
|
||||
@@ -1148,7 +1141,7 @@ Public Class frmValidator
|
||||
|
||||
End If
|
||||
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -1165,7 +1158,7 @@ Public Class frmValidator
|
||||
Private Sub onCustomButtonClick(sender As System.Object, e As System.EventArgs)
|
||||
Dim oButton As Button = sender
|
||||
Dim oControlID = DirectCast(oButton.Tag, ClassControlCreator.ControlMetadata).Guid
|
||||
Dim oSQL = ClassControlCreator.GET_CONTROL_PROPERTY(DT_CONTROLS, oControlID, "SQL_UEBERPRUEFUNG")
|
||||
Dim oSQL = ControlCreator.GET_CONTROL_PROPERTY(DT_CONTROLS, oControlID, "SQL_UEBERPRUEFUNG")
|
||||
If IsNothing(oSQL) Then
|
||||
LOGGER.Warn("onCustomButtonClick - SQL_UEBERPRUEFUNG IS NOTHING")
|
||||
Exit Sub
|
||||
@@ -1175,7 +1168,7 @@ Public Class frmValidator
|
||||
LOGGER.Warn("onCustomButtonClick - Check_UpdateIndexe = False >> Exit Click")
|
||||
Exit Sub
|
||||
End If
|
||||
Override_SQLCommand = ClassControlCreator.GET_CONTROL_PROPERTY(DT_CONTROLS, oControlID, "SQL2")
|
||||
Override_SQLCommand = ControlCreator.GET_CONTROL_PROPERTY(DT_CONTROLS, oControlID, "SQL2")
|
||||
If IsNothing(Override_SQLCommand) Then
|
||||
Override_SQLCommand = ""
|
||||
End If
|
||||
@@ -1395,7 +1388,7 @@ Public Class frmValidator
|
||||
Dim oLookup As RepositoryItemLookupControl3 = sender
|
||||
listChangedLookup.Add(oLookup.Name)
|
||||
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
@@ -1413,7 +1406,7 @@ Public Class frmValidator
|
||||
Checkbox_EnablingControls(oCheckbox)
|
||||
CheckBox_DependingColumn(oCheckbox)
|
||||
SetControlValues_FromControl(oCheckbox)
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
@@ -1959,7 +1952,7 @@ Public Class frmValidator
|
||||
Dim oControlId = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid
|
||||
|
||||
If oControlId = oDEPENDING_CONTROL_ID Then
|
||||
ClassControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
ControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
_dependingColumn_in_action = False
|
||||
Exit For
|
||||
End If
|
||||
@@ -2003,7 +1996,7 @@ Public Class frmValidator
|
||||
For Each oControl As Control In PanelValidatorControl.Controls
|
||||
Dim oControlId = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid
|
||||
If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_CONTROL_ID Then
|
||||
ClassControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
ControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
_dependingColumn_in_action = False
|
||||
Exit For
|
||||
End If
|
||||
@@ -2019,7 +2012,7 @@ Public Class frmValidator
|
||||
End Sub
|
||||
|
||||
Public Sub OnCmbselectedIndex(sender As System.Object, e As System.EventArgs)
|
||||
Dim oCombobox As ComboBox = sender
|
||||
Dim oCombobox As Windows.Forms.ComboBox = sender
|
||||
If oCombobox.SelectedIndex <> -1 And _Indexe_Loaded = True Then
|
||||
If oCombobox.Name = last_control.Name Then
|
||||
'Abschluss()
|
||||
@@ -2060,7 +2053,7 @@ Public Class frmValidator
|
||||
Next
|
||||
End If
|
||||
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
|
||||
Controls2beEnabled(oCombobox.Name)
|
||||
|
||||
@@ -2990,12 +2983,12 @@ Public Class frmValidator
|
||||
If DTVWCONTROL_INDEX.Rows.Count > 0 Then
|
||||
Dim oCount As Integer = 0
|
||||
For Each oControl As Control In Me.PanelValidatorControl.Controls
|
||||
If SingleAttribute <> "" Then
|
||||
oIDBOverride = True
|
||||
If SingleAttribute <> oControl.Name Then
|
||||
Continue For
|
||||
End If
|
||||
End If
|
||||
'If SingleAttribute <> "" Then
|
||||
' oIDBOverride = True
|
||||
' If SingleAttribute <> oControl.Name Then
|
||||
' Continue For
|
||||
' End If
|
||||
'End If
|
||||
|
||||
Dim oValueFromSource
|
||||
Dim oFormattedValue As String = ""
|
||||
@@ -3104,7 +3097,7 @@ Public Class frmValidator
|
||||
End Try
|
||||
|
||||
|
||||
ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
ControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
|
||||
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -3285,25 +3278,6 @@ Public Class frmValidator
|
||||
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
|
||||
'Select Case oColValuesfromSource.Length
|
||||
' Case 1
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0)})
|
||||
' Case 2
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)})
|
||||
' Case 3
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)})
|
||||
' Case 4
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)})
|
||||
' Case 5
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)})
|
||||
' Case 6
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)})
|
||||
' Case 7
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)})
|
||||
' Case 8
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)})
|
||||
'End Select
|
||||
|
||||
|
||||
ElseIf oValueType = "System.Data.DataTable" Then
|
||||
Dim oMyDatatable As DataTable = oValueFromSource
|
||||
@@ -3327,25 +3301,6 @@ Public Class frmValidator
|
||||
|
||||
oDataSource.Rows.Add(oRowData.ToArray())
|
||||
|
||||
'Select Case oColValuesfromSource.Length
|
||||
' Case 1
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0)})
|
||||
' Case 2
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)})
|
||||
' Case 3
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)})
|
||||
' Case 4
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)})
|
||||
' Case 5
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4)})
|
||||
' Case 6
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5)})
|
||||
' Case 7
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6)})
|
||||
' Case 8
|
||||
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3), oColValuesfromSource(4), oColValuesfromSource(5), oColValuesfromSource(6), oColValuesfromSource(7)})
|
||||
'End Select
|
||||
|
||||
Next
|
||||
End If
|
||||
|
||||
@@ -3634,7 +3589,7 @@ Public Class frmValidator
|
||||
For Each oControl As Control In PanelValidatorControl.Controls
|
||||
Dim oControlId = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid
|
||||
If oControlId = oDEPENDING_CTRL_ID Then
|
||||
ClassControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
ControlCreator.GridTables_CacheDatatableForColumn(oControlId, oDEPENDING_COLUMN, oSqlCommand, oCONNID, oAdvancedLookup)
|
||||
Exit For
|
||||
End If
|
||||
Next
|
||||
@@ -4181,7 +4136,7 @@ Public Class frmValidator
|
||||
End Try
|
||||
|
||||
Case GetType(System.Windows.Forms.ComboBox)
|
||||
Dim cmb As ComboBox = oControl
|
||||
Dim cmb As Windows.Forms.ComboBox = oControl
|
||||
Try
|
||||
value_from_control = cmb.Text
|
||||
Catch ex As Exception
|
||||
@@ -4328,17 +4283,24 @@ Public Class frmValidator
|
||||
|
||||
btnSave.Enabled = True
|
||||
End Sub
|
||||
Function Check_Missing(control As Control, typ As String) As Boolean
|
||||
|
||||
Function Check_Missing_Control_Value(control As Control, typ As String) As Boolean
|
||||
Select Case typ
|
||||
Case "txt"
|
||||
Dim oTextBox As TextEdit = control
|
||||
If oTextBox.Text = String.Empty Then
|
||||
|
||||
If IsNothing(oTextBox.EditValue) Then
|
||||
Return True
|
||||
End If
|
||||
|
||||
If oTextBox.EditValue.ToString = String.Empty Then
|
||||
Return True
|
||||
End If
|
||||
End Select
|
||||
|
||||
Return False
|
||||
End Function
|
||||
|
||||
Function Return_PM_VEKTOR(input As String, VKTBezeichner As String)
|
||||
Dim PM_String As String
|
||||
Try
|
||||
@@ -4673,7 +4635,7 @@ Public Class frmValidator
|
||||
End If
|
||||
|
||||
'as erstes überprüfen ob überhaupt etwas eingetragen worden ist
|
||||
If Check_Missing(oControl, "txt") = True And oIsRequired = True Then 'NICHTS EINGETRAGEN
|
||||
If Check_Missing_Control_Value(oControl, "txt") = True And oIsRequired = True Then 'NICHTS EINGETRAGEN
|
||||
oMissing = True
|
||||
oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
|
||||
LOGGER.Warn(oErrMsgMissingInput)
|
||||
|
||||
Reference in New Issue
Block a user