This commit is contained in:
2020-01-15 14:48:46 +01:00
parent 9582091c6d
commit 1f6c197b7f
699 changed files with 516723 additions and 7912 deletions

View File

@@ -128,8 +128,8 @@ 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 USERNAME As String
USERNAME = row.Item(1)
Dim oUSERNAME As String
oUSERNAME = row.Item(1)
_Step = 2
Dim PRENAME As String
Try
@@ -148,33 +148,39 @@ Public Class frmUserKonfig_AddUsers
NAME = ""
End Try
Dim email As String
Dim oEmail As String
Try
email = row.Item(4)
oEmail = row.Item(4)
' IIf(IsDBNull(row.Item(4)), email = "", email = row.Item(4))
_Step = 6
Catch ex As Exception
email = ""
oEmail = ""
End Try
Dim SQL
If UserExists(USERNAME) = False Then
If UserExists(oUSERNAME) = False Then
_Step = 7
SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, MODULE_RECORD_ORG,LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & USERNAME & "','" & email & "'," & 1 & ",'" & USER_LANGUAGE & "','" & USER_USERNAME & "')"
SQL = "INSERT INTO TBDD_USER(PRENAME, NAME, USERNAME, EMAIL, LANGUAGE, ADDED_WHO) VALUES('" & PRENAME & "', '" & NAME & "', '" & oUSERNAME & "','" & oEmail & "','" &
USER_LANGUAGE & "','" & USER_USERNAME & "')"
_Step = 8
If ClassDatabase.Execute_non_Query(SQL, False) = 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}')"
ClassDatabase.Execute_non_Query(SQL, False)
_Step = 9
Dim ID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_USER")
Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, USERNAME)
Dim msg = String.Format(">> USER {0}, {1} - {2} ADDED TO CONFIGURATION", NAME, PRENAME, oUSERNAME)
_Step = 10
ClassLogger.Add(msg, False)
ClassHelper.InsertEssential_Log(ID, "USER-ID", msg.Replace(">> ", ""))
usersAdded += 1
Else
MsgBox("Unexpected Error In Adding User (" & USERNAME & ") : " & "Check the log!", MsgBoxStyle.Exclamation)
MsgBox("Unexpected Error In Adding User (" & oUSERNAME & ") : " & "Check the log!", MsgBoxStyle.Exclamation)
End If
Else
_Step = 11
SQL = String.Format("UPDATE TBDD_USER SET MODULE_RECORD_ORG = 1,PRENAME = '{0}', NAME = '{1}', EMAIL = '{2}' WHERE UPPER(USERNAME) = UPPER('{3}')", PRENAME, NAME, email, USERNAME)
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}')"
_Step = 12
If ClassDatabase.Execute_non_Query(SQL, False) = True Then
usersRefreshed += 1