MS 2.2.11

This commit is contained in:
SchreiberM 2021-03-25 10:04:15 +01:00
parent fafabe8754
commit 0aa24e7909
2 changed files with 36 additions and 51 deletions

View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.11.0")>
<Assembly: AssemblyVersion("2.2.11.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@ -3124,8 +3124,6 @@ Public Class frmValidator
Dim oExpression = $"CONTROL_ID = {oControlId}"
DTGRID_COLUMNS.Select(oExpression, "SEQUENCE").CopyToDataTable(oDTColumnsPerDevExGrid, LoadOption.PreserveChanges)
'Dim oDTColumnsPerDevExGrid As DataTable = ClassDatabase.Return_Datatable($"SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = {oControlId} ORDER BY [SEQUENCE]")
'Dim oColCount = oDTColumnsPerDevExGrid.Rows.Count
Dim oColValuesfromSource As String()
LOGGER.Debug($"DevExpressGrid: {oDTColumnsPerDevExGrid.Rows.Count} Columns configured for control {oControlId}.")
If oDTColumnsPerDevExGrid.Rows.Count >= 1 Then
@ -3154,46 +3152,7 @@ Public Class frmValidator
LOGGER.Debug("Adding row to grid..")
oDataSource.Rows.Add(oNewRow)
'Select Case oDTColumnsPerDevExGrid.Rows.Count
' Case 1
' oDataSource.Rows.Add(New String() {Zeile.ToString})
' 'dgv.Rows.Add(New String() {Zeile.ToString})
' Case 2
' If oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1)})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), ""})
' End If
' Case 3
' If oColValuesfromSource.Length = 3 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2)})
' ElseIf oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), ""})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", ""})
' End If
' Case 4
' If oColValuesfromSource.Length = 4 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), oColValuesfromSource(3)})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), SpaltenWerte(3)})
' ElseIf oColValuesfromSource.Length = 3 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), oColValuesfromSource(2), ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), SpaltenWerte(2), ""})
' ElseIf oColValuesfromSource.Length = 2 Then
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), oColValuesfromSource(1), "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), SpaltenWerte(1), "", ""})
' Else
' oDataSource.Rows.Add(New String() {oColValuesfromSource(0), "", "", ""})
' 'dgv.Rows.Add(New String() {SpaltenWerte(0), "", "", ""})
' End If
'End Select
Next
Else
If oValueType = "System.String" Then
@ -3541,7 +3500,7 @@ Public Class frmValidator
Try
Dim oDTRESULT_FOR_COLUMN As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID, $"oDEPENDING_CTRL_ID: {oDEPENDING_CTRL_ID}")
If Not IsNothing(oDTRESULT_FOR_COLUMN) Then
LOGGER.Debug($"Trying to create a DropDown(FIV) for oDEPENDING_CTRL_ID [{oDEPENDING_CTRL_ID}]..RowCount: [{oDTRESULT_FOR_COLUMN.Rows.Count}] ")
LOGGER.Debug($"Trying to create a DropDown(FIV) for CONTROL-ID [{oDEPENDING_CTRL_ID}] - RowCount: [{oDTRESULT_FOR_COLUMN.Rows.Count}] ")
For Each oControl As Control In pnldesigner.Controls
If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_CTRL_ID Then
ClassControlCreator.GridTables.Item(oControl.Name).Add(oDEPENDING_COLUMN, oDTRESULT_FOR_COLUMN)
@ -3549,16 +3508,15 @@ Public Class frmValidator
End If
Next
Else
LOGGER.Warn($"oDTRESULT_FOR_COLUMN is nothing!")
LOGGER.Warn($"FillIndexValues - oDTRESULT_FOR_COLUMN is nothing!")
End If
Catch ex As Exception
LOGGER.Warn($"Unexpected error in creating dropdown(FIV) for oDEPENDING_GUID {oDEPENDING_CTRL_ID} an Column {oDEPENDING_COLUMN} " & ex.Message)
LOGGER.Warn($"FillIndexValues - Unexpected error in creating Grid-Dropdown-Column [{oDEPENDING_COLUMN}] for CONTROL-ID [{oDEPENDING_CTRL_ID}]: " & ex.Message)
End Try
Next
Catch ex As Exception
LOGGER.Warn($"Unexpected error in creating dropdown(FIV) for Grid: " & ex.Message)
LOGGER.Warn($"FillIndexValues - Unexpected error in creating dropdown for Grid: " & ex.Message)
End Try
@ -4219,6 +4177,7 @@ Public Class frmValidator
'Jetzt die Datei indexieren
If Indexiere_File(CURRENT_WMFILE, NameVKTIndex, oNewValue) = False Then
oMissing = True
LOGGER.Info("Error while indexing Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message)
oErrMsgMissingInput = "Error while indexing Vektorfeld '" & NameVKTIndex & "' - ERROR: " & idxerr_message
End If
End If
@ -4285,6 +4244,7 @@ Public Class frmValidator
If lookup.Properties.SelectedValues.Count = 0 And oIsRequired = True Then
oMissing = True
oErrMsgMissingInput = $"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'"
LOGGER.Warn($"Kein Auswahl getroffen in LookupGrid '{oControl.Name}'")
oControl.BackColor = Color.Red
Exit For
Else
@ -4312,6 +4272,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing von LookupGrid - ERROR: " & idxerr_message
LOGGER.Warn($"Error while indexing [{oIndexName}] von LookupGrid - ERROR: " & idxerr_message)
Exit For
End If
Else
@ -4320,6 +4281,7 @@ Public Class frmValidator
If IDBData.SetVariableValue(oIndexName, oMyDT, oOVERWRITE_DATA, oIDBTyp) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing IDB-Object LookupGrid"
LOGGER.Warn($"Error while indexing IDB-Object LookupGrid [{oIndexName}] ")
Exit For
End If
End If
@ -4329,6 +4291,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, oValues.ToArray) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing von LookupGrid - ERROR: " & idxerr_message
LOGGER.Warn($"Error while indexing LookupGrid [{oIndexName}] ")
Exit For
End If
Else
@ -4347,6 +4310,7 @@ Public Class frmValidator
If IsNothing(oMyInput) And oIsRequired = True Then
oMissing = True
oErrMsgMissingInput = $"Could not get FirstOrDefault-Value of LookUpGrid! - LookUPGridName: {lookup.Name}"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
ElseIf IsNothing(oMyInput) And oIsRequired = False Then
For Each ochangedLookub In listChangedLookup
@ -4418,6 +4382,7 @@ Public Class frmValidator
If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Textbox as VEKTOR - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4428,6 +4393,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Textbox - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4465,7 +4431,7 @@ Public Class frmValidator
oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
LOGGER.Warn(oErrMsgMissingInput)
If oRegexMessage <> String.Empty Then
oErrMsgMissingInput &= ":" & vbCrLf & oRegexMessage
End If
@ -4478,7 +4444,7 @@ Public Class frmValidator
If Check_Missing(oControl, "txt") = True And oIsRequired = True Then 'NICHTS EINGETRAGEN
oMissing = True
oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"
LOGGER.Warn(oErrMsgMissingInput)
oControl.BackColor = Color.Red
Exit For
Else
@ -4532,6 +4498,7 @@ Public Class frmValidator
If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then
oMissing = True
oErrMsgMissingInput = "Error while indexing textbox as VEKTOR - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4542,6 +4509,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Textbox - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4583,6 +4551,7 @@ Public Class frmValidator
If cmb.SelectedIndex = -1 And oIsRequired = True Then
oMissing = True
oErrMsgMissingInput = "Please Choose an entry out of ComboBox '" & cmb.Name & "'"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
'ElseIf cmb.SelectedIndex <> -1 Then
Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben
@ -4637,6 +4606,7 @@ Public Class frmValidator
If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Combobox as VEKTOR - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4648,6 +4618,7 @@ Public Class frmValidator
cmb.DroppedDown = True
oMissing = True
oErrMsgMissingInput = "Error while indexing Combobox - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4655,6 +4626,7 @@ Public Class frmValidator
cmb.DroppedDown = True
oMissing = True
oErrMsgMissingInput = "Error indexing combobox idb"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
End If
@ -4694,6 +4666,7 @@ Public Class frmValidator
If oIsRequired = True And dtp.Value.ToString = String.Empty Then
oMissing = True
oErrMsgMissingInput = "Please Choose DateValue for field'" & dtp.Name & "'"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
ElseIf dtp.Value.ToString <> "01.01.0001 00:00:00" Then
oMyInput = CDate(dtp.Value)
@ -4718,6 +4691,7 @@ Public Class frmValidator
If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then
oMissing = True
oErrMsgMissingInput = "Error while indexing DatePicker as VEKTOR - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4728,12 +4702,14 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing DatePicker- ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
If IDBData.SetVariableValue(oIndexName, oObjectValue) = False Then
oMissing = True
oErrMsgMissingInput = "Error indexing datepicker idb"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
End If
@ -4815,6 +4791,7 @@ Public Class frmValidator
If WMIndexVectofield(oMyInput, PROFIL_VEKTORINDEX) = True Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Checkbox as VEKTOR - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4822,6 +4799,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, result) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Checkbox - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4859,6 +4837,7 @@ Public Class frmValidator
If oIsRequired = True And Zeilen = 0 Then
oMissing = True
oErrMsgMissingInput = "Fehlende Eingabe in Vektorfeld '" & dgv.Name & "'"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
ElseIf Zeilen > 0 Then
Dim ZeilenGrid As Integer = 0
@ -4903,6 +4882,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
oMissing = True
oErrMsgMissingInput = "Error while indexing Vektorfeld - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4911,6 +4891,7 @@ Public Class frmValidator
If IDBData.SetVariableValue(oIndexName, oDT, True) = False Then
oMissing = True
oErrMsgMissingInput = "Error indexing Datagridview idb"
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
End If
@ -4928,6 +4909,7 @@ Public Class frmValidator
oMissing = True
oErrMsgMissingInput = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'"
oControl.BackColor = Color.Red
LOGGER.Warn(oErrMsgMissingInput)
Exit For
@ -4983,6 +4965,7 @@ Public Class frmValidator
If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
oMissing = True
oErrMsgMissingInput = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -4991,6 +4974,7 @@ Public Class frmValidator
If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then
oMissing = True
oErrMsgMissingInput = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
End If
@ -5005,6 +4989,7 @@ Public Class frmValidator
oMissing = True
'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message
oErrMsgMissingInput = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message
LOGGER.Warn(oErrMsgMissingInput)
Exit For
End If
Else
@ -5030,12 +5015,12 @@ Public Class frmValidator
' If Error happened in inner For, exit the outer as well
If oMissing = True Then
LOGGER.Warn("Error in Inner Check_updateIndexe - Exiting...")
LOGGER.Info("oMissing = True...Exiting")
Exit For
End If
Next
If oMissing = True Then
LOGGER.Debug("Check_UpdateIndexe: ERROR or Missing Indexing - returning False")
LOGGER.Warn("Check_UpdateIndexe: ERROR or Missing Indexing - returning False")
Return False
Else
LOGGER.Debug("Check_UpdateIndexe: Everything OK - returning True")