V 2.4.9.4 WISAG Buttons, Reject-Attribute als Ausnahme in CheckUpdateIndexe, FilterActive Hinweis, Logging anpassen
This commit is contained in:
@@ -186,7 +186,7 @@ Public Class frmMain
|
||||
omsgTitleAttention = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("MsgboxTitleAttention")
|
||||
|
||||
|
||||
Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build)
|
||||
Dim oVErsion = My.Application.Info.Version.ToString 'String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build)
|
||||
BSIVERSION1.Caption = oVErsion
|
||||
If ERROR_STATE = "NO DB-CONNECTION" Or ERROR_STATE = "FAILED DBCONNECTION" Then
|
||||
MsgBox(S.Bitte_konfigurieren_Sie_eine_Datenbankverbindung_, MsgBoxStyle.Critical, "Fehlende Konfiguration:")
|
||||
@@ -619,7 +619,7 @@ Public Class frmMain
|
||||
|
||||
Private Function GetLayoutName_GridMain()
|
||||
Dim Filename As String = String.Format("DevExpressGridViewOverview_UserLayout_{0}_{1}.xml", GRID_LOAD_TYPE, USER_LANGUAGE)
|
||||
Return System.IO.Path.Combine(CONFIG.UserConfigPath.Replace("UserConfig.xml", ""), Filename)
|
||||
Return System.IO.Path.Combine(USER_CONFIG_DIRECTORY, Filename)
|
||||
End Function
|
||||
|
||||
Private Sub SaveGridLayout()
|
||||
@@ -1005,8 +1005,6 @@ Public Class frmMain
|
||||
|
||||
RestoreLayout()
|
||||
|
||||
|
||||
|
||||
End If
|
||||
|
||||
End If
|
||||
@@ -2143,6 +2141,7 @@ Public Class frmMain
|
||||
LOGGER.Error(ex)
|
||||
End Try
|
||||
End If
|
||||
RestoreLayout()
|
||||
oStopWatch.Done()
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex)
|
||||
@@ -2297,6 +2296,7 @@ Public Class frmMain
|
||||
If hi.HitTest = GridHitTest.FilterPanelCloseButton Then
|
||||
Ev_Filter_Panel_Closed = True
|
||||
Grid_Reset_Filter()
|
||||
Ev_Filter_Panel_Closed = False
|
||||
End If
|
||||
End If
|
||||
If Not IsNothing(CURRENT_CLICKED_PROFILE_ID) Then
|
||||
@@ -2808,36 +2808,11 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
|
||||
End If
|
||||
GridLayout_Changed("ColumnFilterChanged")
|
||||
RowCount()
|
||||
Catch ex As Exception
|
||||
LOGGER.Error(ex.Message)
|
||||
End Try
|
||||
End Sub
|
||||
Sub RowCount()
|
||||
Try
|
||||
'Dim oGroupCount As Integer = 0
|
||||
'For index = 0 To GridViewWorkflows.RowCount
|
||||
' Dim oRow = GridViewWorkflows.GetRow(index)
|
||||
' If oRow Is Nothing Then
|
||||
' Continue For
|
||||
' End If
|
||||
' If GridViewWorkflows.GetRowExpanded(index) = True Then
|
||||
' oGroupCount += 1
|
||||
' End If
|
||||
|
||||
'Next
|
||||
Dim oRowCount = GridViewWorkflows.RowCount
|
||||
|
||||
oRowCount = oRowCount '- oGroupCount
|
||||
Dim objectCount_Descr = $"[{oRowCount.ToString}]"
|
||||
objectCount_Descr = String.Format(S.__0___Workflows, objectCount_Descr)
|
||||
|
||||
bsiRowCount.Caption = objectCount_Descr
|
||||
Catch ex As Exception
|
||||
bsiRowCount.Caption = "Error getting RowCount"
|
||||
End Try
|
||||
|
||||
End Sub
|
||||
Sub Create_View_Caption()
|
||||
Try
|
||||
lblCaptionMainGrid.Text = S.Gesamtübersicht
|
||||
@@ -3188,7 +3163,6 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
|
||||
Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWorkflows.SubstituteFilter
|
||||
GridLayout_Changed("GridViewWFItems_SubstituteFilter")
|
||||
RowCount()
|
||||
End Sub
|
||||
|
||||
Private Sub BbtnitmAHWF1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BbtnitmAHWF1.ItemClick, BbtnitmAHWF2.ItemClick, BbtnitmAHWF3.ItemClick, BbtnitmAHWF4.ItemClick
|
||||
@@ -3296,14 +3270,4 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_
|
||||
LOGGER.Info("User clicked reset layout")
|
||||
Await GridLayout_Reset()
|
||||
End Sub
|
||||
|
||||
Private Sub GridViewWorkflows_KeyUp(sender As Object, e As KeyEventArgs) Handles GridViewWorkflows.KeyUp
|
||||
If GridViewWorkflows.ActiveFilterEnabled = False Then
|
||||
If DetailLinkActive Then
|
||||
lblCaptionMainGrid.Text = CURRENT_CLICKED_PROFILE_TITLE
|
||||
Else
|
||||
Create_View_Caption()
|
||||
End If
|
||||
End If
|
||||
End Sub
|
||||
End Class
|
||||
Reference in New Issue
Block a user