Merge branch 'master' into Feature_LookupGrid_DependingControls

app/DD_PM_WINDREAM/frmMain.vb

@@ -711,9 +711,7 @@ Public Class frmMain
                 If IsNumeric(_tag) Then
                     If CURRENT_CLICKED_PROFILE_ID <> _tag Then
                         OverviewOrDEtail = "DETAIL"
-
                         CURRENT_CLICKED_PROFILE_ID = _tag
-                        LOGGER.Debug("CURRENT_CLICKED_PROFILE_ID set to [{0}]", CURRENT_CLICKED_PROFILE_ID)
                         CURRENT_CLICKED_PROFILE_TITLE = e.Link.Item.Caption
                         GRID_LOAD_TYPE = "PROFILE#" & CURRENT_CLICKED_PROFILE_ID.ToString
                         TimerRefresh.Stop()
@@ -1119,6 +1117,7 @@ Public Class frmMain
             '    Catch ex As Exception
             '        LOGGER.Warn($"Unexpected Error in freefileforUser [{oUpdate}] - {ex.Message}")
             '    End Try
+
             'End If 
 
             If bwSync.IsBusy Then
@@ -1127,14 +1126,16 @@ Public Class frmMain
             End If
 
             Try
+                ' SaveGridLayout()
+                'bwSync.ReportProgress(10)
                 LoadNavBar()
+                'bwSync.ReportProgress(60)
                 Dim oStopWatch As New RefreshHelper.SW("Decide_Load")
                 Await Decide_Load(False)
                 oStopWatch.Done()
+                'bwSync.ReportProgress(95)
 
-                If GridControl_Docs.Visible = True And FormOpenClose = False Then
-                    RefreshHelper.LoadViewInfo()
-                End If
+                If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
 
                 Handling_DEBUG_USER()
             Catch ex As Exception
@@ -1142,9 +1143,13 @@ Public Class frmMain
             End Try
         Catch ex As Exception
             LOGGER.Error(ex)
-        Finally
-            TimerRefresh_running = False
         End Try
+        TimerRefresh_running = False
+        'BarEditItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+        '' call this method to start your asynchronous Task.
+        'bwSync.RunWorkerAsync()
+
+
     End Sub
 
     Private Sub NotifyIcon1_Click(sender As System.Object, e As EventArgs) Handles NotifyIcon1.Click
@@ -1168,12 +1173,7 @@ Public Class frmMain
             TimerRefresh.Stop()
 
             If GRID_LOAD_TYPE = "OVERVIEW" Then
-                For Each orow As DataRow In CURRENT_DT_PROFILES.Rows
-                    If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then
-                        CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE")
-                        Exit For
-                    End If
-                Next
+
                 Await Load_Grid_Overview(pIsFormLoad, ForceReload)
             ElseIf GRID_LOAD_TYPE.StartsWith("PROFILE#") Then
                 Await Load_single_Profile(ForceReload)
@@ -1463,8 +1463,11 @@ Public Class frmMain
             End If
             If Len(oHitProfilID) > 0 Then
                 If oHitProfilID > 0 Then
-                    CURRENT_CLICKED_PROFILE_ID = oHitProfilID
-                    LOGGER.Debug("CURRENT_CLICKED_PROFILE_ID set to [{0}]", CURRENT_CLICKED_PROFILE_ID)
+                    If oHitProfilID <> CURRENT_CLICKED_PROFILE_ID Then
+                        LOGGER.Debug($"Item_Scope: oHitProfilID {oHitProfilID} <> CURRENT_CLICKED_PROFILE_ID {CURRENT_CLICKED_PROFILE_ID} ")
+                        CURRENT_CLICKED_PROFILE_ID = oHitProfilID
+                    End If
+
                 End If
             End If
 
@@ -1476,7 +1479,7 @@ Public Class frmMain
                     CURRENT_JUMP_DOC_GUID = 0
                     CURRENT_DOC_GUID = 0
                     CURRENT_ProfilGUID = CURRENT_CLICKED_PROFILE_ID
-                    LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...oHitProfilID [{CURRENT_CLICKED_PROFILE_ID}]")
+                    LOGGER.Debug($"Item_Scope: hitInfo.InGroupRow...CURRENT_CLICKED_PROFILE_ID [{CURRENT_CLICKED_PROFILE_ID}]")
                     Load_Profil_from_Grid(CURRENT_CLICKED_PROFILE_ID)
                 ElseIf hitInfo.InDataRow Then
                     LOGGER.Debug($"Item_Scope: hitInfo.InDataRow...")
@@ -2126,14 +2129,25 @@ Public Class frmMain
             DXMouseEventArgs.GetMouseArgs(e).Handled = True
             GridViewItem_Clicked = "GROUP"
             CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
-            LOGGER.Debug("CURRENT_CLICKED_PROFILE_ID set to [{0}]", CURRENT_CLICKED_PROFILE_ID)
         ElseIf hi.InDataRow Then
             GridViewItem_Clicked = "ROW"
             CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
-            LOGGER.Debug("CURRENT_CLICKED_PROFILE_ID set to [{0}]", CURRENT_CLICKED_PROFILE_ID)
         Else
             GridViewItem_Clicked = Nothing
         End If
+        If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) Then
+            If IsNumeric(CURRENT_CLICKED_PROFILE_ID) Then
+                If CURRENT_CLICKED_PROFILE_ID > 0 Then
+                    For Each orow As DataRow In CURRENT_DT_PROFILES.Rows
+                        If orow.Item("GUID") = CURRENT_CLICKED_PROFILE_ID Then
+                            CURRENT_CLICKED_PROFILE_TITLE = orow.Item("TITLE")
+                            Exit For
+                        End If
+                    Next
+                End If
+            End If
+        End If
+
     End Sub
 
     Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged