diff --git a/app/DD-Record-Organiser/ClassInit.vb b/app/DD-Record-Organiser/ClassInit.vb index baa06fe..18d3a18 100644 --- a/app/DD-Record-Organiser/ClassInit.vb +++ b/app/DD-Record-Organiser/ClassInit.vb @@ -55,11 +55,16 @@ Public Class ClassInit 'Me.Close() Else 'Am System anmelden - sql = sql_User_Login + sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" sql = sql.Replace("@LogInOut", 1) sql = sql.Replace("@ANGEMELDETWO", Environment.MachineName) sql = sql.Replace("@user", Environment.UserName) ClassDatabase.Execute_non_Query(sql) + sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_GUID & " AND MODULE= 'RECORD_ORGANIZER'" + If ClassDatabase.Execute_non_Query(sql, True) = True Then + + End If + sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & USER_GUID & ",'RECORD_ORGANIZER')" ClassDatabase.Execute_non_Query(sql) sql = "SELECT RECORD_ADMIN FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" diff --git a/app/DD-Record-Organiser/ModuleMySettings.vb b/app/DD-Record-Organiser/ModuleMySettings.vb index 75127f1..6b3103c 100644 --- a/app/DD-Record-Organiser/ModuleMySettings.vb +++ b/app/DD-Record-Organiser/ModuleMySettings.vb @@ -27,7 +27,6 @@ Module ModuleMySettings Public USERS_LOGGED_IN = 0 Public USER_GUID = 0 - Public sql_User_Login As String = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" Public sql_UserID As String = "SELECT GUID FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" Dim rowresult As String = "" diff --git a/app/DD-Record-Organiser/frmMain.vb b/app/DD-Record-Organiser/frmMain.vb index a2a249c..3b321a1 100644 --- a/app/DD-Record-Organiser/frmMain.vb +++ b/app/DD-Record-Organiser/frmMain.vb @@ -13,7 +13,7 @@ Public Class frmMain Private Sub frmMain_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing Try - Dim sql = sql_User_Login + Dim sql = "UPDATE TBDD_USER SET LOGGED_IN = @LogInOut, LOGGED_WHERE = '@ANGEMELDETWO' WHERE (LOWER(USERNAME) = LOWER('@user'))" sql = sql.Replace("@LogInOut", 0) sql = sql.Replace("@ANGEMELDETWO", "''") sql = sql.Replace("@user", Environment.UserName) diff --git a/app/DD-Record-Organiser/frmSplash.vb b/app/DD-Record-Organiser/frmSplash.vb index 73db149..90de0fd 100644 --- a/app/DD-Record-Organiser/frmSplash.vb +++ b/app/DD-Record-Organiser/frmSplash.vb @@ -58,22 +58,22 @@ Public NotInheritable Class frmSplash bw.ReportProgress(CalcProgress(1), "Initialisiere Logger") Init.InitLogger() - System.Threading.Thread.Sleep(500) + System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(2), "Initialisiere Datenbank") Init.InitDatabase() - System.Threading.Thread.Sleep(500) + System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(3), "Initialisiere Windream-Einstellungen") Init.InitWindream() - System.Threading.Thread.Sleep(500) + System.Threading.Thread.Sleep(600) bw.ReportProgress(CalcProgress(4), "Initialisiere Benutzer") Init.InitUserLogin() - System.Threading.Thread.Sleep(300) + System.Threading.Thread.Sleep(500) End Sub Private Sub bw_ProgressChanged(sender As Object, e As System.ComponentModel.ProgressChangedEventArgs)