This commit is contained in:
Digital Data - Marlon Schreiber
2017-07-26 11:09:38 +02:00
parent 0f8f8ddf65
commit 3ae24fe471
35 changed files with 59894 additions and 1899 deletions

View File

@@ -516,6 +516,7 @@ Public Class frmMain
End Sub
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
Me.Cursor = Cursors.WaitCursor
If ERROR_INIT <> "INVALID USER" Then
If Task_Popup_minutes <> 0 Then
TimerTasks.Start()
@@ -548,11 +549,44 @@ Public Class frmMain
Me.BarButtonItemSAPConnect.Enabled = True
End If
End If
Try
If ClassUpdate.Init = True And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then
If Not IsNothing(ClassUpdate.DT_UPDATE) And Not IsNothing(ClassUpdate.DT_UPDATE_ITEMS) Then
If ClassUpdate.DT_UPDATE_ITEMS.Rows.Count > 0 Then
If ClassUpdate.InitUser = False Then
Me.Cursor = Cursors.Default
Exit Sub
Else
ClassUpdate.RUN_UPDATE()
If ClassUpdate.UPDATE_ERROR = True Then
Dim msg = String.Format("Während des Updatevorgangs für Version '{0}' haben sich unerwartet Fehler ereignet!" & vbNewLine & "Wollen Sie die Logdatei anzeigen?", ClassUpdate.VERSION_SERVER)
If USER_LANGUAGE <> "de-DE" Then
msg = String.Format("During update of version '{0}' unexpected errors occured!" & vbNewLine & "Would You like to show the logfile?", ClassUpdate.VERSION_SERVER)
End If
ClassHelper.InsertEssential_Log(USER_GUID, "USER-ID", String.Format("Unexpected errors occured during client-update update of version {0}!", ClassUpdate.VERSION_SERVER))
Dim result As MsgBoxResult
result = MessageBox.Show(msg, "Confirmation:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
If result = MsgBoxResult.Yes Then
Process.Start(ClassLogger.DateiSpeicherort)
End If
End If
End If
End If
End If
End If
Catch ex As Exception
MsgBox("Unexpected Error in Update VersionChecker: " & ex.Message, MsgBoxStyle.Critical)
End Try
Else
MsgBox("Application will close now!", MsgBoxStyle.Critical)
Me.Close()
End If
'If DOCTYPE_COUNT_ACTUAL > LICENSE_DOCTYPE_COUNT Then
' If CURRENT_USER_IS_ADMIN = True Then
' ClassLogger.Add(">> User is Admin - Timer will be started", False)
@@ -568,7 +602,7 @@ Public Class frmMain
' End If
' End If
'End If
Me.Cursor = Cursors.Default
End Sub
Private Sub DokumentartkonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs)