FORMEL_SQL release Candidate
This commit is contained in:
@@ -952,6 +952,7 @@ Public Class frmMain
|
||||
_tag = _tag.ToString.Replace("itmProfile#", "")
|
||||
If IsNumeric(_tag) Then
|
||||
If CURRENT_CLICKED_PROFILE_ID <> _tag Then
|
||||
LOGGER.Debug($"Profile with ID {_tag} clicked in NavBarControl...loading Profile...")
|
||||
OverviewOrDEtail = "DETAIL"
|
||||
If Not Application.OpenForms().OfType(Of frmValidator).Any Then
|
||||
CURRENT_CLICKED_PROFILE_ID = _tag
|
||||
@@ -968,14 +969,14 @@ Public Class frmMain
|
||||
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Try
|
||||
LOGGER.Debug($"Loading profile with ID {_tag}...")
|
||||
' Zentral über Decide_Load laden
|
||||
Await Decide_Load(False, True)
|
||||
Finally
|
||||
Me.Cursor = Cursors.Default
|
||||
End Try
|
||||
Else
|
||||
CURRENT_CLICKED_PROFILE_TITLE = Nothing
|
||||
CURRENT_CLICKED_PROFILE_ID = Nothing
|
||||
LOGGER.Debug($"Profile with ID {_tag} clicked in NavBarControl is already active...ignoring click.")
|
||||
End If
|
||||
End If
|
||||
|
||||
@@ -1445,11 +1446,6 @@ Public Class frmMain
|
||||
LOGGER.Info("[PERF Decide_Load] ruft LoadOverviewData auf...")
|
||||
End If
|
||||
|
||||
'' UI vorbereiten
|
||||
'If Not PrepareGridForLoading() Then
|
||||
' Exit Function
|
||||
'End If
|
||||
|
||||
Await Task.Yield()
|
||||
|
||||
' Daten laden
|
||||
@@ -1460,11 +1456,6 @@ Public Class frmMain
|
||||
LOGGER.Info("[PERF Decide_Load] ruft LoadProfileData auf...")
|
||||
End If
|
||||
|
||||
'' UI vorbereiten
|
||||
'If Not PrepareGridForLoading() Then
|
||||
' Exit Function
|
||||
'End If
|
||||
|
||||
Await Task.Yield()
|
||||
|
||||
' Daten laden
|
||||
@@ -1479,6 +1470,10 @@ Public Class frmMain
|
||||
' ========== NACHBEARBEITUNG ==========
|
||||
ApplyPostLoadSettings()
|
||||
GridIsLoaded = True
|
||||
' ========== CAPTION FINAL SICHERSTELLEN ==========
|
||||
' ApplyPostLoadSettings kann durch Spalten-Events den Caption überschreiben,
|
||||
' daher hier nochmals den korrekten Caption setzen
|
||||
UpdateGridCaption()
|
||||
|
||||
Catch ex As Exception
|
||||
GridIsLoaded = True
|
||||
@@ -1697,6 +1692,9 @@ Public Class frmMain
|
||||
Return False
|
||||
End If
|
||||
|
||||
' === FIX: Grid sichtbar machen bevor BeginUpdate ===
|
||||
GridControlWorkflows_Visible()
|
||||
|
||||
If GridControlWorkflows.Visible Then
|
||||
GridControlWorkflows.BeginUpdate()
|
||||
gridUpdateStarted = True
|
||||
@@ -1711,6 +1709,7 @@ Public Class frmMain
|
||||
DT_CURR_WF_ITEMS = Await DatabaseFallback.GetDatatableECMAsync(oSQL)
|
||||
|
||||
If IsNothing(DT_CURR_WF_ITEMS) Then
|
||||
LOGGER.Warn("Daten konnten nicht geladen werden für Profil: " & CURRENT_CLICKED_PROFILE_TITLE)
|
||||
Return False
|
||||
End If
|
||||
|
||||
@@ -1722,12 +1721,13 @@ Public Class frmMain
|
||||
GridControlWorkflows.Visible = False
|
||||
bindsourcegrid.DataSource = Nothing
|
||||
GridControlWorkflows.DataSource = Nothing
|
||||
LOGGER.Info("Keine Workflow-Items für Profil: " & CURRENT_CLICKED_PROFILE_TITLE)
|
||||
Return False
|
||||
End If
|
||||
|
||||
' ========== BASIC VIEW ERSTELLEN ==========
|
||||
Await CreateBasicViewForProfile()
|
||||
|
||||
LOGGER.Debug("Basic View für Profil erstellt: " & CURRENT_CLICKED_PROFILE_TITLE)
|
||||
Return True
|
||||
|
||||
Catch ex As Exception
|
||||
@@ -3594,7 +3594,7 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
|
||||
Private Sub GridViewWorkflows_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWorkflows.ColumnFilterChanged
|
||||
Try
|
||||
If FormShown = False Or FRONTEND_ACTION = NAVBAR_CLICKED Then
|
||||
If FormShown = False Or FRONTEND_ACTION <> FA_NONE Then
|
||||
Exit Sub
|
||||
End If
|
||||
|
||||
@@ -3612,11 +3612,21 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G
|
||||
If lblCaptionMainGrid.Text.Contains(oTermFilterActive) Then
|
||||
Ev_Filter_Panel_Closed = False
|
||||
End If
|
||||
lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
|
||||
|
||||
' Caption korrekt setzen: Profil-Titel oder Gesamtübersicht
|
||||
If GRID_LOAD_TYPE.StartsWith("PROFILE#") AndAlso Not String.IsNullOrEmpty(CURRENT_CLICKED_PROFILE_TITLE) Then
|
||||
LOGGER.Debug($"Setting Grid Caption with Profile Title [{CURRENT_CLICKED_PROFILE_TITLE}] and Filter Active Term [{oTermFilterActive}]")
|
||||
lblCaptionMainGrid.Text = String.Format("{0} - {1}", CURRENT_CLICKED_PROFILE_TITLE, oTermFilterActive)
|
||||
Else
|
||||
LOGGER.Debug($"Setting Grid Caption with Gesamtübersicht and Filter Active Term [{oTermFilterActive}]")
|
||||
lblCaptionMainGrid.Text = String.Format("{0} - {1}", S.Gesamtübersicht, oTermFilterActive)
|
||||
End If
|
||||
|
||||
bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||
bsitmCount.Caption = oTermFilterActive
|
||||
Else
|
||||
bsitmCount.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||
LOGGER.Debug("No active filter - resetting caption to default")
|
||||
End If
|
||||
|
||||
End If
|
||||
|
||||
Reference in New Issue
Block a user