diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index 4031100..62748f8 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -607,16 +607,17 @@ Public Class ClassControlCreator oView.OptionsSelection.MultiSelect = True oView.OptionsClipboard.CopyColumnHeaders = DefaultBoolean.False 'oView.OptionsView.ColumnAutoWidth = True - If oView.OptionsBehavior.ReadOnly = False Then - If row.Item("VKT_ADD_ITEM") = True Then - oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True - oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True - oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom - Else - oView.OptionsBehavior.Editable = False - oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None - End If + + If row.Item("VKT_ADD_ITEM") = True And oView.OptionsBehavior.Editable Then + oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True + oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.True + oView.OptionsView.NewItemRowPosition = NewItemRowPosition.Bottom + Else + oView.OptionsView.NewItemRowPosition = NewItemRowPosition.None + oView.OptionsBehavior.AllowAddRows = DefaultBoolean.False + oView.OptionsBehavior.AllowDeleteRows = DefaultBoolean.False End If + Logger.Debug("Grid [{0}] setup: READ_ONLY(Row)=[{1}], View.Editable=[{2}], View.ReadOnly=[{3}], AllowAddRows=[{4}]", oControl.Name, row.Item("READ_ONLY"), diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 1cd3635..e031444 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 9d12f43..f18f973 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -1725,46 +1725,46 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 - ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADu - CAAAAk1TRnQBSQFMAgEBAgIAAQ0BAAENARABAAEQAQAE/wEJAQAI/wFCAU0BNgEEBgABNgEEAgABKAMA - AUADAAEQAwABAQEAAQgGAAEEGAABgAIAAYADAAKAAQABgAMAAYABAAGAAQACgAIAA8ABAAHAAdwBwAEA - AfABygGmAQABMwUAATMBAAEzAQABMwEAAjMCAAMWAQADHAEAAyIBAAMpAQADVQEAA00BAANCAQADOQEA - AYABfAH/AQACUAH/AQABkwEAAdYBAAH/AewBzAEAAcYB1gHvAQAB1gLnAQABkAGpAa0CAAH/ATMDAAFm - AwABmQMAAcwCAAEzAwACMwIAATMBZgIAATMBmQIAATMBzAIAATMB/wIAAWYDAAFmATMCAAJmAgABZgGZ - AgABZgHMAgABZgH/AgABmQMAAZkBMwIAAZkBZgIAApkCAAGZAcwCAAGZAf8CAAHMAwABzAEzAgABzAFm - AgABzAGZAgACzAIAAcwB/wIAAf8BZgIAAf8BmQIAAf8BzAEAATMB/wIAAf8BAAEzAQABMwEAAWYBAAEz - AQABmQEAATMBAAHMAQABMwEAAf8BAAH/ATMCAAMzAQACMwFmAQACMwGZAQACMwHMAQACMwH/AQABMwFm - AgABMwFmATMBAAEzAmYBAAEzAWYBmQEAATMBZgHMAQABMwFmAf8BAAEzAZkCAAEzAZkBMwEAATMBmQFm - AQABMwKZAQABMwGZAcwBAAEzAZkB/wEAATMBzAIAATMBzAEzAQABMwHMAWYBAAEzAcwBmQEAATMCzAEA - ATMBzAH/AQABMwH/ATMBAAEzAf8BZgEAATMB/wGZAQABMwH/AcwBAAEzAv8BAAFmAwABZgEAATMBAAFm - AQABZgEAAWYBAAGZAQABZgEAAcwBAAFmAQAB/wEAAWYBMwIAAWYCMwEAAWYBMwFmAQABZgEzAZkBAAFm - ATMBzAEAAWYBMwH/AQACZgIAAmYBMwEAA2YBAAJmAZkBAAJmAcwBAAFmAZkCAAFmAZkBMwEAAWYBmQFm - AQABZgKZAQABZgGZAcwBAAFmAZkB/wEAAWYBzAIAAWYBzAEzAQABZgHMAZkBAAFmAswBAAFmAcwB/wEA - AWYB/wIAAWYB/wEzAQABZgH/AZkBAAFmAf8BzAEAAcwBAAH/AQAB/wEAAcwBAAKZAgABmQEzAZkBAAGZ - AQABmQEAAZkBAAHMAQABmQMAAZkCMwEAAZkBAAFmAQABmQEzAcwBAAGZAQAB/wEAAZkBZgIAAZkBZgEz - AQABmQEzAWYBAAGZAWYBmQEAAZkBZgHMAQABmQEzAf8BAAKZATMBAAKZAWYBAAOZAQACmQHMAQACmQH/ - AQABmQHMAgABmQHMATMBAAFmAcwBZgEAAZkBzAGZAQABmQLMAQABmQHMAf8BAAGZAf8CAAGZAf8BMwEA - AZkBzAFmAQABmQH/AZkBAAGZAf8BzAEAAZkC/wEAAcwDAAGZAQABMwEAAcwBAAFmAQABzAEAAZkBAAHM - AQABzAEAAZkBMwIAAcwCMwEAAcwBMwFmAQABzAEzAZkBAAHMATMBzAEAAcwBMwH/AQABzAFmAgABzAFm - ATMBAAGZAmYBAAHMAWYBmQEAAcwBZgHMAQABmQFmAf8BAAHMAZkCAAHMAZkBMwEAAcwBmQFmAQABzAKZ - AQABzAGZAcwBAAHMAZkB/wEAAswCAALMATMBAALMAWYBAALMAZkBAAPMAQACzAH/AQABzAH/AgABzAH/ - ATMBAAGZAf8BZgEAAcwB/wGZAQABzAH/AcwBAAHMAv8BAAHMAQABMwEAAf8BAAFmAQAB/wEAAZkBAAHM - ATMCAAH/AjMBAAH/ATMBZgEAAf8BMwGZAQAB/wEzAcwBAAH/ATMB/wEAAf8BZgIAAf8BZgEzAQABzAJm - AQAB/wFmAZkBAAH/AWYBzAEAAcwBZgH/AQAB/wGZAgAB/wGZATMBAAH/AZkBZgEAAf8CmQEAAf8BmQHM - AQAB/wGZAf8BAAH/AcwCAAH/AcwBMwEAAf8BzAFmAQAB/wHMAZkBAAH/AswBAAH/AcwB/wEAAv8BMwEA - AcwB/wFmAQAC/wGZAQAC/wHMAQACZgH/AQABZgH/AWYBAAFmAv8BAAH/AmYBAAH/AWYB/wEAAv8BZgEA - ASEBAAGlAQADXwEAA3cBAAOGAQADlgEAA8sBAAOyAQAD1wEAA90BAAPjAQAD6gEAA/EBAAP4AQAB8AH7 - Af8BAAGkAqABAAOAAwAB/wIAAf8DAAL/AQAB/wMAAf8BAAH/AQAC/wIAA/9GAAEIBHIBCAoAARoBHAJ0 - ARwBGikAAXIBVQFaAlsBWgFVAU8IAAF0AXkBegLlAXoBeQF0JwACVQFaAVsC5AFbAVoCVQYAAXQCegTl - AXoBeQFSJQABTwFVAloEWwFaAlUBTwQAAVIBWQF6BuUBegJSIwABCAJVCFoCVQEIAgABGgFSAVkBegbl - AVkBWAFSARoiAAFPAlUHWgNVAU8CAAFMAVIKWQFSAUwiAAFPATQKVQE0AS4CAAFMAVIBUwhZAVMBUgFM - IgABLQMzBzQCMwEtAgACKwIyBlMCMgIrIgABTwEtATMIVQE0Ai0CAAFMAisIUwFSAisiAAEIAS0BVQiX - AVUBLQEIAgABGgErAVIIdQFSASsBGiMAAQIBlwiYAZcBLQQAASoBdAiaAXQBKyUAAU8BCAEbBcIB8QFP - BgABTAEaARsEGgEbARoBUicAAU8BCAHzAv8B8wEIAXIIAAFMARoE9gEaAXQpAAEIBHIBCAoAARoEdAEa - ZQABQgFNAT4HAAE+AwABKAMAAUADAAEQAwABAQEAAQEFAAGAFwAD/wEABP8EAAH4AR8B+AEfBAAB8AEP - AfABDwQAAeABBwHgAQcEAAHAAQMBwAEDBAABgAEBAYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABgAEB - AYABAQQAAYABAQGAAQEEAAGAAQEBgAEBBAABwAEDAcABAwQAAeABBwHgAQcEAAHwAQ8B8AEPBAAB+AEf - AfgBHwQABP8EAAs= + ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw + CAAAAk1TRnQBSQFMAgEBAgEAARABDQEQAQ0BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA + AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 + AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA + AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm + AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM + AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA + ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz + AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ + AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM + AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA + AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA + AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ + AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/ + AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA + AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm + ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ + Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz + AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA + AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM + AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM + ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM + Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA + AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM + AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ + AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz + AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm + AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw + AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/0YAAQgEcgEICgABGgEc + AnQBHAEaKQABcgFVAVoCWwFaAVUBTwgAAXQBeQF6AuUBegF5AXQnAAJVAVoBWwLkAVsBWgJVBgABdAJ6 + BOUBegF5AVIlAAFPAVUCWgRbAVoCVQFPBAABUgFZAXoG5QF6AlIjAAEIAlUIWgJVAQgCAAEaAVIBWQF6 + BuUBWQFYAVIBGiIAAU8CVQdaA1UBTwIAAUwBUgpZAVIBTCIAAU8BNApVATQBLgIAAUwBUgFTCFkBUwFS + AUwiAAEtAzMHNAIzAS0CAAIrAjIGUwIyAisiAAFPAS0BMwhVATQCLQIAAUwCKwhTAVICKyIAAQgBLQFV + CJcBVQEtAQgCAAEaASsBUgh1AVIBKwEaIwABAgGXCJgBlwEtBAABKgF0CJoBdAErJQABTwEIARsFwgHx + AU8GAAFMARoBGwQaARsBGgFSJwABTwEIAfMC/wHzAQgBcggAAUwBGgT2ARoBdCkAAQgEcgEICgABGgR0 + ARplAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEBAQABAQUAAYAXAAP/AQAE/wQAAfgBHwH4AR8EAAHw + AQ8B8AEPBAAB4AEHAeABBwQAAcABAwHAAQMEAAGAAQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAGA + AQEBgAEBBAABgAEBAYABAQQAAYABAQGAAQEEAAHAAQMBwAEDBAAB4AEHAeABBwQAAfABDwHwAQ8EAAH4 + AR8B+AEfBAAE/wQACw== diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index d807327..4560793 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -82,6 +82,8 @@ Public Class frmMain Private COCKPIT_PROFILE_SQL As String = String.Empty Private COCKPIT_CONFIG_ID As Integer = 0 Private _emptyNodeCount As Integer = 0 + Private _lastClickedGroupValue As Object = Nothing + Private _lastClickedDocId As Object = Nothing Private Class S @@ -303,7 +305,7 @@ Public Class frmMain bsiLicenses.Visibility = DevExpress.XtraBars.BarItemVisibility.Always If EDMIAppServerActive = True Then - bbtnitm_Appservice.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + bbtnitm_Appservice.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End If Else @@ -2134,7 +2136,7 @@ Public Class frmMain ClassAllgemeineFunktionen.ApplyGridView_Col_Formatting(GridViewWorkflows) End Function - + Private Async Function CreateBasicViewForProfile() As Task ' ===== GRID DATASOURCE ZURÜCKSETZEN ===== @@ -2746,6 +2748,7 @@ Public Class frmMain If isGroupRow OrElse (startedFrom = "CMGROUP" AndAlso isDataRow) Then ' GRUPPE: Workflow ohne spezifisches Dokument + SaveGridStateForRestore(effectiveRowHandle, isGroupRow, isDataRow) Reset_Current() CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID LOGGER.Debug($"Item_Scope: isGroupRow...CURRENT_CLICKED_PROFILE_ID [{CURRENT_CLICKED_PROFILE_ID}]") @@ -2796,6 +2799,7 @@ Public Class frmMain Dim oResult = DatabaseFallback.GetScalarValueECM(oSQL) If CBool(oResult) = True Then + SaveGridStateForRestore(effectiveRowHandle, isGroupRow, isDataRow) Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID) Else Dim omsg = S.Der_gewählte_Beleg_ist_durch_einen_anderen_Benutzer_bereits_in_Bearbeitung_oder_anderweitig_gesperrt_ @@ -2826,21 +2830,14 @@ Public Class frmMain End Function Private Async Sub ValidatorClosed(sender As Object, e As FormClosedEventArgs) Dim oGridOverlayHandle As Object = Nothing - ' ← NEU: Kontext vor dem Reload sichern Dim oPreviousLoadType As String = GRID_LOAD_TYPE - Dim oPreviousProfileId As Integer = If(IsNumeric(CURRENT_CLICKED_PROFILE_ID), CInt(CURRENT_CLICKED_PROFILE_ID), 0) Try - ' Aktuellen Grid-Zustand sichern BEVOR DataSource zurückgesetzt wird If GridControlWorkflows.Visible = True AndAlso FormOpenClose = False Then RefreshHelper.SaveViewInfo() End If - ' DevExpress-Overlay NUR über dem Grid anzeigen – verhindert leere Bereiche - ' und signalisiert dem Nutzer den laufenden Ladevorgang direkt im Grid-Bereich. - ' ShowOverlayForm(Control) ist die empfohlene DevExpress-Methode hierfür. oGridOverlayHandle = SplashScreenManager.ShowOverlayForm(GridControlWorkflows) - ' BeginUpdate verhindert zusätzliche Paint-Events während des Neuaufbaus. GridControlWorkflows.BeginUpdate() GridViewWorkflows.BeginUpdate() Try @@ -2853,21 +2850,102 @@ Public Class frmMain If GridControlWorkflows.Visible = True AndAlso FormOpenClose = False Then RefreshHelper.LoadViewInfo() End If - ' ← NEU: Bei OVERVIEW + CMROW dieselbe Gruppe wiederherstellen - If oPreviousLoadType = "OVERVIEW" AndAlso oPreviousProfileId > 0 Then - LOGGER.Debug($"ValidatorClosed: Restoring group for PROFILE_ID [{oPreviousProfileId}] after OVERVIEW reload") - RestoreGroupForProfile(oPreviousProfileId) - End If + + RestoreGridStateAfterValidation() + Catch ex As Exception LOGGER.Error(ex) Finally - ' Overlay immer schließen – auch bei Fehlern If oGridOverlayHandle IsNot Nothing Then SplashScreenManager.CloseOverlayForm(oGridOverlayHandle) End If End Try End Sub + Private Sub RestoreGridStateAfterValidation() + Try + ' Keine Wiederherstellung wenn Grid leer ist + If GridViewWorkflows.RowCount = 0 Then + LOGGER.Debug("RestoreGridStateAfterValidation: Grid has no rows - skipping") + Exit Sub + End If + ' Kein Grouping aktiv → nur DocID-Zeile fokussieren + If GridViewWorkflows.GroupCount = 0 Then + If _lastClickedDocId IsNot Nothing Then + FocusRowByDocId(_lastClickedDocId) + End If + Exit Sub + End If + + ' Kein gespeicherter Gruppenwert → nichts tun + If _lastClickedGroupValue Is Nothing Then + LOGGER.Debug("RestoreGridStateAfterValidation: No group value stored - skipping") + Exit Sub + End If + + Dim groupTextCol As GridColumn = GridViewWorkflows.Columns.ColumnByFieldName("GROUP_TEXT") + If groupTextCol Is Nothing Then + Exit Sub + End If + + ' Ziel-Gruppen-Handle über Datenzeilen ermitteln + Dim targetGroupHandle As Integer = DevExpress.XtraGrid.GridControl.InvalidRowHandle + + For rowHandle As Integer = 0 To GridViewWorkflows.RowCount - 1 + If Not GridViewWorkflows.IsDataRow(rowHandle) Then Continue For + Dim groupVal As Object = GridViewWorkflows.GetRowCellValue(rowHandle, groupTextCol) + If groupVal IsNot Nothing AndAlso groupVal.ToString() = _lastClickedGroupValue.ToString() Then + targetGroupHandle = GridViewWorkflows.GetParentRowHandle(rowHandle) + Exit For + End If + Next + + ' Alle Gruppen schließen + GridViewWorkflows.CollapseAllGroups() + + If targetGroupHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle OrElse + Not GridViewWorkflows.IsGroupRow(targetGroupHandle) Then + LOGGER.Warn($"RestoreGridStateAfterValidation: Group [{_lastClickedGroupValue}] not found in reloaded grid") + Exit Sub + End If + + ' Ziel-Gruppe aufklappen und fokussieren + GridViewWorkflows.ExpandGroupRow(targetGroupHandle, False) + GridViewWorkflows.FocusedRowHandle = targetGroupHandle + LOGGER.Debug($"RestoreGridStateAfterValidation: Group [{_lastClickedGroupValue}] expanded and focused") + + ' DocID-Zeile innerhalb der Gruppe fokussieren (falls noch vorhanden) + If _lastClickedDocId IsNot Nothing Then + FocusRowByDocId(_lastClickedDocId) + End If + + Catch ex As Exception + LOGGER.Error(ex) + End Try + + End Sub + Private Sub FocusRowByDocId(docId As Object) + Try + Dim docIdCol As GridColumn = GridViewWorkflows.Columns.ColumnByFieldName("DocID") + If docIdCol Is Nothing Then + Exit Sub + End If + + For rowHandle As Integer = 0 To GridViewWorkflows.RowCount - 1 + If Not GridViewWorkflows.IsDataRow(rowHandle) Then Continue For + Dim val As Object = GridViewWorkflows.GetRowCellValue(rowHandle, docIdCol) + If val IsNot Nothing AndAlso val.ToString() = docId.ToString() Then + GridViewWorkflows.FocusedRowHandle = rowHandle + LOGGER.Debug($"FocusRowByDocId: Row with DocID [{docId}] focused") + Exit Sub + End If + Next + + LOGGER.Debug($"FocusRowByDocId: DocID [{docId}] no longer in grid (likely processed)") + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub Private Sub RestoreGroupForProfile(pProfileId As Integer) Try If GridViewWorkflows.GroupCount = 0 Then @@ -3373,7 +3451,38 @@ Public Class frmMain Await Decide_Load(FormLoad) InResetlayout = False End Function + Private Sub SaveGridStateForRestore(effectiveRowHandle As Integer, isGroupRow As Boolean, isDataRow As Boolean) + _lastClickedGroupValue = Nothing + _lastClickedDocId = Nothing + If GridViewWorkflows.GroupCount = 0 Then + Exit Sub + End If + + Try + Dim groupTextCol As GridColumn = GridViewWorkflows.Columns.ColumnByFieldName("GROUP_TEXT") + If groupTextCol Is Nothing Then + Exit Sub + End If + + If isGroupRow Then + Dim childHandle As Integer = GridViewWorkflows.GetChildRowHandle(effectiveRowHandle, 0) + If childHandle <> DevExpress.XtraGrid.GridControl.InvalidRowHandle Then + _lastClickedGroupValue = GridViewWorkflows.GetRowCellValue(childHandle, groupTextCol) + End If + ElseIf isDataRow Then + _lastClickedGroupValue = GridViewWorkflows.GetRowCellValue(effectiveRowHandle, groupTextCol) + Dim docIdCol As GridColumn = GridViewWorkflows.Columns.ColumnByFieldName("DocID") + If docIdCol IsNot Nothing Then + _lastClickedDocId = GridViewWorkflows.GetRowCellValue(effectiveRowHandle, docIdCol) + End If + End If + + LOGGER.Debug($"SaveGridStateForRestore: GroupValue=[{_lastClickedGroupValue}] DocId=[{_lastClickedDocId}]") + Catch ex As Exception + LOGGER.Warn($"SaveGridStateForRestore: Failed - {ex.Message}") + End Try + End Sub Private Async Sub GridViewWorkflows_DoubleClick(sender As Object, e As EventArgs) Handles GridViewWorkflows.DoubleClick Try ' ===== KRITISCH: HitInfo MIT AKTUELLEM Mauszeiger-Position berechnen ===== @@ -4810,7 +4919,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G - Select Case oTypeIdInt + Select Case oTypeIdInt Case 0 LOGGER.Debug("TreeList_Cockpit: Loading overview") diff --git a/app/TaskFlow/frmValidator.Designer.vb b/app/TaskFlow/frmValidator.Designer.vb index 89834cf..54ccd30 100644 --- a/app/TaskFlow/frmValidator.Designer.vb +++ b/app/TaskFlow/frmValidator.Designer.vb @@ -232,6 +232,7 @@ Partial Class frmValidator ' 'PanelValidatorControl ' + Me.PanelValidatorControl.AllowTouchScroll = True resources.ApplyResources(Me.PanelValidatorControl, "PanelValidatorControl") Me.PanelValidatorControl.Appearance.BackColor = System.Drawing.Color.Transparent Me.PanelValidatorControl.Appearance.Options.UseBackColor = True diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 97b4859..b3096f2 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -700,6 +700,8 @@ Public Class frmValidator RemoveHandler gv.ShowingEditor, AddressOf GridView_ShowingEditor_EnsureLookupColumnEdit RemoveHandler gv.ShownEditor, AddressOf GridView_ShownEditor_RefreshLookupSql RemoveHandler gv.HiddenEditor, AddressOf GridView_HiddenEditor_DetachQueryPopUp + RemoveHandler gv.ValidatingEditor, AddressOf GridView_ValidatingEditor_LogLookup + RemoveHandler gv.InvalidValueException, AddressOf GridView_InvalidValueException_LogLookup ' DataSource-Events ebenfalls trennen If TypeOf gv.DataController.DataSource Is DataTable Then Dim dt = DirectCast(gv.DataController.DataSource, DataTable) @@ -716,6 +718,183 @@ Public Class frmValidator End If Next End Sub + Private Sub GridView_ValidatingEditor_LogLookup(sender As Object, e As DevExpress.XtraEditors.Controls.BaseContainerValidateEditorEventArgs) + Try + Dim oView As GridView = TryCast(sender, GridView) + If oView Is Nothing OrElse oView.FocusedColumn Is Nothing Then Exit Sub + + Dim oRepo As RepositoryItem = oView.FocusedColumn.ColumnEdit + + If TypeOf oRepo Is RepositoryItemComboBox Then + Dim oComboRepo As RepositoryItemComboBox = DirectCast(oRepo, RepositoryItemComboBox) + Dim oCanonical As String = Nothing + + If TryNormalizeComboValue(oComboRepo, e.Value, oCanonical) Then + e.Value = oCanonical + e.Valid = True + MyValidationLogger.Debug($"[GridValidation][ComboFix] Column=[{oView.FocusedColumn.FieldName}], Input=[{Convert.ToString(e.Value)}], Canonical=[{oCanonical}]") + Else + e.Valid = False + e.ErrorText = "Ungültiger Wert" + MyValidationLogger.Warn($"[GridValidation][ComboFix] Column=[{oView.FocusedColumn.FieldName}] Value not found in Combo items: [{Convert.ToString(e.Value)}]") + End If + End If + + LogGridLookupValidationContext(oView, e.Value, "ValidatingEditor") + Catch ex As Exception + MyValidationLogger.Warn($"⚠️ [GridView_ValidatingEditor_LogLookup] {ex.Message}") + End Try + End Sub + + Private Sub GridView_InvalidValueException_LogLookup(sender As Object, e As DevExpress.XtraEditors.Controls.InvalidValueExceptionEventArgs) + Try + Dim oView As GridView = TryCast(sender, GridView) + If oView Is Nothing Then Exit Sub + + Dim oRepo As RepositoryItem = Nothing + If oView.FocusedColumn IsNot Nothing Then + oRepo = oView.FocusedColumn.ColumnEdit + End If + + If TypeOf oRepo Is RepositoryItemComboBox Then + Dim oComboRepo As RepositoryItemComboBox = DirectCast(oRepo, RepositoryItemComboBox) + Dim oCanonical As String = Nothing + + Dim editorValue As Object = Nothing + If oView.ActiveEditor IsNot Nothing Then + editorValue = oView.ActiveEditor.EditValue + End If + + If TryNormalizeComboValue(oComboRepo, editorValue, oCanonical) Then + If oView.FocusedColumn IsNot Nothing AndAlso oView.FocusedRowHandle >= 0 Then + oView.SetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn, oCanonical) + End If + e.ExceptionMode = DevExpress.XtraEditors.Controls.ExceptionMode.NoAction + MyValidationLogger.Warn($"[GridValidation][ComboFix] InvalidValueException suppressed; normalized to [{oCanonical}]") + Return + End If + End If + + Dim oCurrentValue As Object = Nothing + Try + If oView.FocusedColumn IsNot Nothing AndAlso oView.FocusedRowHandle >= 0 Then + oCurrentValue = oView.GetFocusedValue() + End If + Catch + End Try + + LogGridLookupValidationContext(oView, oCurrentValue, "InvalidValueException") + + Dim oExceptionText As String = "" + If e.Exception IsNot Nothing Then + oExceptionText = e.Exception.Message + End If + + MyValidationLogger.Warn($"[GridValidation][InvalidValueException] ErrorText=[{e.ErrorText}], Exception=[{oExceptionText}]") + Catch ex As Exception + MyValidationLogger.Warn($"⚠️ [GridView_InvalidValueException_LogLookup] {ex.Message}") + End Try + End Sub + Private Function TryNormalizeComboValue(pRepo As RepositoryItemComboBox, pValue As Object, ByRef pCanonical As String) As Boolean + pCanonical = Nothing + + If pRepo Is Nothing Then Return False + If pValue Is Nothing OrElse IsDBNull(pValue) Then Return False + + Dim input As String = Convert.ToString(pValue, CultureInfo.InvariantCulture) + If input Is Nothing Then Return False + input = input.Trim() + + For Each item As Object In pRepo.Items + Dim candidate As String = Convert.ToString(item, CultureInfo.InvariantCulture) + If candidate Is Nothing Then Continue For + + Dim normalizedCandidate As String = candidate.Trim() + If String.Equals(normalizedCandidate, input, StringComparison.OrdinalIgnoreCase) Then + pCanonical = candidate + Return True + End If + Next + + Return False + End Function + Private Sub LogGridLookupValidationContext(pView As GridView, pValue As Object, pPhase As String) + If pView Is Nothing OrElse pView.FocusedColumn Is Nothing Then Exit Sub + + Dim oColumn As GridColumn = pView.FocusedColumn + Dim oRepo As RepositoryItem = oColumn.ColumnEdit + + Dim oValueText As String = "" + Dim oValueType As String = "" + If pValue IsNot Nothing AndAlso Not IsDBNull(pValue) Then + oValueText = pValue.ToString() + oValueType = pValue.GetType().FullName + End If + + Dim oTargetType As String = "" + Dim oGridData As DataTable = TryCast(pView.GridControl.DataSource, DataTable) + If oGridData IsNot Nothing AndAlso oGridData.Columns.Contains(oColumn.FieldName) Then + oTargetType = oGridData.Columns(oColumn.FieldName).DataType.FullName + End If + + Dim oValueMember As String = "" + Dim oDisplayMember As String = "" + Dim oDataSourceRows As Integer = -1 + Dim oValueFound As String = "n/a" + + If oRepo IsNot Nothing Then + If TypeOf oRepo Is RepositoryItemLookupControl3 Then + Dim oLookupRepo As RepositoryItemLookupControl3 = DirectCast(oRepo, RepositoryItemLookupControl3) + oValueMember = oLookupRepo.ValueMember + oDisplayMember = oLookupRepo.DisplayMember + + Dim oLookupDt As DataTable = TryCast(oLookupRepo.DataSource, DataTable) + If oLookupDt IsNot Nothing Then + oDataSourceRows = oLookupDt.Rows.Count + + If Not String.IsNullOrWhiteSpace(oValueMember) AndAlso oLookupDt.Columns.Contains(oValueMember) Then + Dim found As Boolean = oLookupDt.AsEnumerable().Any( + Function(r) String.Equals( + Convert.ToString(r(oValueMember), CultureInfo.InvariantCulture), + oValueText, + StringComparison.OrdinalIgnoreCase)) + oValueFound = found.ToString() + Else + oValueFound = "ValueMemberMissing" + End If + End If + + ElseIf TypeOf oRepo Is RepositoryItemLookUpEdit Then + Dim oLookupRepo As RepositoryItemLookUpEdit = DirectCast(oRepo, RepositoryItemLookUpEdit) + oValueMember = oLookupRepo.ValueMember + oDisplayMember = oLookupRepo.DisplayMember + + Dim oLookupDt As DataTable = TryCast(oLookupRepo.DataSource, DataTable) + If oLookupDt IsNot Nothing Then + oDataSourceRows = oLookupDt.Rows.Count + + If Not String.IsNullOrWhiteSpace(oValueMember) AndAlso oLookupDt.Columns.Contains(oValueMember) Then + Dim found As Boolean = oLookupDt.AsEnumerable().Any( + Function(r) String.Equals( + Convert.ToString(r(oValueMember), CultureInfo.InvariantCulture), + oValueText, + StringComparison.OrdinalIgnoreCase)) + oValueFound = found.ToString() + Else + oValueFound = "ValueMemberMissing" + End If + End If + End If + End If + + Dim oRepoType As String = "" + If oRepo IsNot Nothing Then + oRepoType = oRepo.GetType().Name + End If + + MyValidationLogger.Warn( + $"[GridValidation][{pPhase}] Column=[{oColumn.FieldName}], Value=[{oValueText}], ValueType=[{oValueType}], TargetType=[{oTargetType}], Repo=[{oRepoType}], ValueMember=[{oValueMember}], DisplayMember=[{oDisplayMember}], DataSourceRows=[{oDataSourceRows}], ValueFound=[{oValueFound}]") + End Sub Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing ' Guard: Re-Entry und Post-Dispose-Aufrufe verhindern If _isClosingGuard Then @@ -1754,6 +1933,8 @@ Public Class frmValidator AddHandler DirectCast(oGrid.MainView, GridView).ShowingEditor, AddressOf GridView_ShowingEditor_EnsureLookupColumnEdit AddHandler DirectCast(oGrid.MainView, GridView).ShownEditor, AddressOf GridView_ShownEditor_RefreshLookupSql AddHandler DirectCast(oGrid.MainView, GridView).HiddenEditor, AddressOf GridView_HiddenEditor_DetachQueryPopUp + AddHandler DirectCast(oGrid.MainView, GridView).ValidatingEditor, AddressOf GridView_ValidatingEditor_LogLookup + AddHandler DirectCast(oGrid.MainView, GridView).InvalidValueException, AddressOf GridView_InvalidValueException_LogLookup Case "LINE" oMyControl = ControlCreator.CreateExistingLine(oControlRow, False) @@ -2385,8 +2566,13 @@ Public Class frmValidator MyValidationLogger.Debug($"[GridRefresh] ShownEditor: Column=[{oView.FocusedColumn.FieldName}], Editor=[{oView.ActiveEditor.GetType().Name}]") - ' WICHTIG: initial sofort laden (nicht erst bei QueryPopUp) - RefreshGridDropdownSqlForCurrentColumn(oView) + ' FIX: + ' KEIN erneutes Refresh der Lookup-DataSource mehr während laufender Editierung. + ' Sonst kann der gerade gewählte Wert beim Zellverlassen ungültig werden. + ' Nur Fallback: falls noch kein ColumnEdit gesetzt ist, einmalig setzen. + If oView.FocusedColumn.ColumnEdit Is Nothing Then + RefreshGridDropdownSqlForCurrentColumn(oView) + End If Dim oPopupEditor As PopupBaseEdit = TryCast(oView.ActiveEditor, PopupBaseEdit) If oPopupEditor Is Nothing Then Exit Sub @@ -2429,35 +2615,15 @@ Public Class frmValidator If oView Is Nothing OrElse oView.FocusedColumn Is Nothing Then Exit Sub - Dim oMeta As ClassControlCreator.ControlMetadata = TryCast(oView.GridControl.Tag, ClassControlCreator.ControlMetadata) - If oMeta Is Nothing Then Exit Sub - - Dim oControlId As Integer = oMeta.Guid - Dim oColumnName As String = oView.FocusedColumn.FieldName - - Dim oRows = DT_GRID_COLUMNS_WITH_SQL.Select($"CONTROL_ID = {oControlId} AND SPALTENNAME = '{oColumnName.Replace("'", "''")}'") - If oRows Is Nothing OrElse oRows.Length = 0 Then Exit Sub - - For Each oRow As DataRow In oRows - Dim oConnId As Integer = oRow.ItemEx("CONNECTION_ID", 1) - Dim oSql As String = oRow.ItemEx("SQL_COMMAND", String.Empty) - Dim oAdvancedLookup = oRow.ItemEx("ADVANCED_LOOKUP", False) - - If String.IsNullOrWhiteSpace(oSql) Then Continue For - - oSql = clsPatterns.ReplaceAllValues(oSql, PanelValidatorControl, True) - If String.IsNullOrWhiteSpace(oSql) OrElse clsPatterns.HasComplexPatterns(oSql) Then Continue For - - Dim cacheKey = $"{oConnId}|{oSql}" - If _CachedSqlDataCache.ContainsKey(cacheKey) Then - _CachedSqlDataCache.Remove(cacheKey) - End If - - Dim oDT = GetCachedDatatable(oSql, oConnId) - If oDT IsNot Nothing Then - ControlCreator.GridTables_CacheDatatableForColumn(oControlId, oColumnName, oSql, oConnId, oAdvancedLookup) - End If - Next + ' FIX: + ' Beim Öffnen des Popups NICHT erneut SQL-Cache invalidieren / DataSource neu aufbauen. + ' Nur falls ausnahmsweise kein Editor vorhanden ist, einmalig herstellen. + If oView.FocusedColumn.ColumnEdit Is Nothing Then + RefreshGridDropdownSqlForCurrentColumn(oView) + MyValidationLogger.Debug($"[GridRefresh] QueryPopUp fallback assign for [{oView.FocusedColumn.FieldName}]") + Else + MyValidationLogger.Debug($"[GridRefresh] QueryPopUp skip refresh for [{oView.FocusedColumn.FieldName}]") + End If Catch ex As Exception MyValidationLogger.Warn($"⚠️ [GridEditor_QueryPopUpRefreshSql] {ex.Message}") @@ -2472,6 +2638,16 @@ Public Class frmValidator Dim oControlId As Integer = oMeta.Guid Dim oFieldName As String = oView.FocusedColumn.FieldName + + ' FIX: Zuerst prüfen ob GridTables bereits durch GridTables_HandleControlValueChange + ' befüllt wurde (z.B. CTRL-abhängige SQL). Falls ja, direkt zuweisen und fertig. + If ControlCreator.GridTables.ContainsKey(oControlId) AndAlso + ControlCreator.GridTables(oControlId).ContainsKey(oFieldName) Then + oView.FocusedColumn.ColumnEdit = ControlCreator.GridTables(oControlId)(oFieldName) + MyValidationLogger.Debug($"[GridRefresh] ColumnEdit assigned from GridTables-Cache for [{oFieldName}]") + Return + End If + Dim oRows = ResolveGridSqlRows(oControlId, oFieldName) If oRows Is Nothing OrElse oRows.Length = 0 Then @@ -2922,10 +3098,21 @@ Public Class frmValidator Dim oDependingLookup As LookupControl3 = oControl Dim oValueToSet As String = oResultRow.ItemEx("SelectedValue", oControlCaption) + ' ========== NEU: Leerstring/Whitespace → Selektion löschen ========== If String.IsNullOrWhiteSpace(oValueToSet) Then - MyValidationLogger.Warn($"⚠️ [SetControlValues_FromControl] Lookup [{oControl.Name}]: Kein Wert zum Setzen.") + MyValidationLogger.Debug($"[SetControlValues_FromControl] Lookup [{oControl.Name}]: Leerwert → SelectedValues werden gelöscht.") + oDependingLookup.Properties.SelectedValues = New List(Of String)() + oMeta.IsDirty = True + If Not _listForceReindex.Contains(oControl.Name) Then + _listForceReindex.Add(oControl.Name) + End If + clsPatterns.UpdateControlInCache(oMeta.Name, New List(Of String)()) + If Not changedControlNames.Contains(oControl.Name) Then + changedControlNames.Add(oControl.Name) + End If Exit Select End If + ' ========== ENDE NEU ========== Dim valueMember As String = oDependingLookup.Properties.ValueMember Dim valueExists As Boolean = False @@ -2956,10 +3143,21 @@ Public Class frmValidator End If End If + ' ========== NEU: DataSource ist gesetzt, Wert fehlt trotzdem → Selektion löschen ========== If Not valueExists Then - MyValidationLogger.Warn($"⚠️ [SetControlValues_FromControl] Lookup [{oControl.Name}]: Wert [{oValueToSet}] weiterhin nicht vorhanden.") + MyValidationLogger.Warn($"⚠️ [SetControlValues_FromControl] Lookup [{oControl.Name}]: Wert [{oValueToSet}] weiterhin nicht vorhanden → SelectedValues werden gelöscht.") + oDependingLookup.Properties.SelectedValues = New List(Of String)() + oMeta.IsDirty = True + If Not _listForceReindex.Contains(oControl.Name) Then + _listForceReindex.Add(oControl.Name) + End If + clsPatterns.UpdateControlInCache(oMeta.Name, New List(Of String)()) + If Not changedControlNames.Contains(oControl.Name) Then + changedControlNames.Add(oControl.Name) + End If Exit Select End If + ' ========== ENDE NEU ========== If oDependingLookup.Properties.SelectedValues Is Nothing Then oDependingLookup.Properties.SelectedValues = New List(Of String)() @@ -5850,9 +6048,6 @@ Public Class frmValidator ' IDB-Pfad If oValueType = "System.String" Then oColValuesfromSource = Split(oValueFromSource.ToString, PMDelimiter) - If oColValuesfromSource.Length > 8 Then - MyValidationLogger.Warn("⚠️ [FillGridControlFromSource] Fill Grid Error - Max 8 columns can be configured!") - End If Dim oRowData As New List(Of Object) For index = 1 To oColValuesfromSource.Length If oDTColumnsPerDevExGrid.Rows.Count > (index - 1) Then