This commit is contained in:
Digital Data - Marlon Schreiber
2018-05-11 10:37:00 +02:00
parent 17946f1a19
commit f4d1a8c8b1
13 changed files with 273 additions and 187 deletions

View File

@@ -149,10 +149,10 @@ Public Class ClassInit
clsCURRENT.USER_LANGUAGE = USER_LANGUAGE
USER_DATE_FORMAT = USER_DT.Rows(0).Item("DATE_FORMAT")
USER_GENERAL_VIEWER = USER_DT.Rows(0).Item("GENERAL_VIEWER")
sql = String.Format("SELECT COUNT(T.GUID) FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID)
Dim USER2MODULE = clsDatabase.Execute_Scalar(sql)
sql = String.Format("SELECT * FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND T1.NAME = 'Record-Organizer' AND T.USER_ID = {0}", USER_GUID)
Dim USER2MODULE As DataTable = clsDatabase.Return_Datatable(sql)
If Not IsNothing(USER2MODULE) Then
If USER2MODULE = 1 Then
If USER2MODULE.Rows.Count = 1 Then
Right_RO = True
End If
Else
@@ -207,7 +207,7 @@ Public Class ClassInit
sql = String.Format("INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,CLIENT_ID,MODULE,VERSION_CLIENT,MACHINE_NAME,CONNECTION_STRING) VALUES ({0},{1},'Record-Organizer','{2}','{3}','{4}')", USER_GUID, CLIENT_SELECTED, My.Application.Info.Version.ToString, Environment.MachineName, ConStringMain)
ClassDatabase.Execute_non_Query(sql)
USER_IS_ADMIN = USER_DT.Rows(0).Item("RECORD_ADMIN")
USER_IS_ADMIN = USER2MODULE.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
If USER_IS_ADMIN = True Then
If ESC_Hidden = True Then
frmLoginUserSelect.ShowDialog()