Dataset

app/DD_PM_WINDREAM/ClassInit.vb

@@ -20,7 +20,6 @@ Public Class ClassInit
     Public Sub InitUserConfig()
         Settings_Load()
     End Sub
-
     Public Function InitDatabase()
         Dim dbResult As Boolean
 
@@ -46,8 +45,8 @@ Public Class ClassInit
             ' Windream instanziieren
             _windreamPM = New ClassPMWindream()
             'Windream initialisieren (Connection, Session, ... aufbauen)
-            _windreamPM.Init()
-            Return True
+            Return _windreamPM.Init()
+
         Catch ex As Exception
             MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             Return False
@@ -70,10 +69,11 @@ Public Class ClassInit
                 LICENSE_EXPIRED = True
                 LICENSE_COUNT = 0
             End If
-
+            If LogErrorsOnly = False Then ClassLogger.Add(" >> license initialized....", False)
 
             LICENSE_PROFILES = split(2)
         Catch ex As Exception
+            ClassLogger.Add("Unexpected error in Refresh license: " & ex.Message, True)
             MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Fehler bei Licensemanager:")
         End Try
     End Sub
@@ -91,41 +91,47 @@ Public Class ClassInit
                 ERROR_STATE = "NO USER"
                 Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
             Else
+
                 If IsNothing(CURRENT_USERID) Then
                     ClassLogger.Add(" - User: " & USER_USERNAME & " ' not configured in Useradministration! (nothing)", False)
                     ERROR_STATE = "NO USER"
                     Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
                 Else
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> User exists....", False)
                     'Am System anmelden
                     Refresh_Licence()
+
                     Dim sql1 = "SELECT COUNT(GUID) FROM TBPM_PROFILE"
                     Dim anz = ClassDatabase.Execute_Scalar(sql1, MyConnectionString, True)
                     If anz > LICENSE_PROFILES Then
                         MsgBox("Your amount of configurable profiles is limited to " & LICENSE_PROFILES.ToString & " profiles. You can not add more profiles!" & vbNewLine & "Please contact Digital Data for further licensedetails", MsgBoxStyle.Information)
                     End If
 
-                    sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 1, LOGGED_WHERE = '{0}' WHERE GUID = {1}", Environment.MachineName, CURRENT_USERID)
-                    ClassDatabase.Execute_non_Query(sql)
+                    ClassAllgemeineFunktionen.LoginOut("LOGIN")
 
-                    sql = String.Format("SELECT PM_ADMIN FROM TBDD_USER WHERE GUID = {0}", CURRENT_USERID)
-                    USER_IS_ADMIN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+                    sql = String.Format("SELECT * FROM TBDD_USER_MODULES T, TBDD_MODULES T1 WHERE T.MODULE_ID = T1.GUID AND UPPER(T1.SHORT_NAME) = UPPER('PM') AND T.USER_ID = {0}", CURRENT_USERID)
+                    DT_USER2MODULE = ClassDatabase.Return_Datatable(sql)
+                    If Not IsNothing(DT_USER2MODULE) Then
+                        If DT_USER2MODULE.Rows.Count = 1 Then
+                            USER_IS_ADMIN = DT_USER2MODULE.Rows(0).Item("IS_ADMIN")
+                        End If
+                    End If
 
-                    sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER WHERE LOGGED_IN = 1"
+                    sql = String.Format("SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE UPPER(MODULE) = UPPER('Process-Manager') AND CLIENT_ID = {0}", 1)
                     USERCOUNT_LOGGED_IN = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl Angemeldete User: " & USERCOUNT_LOGGED_IN.ToString, False)
+
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Count Users logged in: " & USERCOUNT_LOGGED_IN.ToString, False)
                     If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
                         MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
                         ClassLogger.Add(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Process Manager!", False)
                         If USER_IS_ADMIN = False Then
-                            'Anmeldung wieder herausnehmen
-                            sql = String.Format("UPDATE TBDD_USER SET LOGGED_IN = 0, LOGGED_WHERE = '' WHERE GUID = {0}", CURRENT_USERID)
-                            ClassDatabase.Execute_non_Query(sql, True)
-                            ClassLogger.Add(" - Wieder abgemeldet", False)
+                            ClassAllgemeineFunktionen.LoginOut("LOGOUT")
+                            ClassLogger.Add(" - Wieder abgemeldet - START INCOMPLETE", False)
                             ERROR_STATE = "START INCOMPLETE"
                         End If
                     End If
                     'Alles OK bis hierhin...nun die FolderwatchKonfig laden
-
+                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Init Userlogin successfull completed....", False)
                 End If
             End If
         Catch ex As Exception