This commit is contained in:
2023-07-20 14:12:24 +02:00
parent c2deb54f11
commit ea5ea5f205
64 changed files with 8139 additions and 7996 deletions

View File

@@ -127,9 +127,11 @@ Public Class frmUserKonfig_AddUsers
For Each row As DataRow In DD_ECMAdmin.TBAD_Users.Rows
If row.Item(0) = CBool(True) Then
_Step = 1
Dim oUSERNAME As String
oUSERNAME = row.Item(1)
LOGGER.Info($"Working on User: {oUSERNAME}")
_Step = 2
Dim PRENAME As String
Try
@@ -163,15 +165,21 @@ Public Class frmUserKonfig_AddUsers
USER_LANGUAGE & "','" & USER_USERNAME & "')"
_Step = 8
If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
SQL = $"INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,ADDED_WHO) VALUES
(SELECT MAX(GUID) FROM TBDD_USER),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
MYDB_ECM.ExecuteNonQuery(SQL)
Dim oUserID = MYDB_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_USER")
Try
SQL = $"INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,ADDED_WHO) VALUES
({oUserID},(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
MYDB_ECM.ExecuteNonQuery(SQL)
Catch ex As Exception
End Try
_Step = 9
Dim ID = MYDB_ECM.GetScalarValue("SELECT MAX(GUID) FROM TBDD_USER")
Dim msg = String.Format("USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, oUSERNAME)
_Step = 10
LOGGER.Info(msg)
ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace("", ""))
ClassHelper.InsertEssential_Log(oUserID, "USER-ID", msg)
usersAdded += 1
Else
MsgBox("Unexpected Error In Adding User (" & oUSERNAME & ") : " & "Check the log!", MsgBoxStyle.Exclamation)
@@ -180,7 +188,7 @@ Public Class frmUserKonfig_AddUsers
_Step = 11
SQL = $"IF NOT EXISTS(SELECT T.GUID FROM TBDD_USER_MODULES T INNER JOIN TBDD_USER T1 ON T.USER_ID = T1.GUID INNER JOIN TBDD_MODULES T2 ON T.MODULE_ID = T2.GUID WHERE T2.SHORT_NAME = 'ADDI' AND T1.USERNAME = '{oUSERNAME}')
INSERT INTO TBDD_USER_MODULES (USER_ID,MODULE_ID,ADDED_WHO) VALUES
(SELECT GUID FROM TBDD_USER WHERE USERNAME = '{oUSERNAME}'),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
((SELECT GUID FROM TBDD_USER WHERE USERNAME = '{oUSERNAME}'),(SELECT T.GUID FROM TBDD_MODULES T WHERE T.SHORT_NAME = 'ADDI'),'{Environment.UserName}')"
_Step = 12
If MYDB_ECM.ExecuteNonQuery(SQL) = True Then
usersRefreshed += 1