MS Rework

This commit is contained in:
Digital Data - Marlon Schreiber
2018-07-20 13:03:41 +02:00
parent 2bdb7d1512
commit b081925128
39 changed files with 2747 additions and 1200 deletions

View File

@@ -87,6 +87,7 @@ Public Class frmMain
Me.Text = Application.ProductName
LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString)
StatusVersionDB.Caption = "DB-Version: " & DBVERSION
LabelUser.Caption = USER_USERNAME
'IP-Adresse-Auslesen
@@ -103,7 +104,7 @@ Public Class frmMain
LabelLanguage.Caption = "Language: " & USER_LANGUAGE
Load_Connection_Dep_Data()
Display_ConString
'Wenn Argumente übergeben wurden, wird Formular geladen und zu record gesprungen
ClassJumpRecord.ParseArgs()
@@ -209,6 +210,20 @@ Public Class frmMain
End If
Load_TasksforUser()
End Sub
Sub Display_ConString()
Try
Dim connection As New SqlClient.SqlConnection(MyConnectionString) 'csb.ConnectionString)
Dim csb As New SqlClient.SqlConnectionStringBuilder
csb.ConnectionString = MyConnectionString
Dim constr = connection.ConnectionString
If constr.Contains("Trusted_Connection=True") = False Then
constr = constr.Replace(csb.Password, "XXXXX")
End If
LabelConString.Caption = constr
Catch ex As Exception
MsgBox("Unexpected Error in Display_ConString:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
End Try
End Sub
Sub Load_TasksforUser()
Try
VWPMO_WF_ACTIVETableAdapter.Connection.ConnectionString = MyConnectionString
@@ -722,8 +737,10 @@ Public Class frmMain
If CONNECTION_CHANGED = True Then
' Den User neu laden, damit MenuItems korrekt geladen werden können
If ClassInit.InitDatabase = True Then
ClassInit.InitUserLogin()
Load_Connection_Dep_Data()
Display_ConString()
Else
MsgBox("Unexpected Error when new Initialize Database!", MsgBoxStyle.Critical)
End If