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

Zooflow: Implement prefix for Config and Logging, Remove halbgar dev config

Browse Source
This commit is contained in:
Jonathan Jenne
2022-05-06 13:29:06 +02:00
parent 02f61b1e3f
commit 308b26556c
14 changed files with 109 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
GUIs.ZooFlow/Administration/frmAdmin_Start.vb
View File

@@ -30,13 +30,6 @@ Public Class frmAdmin_Start
DetailForm = New ClassDetailForm(My.LogConfig)
AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed
'If My.SystemConfig.ConnectionString = String.Empty Then
' If ShowDatabaseSettings() = False Then
' MsgBox("Die Datenbank verbindung wurde nicht konfiguriert. Die Administration kann nicht verwendet werden.", MsgBoxStyle.Critical, Text)
' Exit Sub
' End If
'End If
DetailForm.LoadData()
TreeListMenu.ExpandAll()
End Sub
@@ -290,54 +283,4 @@ Public Class frmAdmin_Start
Dim oForm As New frmAdmin_UserImport()
oForm.ShowDialog()
End Sub
Private Sub btnDatabaseConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnDatabaseConnection.ItemClick
ShowDatabaseSettings()
End Sub
Private Function ShowDatabaseSettings() As Boolean
Dim oForm As New frmSQLConfig(My.LogConfig) With {
.ConnectionString = My.SystemConfig.ConnectionString,
.FormTitle = "ECM Datenbank"
}
Dim oResult = oForm.ShowDialog()
If oResult = DialogResult.OK Then
My.SystemConfig.ConnectionString = oForm.ConnectionString
My.SystemConfigManager.Save()
Return True
Else
Return False
End If
End Function
Private Sub btnSecondServiceConnection_ItemClick(sender As Object, e As ItemClickEventArgs) Handles btnSecondServiceConnection.ItemClick
If My.SystemConfig.AppServerConfigDevelopment = String.Empty Then
Dim oAnswer = MsgBox("Es ist keine zweite Dienstkonfiguration vorhanden. Wollen Sie nun eine hinterlegen?", MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text)
If oAnswer = MsgBoxResult.Yes Then
Dim oForm As New frmServiceConfig() With {
.ServiceAddress = "",
.ServiceOnline = False
}
oForm.ShowDialog()
My.SystemConfig.AppServerConfigDevelopment = oForm.ServiceAddress
My.SystemConfigManager.Save()
Else
' Cancel
Exit Sub
End If
End If
Dim oServiceAddress = My.SystemConfig.AppServerConfig
If My.Application.Service.Client.ServerAddress = My.SystemConfig.AppServerConfig Then
oServiceAddress = My.SystemConfig.AppServerConfigDevelopment
Else
oServiceAddress = My.SystemConfig.AppServerConfig
End If
My.Application.Service.Client = New Modules.EDMI.API.Client(My.LogConfig, oServiceAddress)
End Sub
End Class