From e4c4b2e7fe4fa3869e008087c9a00e8d652abc56 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Thu, 23 Mar 2023 13:46:26 +0100 Subject: [PATCH] MS Update dll --- app/DD_Clipboard_Searcher/App.config | 2 +- app/DD_Clipboard_Searcher/ClassDataASorDB.vb | 2 +- app/DD_Clipboard_Searcher/ClassInit.vb | 2 +- app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj | 5 ++++- app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb | 4 ++-- app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb | 2 +- app/DD_Clipboard_Searcher/My Project/Settings.settings | 2 +- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/app/DD_Clipboard_Searcher/App.config b/app/DD_Clipboard_Searcher/App.config index 0232d88..bdc0811 100644 --- a/app/DD_Clipboard_Searcher/App.config +++ b/app/DD_Clipboard_Searcher/App.config @@ -18,7 +18,7 @@ - + en-US diff --git a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb index 0cd1ee8..cfaf48d 100644 --- a/app/DD_Clipboard_Searcher/ClassDataASorDB.vb +++ b/app/DD_Clipboard_Searcher/ClassDataASorDB.vb @@ -32,7 +32,7 @@ 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 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 = GetDatatable(oSql, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'CW'", "", "") diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index e75c23e..16d4032 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -195,7 +195,7 @@ Public Class ClassInit End Function Public Function CheckModuleData() Try - Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED) + Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','CW',{1},'{2}')", USER_USERNAME, CLIENT_SELECTED, My.Settings.SYS_Override_Language) Dim DT_CHECKUSER_MODULE As DataTable DT_CHECKUSER_MODULE = _DataASorDB.GetDatatable(oSql, "TBDD_USER_MODULE", $"USERNAME = '{USER_USERNAME.ToLower}' AND MODULE_SHORT = 'CW'", "", "") diff --git a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj index 9db99d7..1d256e9 100644 --- a/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj +++ b/app/DD_Clipboard_Searcher/DD_Clipboard_Watcher.vbproj @@ -102,7 +102,8 @@ 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 @@ -352,9 +353,11 @@ frmMain.vb + Designer frmMain.vb + Designer frmMain.vb diff --git a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb index ce627cc..89cd366 100644 --- a/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb +++ b/app/DD_Clipboard_Searcher/My Project/AssemblyInfo.vb @@ -11,9 +11,9 @@ Imports System.Runtime.InteropServices - + - + diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb index bea1750..6db129f 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb +++ b/app/DD_Clipboard_Searcher/My Project/Settings.Designer.vb @@ -94,7 +94,7 @@ Namespace My _ + Global.System.Configuration.DefaultSettingValueAttribute("en-US")> _ Public ReadOnly Property SYS_Override_Language() As String Get Return CType(Me("SYS_Override_Language"),String) diff --git a/app/DD_Clipboard_Searcher/My Project/Settings.settings b/app/DD_Clipboard_Searcher/My Project/Settings.settings index c945aa6..a77d10f 100644 --- a/app/DD_Clipboard_Searcher/My Project/Settings.settings +++ b/app/DD_Clipboard_Searcher/My Project/Settings.settings @@ -20,7 +20,7 @@ Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd - + en-US \ No newline at end of file