From 43a42644102c583990669401a0e509537a831799 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 24 Mar 2021 14:44:44 +0100 Subject: [PATCH] 2.1.11.0 --- app/DD_PM_WINDREAM/ClassInit.vb | 28 +- app/DD_PM_WINDREAM/ClassParamRefresh.vb | 16 +- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- app/DD_PM_WINDREAM/frmMain.Designer.vb | 30 +- app/DD_PM_WINDREAM/frmMain.resx | 302 +++++++++--------- app/DD_PM_WINDREAM/frmMain.vb | 12 +- app/DD_PM_WINDREAM/frmValidator.vb | 3 +- 7 files changed, 209 insertions(+), 184 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index 6b6ecbb..afb4c9d 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -217,6 +217,7 @@ Public Class ClassInit Dim oSQL As String Try If pUSRNAME <> String.Empty Then + LOGGER.Info($"InitUserLogin with GhostUSer [{pUSRNAME}]") USER_USERNAME = pUSRNAME Else USER_USERNAME = Environment.UserName @@ -260,6 +261,7 @@ Public Class ClassInit If DT_CHECKUSER_MODULE.Rows.Count = 1 Then + LOGGER.Info($"Got a CheckUserDefintion for User [{USER_USERNAME}]") If DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") <> 0 Then USER_EXISTS = True Else @@ -275,7 +277,13 @@ Public Class ClassInit USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") - USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) + Try + USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")) + + Catch ex As Exception + LOGGER.Warn("Error in USER_RIGHT_FILE_DELETE: " & ex.Message) + USER_RIGHT_FILE_DELETE = False + End Try USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") @@ -340,16 +348,21 @@ Public Class ClassInit End Sub Public Sub InitBasics() + Dim oStep As String Try + If IsNothing(DataASorDB) Then + DataASorDB = New ClassDataASorDB + End If Dim oStopWatch As New RefreshHelper.SW("InitBasics") Dim oSql = String.Format("select * from TBPM_KONFIGURATION WHERE GUID = 1") + oStep = "TBPM_KONFIGURATION" BASEDATA_DT_CONFIG = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_KONFIGURATION", $"GUID = 1") Settings_LoadBasicConfig() - + oStep = "TBDD_CONNECTION" oSql = "select * from TBDD_CONNECTION WHERE AKTIV = 1" BASEDATA_DT_TBDD_CONNECTION = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_CONNECTION", "") - + oStep = "TBDD_3RD_PARTY_MODULES" oSql = "Select * FROM TBDD_3RD_PARTY_MODULES WHERE ACTIVE = 1" Dim oTBDD_3RD_PARTY_MODULES As DataTable oTBDD_3RD_PARTY_MODULES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_3RD_PARTY_MODULES", "") @@ -359,20 +372,23 @@ Public Class ClassInit GDPICTURE_LICENSE = oROW.Item("LICENSE") End If Next + oStep = "TBDD_GUI_LANGUAGE_PHRASE" oSql = "SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WHERE MODULE IN ('PM','All Modules')" BASEDATA_DT_GUI_LANGUAGE_PHRASES = DataASorDB.GetDatatable("DD_ECM", oSql, "TBDD_GUI_LANGUAGE_PHRASE", "") - + oStep = "TBPM_PROFILE_SEARCH" oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX") BASEDATA_DT_PROFILE_SEARCHES_DOC = BASEDATA_DT_PROFILES_SEARCHES_DOC.Clone() - + oStep = "TBPM_MAIN_VIEW_GROUPS" oSql = "SELECT * FROM TBPM_MAIN_VIEW_GROUPS WHERE ACTIVE = 1" BASEDATA_DTGRID_GROUPS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_MAIN_VIEW_GROUPS", "") + oStep = "TBPM_CHART" + oSql = "SELECT * FROM TBPM_CHART" BASEDATA_DT_CHARTS = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_CHART", "") oStopWatch.Done() Catch ex As Exception LOGGER.Error(ex) - LOGGER.Info("Unexpected Error in InitBasics: " & ex.Message, True) + LOGGER.Info($"Unexpected Error in InitBasics - last Step [{oStep}]: {ex.Message}", True) ERROR_STATE = "Basics not initialized" End Try End Sub diff --git a/app/DD_PM_WINDREAM/ClassParamRefresh.vb b/app/DD_PM_WINDREAM/ClassParamRefresh.vb index f24f1a1..5c48f66 100644 --- a/app/DD_PM_WINDREAM/ClassParamRefresh.vb +++ b/app/DD_PM_WINDREAM/ClassParamRefresh.vb @@ -30,10 +30,13 @@ LOGGER.Debug($"oWorkingMode Parameter: {oMode}") If oMode = "PM.FORCE_LAYOUT_OVERVIEW" Then FORCE_LAYOUT_OVERVIEW = True + LOGGER.Info($"FORCE_LAYOUT_OVERVIEW [{FORCE_LAYOUT_OVERVIEW}]") ElseIf oMode = "PM.NO_MASS_VALIDATOR" Then SHOW_MASS_VALIDATOR = False + LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]") ElseIf oMode = "PM.NO_CHARTS" Then SHOW_CHARTS = False + LOGGER.Info($"SHOW_CHARTS [{SHOW_CHARTS}]") ElseIf oMode = "PM.DEBUG_LOG" Then USER_DEBUG_LOG = True LOGCONFIG.Debug = True @@ -41,6 +44,7 @@ IDB_USES_WMFILESTORE = True ElseIf oMode = "PM.NO_BASICCONF" Then BASIC_CONF_VISIBLE = False + LOGGER.Info($"BASIC_CONF_VISIBLE [{BASIC_CONF_VISIBLE}]") ElseIf oMode.StartsWith("PM.IDB_CONID!") Then Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "") Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID) @@ -49,7 +53,7 @@ IDB_ACTIVE = False Else IDB_ACTIVE = True - LOGGER.Debug($"Got an IDB-Connection [{CON_ID}]!") + LOGGER.Info($"Got an IDB-Connection [{CON_ID}]!") End If ElseIf oMode.StartsWith("PM.IDB_APP_SERV_CONID!") Then Dim CON_ID = oMode.Replace("PM.IDB_APP_SERV_CONID!", "") @@ -60,15 +64,20 @@ End If ElseIf oMode = "PM.MONITORING" Then MONITORING_ACTIVE = True + LOGGER.Info($"SHOW_MASS_VALIDATOR [{SHOW_MASS_VALIDATOR}]") ElseIf oMode = "PM.GHOSTMODE" Then GHOSTMODE_ACTIVE = True + LOGGER.Info($"GHOSTMODE_ACTIVE [{GHOSTMODE_ACTIVE}]") ElseIf oMode.StartsWith("PM.COLORSCHEME") Then Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "") RIBBON_COLOR_SCHEME = oColorScheme.ToUpper + LOGGER.Info($"RIBBON_COLOR_SCHEME [{RIBBON_COLOR_SCHEME}]") ElseIf oMode.StartsWith("PM.NO_DETAIL_PROFILES") Then NO_DETAIL_PROFILES = True + LOGGER.Info($"NO_DETAIL_PROFILES [{NO_DETAIL_PROFILES}]") ElseIf oMode = "PM.NO_POPUP" Then POPUP_REMINDER_ACTIVE = False + LOGGER.Info($"POPUP_REMINDER_ACTIVE [{POPUP_REMINDER_ACTIVE}]") ElseIf oMode.StartsWith("PM.CONV_IDENTIFICATION") Then Dim oIdent = oMode.Replace("PM.CONV_IDENTIFICATION=", "") CONV_IDENTIFICATION = oIdent @@ -76,6 +85,7 @@ Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "") Try INACTIVITY_DURATION = CInt(oInactivityDuration) + LOGGER.Info($"InactivityDuration [{INACTIVITY_DURATION}]") Catch ex As Exception INACTIVITY_DURATION = 0 End Try @@ -83,7 +93,7 @@ Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "") Try LAST_EDITED_COLUMN = oLEDITEDCOL - LOGGER.Debug($"LAST_EDITED_COLUMN: {oLEDITEDCOL}") + LOGGER.Info($"LAST_EDITED_COLUMN: {oLEDITEDCOL}") Catch ex As Exception LAST_EDITED_COLUMN = "" @@ -92,7 +102,7 @@ Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "") Try LAST_ADDED_COLUMN = oLEDITEDCOL - LOGGER.Debug($"LAST_ADDED_COLUMN: {oLEDITEDCOL}") + LOGGER.Info($"LAST_ADDED_COLUMN: {oLEDITEDCOL}") Catch ex As Exception LAST_ADDED_COLUMN = "" diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 7b06d96..3e13a25 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index 3c2e338..0604c81 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -87,7 +87,7 @@ Partial Class frmMain Me.bsiGeneralInfo = New DevExpress.XtraBars.BarStaticItem() Me.bbtnitmGhostMode = New DevExpress.XtraBars.BarButtonItem() Me.bsi_GhostMode = New DevExpress.XtraBars.BarStaticItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItemGhostMode = New DevExpress.XtraBars.BarButtonItem() Me.SearchItem1 = New DevExpress.XtraBars.BarButtonItem() Me.SearchItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarStaticItemAppServer = New DevExpress.XtraBars.BarStaticItem() @@ -464,7 +464,7 @@ Partial Class frmMain 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItem2, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtniRefresh, Me.bbtniMonitor, Me.bbiProfilverwaltung, Me.bbiKonfiguration, Me.bbtniGrundeinstellung, Me.bbtnitemInfo, Me.BarButtonItem1, Me.bsiUser, Me.bsiLicenses, Me.bsiUserLoggedIn, Me.bsiVersion, Me.bsilastsync, Me.bsiDebug, Me.bsiMessage, Me.bbtniMetadataFile, Me.BarEditItem1, Me.bbtnitDashboardInv, Me.bsiGeneralInfo, Me.bbtnitmGhostMode, Me.bsi_GhostMode, Me.BarButtonItemGhostMode, Me.SearchItem1, Me.SearchItem2, Me.BarStaticItemAppServer, Me.bbtniCW}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") Me.RibbonControl1.MaxItemId = 26 Me.RibbonControl1.Name = "RibbonControl1" @@ -647,18 +647,18 @@ Partial Class frmMain Me.bsi_GhostMode.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.bsi_GhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never ' - 'BarButtonItem2 + 'BarButtonItemGhostMode ' - resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2") - Me.BarButtonItem2.Id = 21 - Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem2.ItemAppearance.Normal.Font = CType(resources.GetObject("BarButtonItem2.ItemAppearance.Normal.Font"), System.Drawing.Font) - Me.BarButtonItem2.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) - Me.BarButtonItem2.ItemAppearance.Normal.Options.UseFont = True - Me.BarButtonItem2.ItemAppearance.Normal.Options.UseForeColor = True - Me.BarButtonItem2.Name = "BarButtonItem2" - Me.BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing + 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.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 + Me.BarButtonItemGhostMode.Name = "BarButtonItemGhostMode" + Me.BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing ' 'SearchItem1 ' @@ -702,7 +702,7 @@ Partial Class frmMain 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtniRefresh) - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItemGhostMode) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' @@ -1543,7 +1543,7 @@ Partial Class frmMain Friend WithEvents AktionenToolStripMenuItem As ToolStripMenuItem Friend WithEvents DateiAlsLinkVersendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents bsi_GhostMode As DevExpress.XtraBars.BarStaticItem - Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItemGhostMode As DevExpress.XtraBars.BarButtonItem Friend WithEvents tslblObjectCount As ToolStripLabel Friend WithEvents ExportierenToolStripMenuItem As ToolStripMenuItem Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index c512c91..ad0f0ff 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAWABBwFgAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAWgBBwFoAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -176,108 +176,6 @@ 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 @@ -297,6 +195,7 @@ 1114, 335 + 8 @@ -418,12 +317,6 @@ 17, 56 - - 219, 26 - - - Starte Validierung für Profil - 220, 30 @@ -604,33 +497,119 @@ 3 - - 490, 17 - - - 640, 56 - - - 234, 22 + + 269, 26 - - Popup Erinnerung inaktivieren + + Validierung für Gruppe/Profil starten - - 231, 6 + + 269, 26 - - 234, 22 + + Validierung für Datei starten - - Bring to Front + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAANNJREFUOE+1k80NgzAMRhmlI3QGZuGeLdiBXjoEU2QaCk3gSPssjJIQBXpopE9y + 7M/PCT9VuuZ5XgsanHP3zZpfGOu6zqpt23NICYBOISHgNYyRipBlWW7e+ycAa63Ivd06jdMBEEKkGRIb + mpExRqR7QLmTUJPJ32Bomkaa+r7fDcTkqIWQCKDHxqiFVHoavY7mBcB0Ap3cdY99EjE5anj0FCkgmq6N + CtI8Hu/8fwCXr6CeCPDLQ0w9Arj6GjHndOlDolb8gVjBp7yDiMlR22zJqqoPDtN4ChAfojUAAAAASUVO + RK5CYII= + - - 234, 22 + + 269, 26 - - Out of Range - PM fixieren + + 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 + 235, 76 @@ -812,6 +791,27 @@ True + + 234, 22 + + + Popup Erinnerung inaktivieren + + + 231, 6 + + + 234, 22 + + + Bring to Front + + + 234, 22 + + + Out of Range - PM fixieren + 605, 17 @@ -1266,7 +1266,7 @@ Tahoma, 9.75pt, style=Bold - + Ghost Mode inaktivieren @@ -1377,21 +1377,6 @@ 0, 0 - - Allgemein - - - Auswertungen - - - Verwaltung - - - Grundeinstellungen - - - Funktionen/App Start - Start @@ -1428,6 +1413,21 @@ 5 + + Allgemein + + + Auswertungen + + + Verwaltung + + + Grundeinstellungen + + + Funktionen/App Start + Top @@ -2020,10 +2020,10 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem2 + + BarButtonItemGhostMode - + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -2718,6 +2718,9 @@ &Ansicht + + &Hintergrund + &Seiten Layout @@ -2730,9 +2733,6 @@ Bars - - &Hintergrund - PDF Dokument diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index dd1a837..c0791fc 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -149,8 +149,8 @@ Public Class frmMain ' Create helper to save/load expanded GroupColumns at runtime RefreshHelper = New RefreshHelper(GridView_Docs, "GUID") - - bsiVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString) + Dim oVErsion = String.Format("{0}.{1}.{2}", My.Application.Info.Version.Major, My.Application.Info.Version.Minor, My.Application.Info.Version.Build) + bsiVersion.Caption = oVErsion If ERROR_STATE = "NO DB-CONNECTION" Or ERROR_STATE = "FAILED DBCONNECTION" Then MsgBox("Please add a database-Connection in AppConfig!", MsgBoxStyle.Critical, "Fehlende Konfiguration:") frmKonfig.ShowDialog() @@ -2454,9 +2454,9 @@ Public Class frmMain frmGhostMode.ShowDialog() If USER_GHOST_MODE_ACTIVE = True And USER_GHOST_MODE_USRNAME <> String.Empty Then LOGGER.Info($"GHOST MODE for User {USER_GHOST_MODE_USRNAME} will now be initialized!") - BarButtonItem2.Caption = $"Ghost Mode ({USER_GHOST_MODE_USRNAME}) inaktivieren" + BarButtonItemGhostMode.Caption = $"Ghost Mode ({USER_GHOST_MODE_USRNAME}) inaktivieren" - BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Always _Init.InitBasics() _Init.InitUserLogin(USER_GHOST_MODE_USRNAME) _Init.InitBasics2() @@ -2483,10 +2483,10 @@ Public Class frmMain End Sub - Private Async Sub BarButtonItem2_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + Private Async Sub BarButtonItem2_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemGhostMode.ItemClick USER_GHOST_MODE_ACTIVE = False USER_GHOST_MODE_USRNAME = String.Empty - BarButtonItem2.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + BarButtonItemGhostMode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never _Init.InitUserLogin() LoadNavBar() Await Decide_Load(False) diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index c738158..dcae958 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -2592,14 +2592,13 @@ Public Class frmValidator End Sub Sub load_viewer() DocumentViewerValidator.LoadFile(WMDocPathWindows) - ' DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) + DocumentViewerValidator.RightOnlyView(USER_RIGHT_VIEW_ONLY) 'war auskommentiert.....WARUM? If USER_RIGHT_VIEW_ONLY = True Then RibbonPageFile.Visible = False Else RibbonPageFile.Visible = True End If SplitContainer1.Panel2Collapsed = False - End Sub Sub activate_controls(status As Boolean) Me.pnldesigner.Enabled = status