3 Commits

Author SHA1 Message Date
Jonathan Jenne
f1abc1ca58 Database: Add logging 2022-07-08 15:23:15 +02:00
Jonathan Jenne
e680d39b48 Zugferdservice: 2.1.2.0 2022-07-08 15:23:01 +02:00
Jonathan Jenne
9193df0dd2 Common: Improve Workspace Class 2022-07-08 15:22:33 +02:00
5 changed files with 11 additions and 10 deletions

View File

@@ -5,7 +5,6 @@ Namespace DocumentResultList
Public Property WindowLocation As Point
Public Property WindowSize As Size
Public Property GridFontSizeDelta As Integer = 0
Public Property SelectedWorkspace As String = Workspace.DEFAULT_WORKSPACE
Public Property SelectedWorkspace As String = Workspace(Of Config).DEFAULT_WORKSPACE
End Class
End Namespace

View File

@@ -8,11 +8,11 @@ Imports DigitalData.Modules.Filesystem
Imports DigitalData.Modules.Language
Namespace DocumentResultList
Public Class Workspace
Public Class Workspace(Of TConfig)
Inherits BaseClass
Private ReadOnly Manager As WorkspaceManager
Private ReadOnly Config As ConfigManager(Of Config)
Private ReadOnly Config As ConfigManager(Of TConfig)
Private ReadOnly FileEx As File
Public Const WORKSPACE_FILENAME As String = "Workspaces.xml"
@@ -37,7 +37,7 @@ Namespace DocumentResultList
End Get
End Property
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of Config), pWorkspaceManager As WorkspaceManager)
Public Sub New(pLogConfig As LogConfig, pConfigManager As ConfigManager(Of TConfig), pWorkspaceManager As WorkspaceManager)
MyBase.New(pLogConfig)
Manager = pWorkspaceManager
Config = pConfigManager

View File

@@ -48,7 +48,7 @@ Public Class frmDocumentResultList
Private ReadOnly Params As Params
Private ReadOnly LayoutManager As Layout
Private ReadOnly FormHelper As FormHelper
Private ReadOnly Workspace As Workspace
Private ReadOnly Workspace As Workspace(Of Config)
Private WithEvents Watcher As Watcher
' Runtime variables
@@ -119,7 +119,7 @@ Public Class frmDocumentResultList
GridBuilder = New GridBuilder(New List(Of GridView) From {GridView1, GridView2, GridView3})
FileEx = New Modules.Windows.File(pLogConfig)
LayoutManager = New Layout(pLogConfig, Config, New List(Of GridView) From {GridView1, GridView2, GridView3})
Workspace = New Workspace(pLogConfig, Config, WorkspaceManager1)
Workspace = New Workspace(Of Config)(pLogConfig, Config, WorkspaceManager1)
UserLanguage = Utils.NotNull(Environment.User.Language, State.UserState.LANG_EN_US)
End Sub

View File

@@ -148,6 +148,8 @@ Public Class MSSQLServer
Public Function Get_ConnectionStringforID(pConnectionId As Integer) As String
Dim oConnectionString As String = String.Empty
_Logger.Debug("Getting ConnectionString for ConnectionId [{0}]", pConnectionId)
If pConnectionId = 0 Then
_Logger.Warn("ConnectionId was 0. Falling back to default connection.")
Return String.Empty

View File

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("DDZUGFeRDService")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("2.1.1.0")>
<Assembly: AssemblyTrademark("2.1.2.0")>
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.1.1.0")>
<Assembly: AssemblyFileVersion("2.1.1.0")>
<Assembly: AssemblyVersion("2.1.2.0")>
<Assembly: AssemblyFileVersion("2.1.2.0")>