diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 0604c81..3f9abae 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -651,9 +651,9 @@ Partial Class frmMain ' resources.ApplyResources(Me.BarButtonItemGhostMode, "BarButtonItemGhostMode") Me.BarButtonItemGhostMode.Id = 21 - Me.BarButtonItemGhostMode.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItemGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItemGhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font) + Me.BarButtonItemGhostMode.ImageOptions.Image = CType(resources.GetObject("BarButtonItemGhostMode.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItemGhostMode.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItemGhostMode.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItemGhostMode.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItemGhostMode.ItemAppearance.Normal.Font"), System.Drawing.Font) Me.BarButtonItemGhostMode.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) Me.BarButtonItemGhostMode.ItemAppearance.Normal.Options.UseFont = True Me.BarButtonItemGhostMode.ItemAppearance.Normal.Options.UseForeColor = True @@ -709,7 +709,6 @@ Partial Class frmMain 'RibbonPageGroup2 ' Me.RibbonPageGroup2.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMetadataFile) Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtnitDashboardInv) Me.RibbonPageGroup2.ItemLinks.Add(Me.bbtniMonitor) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index ad0f0ff..ec2e77e 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWgBBwFoAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAXgBBwF4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -176,6 +176,108 @@ 863, 17 + + 269, 26 + + + Validierung für Gruppe/Profil starten + + + 269, 26 + + + Validierung für Datei starten + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y + 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb + mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N + CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO + RK5CYII= + + + + 269, 26 + + + Metadaten Datei anzeigen + + + + False + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA + qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg + 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY + AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC + + + + 269, 26 + + + Massenabschluss markierte Dateien + + + 266, 6 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF + RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF + ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d + C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 + AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== + + + + 269, 26 + + + Lösche alle Filter + + + 269, 26 + + + Layout zurücksetzen + + + 269, 26 + + + Layout speichern + + + 266, 6 + + + 200, 22 + + + Datei als Link versenden + + + 269, 26 + + + Aktionen Datei + + + 269, 26 + + + Exportieren + 270, 256 @@ -195,7 +297,6 @@ 1114, 335 - 8 @@ -317,6 +418,12 @@ 17, 56 + + 219, 26 + + + Starte Validierung für Profil + 220, 30 @@ -497,119 +604,33 @@ 3 - - 269, 26 - - - Validierung für Gruppe/Profil starten - - - 269, 26 - - - Validierung für Datei starten - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y - 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb - mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N - CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO - RK5CYII= - - - - 269, 26 - - - Metadaten Datei anzeigen - - - False - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAM5JREFUOE9jwAa+fv3a8O3bt/9I+D0QCECl8QOQQpAG+fTl/xmC5/yvXnryP8hA - qDRhALJx1s4rYM38sYv+P3/zAcUlX758MYAqhQAkSbACEI1se2Rk5H8nJycwTklJ+f/8+XNUQ0CakDUg - 2754xVq4ZpyGgPyHrAnZsI8fPv3/8P4jHOfl5mEagh5oyLYja0Y2AGYISB+GK2C2g/yObgAMwwwBhRfY - AJgrQAIgvHnzZrACbJpBGMMAZAAShCnAphmER5IBhDDtDCAef/sPAEGjQ6y45GCmAAAAAElFTkSuQmCC - - - - 269, 26 - - - Massenabschluss markierte Dateien - - - 266, 6 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAP9JREFUOE9jAIHv3787fHz5/P/DQ3v+f/v2jSQMNuDr168NZ/qa/i9U4/1/sCQF - RcGRPbvAYk/v3fkfGRn538nJCY7hBgBdkPDs/Kn/y4xlwIYcaywGS17YueX/Gget/6fnTv6fkpKCohnF - ABAAcV7fufl/o68l3BCQgddWzIe7BhuGaocYAMKgsIC5ZFuUO4YGdAzVjukCkNNBNC7no3gBGIj7b29d - C7cZFpAg54PEbh/Zjz8MQM4GaUTWDMOgwAW5CkQji8Mw2AAg4z1IIygq0RUQwmADvnz5YgDi4PIrLgw3 - AARAHGyK8GEMA8jBUO1UMgCbM/Fh6htAOv72HwANMrXhfARkwAAAAABJRU5ErkJggg== - - - - 269, 26 - - - Lösche alle Filter - - - 269, 26 - - - Layout zurücksetzen - - - 269, 26 - - - Layout speichern - - - 266, 6 - - - 269, 26 - - - Aktionen Datei - - - 200, 22 - - - Datei als Link versenden - - - 269, 26 - - - Exportieren - - - 219, 26 - - - Starte Validierung für Profil - 490, 17 640, 56 + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 235, 76 @@ -791,27 +812,6 @@ True - - 234, 22 - - - Popup Erinnerung inaktivieren - - - 231, 6 - - - 234, 22 - - - Bring to Front - - - 234, 22 - - - Out of Range - PM fixieren - 605, 17 @@ -1269,7 +1269,7 @@ Ghost Mode inaktivieren - + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAQdEVYdFRpdGxlAE1hc2s7Um9sZTu6seyzAAAA3klE @@ -1279,7 +1279,7 @@ 6ND9GYC1eAiKbZDRqW78Y8dG3EXzGI+s1q8JD762g7gZPOM1enHwAUbOxAVvaZeAAAAAAElFTkSuQmCC - + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAQdEVYdFRpdGxlAE1hc2s7Um9sZTu6seyzAAACmUlE @@ -1297,7 +1297,7 @@ auQPQiXhdkHlGrsAAAAASUVORK5CYII= - + Tahoma, 9.75pt, style=Bold @@ -1377,6 +1377,21 @@ 0, 0 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Funktionen/App Start + Start @@ -1413,21 +1428,6 @@ 5 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Funktionen/App Start - Top @@ -2718,9 +2718,6 @@ &Ansicht - - &Hintergrund - &Seiten Layout @@ -2733,6 +2730,9 @@ Bars + + &Hintergrund + PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index c0791fc..d4fc598 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -138,12 +138,6 @@ Public Class frmMain End Sub Private Sub frmMain_Load(sender As Object, e As System.EventArgs) Handles Me.Load - If Environment.UserName.ToLower = "schreiberm" Or Environment.UserName.ToLower = "jennej" Or Environment.UserName.ToLower = "marschreiber" Then - bbtniMetadataFile.Visibility = DevExpress.XtraBars.BarItemVisibility.Always - Else - bbtniMetadataFile.Visibility = DevExpress.XtraBars.BarItemVisibility.Never - End If - FormOpenClose = True LOGGER.Debug("Initializing MainForm....") @@ -322,7 +316,7 @@ Public Class frmMain bbtniMonitor.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End If Check_Timer_Notification() - Check_Timer_Inactivity() + Timer_Inactivity_Reset_Disable() FormShown = True Restore_Form_Position() @@ -386,7 +380,7 @@ Public Class frmMain End Try End Sub - Public Sub Check_Timer_Inactivity() + Public Sub Timer_Inactivity_Reset_Disable() Try If INACTIVITY_DURATION <> 0 Then TimerInactivity.Stop() @@ -1060,19 +1054,27 @@ Public Class frmMain Exit Sub End If If bwBasicData.IsBusy Then - LOGGER.Info("bwBasicData is busy - no Refreshing") - Exit Sub - End If - If Application.OpenForms().OfType(Of frmValidator).Any Then - Exit Sub - End If - If Application.OpenForms().OfType(Of frmAdministration).Any Then - Exit Sub - End If - If Application.OpenForms().OfType(Of frmAdmin2).Any Then + LOGGER.Info("backGroundWorker BasicData in Action - no Client-Sync") + bsiMessage.Caption = "bwBasicData is busy - no Refreshing" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow Exit Sub End If + + 'If Application.OpenForms().OfType(Of frmValidator).Any Then + ' Exit Sub + 'End If + 'If Application.OpenForms().OfType(Of frmAdministration).Any Then + ' Exit Sub + 'End If + 'If Application.OpenForms().OfType(Of frmAdmin2).Any Then + ' Exit Sub + 'End If + If USER_LANGUAGE <> "de-DE" Then + bsilastsync.Caption = "Last Client-Sync: " & Now.ToLongTimeString + Else + bsilastsync.Caption = "Letzte Synchronisation: " & Now.ToLongTimeString + End If If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.SaveViewInfo() 'If Not Application.OpenForms().OfType(Of frmValidator).Any Then ' Dim oUpdate = "Not Defined" @@ -1097,11 +1099,7 @@ Public Class frmMain Await Decide_Load(False) oStopWatch.Done() 'bwSync.ReportProgress(95) - If USER_LANGUAGE <> "de-DE" Then - bsilastsync.Caption = "Last Client-Sync: " & Now.ToLongTimeString - Else - bsilastsync.Caption = "Letzte Synchronisation: " & Now.ToLongTimeString - End If + If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo() Handling_DEBUG_USER() @@ -1959,7 +1957,7 @@ Public Class frmMain Private Async Sub TabellenlayoutZurücksetzenToolStripMenuItem_Click_1(sender As Object, e As EventArgs) Handles TabellenlayoutZurücksetzenToolStripMenuItem.Click - Check_Timer_Inactivity() + Timer_Inactivity_Reset_Disable() Await Reset_GridLayout(False) Await Decide_Load(False, True) SaveGridLayout() @@ -2081,18 +2079,14 @@ Public Class frmMain End Sub Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged - If FormShown = False Then - Exit Sub - End If - Check_Timer_Inactivity() - SaveGridLayout() + GridLayout_Changed() End Sub Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridView_Docs.EndSorting ' SaveGridLayout() End Sub Private Sub LayoutSpeichernToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LayoutSpeichernToolStripMenuItem.Click - Check_Timer_Inactivity() + Timer_Inactivity_Reset_Disable() SaveGridLayout() End Sub @@ -2118,7 +2112,10 @@ Public Class frmMain If pMode = "bwBasicData" Then bwBasicData.ReportProgress(10) - ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) + If pMode <> "Load" Then + ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) + End If + If pMode = "bwBasicData" Then bwBasicData.ReportProgress(20) oSQL = String.Format("SELECT T.* FROM VWPM_PROFILE_ACTIVE T WHERE T.FILE_COUNT > 0 AND T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_GET_ACTIVE_PROFILES_USER] ({0}))", USER_ID) CURR_DT_VWPM_PROFILE_ACTIVE = ClassDatabase.Return_Datatable(oSQL, "GetBaseData2") @@ -2223,7 +2220,7 @@ Public Class frmMain End Sub Private Sub LöscheAlleFilterToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles LöscheAlleFilterToolStripMenuItem.Click - Check_Timer_Inactivity() + Timer_Inactivity_Reset_Disable() Try GridView_Docs.ClearFindFilter() @@ -2499,7 +2496,7 @@ Public Class frmMain If FormShown = False Then Exit Sub End If - Check_Timer_Inactivity() + Timer_Inactivity_Reset_Disable() Dim objectCount_Descr = GridView_Docs.RowCount.ToString If USER_LANGUAGE <> "de-DE" Then objectCount_Descr &= " objects (filtered)" @@ -2530,23 +2527,33 @@ Public Class frmMain Private Sub TimerInactivity_Tick(sender As Object, e As EventArgs) Handles TimerInactivity.Tick Try If Application.OpenForms().OfType(Of frmValidator).Any Then - Check_Timer_Inactivity() + bsiMessage.Caption = "Validation Active - no Inactivity-Logout" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow + Timer_Inactivity_Reset_Disable() Exit Sub End If If Application.OpenForms().OfType(Of frmAdministration).Any Then - Check_Timer_Inactivity() + bsiMessage.Caption = "Administration Active - no Inactivity-Logout" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow + Timer_Inactivity_Reset_Disable() Exit Sub End If If Application.OpenForms().OfType(Of frmAdmin2).Any Then - Check_Timer_Inactivity() + bsiMessage.Caption = "Administration2 Active - no Inactivity-Logout" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow + Timer_Inactivity_Reset_Disable() Exit Sub End If If Application.OpenForms().OfType(Of frmMonitor).Any Then - Check_Timer_Inactivity() + bsiMessage.Caption = "Monitoring open - no Inactivity-Logout" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow + Timer_Inactivity_Reset_Disable() Exit Sub End If - If GHOSTMODE_ACTIVE = True Then - Check_Timer_Inactivity() + If GHOSTMODE_ACTIVE And USER_GHOST_MODE_ACTIVE Then + bsiMessage.Caption = "GhostMode Active - no Inactivity-Logout" + bsiMessage.ItemAppearance.Normal.BackColor = Color.Yellow + Timer_Inactivity_Reset_Disable() Exit Sub End If INACTIVITYRecognized = True @@ -2603,5 +2610,18 @@ Public Class frmMain End Try End Sub + Private Sub GridView_Docs_ColumnPositionChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnPositionChanged + GridLayout_Changed() + End Sub + Sub GridLayout_Changed() + If FormShown = False Then + Exit Sub + End If + Timer_Inactivity_Reset_Disable() + SaveGridLayout() + End Sub + Private Sub GridView_Docs_CustomColumnSort(sender As Object, e As CustomColumnSortEventArgs) Handles GridView_Docs.CustomColumnSort + GridLayout_Changed() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 01845c2..095c856 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -396,7 +396,7 @@ Public Class frmValidator End Try My.Settings.frmValidatorSize = Me.Size My.Settings.Save() - If INACTIVITY_DURATION <> 0 Then frmMain.Check_Timer_Inactivity() + If INACTIVITY_DURATION <> 0 Then frmMain.Timer_Inactivity_Reset_Disable() Try _frmValidatorSearch.Close()