From a7061968a150b71a1dc2fe9a5d367720d582a428 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 26 Jan 2021 16:01:13 +0100 Subject: [PATCH] =?UTF-8?q?Speichern=20Pr=C3=BCfen=20-=203164=20-=20CheckU?= =?UTF-8?q?pdateIndices=20-=20Error=20BtnClick?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmAdministration.vb | 5 +- app/DD_PM_WINDREAM/frmControl_Detail.vb | 4 + app/DD_PM_WINDREAM/frmMain.Designer.vb | 4 +- app/DD_PM_WINDREAM/frmMain.resx | 271 ++++++++++-------- app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb | 70 ++--- app/DD_PM_WINDREAM/frmValidator.vb | 65 +++-- 7 files changed, 239 insertions(+), 182 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index c8063c7..c8c5f62 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmAdministration.vb b/app/DD_PM_WINDREAM/frmAdministration.vb index 68adf31..f6030ec 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.vb @@ -18,7 +18,7 @@ Public Class frmAdministration Dim DT2Compare As DataTable Dim PROF_ORIGIN As DataTable Private CURR_TEXT_CONTROL_CONTENT As String - Private CURR_BOOL_CONTROL_CONTENT As Boolean + Private CURR_BOOL_CONTROL_CONTENT As CheckState = CheckState.Indeterminate Private CURR_COMBOBOX_CONTROL_CONTENT As String Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load @@ -1123,6 +1123,7 @@ Public Class frmAdministration tsbStaticInfo.Caption = $"ProfileData saved - {Now.ToLongTimeString}" CHANGES_FORM_DESIGN = True UNSAVED_CHANGES_PROFILE = False + CURR_TEXT_CONTROL_CONTENT = String.Empty DD_DMSLiteDataSet.AcceptChanges() Else tsbStaticInfo.Caption = "" @@ -1451,7 +1452,7 @@ Public Class frmAdministration End Sub Private Sub ACTIVECheckBox_CheckStateChanged(sender As Object, e As EventArgs) Handles SORT_BY_LATESTCheckBox.CheckStateChanged, FINAL_PROFILECheckBox.CheckStateChanged, ACTIVECheckBox.CheckStateChanged - If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Then + If formloaded = False Or UNSAVED_CHANGES_PROFILE Or change_BindingSource = True Or CURR_BOOL_CONTROL_CONTENT = CheckState.Indeterminate Then Exit Sub End If Dim ochk As CheckBox = sender diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.vb b/app/DD_PM_WINDREAM/frmControl_Detail.vb index 3b93c93..bd72e80 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.vb @@ -84,8 +84,12 @@ Public Class frmControl_Detail Private Sub btnSQLEdit_Click(sender As Object, e As EventArgs) Handles btnSQLEdit.Click Dim oldSQL = SQL_COMMANDTextBox.Text + CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" + CURRENT_INDEX_ID = GUIDTextBox.Text Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} + oForm.TopMost = True Dim oResult = oForm.ShowDialog() + oForm.BringToFront() If oResult = DialogResult.OK Then If oldSQL <> oForm.SQLCommand Then diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index b01f143..cb994eb 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -468,11 +468,12 @@ Partial Class frmMain Me.RibbonControl1.MaxItemId = 26 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.QuickToolbarItemLinks.Add(Me.bbtnitemInfo) Me.RibbonControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemProgressBar1}) Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2013 Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowToolbarCustomizeItem = False Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' 'bbtniRefresh ' @@ -523,6 +524,7 @@ Partial Class frmMain Me.bbtnitemInfo.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitemInfo.ImageOptions.LargeImage"), System.Drawing.Image) Me.bbtnitemInfo.Name = "bbtnitemInfo" Me.bbtnitemInfo.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText + Me.bbtnitemInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' 'BarButtonItem1 ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index dad6e85..9f517b8 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAVABBwFQAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVgBBwFYAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -172,10 +172,114 @@ 179, 17 + + 138, 56 + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + + + BindingNavigator1 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + NavBarControl1 + + + DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 2 + + + + Fill + + + + Tahoma, 9pt + + + 0, 146 + + + 1347, 360 + + + + 4 + + + Panel1 + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 3 + 863, 17 - + + 270, 256 + + + ContextMenuGrid + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fill + + + 233, 25 + + + 1114, 335 + + + 8 + + + False + + + GridControl_Docs + + + DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Panel1 + + + 0 + 269, 26 @@ -204,7 +308,6 @@ Metadaten Datei anzeigen - False @@ -260,61 +363,24 @@ 266, 6 - - 200, 22 - - - Datei als Link versenden - 269, 26 Aktionen Datei + + 200, 22 + + + Datei als Link versenden + 269, 26 Exportieren - - 270, 256 - - - ContextMenuGrid - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - Fill - - - 233, 25 - - - 1114, 335 - - - 8 - - - False - - - GridControl_Docs - - - DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Panel1 - - - 0 - 138, 56 @@ -418,12 +484,6 @@ 17, 56 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -577,32 +637,11 @@ 2 - - Fill - - - Tahoma, 9pt - - - 0, 146 - - - 1347, 360 - - - 4 - - - Panel1 - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this + + 219, 26 - - 3 + + Starte Validierung für Profil 490, 17 @@ -610,27 +649,6 @@ 640, 56 - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 235, 76 @@ -812,6 +830,27 @@ True + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 605, 17 @@ -1377,21 +1416,6 @@ 0, 0 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Funktionen/App Start - Start @@ -1428,6 +1452,21 @@ 5 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Funktionen/App Start + Top @@ -2718,6 +2757,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -2730,9 +2772,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb index 88ed65e..fe53404 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.vb @@ -36,8 +36,10 @@ Public Class frmSQL_DESIGNER TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION) If CURRENT_DESIGN_TYPE = "INPUT_INDEX" Then CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_CONTROL_ID), "frmSQL_FINAL_INDICES_Load1") - Else + ElseIf CURRENT_DESIGN_TYPE = "FINAL_INDEX" Then CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_FINAL_INDEXING T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") + ElseIf CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then + CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(String.Format("SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_COMMAND,'') AS 'SQL_COMMAND' FROM TBPM_CONTROL_TABLE T, TBDD_CONNECTION T1 WHERE T.CONNECTION_ID = T1.GUID AND T.GUID = {0}", CURRENT_INDEX_ID), "frmSQL_FINAL_INDICES_Load2") End If If CURRENT_DESIGN_TYPE = "SQL_OVERVIEW" Then cmbConnection.Enabled = False @@ -47,45 +49,47 @@ Public Class frmSQL_DESIGNER btnShowConnections.Enabled = True End If - If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Then + If (CURRENT_DESIGN_TYPE = "INPUT_INDEX") Or CURRENT_DESIGN_TYPE = "FINAL_INDEX" Or CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" Or CURRENT_DESIGN_TYPE = "SQL_SOURCE_TABLE_COLUMN" Then If CURRENT_DT_SQL_CONFIG_TABLE.Rows.Count = 1 Then cmbConnection.SelectedValue = CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CONNECTION_ID") cmbConnection.FindStringExact(CURRENT_DT_SQL_CONFIG_TABLE.Rows(0).Item("CON_STRING")) End If - - Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) - Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL, "frmSQL_FINAL_INDICES_Load3") - cmbControls.DataSource = oDatatable - cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName - cmbControls.Visible = True - lblControls.Visible = True - btnAddControl.Visible = True - - cmbIndexe.Items.Clear() - If IDB_ACTIVE = False Then - If MyIndicies IsNot Nothing Then - For Each index As String In MyIndicies - cmbIndexe.Items.Add(index) - Next - cmbIndexe.SelectedIndex = -1 - End If - 'cmbIndexe.Enabled = True - 'lbIndexe.Enabled = True - 'btnAddIndex.Enabled = True - Else - Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) - If oAttributes IsNot Nothing Then - For Each oAttribute As String In oAttributes - cmbIndexe.Items.Add(oAttribute) - Next - cmbIndexe.SelectedIndex = -1 + If CURRENT_DESIGN_TYPE <> "SQL_SOURCE_TABLE_COLUMN" Then + Dim oSQL = String.Format("SELECT NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0} AND CTRL_TYPE <> 'LBL' ORDER BY NAME", CURRENT_ProfilGUID) + Dim oDatatable As DataTable = ClassDatabase.Return_Datatable(oSQL, "frmSQL_FINAL_INDICES_Load3") + cmbControls.DataSource = oDatatable + cmbControls.DisplayMember = oDatatable.Columns(0).ColumnName + cmbControls.Visible = True + lblControls.Visible = True + btnAddControl.Visible = True + + cmbIndexe.Items.Clear() + If IDB_ACTIVE = False Then + If MyIndicies IsNot Nothing Then + For Each index As String In MyIndicies + cmbIndexe.Items.Add(index) + Next + cmbIndexe.SelectedIndex = -1 + End If + 'cmbIndexe.Enabled = True + 'lbIndexe.Enabled = True + 'btnAddIndex.Enabled = True + Else + Dim oAttributes = IDBData.GetIndicesByBE(CURRENT_OBJECTTYPE) + If oAttributes IsNot Nothing Then + For Each oAttribute As String In oAttributes + cmbIndexe.Items.Add(oAttribute) + Next + cmbIndexe.SelectedIndex = -1 + End If + + 'cmbIndexe.Enabled = False + 'lbIndexe.Enabled = False + 'btnAddIndex.Enabled = False End If - - 'cmbIndexe.Enabled = False - 'lbIndexe.Enabled = False - 'btnAddIndex.Enabled = False End If + Else cmbControls.Visible = False lblControls.Visible = False diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 3f873ac..97d1e99 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1295,11 +1295,12 @@ Public Class frmValidator Dim oControlID = DirectCast(oButton.Tag, ClassControlCreator.ControlMetadata).Guid Dim oSQL = ClassControlCreator.GET_CONTROL_PROPERTY(DTCONTROLS, oControlID, "SQL_UEBERPRUEFUNG") If IsNothing(oSQL) Then + LOGGER.Warn("onCustomButtonClick - SQL_UEBERPRUEFUNG IS NOTHING") Exit Sub End If If Check_UpdateIndexe() = False Then - + LOGGER.Warn("onCustomButtonClick - Check_UpdateIndexe = False >> Exit Click") Exit Sub End If Override_SQLCommand = ClassControlCreator.GET_CONTROL_PROPERTY(DTCONTROLS, oControlID, "SQL2") @@ -1417,12 +1418,12 @@ Public Class frmValidator End If Case "Override_Direct".ToUpper Override = True - If Check_UpdateIndexe() = False Then + If Check_UpdateIndexe() = True Then Finish_WFStep(False) End If Case "Override incFinal".ToUpper - If Check_UpdateIndexe() = False Then + If Check_UpdateIndexe() = True Then Finish_WFStep(False) End If Case Else @@ -3863,7 +3864,7 @@ Public Class frmValidator Dim oErrorOcurred As Boolean = False If OverrideAll = False Then 'Eingaben auf Form überprüfen - If Check_UpdateIndexe() = False Then + If Check_UpdateIndexe() = True Then If PROFIL_FINISH_SQL <> String.Empty Then If btnFinish_continue() = False Then Exit Sub @@ -4287,7 +4288,7 @@ Public Class frmValidator Next Return odt End Function - Function Check_UpdateIndexe() + Function Check_UpdateIndexe() As Boolean Dim oControlName Dim oControlId As String Try @@ -4298,7 +4299,8 @@ Public Class frmValidator Dim oMyInput As String = "" 'Jedes Control in Konfig Tab durchlaufn For Each oControlRow As DataRow In DTVWCONTROL_INDEX.Rows - If oControlRow.Item("CTRL_TYPE") = "LBL" Or oControlRow.Item("CTRL_TYPE") = "LINE" Then + Dim oCtrlType = oControlRow.Item("CTRL_TYPE").ToString + If oCtrlType = "LBL" Or oCtrlType = "LINE" Or oCtrlType = "BUTTON" Then Continue For End If @@ -4622,7 +4624,7 @@ Public Class frmValidator Dim st As New StackTrace(True) st = New StackTrace(ex, True) LOGGER.Warn("Unexpected error in Check_UpdateIndexe TextBox :" & ex.Message, True) - Return True + Return False End Try Case "System.Windows.Forms.ComboBox" @@ -4638,43 +4640,42 @@ Public Class frmValidator Else 'Änderung 28.08.2018: Ein leerer Wert in der Combobox wird in den Index geschrieben oMyInput = cmb.Text LOGGER.Debug($"inputvalue Combobox: {cmb.Text}") - Dim oWMValue + Dim oValue 'den aktuellen Wert in windream auslesen If oIndexName.StartsWith("[%VKT") Then - oWMValue = ReturnVektor_IndexValue(oIndexName) + oValue = ReturnVektor_IndexValue(oIndexName) Else - oWMValue = GetVariableValuefromSource(oIndexName, oIDBTyp) + oValue = GetVariableValuefromSource(oIndexName, oIDBTyp) End If - LOGGER.Debug($"Got a WMValue...") - If IsNothing(oWMValue) Then - LOGGER.Debug($"WMValue is nothing...Value EmptyString will be used") - oWMValue = String.Empty + If IsNothing(oValue) Then + LOGGER.Debug($"oValue is nothing...Value EmptyString will be used") + oValue = String.Empty End If Dim oIndexType As String = "Index" Try - If oWMValue.ToString = "System.Object[]" Then + If oValue.ToString = "System.Object[]" Then oIndexType = "Vector" End If Catch ex As Exception - LOGGER.Debug($"Exception while oWMValue.ToString = System.Object[]...") + LOGGER.Debug($"Exception while oValue.ToString = System.Object[]...") End Try If oIndexType = "Vector" Then LOGGER.Debug($"Control with ID{oControlId} is a vectorfield...") - If oWMValue.Length = 1 Then - oWMValue = oWMValue(0).ToString + If oValue.Length = 1 Then + oValue = oValue(0).ToString Else ' LOGGER.Info(" >> Vectorfield " & oIndexName & "' contains more then one value - First value will be used") - oWMValue = oWMValue(0).ToString + oValue = oValue(0).ToString End If Else - LOGGER.Debug($"WMValue is a regular item...") + LOGGER.Debug($"oValue is a regular item...") Dim oitsadifference As Boolean = False Try - If oWMValue.ToString <> oMyInput.ToString Then + If oValue.ToString <> oMyInput.ToString Then oitsadifference = True End If Catch ex As Exception - LOGGER.Warn($"Could not convert the WMValue of Control with ID{oControlId}...") + LOGGER.Warn($"Could not convert the oValue of Control with ID{oControlId}...") LOGGER.Error(ex.Message) oitsadifference = True End Try @@ -4711,7 +4712,7 @@ Public Class frmValidator End If If IDB_ACTIVE = False Then If PROFIL_LOGINDEX <> "" Then - Dim ologStr = Return_LOGString(oMyInput, oWMValue, oIndexName) + Dim ologStr = Return_LOGString(oMyInput, oValue, oIndexName) WMIndexVectofield(ologStr, PROFIL_LOGINDEX) 'Else 'IDBData.SetVariableValue(PROFIL_LOGINDEX, ologStr) @@ -4722,7 +4723,7 @@ Public Class frmValidator End If Else - LOGGER.Debug($"oitsadifference = False...Index with ID{oControlId} will not be indexed...") + LOGGER.Debug($"oitsadifference = False...Index with ID {oControlId} will not be indexed...") 'Wenn der Wert in ein Vektorfeld geschrieben wird End If End If @@ -4736,7 +4737,7 @@ Public Class frmValidator st = New StackTrace(ex, True) MsgBox($"Unexpected error in Check_UpdateIndexe Combobox : ID{oControlId} " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Error:") LOGGER.Info($"Unexpected error in Check_UpdateIndexe Combobox : ID{oControlId}" & ex.Message) - Return True + Return False End Try Case "System.Windows.Forms.DateTimePicker" @@ -5081,11 +5082,17 @@ 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...") Exit For End If Next - - Return oMissing + If oMissing = True Then + LOGGER.Debug("Check_UpdateIndexe: ERROR or Missing Indexing - returning False") + Return False + Else + LOGGER.Debug("Check_UpdateIndexe: Everything OK - returning True") + Return True + End If Catch ex As Exception LOGGER.Warn($"Unexpected error in Check_UpdateIndexe - ControlID: {oControlId},{oControlName}") @@ -5094,7 +5101,7 @@ Public Class frmValidator st = New StackTrace(ex, True) MsgBox($"Unexpected error in Check_UpdateIndexe ControlID,Name: {oControlId},{oControlName}" & vbNewLine & ex.Message & vbNewLine & "Line: " & st.GetFrame(0).GetFileLineNumber().ToString, MsgBoxStyle.Critical, "Error:") LOGGER.Info("Unexpected error in Check_UpdateIndexe:" & ex.Message & " - Line: " & st.GetFrame(0).GetFileLineNumber().ToString, True) - Return True + Return False End Try End Function @@ -5462,7 +5469,7 @@ Public Class frmValidator Else oRESULT = "Eingaben gespeichert" End If - If Check_UpdateIndexe() = False Then + If Check_UpdateIndexe() = True Then SetStatusLabel($"Data saved", "LimeGreen") Else SetStatusLabel($"Error while saving data!", "Red")