AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MS: Bugfixing und Änderungen UM Aufruf

Browse Source
This commit is contained in:
Digital Data - Marlon Schreiber
2018-06-13 10:26:07 +02:00
parent 867e00d301
commit 3f29f243a2
12 changed files with 144 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/DD_PM_WINDREAM/ClassInit.vb
View File

@@ -84,19 +84,9 @@ Public Class ClassInit
ClassLogger.Add(">> Username: " & USER_USERNAME, False)
Dim dtUser As DataTable = ClassDatabase.Return_Datatable(sql)
CURRENT_USER_ID = dtUser.Rows(0).Item("GUID")
CURRENT_USER_SURNAME = IIf(IsDBNull(dtUser.Rows(0).Item("NAME")), "", dtUser.Rows(0).Item("NAME"))
CURRENT_USER_PRENAME = IIf(IsDBNull(dtUser.Rows(0).Item("PRENAME")), "", dtUser.Rows(0).Item("PRENAME"))
CURRENT_USER_SHORTNAME = IIf(IsDBNull(dtUser.Rows(0).Item("SHORTNAME")), "", dtUser.Rows(0).Item("SHORTNAME"))
CURRENT_USER_EMAIL = IIf(IsDBNull(dtUser.Rows(0).Item("EMAIL")), "", dtUser.Rows(0).Item("EMAIL"))
CURRENT_USER_LANGUAGE = dtUser.Rows(0).Item("LANGUAGE")
If IsDBNull(CURRENT_USER_ID) Or IsNothing(CURRENT_USER_ID) Then
USER_EXISTS = False
Else
USER_EXISTS = True
End If
If USER_EXISTS = False Then
If dtUser.Rows.Count = 0 Then
ClassLogger.Add("User '" & USER_USERNAME & "' not configured in Useradministration! (DBNull)", True)
'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
'Me.Close()
@@ -104,6 +94,14 @@ Public Class ClassInit
' Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
MsgBox("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!", MsgBoxStyle.Exclamation)
Else
USER_EXISTS = True
CURRENT_USER_ID = dtUser.Rows(0).Item("GUID")
CURRENT_USER_SURNAME = IIf(IsDBNull(dtUser.Rows(0).Item("NAME")), "", dtUser.Rows(0).Item("NAME"))
CURRENT_USER_PRENAME = IIf(IsDBNull(dtUser.Rows(0).Item("PRENAME")), "", dtUser.Rows(0).Item("PRENAME"))
CURRENT_USER_SHORTNAME = IIf(IsDBNull(dtUser.Rows(0).Item("SHORTNAME")), "", dtUser.Rows(0).Item("SHORTNAME"))
CURRENT_USER_EMAIL = IIf(IsDBNull(dtUser.Rows(0).Item("EMAIL")), "", dtUser.Rows(0).Item("EMAIL"))
CURRENT_USER_LANGUAGE = dtUser.Rows(0).Item("LANGUAGE")
If LogErrorsOnly = False Then ClassLogger.Add(" >> User exists....", False)
'Am System anmelden
Refresh_Licence()
@@ -125,11 +123,10 @@ Public Class ClassInit
End If
'Alles OK bis hierhin...nun die FolderwatchKonfig laden
If LogErrorsOnly = False Then ClassLogger.Add(" >> Init Userlogin successfull completed....", False)
End If
Catch ex As Exception
ClassLogger.Add("Unexpected Error in InitUserLogin: " & ex.Message, True)
ERROR_STATE = "START INCOMPLETE"