From ca01ff32ac81d20a93201bc1f1e820ffdd029b2a Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Fri, 14 Jun 2024 13:46:40 +0200 Subject: [PATCH] MS Setup und fndd_login_user --- app/DD_Clipboard_Searcher/ClassDataASorDB.vb | 34 +++++++++--------- .../DD_Clipboard_Watcher.vbproj | 6 ++-- .../DD_easyFLOW_ICON.ico | Bin 0 -> 5525 bytes app/SetupVS19/Config.wxi | 6 ++-- app/SetupVS19/Product.wxs | 1 - 5 files changed, 23 insertions(+), 24 deletions(-) create mode 100644 app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico diff --git a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb index 89d36f8..51cd8b2 100644 --- a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb +++ b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb @@ -32,37 +32,37 @@ Public Class ClassDataASorDB Public Function CheckModuleData() Try - Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1},'')", USER_USERNAME, CLIENT_SELECTED) - Dim DT_CHECKUSER_MODULE As DataTable - DT_CHECKUSER_MODULE = Database.GetDatatable(oSql) + Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED) + Dim DT_LOGIN_USER_MODULE As DataTable + DT_LOGIN_USER_MODULE = Database.GetDatatable(oSql) - If DT_CHECKUSER_MODULE.Rows.Count = 0 Then + If DT_LOGIN_USER_MODULE.Rows.Count = 0 Then Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True) 'ERROR_STATE = "NO USER" MsgBox("Sorry - Something went wrong in getting Your rights." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation) Return False End If - If DT_CHECKUSER_MODULE.Rows.Count = 1 Then + If DT_LOGIN_USER_MODULE.Rows.Count = 1 Then Logger.Info(">> Login Username: " & USER_USERNAME, False) Logger.Info(">> Login time: " & Now.ToString, False) - USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") - USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")) - USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")) - USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")) - USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")) - USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE") - USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT") + USER_ID = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_ID") + USER_SURNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SURNAME")) + USER_PRENAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_PRENAME")) + USER_SHORTNAME = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_SHORTNAME")) + USER_EMAIL = IIf(IsDBNull(DT_LOGIN_USER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_LOGIN_USER_MODULE.Rows(0).Item("USER_EMAIL")) + USER_LANGUAGE = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_LANGUAGE") + USER_DATE_FORMAT = DT_LOGIN_USER_MODULE.Rows(0).Item("USER_DATE_FORMAT") - USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS") - USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN") - ADDITIONAL_TITLE = DT_CHECKUSER_MODULE.Rows(0).Item("ADDITIONAL_TITLE") + USER_IN_MODULE = DT_LOGIN_USER_MODULE.Rows(0).Item("MODULE_ACCESS") + USER_IS_ADMIN = DT_LOGIN_USER_MODULE.Rows(0).Item("IS_ADMIN") + ADDITIONAL_TITLE = DT_LOGIN_USER_MODULE.Rows(0).Item("ADDITIONAL_TITLE") If ADDITIONAL_TITLE = String.Empty Then ADDITIONAL_TITLE = My.Application.Info.ProductName End If - USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + USERCOUNT_LOGGED_IN = DT_LOGIN_USER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") USERCOUNT_LOGGED_IN += 1 Try - WORKING_MODE = DT_CHECKUSER_MODULE.Rows(0).Item("WORKING_MODE") + WORKING_MODE = DT_LOGIN_USER_MODULE.Rows(0).Item("WORKING_MODE") Catch ex As Exception WORKING_MODE = "" End Try diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index 82f034b..4e5349e 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -63,7 +63,7 @@ On - search.ico + DD_easyFLOW_ICON.ico My Project\app.manifest @@ -99,8 +99,7 @@ P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\Controls\DigitalData.Controls.RegexEditor.dll - - False + ..\..\..\DDMonorepo\GUIs.ClipboardWatcher\bin\Debug\DigitalData.GUIs.ClipboardWatcher.dll @@ -454,6 +453,7 @@ + diff --git a/app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico b/app/DD_Clipboard_Searcher/DD_easyFLOW_ICON.ico new file mode 100644 index 0000000000000000000000000000000000000000..914504bb7b48d918057bf2ff1992c7e3aef4f879 GIT binary patch literal 5525 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 literal 0 HcmV?d00001 diff --git a/app/SetupVS19/Config.wxi b/app/SetupVS19/Config.wxi index 85b08fc..0d0be0d 100644 --- a/app/SetupVS19/Config.wxi +++ b/app/SetupVS19/Config.wxi @@ -1,10 +1,10 @@ - + - - + + diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index adf7c17..a9d0f16 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -95,7 +95,6 @@ -