MS_ChangesKW38
This commit is contained in:
Digital Data - Marlon Schreiber
@@ -76,7 +76,7 @@ Public Class frmMain
|
||||
LabelUser.Caption = USER_USERNAME
|
||||
|
||||
'IP-Adresse-Auslesen
|
||||
Dim Addresslist() As IPAddress = _
|
||||
Dim Addresslist() As IPAddress =
|
||||
Dns.GetHostEntry(Dns.GetHostName()).AddressList
|
||||
Dim IPs As IPAddress
|
||||
For Each IPs In Addresslist
|
||||
@@ -108,11 +108,11 @@ Public Class frmMain
|
||||
End Sub
|
||||
Sub Proxy_Server_Controls()
|
||||
If LICENSE_PROXY = True And clsDatabase.DB_PROXY_INITIALIZED = True Then
|
||||
itemRefreshProxy.Visibility = BarItemVisibility.Always
|
||||
'itemRefreshProxy.Visibility = BarItemVisibility.Always
|
||||
LabelProxyServer.Visibility = BarItemVisibility.Always
|
||||
ClassLogger.Add(">> PROXY-SERVER is being used", False)
|
||||
Else
|
||||
itemRefreshProxy.Visibility = BarItemVisibility.Never
|
||||
'itemRefreshProxy.Visibility = BarItemVisibility.Never
|
||||
LabelProxyServer.Visibility = BarItemVisibility.Never
|
||||
End If
|
||||
End Sub
|
||||
@@ -146,9 +146,9 @@ Public Class frmMain
|
||||
If ERROR_INIT = "NONE" Then
|
||||
If USER_IS_ADMIN = True Then
|
||||
pageAdmin.Visible = True
|
||||
itemRefreshProxy.Visibility = BarItemVisibility.Always
|
||||
' itemRefreshProxy.Visibility = BarItemVisibility.Always
|
||||
Else
|
||||
itemRefreshProxy.Visibility = BarItemVisibility.Never
|
||||
'itemRefreshProxy.Visibility = BarItemVisibility.Never
|
||||
End If
|
||||
Dim msg = "Anzahl Angemeldete User: " & USERS_LOGGED_IN.ToString()
|
||||
If USER_LANGUAGE <> "de-DE" Then
|
||||
@@ -225,8 +225,8 @@ Public Class frmMain
|
||||
|
||||
Public Sub LoadMenuItems2()
|
||||
Try
|
||||
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _
|
||||
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _
|
||||
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
|
||||
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
|
||||
"'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
|
||||
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
|
||||
|
||||
@@ -247,7 +247,7 @@ Public Class frmMain
|
||||
If title = "CAPTION (OBJ) NOT TRANSLATED" Then
|
||||
Dim objectname = row.Item("OBECTNAME")
|
||||
Dim objectname_temp = String.Format("Object {0} not translated", objectname)
|
||||
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " & _
|
||||
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " &
|
||||
"('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp)
|
||||
If ClassDatabase.Execute_non_Query(ins) = True Then
|
||||
title = objectname_temp
|
||||
@@ -324,8 +324,8 @@ Public Class frmMain
|
||||
End Sub
|
||||
Public Sub LoadQuickStartItems()
|
||||
Try
|
||||
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," & _
|
||||
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _
|
||||
Dim SQL2 As String = String.Format("SELECT GUID, dbo.FNPMO_GETOBJECTCAPTION('{0}', 'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID), {1}) AS FORM_TITLE, SEQUENCE_MENU, ADDED_WHO, ADDED_WHEN, CHANGED_WHO," &
|
||||
"CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " &
|
||||
"'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 1 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
|
||||
Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
|
||||
Dim image2 As Bitmap = LoadNoImage()
|
||||
@@ -353,7 +353,7 @@ Public Class frmMain
|
||||
If title = "CAPTION (OBJ) NOT TRANSLATED" Then
|
||||
Dim objectname = row.Item("OBECTNAME")
|
||||
Dim objectname_temp = String.Format("Object {0} not translated", objectname)
|
||||
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " & _
|
||||
Dim ins = String.Format("INSERT INTO TBPMO_LANGUAGE_OBJECT (LANGUAGE_TYPE,SCREEN_ID,PMO_OBJECT_NAME,CAPTION) VALUES " &
|
||||
"('{0}',{1},'{2}', '{3}')", USER_LANGUAGE, CURRENT_SCREEN_ID, objectname, objectname_temp)
|
||||
If ClassDatabase.Execute_non_Query(ins) = True Then
|
||||
title = objectname_temp
|
||||
@@ -516,73 +516,83 @@ 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()
|
||||
Refresh_TaskReminder()
|
||||
End If
|
||||
Try
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
If ERROR_INIT <> "INVALID USER" Then
|
||||
If Task_Popup_minutes <> 0 Then
|
||||
TimerTasks.Start()
|
||||
Refresh_TaskReminder()
|
||||
End If
|
||||
|
||||
RUN_TIMER()
|
||||
If Sett_ConstructorStart <> 0 Then
|
||||
Cursor = Cursors.WaitCursor
|
||||
OpenFormConstructor(Sett_ConstructorStart)
|
||||
Cursor = Cursors.Default
|
||||
End If
|
||||
'Lizenz abgellaufen, überprüfen ob User Admin ist
|
||||
If LICENSE_COUNT < USERS_LOGGED_IN Then
|
||||
If USER_IS_ADMIN = True Then
|
||||
ClassLogger.Add(">> User is Admin - Timer will be started", False)
|
||||
'If USER_LANGUAGE = "de-DE" Then
|
||||
MsgBox("You now got 3 minutes for creating a new license", MsgBoxStyle.Information)
|
||||
'Else
|
||||
' MsgBox("You now got 3 minutes to update the license!", MsgBoxStyle.Information)
|
||||
'End If
|
||||
RUN_TIMER()
|
||||
If Sett_ConstructorStart <> 0 Then
|
||||
Cursor = Cursors.WaitCursor
|
||||
OpenFormConstructor(Sett_ConstructorStart)
|
||||
Cursor = Cursors.Default
|
||||
End If
|
||||
'Lizenz abgellaufen, überprüfen ob User Admin ist
|
||||
If LICENSE_COUNT < USERS_LOGGED_IN Then
|
||||
If USER_IS_ADMIN = True Then
|
||||
ClassLogger.Add(">> User is Admin - Timer will be started", False)
|
||||
'If USER_LANGUAGE = "de-DE" Then
|
||||
MsgBox("You now got 3 minutes for creating a new license", MsgBoxStyle.Information)
|
||||
'Else
|
||||
' MsgBox("You now got 3 minutes to update the license!", MsgBoxStyle.Information)
|
||||
'End If
|
||||
|
||||
'Timer starten
|
||||
If TimerClose3Minutes.Enabled = False Then
|
||||
TimerClose3Minutes.Start()
|
||||
'Timer starten
|
||||
If TimerClose3Minutes.Enabled = False Then
|
||||
TimerClose3Minutes.Start()
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
If LICENSE_SAP_Connect = True Then
|
||||
Me.BarButtonItemSAPConnect.Enabled = True
|
||||
End If
|
||||
End If
|
||||
Else
|
||||
If LICENSE_SAP_Connect = True Then
|
||||
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)
|
||||
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
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in Update VersionChecker: " & ex.Message, MsgBoxStyle.Critical)
|
||||
End Try
|
||||
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
|
||||
Else
|
||||
MsgBox("Application will close now!", MsgBoxStyle.Critical)
|
||||
Me.Close()
|
||||
End If
|
||||
|
||||
Dim myversion = CInt(My.Application.Info.Version.ToString.Replace(".", ""))
|
||||
Dim minreqver = CInt(MIN_REQUIRED_VERSION.Replace(".", ""))
|
||||
If myversion < minreqver Then
|
||||
MsgBox(String.Format("Your version '{0}' does not match the minimum required version and needs to be updated! Please contact Your systemadministrator!" & vbNewLine & "Application will close now.", My.Application.Info.Version.ToString), MsgBoxStyle.Exclamation)
|
||||
Me.Close()
|
||||
End If
|
||||
Catch ex As Exception
|
||||
MsgBox("Unexpected Error in FormShown: " & ex.Message, MsgBoxStyle.Critical)
|
||||
End Try
|
||||
|
||||
|
||||
|
||||
@@ -659,7 +669,7 @@ Public Class frmMain
|
||||
Private Sub itemSettings_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemSettings.ItemClick
|
||||
Load_ConfigBasic()
|
||||
End Sub
|
||||
Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs) Handles itemRefreshProxy.ItemClick
|
||||
Private Sub itemRefreshProxy_ItemClick(sender As Object, e As ItemClickEventArgs)
|
||||
Me.Cursor = Cursors.WaitCursor
|
||||
Dim upd = "UPDATE TBPROXY_CONFIG SET SYNC_RUNNING = 1 WHERE GUID = 1"
|
||||
clsDatabase.Execute_non_Query(upd, True)
|
||||
|
||||
Reference in New Issue
Block a user