AppStd/RecordOrganizer
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

MS ZSG

Browse Source
This commit is contained in:
SchreiberM
2020-01-15 14:48:46 +01:00
parent 9582091c6d
commit 1f6c197b7f
699 changed files with 516723 additions and 7912 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/DD-Record-Organizer/ClassInit.vb
View File

@@ -157,7 +157,9 @@ Public Class ClassInit
Else
USER_USERNAME = _User
End If
Dim sql = String.Format("SELECT * FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('{0}'))", USER_USERNAME)
Dim sql = String.Format("SELECT T.*, T1.IS_ADMIN FROM TBDD_USER T INNER JOIN TBDD_USER_MODULES T1 ON T.GUID = T1.USER_ID INNER JOIN TBDD_MODULES T2 ON T1.MODULE_ID = T2.GUID
WHERE (LOWER(USERNAME) = LOWER('{0}')) AND T2.SHORT_NAME = 'ADDI'", USER_USERNAME)
ClassLogger.Add(">> Login at: " & Now.ToString, False)
ClassLogger.Add(">> Username: " & USER_USERNAME, False)
Dim USER_DT As DataTable = ClassDatabase.Return_Datatable(sql, True)
@@ -178,15 +180,7 @@ 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 T.* 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.Rows.Count = 1 Then
Right_RO = True
End If
Else
Right_RO = USER_DT.Rows(0).Item("MODULE_RECORD_ORG")
End If
Right_RO = True
If Right_RO = False Then
@@ -241,7 +235,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 = USER2MODULE.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
USER_IS_ADMIN = USER_DT.Rows(0).Item("IS_ADMIN") 'vorher RECORD_ADMIN
If USER_IS_ADMIN = True Then
If ESC_Hidden = True Then
frmLoginUserSelect.ShowDialog()