MS Anpassungen Views und Spalten
This commit is contained in:
Developer01
@@ -57,8 +57,8 @@ Public Class ClassInit
|
||||
End If
|
||||
|
||||
Try
|
||||
Database = New MSSQLServer(LogConfig, MyConnectionString)
|
||||
If Database.DBInitialized = True Then
|
||||
MyDB_DDECM = New MSSQLServer(LogConfig, MyConnectionString)
|
||||
If MyDB_DDECM.DBInitialized = True Then
|
||||
Return True
|
||||
Else
|
||||
Return False
|
||||
@@ -162,7 +162,7 @@ Public Class ClassInit
|
||||
Try
|
||||
Dim oSql = String.Format("SELECT * FROM [dbo].[FNDD_LOGIN_USER_MODULE] ('{0}','CW',{1})", USER_USERNAME, CLIENT_SELECTED)
|
||||
Dim DT_CHECKUSER_MODULE As DataTable
|
||||
DT_CHECKUSER_MODULE = Database.GetDatatable(oSql)
|
||||
DT_CHECKUSER_MODULE = MyDB_DDECM.GetDatatable(oSql)
|
||||
|
||||
If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
|
||||
Logger.Info("DT_CHECKUSER_MODULE.Rows.Count = 0", True)
|
||||
@@ -207,7 +207,7 @@ Public Class ClassInit
|
||||
Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
|
||||
Dim oMode As String
|
||||
For Each oMode In oSplitWorkMode
|
||||
Logger.Debug($"oWorkingMode Parameter: {oMode}")
|
||||
Logger.Debug($"oWorkingMode Parameter [{oMode}]")
|
||||
If oMode = "NO_BASICCONF" Then
|
||||
BASIC_CONF_VISIBLE = False
|
||||
ElseIf oMode.StartsWith("NOMATCH_INFO") Then
|
||||
@@ -322,17 +322,19 @@ Public Class ClassInit
|
||||
'Database.GetDatatable(sql)
|
||||
Dim oSQL As String
|
||||
oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE = 'Clipboard-Watcher'"
|
||||
Database.ExecuteNonQuery(oSQL)
|
||||
MyDB_DDECM.ExecuteNonQuery(oSQL)
|
||||
|
||||
oSQL = $"INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME) VALUES
|
||||
({USER_ID},1,'Clipboard-Watcher','{My.Application.Info.Version.ToString}','Environment.MachineName')"
|
||||
Database.ExecuteNonQuery(oSQL)
|
||||
MyDB_DDECM.ExecuteNonQuery(oSQL)
|
||||
|
||||
If USER_IS_ADMIN = True Then
|
||||
If ESC_Hidden = True Then
|
||||
frmGhostUser.ShowDialog()
|
||||
'frmLoginUserSelect.ShowDialog()
|
||||
ESC_Hidden = False
|
||||
If USER_USERNAME <> "" Then
|
||||
If USER_USERNAME <> "" And GHOST_USERID <> 0 Then
|
||||
Logger.Info("GHOST USER ACTIVE")
|
||||
InitUserLogin(USER_USERNAME)
|
||||
End If
|
||||
|
||||
@@ -341,16 +343,16 @@ Public Class ClassInit
|
||||
' pageAdmin.Visible = True
|
||||
End If
|
||||
|
||||
WD_UNICODE = Database.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
|
||||
WD_UNICODE = MyDB_DDECM.GetScalarValue("SELECT WD_UNICODE FROM TBCW_CONFIGURATION WHERE GUID = 1")
|
||||
oSQL = $"SELECT COALESCE(MAX(LICENSE),'') FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'
|
||||
and VERSION = '{My.Settings.GDPICTURE_VERSION}' AND ACTIVE = 1"
|
||||
GDPICTURE_LICENSE = Database.GetScalarValue(oSQL)
|
||||
GDPICTURE_LICENSE = MyDB_DDECM.GetScalarValue(oSQL)
|
||||
If GDPICTURE_LICENSE = String.Empty Then
|
||||
Logger.Info($"ATTENTION: GDPICTURE VERSION is nothing. [{oSQL}]")
|
||||
End If
|
||||
oSQL = "SELECT LANG_CODE FROM TBDD_GUI_LANGUAGE WHERE ACTIVE = 1 ORDER BY LANG_CODE"
|
||||
|
||||
BASEDATA_DT_LANGUAGE = Database.GetDatatable(oSQL)
|
||||
BASEDATA_DT_LANGUAGE = MyDB_DDECM.GetDatatable(oSQL)
|
||||
|
||||
Logger.Debug(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False)
|
||||
If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
|
||||
@@ -365,7 +367,7 @@ Public Class ClassInit
|
||||
If USER_IS_ADMIN = False Then
|
||||
'Anmeldung wieder herausnehmen
|
||||
oSQL = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Clipboard-Watcher'"
|
||||
Database.ExecuteNonQuery(oSQL)
|
||||
MyDB_DDECM.ExecuteNonQuery(oSQL)
|
||||
Logger.Info(" - logged out the user", False)
|
||||
Return False
|
||||
End If
|
||||
@@ -407,18 +409,18 @@ Public Class ClassInit
|
||||
End Sub
|
||||
|
||||
Public Shared Function Refresh_Profile_Links() As String
|
||||
Dim oWhereClause = $"USER_ID = {USER_ID}"
|
||||
'OR GROUP_ID IN (SELECT DISTINCT GUID FROM TBDD_GROUPS WHERE GUID IN (SELECT GROUP_ID FROM TBDD_GROUPS_USER WHERE USER_ID = {USER_ID}))"
|
||||
|
||||
Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID [GUID], PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROC_NAME,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE {oWhereClause}"
|
||||
Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND ({oWhereClause})"
|
||||
Dim oWindowSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_WINDOW T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}"
|
||||
Dim oControlSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_CONTROL T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = {USER_ID}"
|
||||
Dim ProfileSQL As String = $"SELECT DISTINCT PROFIL_ID [GUID], PROFIL_ID, PROFIL_NAME,REGEX_EXPRESSION,COMMENT,PROFILE_TYPE FROM VWCW_USER_PROFILE WHERE USER_ID = {USER_ID}"
|
||||
Dim oProcessSQL As String = $"SELECT DISTINCT T.GUID, T1.PROFIL_ID, T.PROC_NAME FROM TBCW_PROFILE_PROCESS T, VWCW_USER_PROFILE T1 WHERE T.PROFILE_ID = T1.PROFIL_ID AND USER_ID = {USER_ID}"
|
||||
Dim oWindowSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_WINDOW T INNER JOIN VWCW_USER_PROFILE T1 ON T.PROFILE_ID = T1.PROFIL_ID AND T1.USER_ID = T.USER_ID
|
||||
WHERE T.USER_ID = {USER_ID}"
|
||||
Dim oControlSQL As String = $"SELECT DISTINCT T.* FROM VWCW_PROFILE_REL_CONTROL T INNER JOIN VWCW_USER_PROFILE T1
|
||||
ON T.PROFILE_ID = T1.PROFIL_ID AND T.USER_ID = T1.USER_ID WHERE T1.USER_ID = {USER_ID} "
|
||||
|
||||
Try
|
||||
DT_USER_PROFILES = Database.GetDatatable(ProfileSQL)
|
||||
DT_USER_PROFILES = MyDB_DDECM.GetDatatable(ProfileSQL)
|
||||
|
||||
If DT_USER_PROFILES Is Nothing OrElse DT_USER_PROFILES.Rows.Count = 0 Then
|
||||
If DT_USER_PROFILES Is Nothing Or DT_USER_PROFILES.Rows.Count = 0 Then
|
||||
Logger.Warn("Keine Profile für den User auswertbar. Konfiuration oder SQL prüfen: " + ProfileSQL)
|
||||
Return S.Es_wurden_noch_keine_Profile_für_den_aktuellen_Benutzer_konfiguriert_
|
||||
End If
|
||||
Catch ex As Exception
|
||||
@@ -428,7 +430,7 @@ Public Class ClassInit
|
||||
Return S.Fehler_bei_der_Aktualisierung_
|
||||
End Try
|
||||
Try
|
||||
DTPROFILE_REL_PROCESS = Database.GetDatatable(oProcessSQL)
|
||||
DTPROFILE_REL_PROCESS = MyDB_DDECM.GetDatatable(oProcessSQL)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
MsgBox("Unexpected Error in Refresh_ProcessLinks: " & ex.Message, MsgBoxStyle.Critical)
|
||||
@@ -436,7 +438,7 @@ Public Class ClassInit
|
||||
Return S.Fehler_bei_der_Aktualisierung_
|
||||
End Try
|
||||
Try
|
||||
DTPROFILE_REL_WINDOW = Database.GetDatatable(oWindowSQL)
|
||||
DTPROFILE_REL_WINDOW = MyDB_DDECM.GetDatatable(oWindowSQL)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
MsgBox("Unexpected Error in Refresh_windowLinks: " & ex.Message, MsgBoxStyle.Critical)
|
||||
@@ -444,7 +446,7 @@ Public Class ClassInit
|
||||
Return S.Fehler_bei_der_Aktualisierung_
|
||||
End Try
|
||||
Try
|
||||
DTPROFILE_REL_CONTROL = Database.GetDatatable(oControlSQL)
|
||||
DTPROFILE_REL_CONTROL = MyDB_DDECM.GetDatatable(oControlSQL)
|
||||
Catch ex As Exception
|
||||
Logger.Error(ex)
|
||||
MsgBox("Unexpected Error in Refresh_ControlLinks: " & ex.Message, MsgBoxStyle.Critical)
|
||||
|
||||
Reference in New Issue
Block a user