From 44af23824c1e7d1c924f292e68381b8fb721ce76 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 19 Jul 2022 11:20:12 +0200 Subject: [PATCH] MS --- app/DD_PM_WINDREAM/ClassInit.vb | 24 ------------------------ app/DD_PM_WINDREAM/frmMain.Designer.vb | 1 - app/DD_PM_WINDREAM/frmMain.resx | 2 +- app/DD_PM_WINDREAM/frmMain.vb | 8 +++++++- 4 files changed, 8 insertions(+), 27 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassInit.vb b/app/DD_PM_WINDREAM/ClassInit.vb index bb7e86e..799f4b3 100644 --- a/app/DD_PM_WINDREAM/ClassInit.vb +++ b/app/DD_PM_WINDREAM/ClassInit.vb @@ -353,30 +353,6 @@ Public Class ClassInit End Try USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") - 'If Not IsNothing(BASEDATA_DT_TBDD_SQL_COMMANDS) Then - ' If BASEDATA_DT_TBDD_SQL_COMMANDS.Rows.Count > 0 Then - ' For Each oRow As DataRow In BASEDATA_DT_TBDD_SQL_COMMANDS.Rows - ' If oRow.Item("TITLE") = "LICENSE_COUNT_PM" Then - ' oSQL = oRow.Item("SQL_COMMAND") - ' Dim oResult = _Client.GetScalarValueFromECM(oSQL) - ' If oResult.OK Then - ' USERCOUNT_LOGGED_IN = oResult.Scalar - ' Else - ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") - ' End If - ' End If - ' Next - ' Else - ' LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS.Rows = 0!") - ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") - ' End If - 'Else - ' LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS is nothing!") - ' USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") - 'End If - - - ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE) diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index ffd571f..9b53040 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -458,7 +458,6 @@ Partial Class frmMain Me.bsiLicenses.Id = 9 Me.bsiLicenses.ImageOptions.Image = Global.DD_ProcessManager.My.Resources.Resources.key Me.bsiLicenses.Name = "bsiLicenses" - Me.bsiLicenses.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph ' 'bsiUserLoggedIn ' diff --git a/app/DD_PM_WINDREAM/frmMain.resx b/app/DD_PM_WINDREAM/frmMain.resx index e00a0ea..0b9a50c 100644 --- a/app/DD_PM_WINDREAM/frmMain.resx +++ b/app/DD_PM_WINDREAM/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAdwBCAHcAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAeQBCAHkAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 9fd078d..f1a42fc 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -203,7 +203,13 @@ Public Class frmMain Try 'DataASorDB = New ClassDataASorDB - bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT + If User.IsAdmin = True Then + bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT + bsiLicenses.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bsiLicenses.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If + LOGGER.Debug("Initializing MainForm....") If ERROR_STATE = "NO USER" Then