monster commit for zoo flow, prepare migration of cw
This commit is contained in:
@@ -6,6 +6,7 @@ Imports DigitalData.Modules.Language.Utils
|
||||
Imports DigitalData.Modules.Logging
|
||||
Imports ZooFlow.ClassInitLoader
|
||||
Imports ZooFlow.ClassConstants
|
||||
Imports ZooFlow.State
|
||||
|
||||
Public Class ClassInit
|
||||
Private _MainForm As frmMain
|
||||
@@ -45,6 +46,7 @@ Public Class ClassInit
|
||||
oInit.Run()
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Function SetupDatabase() As Boolean
|
||||
If My.SystemConfig.ConnectionString = String.Empty Then
|
||||
Dim oResult = frmConfigDatabase.ShowDialog()
|
||||
@@ -67,15 +69,15 @@ Public Class ClassInit
|
||||
If Not IsNothing(e.Error) Then
|
||||
MsgBox("Beim Initialisieren des Programms ist folgender Fehler aufgetreten:" & vbNewLine & vbNewLine & e.Error.Message, MsgBoxStyle.Critical, _MainForm.Text)
|
||||
Application.ExitThread()
|
||||
Else
|
||||
' Copy back state from MyApplication Helper to My.Application
|
||||
Dim oMyApplication As My.MyApplication = DirectCast(e.Result, My.MyApplication)
|
||||
My.Application.User = oMyApplication.User
|
||||
My.Application.Modules = oMyApplication.Modules
|
||||
My.Application.ModulesActive = oMyApplication.ModulesActive
|
||||
|
||||
RaiseEvent Completed(sender, Nothing)
|
||||
End If
|
||||
|
||||
' Copy back state from MyApplication Helper to My.Application
|
||||
Dim oMyApplication As My.MyApplication = DirectCast(e.Result, My.MyApplication)
|
||||
My.Application.User = oMyApplication.User
|
||||
My.Application.Modules = oMyApplication.Modules
|
||||
My.Application.ModulesActive = oMyApplication.ModulesActive
|
||||
|
||||
RaiseEvent Completed(sender, Nothing)
|
||||
End Sub
|
||||
|
||||
Private Sub CheckConnectivity(MyApplication As My.MyApplication)
|
||||
@@ -94,7 +96,7 @@ Public Class ClassInit
|
||||
|
||||
Private Sub InitializeUser(MyApplication As My.MyApplication)
|
||||
Try
|
||||
Dim oSql As String = My.Common.Queries.FNDD_MODULE_INIT(MyApplication.User.UserName)
|
||||
Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName)
|
||||
Dim oDatatable As DataTable = My.Database.GetDatatable(oSql)
|
||||
|
||||
If oDatatable.Rows.Count <= 1 Then
|
||||
@@ -148,7 +150,7 @@ Public Class ClassInit
|
||||
Dim oName As String = Row.Item("NAME").ToString
|
||||
|
||||
If Not MyApplication.Modules.ContainsKey(ModuleName) Then
|
||||
MyApplication.Modules.Item(ModuleName) = New ClassModuleState()
|
||||
MyApplication.Modules.Item(ModuleName) = New DigitalData.Modules.ZooFlow.State.ModuleState()
|
||||
End If
|
||||
|
||||
Select Case oName
|
||||
|
||||
Reference in New Issue
Block a user