Verbesserungen an UI, Logging und Sprachressourcen

Neue Sprachressourcen für `en` und `fr` hinzugefügt, einschließlich Tooltips und Bildoptionen. Fehlerbehandlung und Logging in `frmMain` und `frmSplash` verbessert. Verbindungszeichenketten aktualisiert und neue Ressourcen in `taskFLOW.vbproj` eingebunden. UI-Optimierungen und neue Komponenten wie `bbtnitm_Appservice` hinzugefügt. Stabilität und Benutzerfreundlichkeit der Anwendung erhöht.
This commit is contained in:
Developer01
2026-10-02 18:22:59 +02:00
parent 79166a582c
commit 8063a893d3
20 changed files with 1673 additions and 912 deletions

View File

@@ -156,8 +156,7 @@
<File Id="GdPicture.NET.14.filters" Name="GdPicture.NET.14.filters.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.filters.dll" />
<File Id="GdPicture.NET.14.image" Name="GdPicture.NET.14.image.gdimgplug.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.image.gdimgplug.dll" />
<File Id="GdPicture.NET.14.Imaging.ML" Name="GdPicture.NET.14.Imaging.ML.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.ML.dll" />
<File Id="GdPicture.NET.14.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.Skia.64.dll" />
<File Id="GdPicture.NET.14.Rendering.Skia" Name="GdPicture.NET.14.Imaging.Rendering.Skia.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.Imaging.Rendering.Skia.dll" />
<File Id="GdPicture.NET.14.machine.vision" Name="GdPicture.NET.14.machine.vision.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.machine.vision.dll" />
<File Id="GdPicture.NET.14.twain.client" Name="GdPicture.NET.14.twain.client.dll" Source="..\taskFLOW\bin\$(var.Configuration)\GdPicture.NET.14.twain.client.dll" />
@@ -325,7 +324,22 @@
<File Id="DevExpress.XtraVerticalGrid.v21.2.resources" Name="DevExpress.XtraVerticalGrid.v21.2.resources.dll" />
</Component>
</Directory>
<Directory Id="resources.en" Name="en">
<Component Id="TaskFlow.Locales.en" Guid="A1B2C3D4-E5F6-7890-ABCD-EF1234567890">
<File Id="TaskFlow.resources.en"
Name="taskFLOW.resources.dll"
Source="..\taskFLOW\bin\$(var.Configuration)\en\taskFLOW.resources.dll"
KeyPath="yes" />
</Component>
</Directory>
<Directory Id="resources.fr" Name="fr">
<Component Id="TaskFlow.Locales.fr" Guid="B2C3D4E5-F6A7-8901-BCDE-F01234567891">
<File Id="TaskFlow.resources.fr"
Name="taskFLOW.resources.dll"
Source="..\taskFLOW\bin\$(var.Configuration)\fr\taskFLOW.resources.dll"
KeyPath="yes" />
</Component>
</Directory>
<Component Id="RegistryKeys" Guid="4503BF18-22F2-4DBF-B281-06DE039F52C8">
<RegistryKey Root="HKLM" Key="Software">
<RegistryKey Key="[Manufacturer]">
@@ -349,6 +363,8 @@
<ComponentRef Id="DevExpressLibs" />
<ComponentRef Id="GDPictureLibs" />
<ComponentRef Id="Devexpress.Locales.de" />
<ComponentRef Id="TaskFlow.Locales.en" />
<ComponentRef Id="TaskFlow.Locales.fr" />
<ComponentRef Id="ProtocolHandlerMachine" />
</Feature>

View File

@@ -7,7 +7,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\Setu
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "taskFLOW", "TaskFlow\taskFLOW.vbproj", "{6ACA1432-09A2-47EF-A704-C0AA73905756}"
EndProject
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "EDMI.API", "..\..\..\2_DLL Projekte\DDModules\EDMIAPI\EDMI.API.vbproj", "{25017513-0D97-49D3-98D7-BA76D9B251B0}"
Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "SnapPanel", "..\..\..\2_DLL Projekte\DDMonorepo\Controls.SnapPanel\SnapPanel.vbproj", "{3E19C413-3197-4635-944E-558FC04C3475}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -63,26 +63,26 @@ Global
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|Any CPU.Build.0 = Release|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.ActiveCfg = Debug|x86
{6ACA1432-09A2-47EF-A704-C0AA73905756}.SingleImage|x86.Build.0 = Debug|x86
{25017513-0D97-49D3-98D7-BA76D9B251B0}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.CD_ROM|x86.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.CD_ROM|x86.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|x86.ActiveCfg = Debug|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Debug|x86.Build.0 = Debug|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.DVD-5|Any CPU.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.DVD-5|x86.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.DVD-5|x86.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|Any CPU.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|x86.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.Release|x86.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.SingleImage|Any CPU.Build.0 = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.SingleImage|x86.ActiveCfg = Release|Any CPU
{25017513-0D97-49D3-98D7-BA76D9B251B0}.SingleImage|x86.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.CD_ROM|Any CPU.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.CD_ROM|Any CPU.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.CD_ROM|x86.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.CD_ROM|x86.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Debug|x86.ActiveCfg = Debug|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Debug|x86.Build.0 = Debug|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.DVD-5|Any CPU.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.DVD-5|Any CPU.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.DVD-5|x86.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.DVD-5|x86.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Release|Any CPU.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Release|x86.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.Release|x86.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.SingleImage|Any CPU.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.SingleImage|Any CPU.Build.0 = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.SingleImage|x86.ActiveCfg = Release|Any CPU
{3E19C413-3197-4635-944E-558FC04C3475}.SingleImage|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

View File

@@ -103,7 +103,8 @@
</DevExpress.LookAndFeel.Design.AppSettings>
</applicationSettings>
<connectionStrings>
<add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False" providerName="System.Data.SqlClient" />
<add name="taskFLOW.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VHP04-SQL19\DD_TESTING01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=123456789dD!;Encrypt=False;TrustServerCertificate=True"
providerName="System.Data.SqlClient" />
</connectionStrings>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />

View File

@@ -47,9 +47,7 @@ Public Class ClassInit
Dim oCommonAppDataPath = Application.CommonAppDataPath
Dim oStartupPath = Application.StartupPath
' If AppConfig from Startup Path should be forced, rewrite the common app data path
If My.Settings.UseAppConfigConString = True Then
' UserAppDataPath = StartupPath
oCommonAppDataPath = oStartupPath
End If
@@ -86,25 +84,26 @@ Public Class ClassInit
EDMIAppServerActive = True
EDMIService.Client = _EDMIClient
EDMIService.Address = CONFIG.Config.EDMIAppServer
LOGGER.Info($"✔✔ EDMIAppServer [{CONFIG.Config.EDMIAppServer}] is active!")
Else
LOGGER.Warn($"⚠️ Could not Connect to APPServer [{CONFIG.Config.EDMIAppServer}]!!! ###")
Dim oMsg As String = $"⚠ Verbindung zum AppServer [{CONFIG.Config.EDMIAppServer}] konnte nicht hergestellt werden."
LOGGER.Warn(oMsg)
Throw New Exception(oMsg)
End If
End If
Catch ex As Exception
LOGGER.Warn($"⚠️ Could not initialize the AppServer: {ex.Message}")
Dim oMsg As String = $"⚠ Fehler beim Initialisieren des AppServers: {ex.Message}"
LOGGER.Fatal(ex, oMsg)
Throw New Exception(oMsg, ex) ' ← inner re-throw
End Try
Else
LOGGER.Debug("No EDMI Server Address. (String.empty).")
End If
Catch ex As Exception
LOGGER.Error(ex, "Unexpected Error Getting CONFIG.EDMIAppServer")
Throw ' ← 1. fehlender Throw
End Try
INDEX_DMS_ERSTELLT = CONFIG.Config.IndexDmsErstellt
INDEX_DMS_ERSTELLT_ZEIT = CONFIG.Config.IndexDmsErstelltZeit
@@ -128,6 +127,7 @@ Public Class ClassInit
Catch ex As Exception
LOGGER.Error(ex)
Throw ' ← 2. fehlender Throw
End Try
End Sub
@@ -385,7 +385,8 @@ Public Class ClassInit
LOGGER.Debug("Language: [{0}]", USER_LANGUAGE)
LOGGER.Debug("Username: [{0}]", USER_USERNAME)
LOGGER.Debug("Environment.MachineName: [{0}]", Environment.MachineName)
LOGGER.Debug("CurrentUICulture after set: [{0}]", System.Globalization.CultureInfo.CurrentUICulture.Name)
LOGGER.Debug("CurrentCulture after set: [{0}]", System.Globalization.CultureInfo.CurrentCulture.Name)
Try
USER_RIGHT_FILE_DELETE = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL")), False, DT_CHECKUSER_MODULE.Rows(0).Item("USER_RIGHT_FILE_DEL"))

View File

@@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.5.1.0")>
<Assembly: AssemblyVersion("3.5.3.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>
<Assembly: NeutralResourcesLanguage("")>

View File

@@ -199,8 +199,9 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString), _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security "& _
"Info=True;User ID=sa;Password=dd;Encrypt=False")> _
Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VHP04-SQL19\DD_TESTING01;Initial Catalog=DD_ECM;Persist Security "& _
"Info=True;User ID=sa;Password=123456789dD!;Encrypt=False;TrustServerCertificate="& _
"True")> _
Public ReadOnly Property ConnectionString() As String
Get
Return CType(Me("ConnectionString"),String)

View File

@@ -41,10 +41,10 @@
<Setting Name="ConnectionString" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False&lt;/ConnectionString&gt;
&lt;ConnectionString&gt;Data Source=SDD-VHP04-SQL19\DD_TESTING01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=123456789dD!;Encrypt=False;TrustServerCertificate=True&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</Value>
<Value Profile="(Default)">Data Source=SDD-VHP04-SQL19\DD_TESTING01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=123456789dD!;Encrypt=False;TrustServerCertificate=True</Value>
</Setting>
<Setting Name="frmTableColumns_Position" Roaming="true" Type="System.Drawing.Point" Scope="User">
<Value Profile="(Default)">0, 0</Value>

View File

@@ -151,9 +151,8 @@
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
<Reference Include="DigitalData.Controls.DocumentViewer">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Controls.LookupGrid">
<HintPath>..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
@@ -935,6 +934,7 @@
</EmbeddedResource>
<EmbeddedResource Include="frmMain.aa.resx">
<DependentUpon>frmMain.vb</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="frmMain.en.resx">
<DependentUpon>frmMain.vb</DependentUpon>

View File

@@ -28,13 +28,20 @@ Partial Class frmAdmin_AppserviceTest
Me.lblAppServiceOffline = New DevExpress.XtraEditors.LabelControl()
Me.btnLoadStart = New DevExpress.XtraEditors.SimpleButton()
Me.btnLoadStop = New DevExpress.XtraEditors.SimpleButton()
Me.ListBoxControl1 = New DevExpress.XtraEditors.ListBoxControl()
Me.ListBoxControl2 = New DevExpress.XtraEditors.ListBoxControl()
Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
Me.NumericUpDown1 = New System.Windows.Forms.NumericUpDown()
CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.ListBoxControl2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
Me.MemoEdit1 = New DevExpress.XtraEditors.MemoEdit()
Me.MemoEdit2 = New DevExpress.XtraEditors.MemoEdit()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel1.SuspendLayout()
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel2.SuspendLayout()
Me.SplitContainerControl1.SuspendLayout()
CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MemoEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'SimpleButton1
@@ -86,25 +93,6 @@ Partial Class frmAdmin_AppserviceTest
Me.btnLoadStop.Text = "Stoppe Perf-Test"
Me.btnLoadStop.Visible = False
'
'ListBoxControl1
'
Me.ListBoxControl1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ListBoxControl1.Location = New System.Drawing.Point(286, 1)
Me.ListBoxControl1.Name = "ListBoxControl1"
Me.ListBoxControl1.Size = New System.Drawing.Size(420, 132)
Me.ListBoxControl1.TabIndex = 7
'
'ListBoxControl2
'
Me.ListBoxControl2.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.ListBoxControl2.Location = New System.Drawing.Point(286, 150)
Me.ListBoxControl2.Name = "ListBoxControl2"
Me.ListBoxControl2.Size = New System.Drawing.Size(419, 105)
Me.ListBoxControl2.TabIndex = 8
'
'LabelControl1
'
Me.LabelControl1.Location = New System.Drawing.Point(12, 197)
@@ -125,16 +113,53 @@ Partial Class frmAdmin_AppserviceTest
Me.NumericUpDown1.TabIndex = 11
Me.NumericUpDown1.Value = New Decimal(New Integer() {100, 0, 0, 0})
'
'SplitContainerControl1
'
Me.SplitContainerControl1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
Or System.Windows.Forms.AnchorStyles.Left) _
Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
Me.SplitContainerControl1.Horizontal = False
Me.SplitContainerControl1.Location = New System.Drawing.Point(268, 1)
Me.SplitContainerControl1.Name = "SplitContainerControl1"
'
'SplitContainerControl1.Panel1
'
Me.SplitContainerControl1.Panel1.Controls.Add(Me.MemoEdit1)
Me.SplitContainerControl1.Panel1.Text = "Panel1"
'
'SplitContainerControl1.Panel2
'
Me.SplitContainerControl1.Panel2.Controls.Add(Me.MemoEdit2)
Me.SplitContainerControl1.Panel2.Text = "Panel2"
Me.SplitContainerControl1.Size = New System.Drawing.Size(637, 424)
Me.SplitContainerControl1.SplitterPosition = 238
Me.SplitContainerControl1.TabIndex = 12
'
'MemoEdit1
'
Me.MemoEdit1.Dock = System.Windows.Forms.DockStyle.Fill
Me.MemoEdit1.Location = New System.Drawing.Point(0, 0)
Me.MemoEdit1.Name = "MemoEdit1"
Me.MemoEdit1.Size = New System.Drawing.Size(637, 238)
Me.MemoEdit1.TabIndex = 13
'
'MemoEdit2
'
Me.MemoEdit2.Dock = System.Windows.Forms.DockStyle.Fill
Me.MemoEdit2.Location = New System.Drawing.Point(0, 0)
Me.MemoEdit2.Name = "MemoEdit2"
Me.MemoEdit2.Size = New System.Drawing.Size(637, 176)
Me.MemoEdit2.TabIndex = 0
'
'frmAdmin_AppserviceTest
'
Me.Appearance.Options.UseFont = True
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(717, 267)
Me.ClientSize = New System.Drawing.Size(917, 437)
Me.Controls.Add(Me.SplitContainerControl1)
Me.Controls.Add(Me.NumericUpDown1)
Me.Controls.Add(Me.LabelControl1)
Me.Controls.Add(Me.ListBoxControl2)
Me.Controls.Add(Me.ListBoxControl1)
Me.Controls.Add(Me.btnLoadStop)
Me.Controls.Add(Me.btnLoadStart)
Me.Controls.Add(Me.lblAppServiceOffline)
@@ -145,9 +170,15 @@ Partial Class frmAdmin_AppserviceTest
Me.Margin = New System.Windows.Forms.Padding(4)
Me.Name = "frmAdmin_AppserviceTest"
Me.Text = "AppService Monitor"
CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.ListBoxControl2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.Panel1.ResumeLayout(False)
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.MemoEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.MemoEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -157,8 +188,9 @@ Partial Class frmAdmin_AppserviceTest
Friend WithEvents lblAppServiceOffline As DevExpress.XtraEditors.LabelControl
Friend WithEvents btnLoadStart As DevExpress.XtraEditors.SimpleButton
Friend WithEvents btnLoadStop As DevExpress.XtraEditors.SimpleButton
Friend WithEvents ListBoxControl1 As DevExpress.XtraEditors.ListBoxControl
Friend WithEvents ListBoxControl2 As DevExpress.XtraEditors.ListBoxControl
Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
Friend WithEvents NumericUpDown1 As NumericUpDown
Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
Friend WithEvents MemoEdit1 As DevExpress.XtraEditors.MemoEdit
Friend WithEvents MemoEdit2 As DevExpress.XtraEditors.MemoEdit
End Class

View File

@@ -18,15 +18,21 @@ Public Class frmAdmin_AppserviceTest
Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
' Status abrufen
Dim oStatus = _EDMIClient.GetStatus()
LOGGER.Info(oStatus.ToString())
If oStatus Is Nothing Then
LOGGER.Warn("GetStatus() returned null. AppService is offline or unreachable.")
Return
Else
LOGGER.Info(oStatus.ToString())
End If
' Einzelne Felder
ListBoxControl1.Items.Clear()
MemoEdit1.Text = ""
ListBoxControl1.Items.Add($"Online-Status: {oStatus.IsOnline}")
ListBoxControl1.Items.Add($"Channel-State: {oStatus.ChannelState}")
ListBoxControl1.Items.Add($"Anzahl Verbindungen: {oStatus.ActiveConnections}")
ListBoxControl1.Items.Add($"Cached Tables ({oStatus.CachedTableCount})")
MemoEdit1.Text &= $"Online-Status: {oStatus.IsOnline}" & Environment.NewLine
MemoEdit1.Text &= $"Channel-State: {oStatus.ChannelState}" & Environment.NewLine
MemoEdit1.Text &= $"Anzahl Verbindungen: {oStatus.ActiveConnections}" & Environment.NewLine
MemoEdit1.Text &= $"Cached Tables ({oStatus.CachedTableCount})" & Environment.NewLine
If oStatus.IsOnline And oStatus.ChannelState = "Opened" And oStatus.ActiveConnections > 0 And oStatus.CachedTableCount > 1 Then
lblServiceOnline.Visible = True
lblAppServiceOffline.Visible = False
@@ -35,11 +41,34 @@ Public Class frmAdmin_AppserviceTest
lblAppServiceOffline.Visible = True
End If
Dim oClients = _EDMIClient.GetAllClientStatus()
ListBoxControl1.Items.Add("=============== Geöffnete Clients ===============")
MemoEdit1.Text &= "=============== Geöffnete Clients ===============" & Environment.NewLine
For Each oStatus In oClients
ListBoxControl1.Items.Add(oStatus.ToString())
MemoEdit1.Text &= oStatus.ToString() & Environment.NewLine
LOGGER.Info(oStatus.ToString())
Next
Dim oStatus2 = _EDMIClient.GetServiceStatus()
If oStatus2 Is Nothing Then
LOGGER.Warn("GetServiceStatus() returned null. AppService is offline or unreachable.")
Return
Else
LOGGER.Info($"ServiceStatus: Sessions={oStatus2.ActiveSessionCount}")
End If
MemoEdit1.Text &= $"Aktive Sessions: {oStatus2.ActiveSessionCount}" & Environment.NewLine
MemoEdit1.Text &= "─────────────────────────────" & Environment.NewLine
MemoEdit1.Text &= "Aktive Benutzer:" & Environment.NewLine
For Each oUser In oStatus2.ActiveUsers
MemoEdit1.Text &= $" • {oUser}" & Environment.NewLine
Next
MemoEdit1.Text &= "─────────────────────────────" & Environment.NewLine
MemoEdit1.Text &= "Sessions (Id → Benutzer):" & Environment.NewLine
For Each oPair In oStatus2.ActiveSessions
MemoEdit1.Text &= $" {oPair.Key.Substring(0, Math.Min(8, oPair.Key.Length))}… → {oPair.Value}" & Environment.NewLine
Next
End Sub
Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles btnLoadStart.Click
@@ -56,8 +85,8 @@ Public Class frmAdmin_AppserviceTest
btnLoadStart.Enabled = False
btnLoadStop.Enabled = True
btnLoadStop.Visible = True
ListBoxControl2.Items.Clear()
ListBoxControl2.Items.Add($"[{Now:HH:mm:ss}] Baue {LOAD_CLIENT_COUNT} Verbindungen auf…")
MemoEdit2.Text = ""
MemoEdit2.Text &= $"[{Now:HH:mm:ss}] Baue {LOAD_CLIENT_COUNT} Verbindungen auf…" & Environment.NewLine
Task.Run(Sub()
_loadClients = New List(Of Client)
@@ -81,7 +110,6 @@ Public Class frmAdmin_AppserviceTest
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Client #{i + 1} Connect() fehlgeschlagen")
End If
End SyncLock
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Client #{i + 1} verbunden")
Catch ex As Exception
Interlocked.Increment(errors)
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Client #{i + 1} Fehler: {ex.Message}")
@@ -90,7 +118,7 @@ Public Class frmAdmin_AppserviceTest
Me.Invoke(Sub()
FlushLoadLog()
ListBoxControl2.Items.Add($"[{Now:HH:mm:ss}] {_loadClients.Count} Clients aktiv, {errors} Fehler")
MemoEdit2.Text &= $"[{Now:HH:mm:ss}] {_loadClients.Count} Clients aktiv, {errors} Fehler" & Environment.NewLine
StartLoadTimer()
End Sub)
End Sub)
@@ -114,7 +142,7 @@ Public Class frmAdmin_AppserviceTest
_loadClients.Clear()
End If
ListBoxControl2.Items.Add($"[{Now:HH:mm:ss}] Lasttest beendet.")
MemoEdit2.Text &= $"[{Now:HH:mm:ss}] Lasttest beendet." & Environment.NewLine
btnLoadStart.Enabled = True
btnLoadStop.Enabled = False
End Sub
@@ -133,51 +161,51 @@ Public Class frmAdmin_AppserviceTest
Task.Run(Sub()
If _loadClients Is Nothing OrElse _loadClients.Count = 0 Then Return
Parallel.ForEach(_loadClients,
New ParallelOptions With {.CancellationToken = _loadCts.Token},
Sub(oClient As Client) ' ◄ Typisiert, wird jetzt tatsächlich genutzt
Try
Select Case _timerTick Mod 4
Case 0
' ► GetStatus je Client
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Status: Online={st.IsOnline}, Conn={st.ActiveConnections}")
Dim oSnapshot As List(Of Client)
SyncLock _loadClients
oSnapshot = _loadClients.ToList()
End SyncLock
Case 1
' ► Zufällige DB-Abfrage über den jeweiligen Client
Dim iChoice As Integer
SyncLock _rnd
iChoice = _rnd.Next(0, 3) ' 0, 1 oder 2
End SyncLock
Parallel.ForEach(oSnapshot,
New ParallelOptions With {.CancellationToken = _loadCts.Token},
Sub(oClient As Client)
Try
Select Case _timerTick Mod 4
Case 0
' ► GetStatus je Client
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Status: Online={st.IsOnline}, Conn={st.ActiveConnections}")
Select Case iChoice
Case 0
oClient.GetDatatableFromECM("SELECT * FROM TBDD_CONNECTION WITH (NOLOCK) WHERE AKTIV = 1")
_loadLog.Enqueue($"[{Now:HH:mm:ss}] GetDatatableFromECM → TBDD_CONNECTION")
Case 1
oClient.GetDatatableFromECM("SELECT * FROM TBDD_USER")
_loadLog.Enqueue($"[{Now:HH:mm:ss}] GetDatatableFromECM → TBDD_USER")
Case 2
oClient.GetDatatableFromECM("SELECT * FROM TBDD_GUI_LANGUAGE_PHRASE WITH (NOLOCK) WHERE MODULE IN ('PM','All Modules')")
_loadLog.Enqueue($"[{Now:HH:mm:ss}] GetDatatableFromECM → TBDD_GUI_LANGUAGE_PHRASE")
End Select
Case 1
' ► Zufällige Tabelle aus dem Cache des jeweiligen Clients laden
Dim oCachedTables = oClient.GetStatus().CachedTables
If oCachedTables IsNot Nothing AndAlso oCachedTables.Count > 0 Then
Dim sTable As String
SyncLock _rnd
sTable = oCachedTables(_rnd.Next(0, oCachedTables.Count))
End SyncLock
Dim oResult = oClient.GetDatatableByName(sTable)
_loadLog.Enqueue($"[{Now:HH:mm:ss}] GetDatatableByName → {sTable} OK={oResult?.OK} Rows={oResult?.Table?.Rows.Count}")
Else
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Cache leer – kein Tabellen-Zugriff möglich")
End If
Case 2
' ► Cache-Zugriff
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Cached Tables: {st.CachedTableCount}")
Case 2
' ► Cache-Zugriff
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Cached Tables: {st.CachedTableCount}")
Case 3
' ► Channel-State prüfen
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Channel: {st.ChannelState}")
End Select
Catch ex As OperationCanceledException
' Lasttest gestoppt
Catch ex As Exception
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Fehler: {ex.Message}")
End Try
End Sub)
Case 3
' ► Channel-State prüfen
Dim st = oClient.GetStatus()
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Channel: {st.ChannelState}")
End Select
Catch ex As OperationCanceledException
' Lasttest gestoppt
Catch ex As Exception
_loadLog.Enqueue($"[{Now:HH:mm:ss}] Fehler: {ex.Message}")
End Try
End Sub)
Me.Invoke(Sub() FlushLoadLog())
End Sub)
@@ -187,12 +215,17 @@ Public Class frmAdmin_AppserviceTest
Private Sub FlushLoadLog()
Dim msg As String = Nothing
Dim added As Boolean = False
Dim sb As New System.Text.StringBuilder()
While _loadLog.TryDequeue(msg)
ListBoxControl2.Items.Add(msg)
sb.AppendLine(msg)
added = True
End While
If added Then
ListBoxControl2.SelectedIndex = ListBoxControl2.Items.Count - 1
MemoEdit2.Text &= sb.ToString()
MemoEdit2.SelectionStart = MemoEdit2.Text.Length
MemoEdit2.ScrollToCaret()
End If
End Sub

View File

@@ -364,7 +364,6 @@ Partial Class frmAdministration
Me.gridAssignedUsers.AllowDrop = True
Me.gridAssignedUsers.DataSource = Me.TBPROFILE_USERBindingSource
resources.ApplyResources(Me.gridAssignedUsers, "gridAssignedUsers")
Me.gridAssignedUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAssignedUsers.MainView = Me.viewAssignedUsers
Me.gridAssignedUsers.Name = "gridAssignedUsers"
Me.gridAssignedUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedUsers})
@@ -382,6 +381,7 @@ Partial Class frmAdministration
'viewAssignedUsers
'
Me.viewAssignedUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME1, Me.colNAME3, Me.colUSERNAME1, Me.colEMAIL1, Me.GridColumn1, Me.GridColumn2})
Me.viewAssignedUsers.DetailHeight = 295
Me.viewAssignedUsers.GridControl = Me.gridAssignedUsers
Me.viewAssignedUsers.Name = "viewAssignedUsers"
Me.viewAssignedUsers.OptionsBehavior.Editable = False
@@ -393,42 +393,42 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.colPRENAME1, "colPRENAME1")
Me.colPRENAME1.FieldName = "PRENAME"
Me.colPRENAME1.MinWidth = 21
Me.colPRENAME1.MinWidth = 16
Me.colPRENAME1.Name = "colPRENAME1"
'
'colNAME3
'
resources.ApplyResources(Me.colNAME3, "colNAME3")
Me.colNAME3.FieldName = "NAME"
Me.colNAME3.MinWidth = 21
Me.colNAME3.MinWidth = 16
Me.colNAME3.Name = "colNAME3"
'
'colUSERNAME1
'
resources.ApplyResources(Me.colUSERNAME1, "colUSERNAME1")
Me.colUSERNAME1.FieldName = "USERNAME"
Me.colUSERNAME1.MinWidth = 21
Me.colUSERNAME1.MinWidth = 16
Me.colUSERNAME1.Name = "colUSERNAME1"
'
'colEMAIL1
'
resources.ApplyResources(Me.colEMAIL1, "colEMAIL1")
Me.colEMAIL1.FieldName = "EMAIL"
Me.colEMAIL1.MinWidth = 21
Me.colEMAIL1.MinWidth = 16
Me.colEMAIL1.Name = "colEMAIL1"
'
'GridColumn1
'
resources.ApplyResources(Me.GridColumn1, "GridColumn1")
Me.GridColumn1.FieldName = "COMMENT"
Me.GridColumn1.MinWidth = 21
Me.GridColumn1.MinWidth = 16
Me.GridColumn1.Name = "GridColumn1"
'
'GridColumn2
'
resources.ApplyResources(Me.GridColumn2, "GridColumn2")
Me.GridColumn2.FieldName = "SHORTNAME"
Me.GridColumn2.MinWidth = 21
Me.GridColumn2.MinWidth = 16
Me.GridColumn2.Name = "GridColumn2"
'
'Panel1
@@ -447,7 +447,6 @@ Partial Class frmAdministration
Me.gridAvailableUsers.AllowDrop = True
Me.gridAvailableUsers.DataSource = Me.FNPM_GET_FREE_USER_FOR_PROFILEBindingSource
resources.ApplyResources(Me.gridAvailableUsers, "gridAvailableUsers")
Me.gridAvailableUsers.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableUsers.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAvailableUsers.MainView = Me.viewAvailableUsers
Me.gridAvailableUsers.Name = "gridAvailableUsers"
Me.gridAvailableUsers.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableUsers})
@@ -460,6 +459,7 @@ Partial Class frmAdministration
'viewAvailableUsers
'
Me.viewAvailableUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colPRENAME, Me.colNAME2, Me.colUSERNAME, Me.colEMAIL, Me.GridColumn3, Me.GridColumn4})
Me.viewAvailableUsers.DetailHeight = 295
Me.viewAvailableUsers.GridControl = Me.gridAvailableUsers
Me.viewAvailableUsers.Name = "viewAvailableUsers"
Me.viewAvailableUsers.OptionsBehavior.Editable = False
@@ -471,42 +471,42 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.colPRENAME, "colPRENAME")
Me.colPRENAME.FieldName = "USER_PRENAME"
Me.colPRENAME.MinWidth = 21
Me.colPRENAME.MinWidth = 16
Me.colPRENAME.Name = "colPRENAME"
'
'colNAME2
'
resources.ApplyResources(Me.colNAME2, "colNAME2")
Me.colNAME2.FieldName = "USER_SURNAME"
Me.colNAME2.MinWidth = 21
Me.colNAME2.MinWidth = 16
Me.colNAME2.Name = "colNAME2"
'
'colUSERNAME
'
resources.ApplyResources(Me.colUSERNAME, "colUSERNAME")
Me.colUSERNAME.FieldName = "USER_NAME"
Me.colUSERNAME.MinWidth = 21
Me.colUSERNAME.MinWidth = 16
Me.colUSERNAME.Name = "colUSERNAME"
'
'colEMAIL
'
resources.ApplyResources(Me.colEMAIL, "colEMAIL")
Me.colEMAIL.FieldName = "USER_EMAIL"
Me.colEMAIL.MinWidth = 21
Me.colEMAIL.MinWidth = 16
Me.colEMAIL.Name = "colEMAIL"
'
'GridColumn3
'
resources.ApplyResources(Me.GridColumn3, "GridColumn3")
Me.GridColumn3.FieldName = "USER_COMMENT"
Me.GridColumn3.MinWidth = 21
Me.GridColumn3.MinWidth = 16
Me.GridColumn3.Name = "GridColumn3"
'
'GridColumn4
'
resources.ApplyResources(Me.GridColumn4, "GridColumn4")
Me.GridColumn4.FieldName = "USER_SHORTNAME"
Me.GridColumn4.MinWidth = 21
Me.GridColumn4.MinWidth = 16
Me.GridColumn4.Name = "GridColumn4"
'
'Panel2
@@ -542,7 +542,6 @@ Partial Class frmAdministration
Me.gridAssignedGroups.AllowDrop = True
Me.gridAssignedGroups.DataSource = Me.TBPROFILE_GROUPBindingSource
resources.ApplyResources(Me.gridAssignedGroups, "gridAssignedGroups")
Me.gridAssignedGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAssignedGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAssignedGroups.MainView = Me.viewAssignedGroups
Me.gridAssignedGroups.Name = "gridAssignedGroups"
Me.gridAssignedGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAssignedGroups})
@@ -555,6 +554,7 @@ Partial Class frmAdministration
'viewAssignedGroups
'
Me.viewAssignedGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME5, Me.colCOMMENT1})
Me.viewAssignedGroups.DetailHeight = 295
Me.viewAssignedGroups.GridControl = Me.gridAssignedGroups
Me.viewAssignedGroups.Name = "viewAssignedGroups"
Me.viewAssignedGroups.OptionsBehavior.Editable = False
@@ -566,14 +566,14 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.colNAME5, "colNAME5")
Me.colNAME5.FieldName = "NAME"
Me.colNAME5.MinWidth = 21
Me.colNAME5.MinWidth = 16
Me.colNAME5.Name = "colNAME5"
'
'colCOMMENT1
'
resources.ApplyResources(Me.colCOMMENT1, "colCOMMENT1")
Me.colCOMMENT1.FieldName = "COMMENT"
Me.colCOMMENT1.MinWidth = 21
Me.colCOMMENT1.MinWidth = 16
Me.colCOMMENT1.Name = "colCOMMENT1"
'
'Panel3
@@ -592,7 +592,6 @@ Partial Class frmAdministration
Me.gridAvailableGroups.AllowDrop = True
Me.gridAvailableGroups.DataSource = Me.TBDD_GROUPSBindingSource
resources.ApplyResources(Me.gridAvailableGroups, "gridAvailableGroups")
Me.gridAvailableGroups.EmbeddedNavigator.Margin = CType(resources.GetObject("gridAvailableGroups.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridAvailableGroups.MainView = Me.viewAvailableGroups
Me.gridAvailableGroups.Name = "gridAvailableGroups"
Me.gridAvailableGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewAvailableGroups})
@@ -605,6 +604,7 @@ Partial Class frmAdministration
'viewAvailableGroups
'
Me.viewAvailableGroups.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colNAME4, Me.colCOMMENT})
Me.viewAvailableGroups.DetailHeight = 295
Me.viewAvailableGroups.GridControl = Me.gridAvailableGroups
Me.viewAvailableGroups.Name = "viewAvailableGroups"
Me.viewAvailableGroups.OptionsBehavior.Editable = False
@@ -616,14 +616,14 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.colNAME4, "colNAME4")
Me.colNAME4.FieldName = "NAME"
Me.colNAME4.MinWidth = 21
Me.colNAME4.MinWidth = 16
Me.colNAME4.Name = "colNAME4"
'
'colCOMMENT
'
resources.ApplyResources(Me.colCOMMENT, "colCOMMENT")
Me.colCOMMENT.FieldName = "COMMENT"
Me.colCOMMENT.MinWidth = 21
Me.colCOMMENT.MinWidth = 16
Me.colCOMMENT.Name = "colCOMMENT"
'
'Panel4
@@ -651,13 +651,12 @@ Partial Class frmAdministration
'
Me.SplitContainerControl1.Panel2.Controls.Add(Me.pgFinalIndexes)
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 651
Me.SplitContainerControl1.SplitterPosition = 506
'
'gridFinalIndex
'
Me.gridFinalIndex.DataSource = Me.TBPM_PROFILE_FINAL_INDEXINGBindingSource
resources.ApplyResources(Me.gridFinalIndex, "gridFinalIndex")
Me.gridFinalIndex.EmbeddedNavigator.Margin = CType(resources.GetObject("gridFinalIndex.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.gridFinalIndex.MainView = Me.viewFinalIndex
Me.gridFinalIndex.Name = "gridFinalIndex"
Me.gridFinalIndex.TabStop = False
@@ -678,6 +677,7 @@ Partial Class frmAdministration
Me.viewFinalIndex.Appearance.EvenRow.BackColor = System.Drawing.Color.PaleTurquoise
Me.viewFinalIndex.Appearance.EvenRow.Options.UseBackColor = True
Me.viewFinalIndex.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colGUID, Me.colPROFIL_ID, Me.colCONNECTION_ID, Me.colINDEXNAME, Me.colVALUE, Me.colSQL_COMMAND, Me.colPREVENT_DUPLICATES, Me.colALLOW_NEW_VALUES, Me.colDESCRIPTION1, Me.colACTIVE})
Me.viewFinalIndex.DetailHeight = 295
Me.viewFinalIndex.GridControl = Me.gridFinalIndex
Me.viewFinalIndex.Name = "viewFinalIndex"
Me.viewFinalIndex.OptionsBehavior.Editable = False
@@ -689,92 +689,74 @@ Partial Class frmAdministration
'colGUID
'
Me.colGUID.FieldName = "GUID"
Me.colGUID.MinWidth = 26
Me.colGUID.Name = "colGUID"
resources.ApplyResources(Me.colGUID, "colGUID")
'
'colPROFIL_ID
'
Me.colPROFIL_ID.FieldName = "PROFIL_ID"
Me.colPROFIL_ID.MinWidth = 26
Me.colPROFIL_ID.Name = "colPROFIL_ID"
resources.ApplyResources(Me.colPROFIL_ID, "colPROFIL_ID")
'
'colCONNECTION_ID
'
Me.colCONNECTION_ID.FieldName = "CONNECTION_ID"
Me.colCONNECTION_ID.MinWidth = 26
Me.colCONNECTION_ID.Name = "colCONNECTION_ID"
resources.ApplyResources(Me.colCONNECTION_ID, "colCONNECTION_ID")
'
'colINDEXNAME
'
resources.ApplyResources(Me.colINDEXNAME, "colINDEXNAME")
Me.colINDEXNAME.FieldName = "INDEXNAME"
Me.colINDEXNAME.MinWidth = 26
Me.colINDEXNAME.Name = "colINDEXNAME"
'
'colVALUE
'
resources.ApplyResources(Me.colVALUE, "colVALUE")
Me.colVALUE.FieldName = "VALUE"
Me.colVALUE.MinWidth = 26
Me.colVALUE.Name = "colVALUE"
'
'colSQL_COMMAND
'
resources.ApplyResources(Me.colSQL_COMMAND, "colSQL_COMMAND")
Me.colSQL_COMMAND.FieldName = "SQL_COMMAND"
Me.colSQL_COMMAND.MinWidth = 26
Me.colSQL_COMMAND.Name = "colSQL_COMMAND"
'
'colPREVENT_DUPLICATES
'
resources.ApplyResources(Me.colPREVENT_DUPLICATES, "colPREVENT_DUPLICATES")
Me.colPREVENT_DUPLICATES.FieldName = "PREVENT_DUPLICATES"
Me.colPREVENT_DUPLICATES.MinWidth = 26
Me.colPREVENT_DUPLICATES.Name = "colPREVENT_DUPLICATES"
'
'colALLOW_NEW_VALUES
'
resources.ApplyResources(Me.colALLOW_NEW_VALUES, "colALLOW_NEW_VALUES")
Me.colALLOW_NEW_VALUES.FieldName = "ALLOW_NEW_VALUES"
Me.colALLOW_NEW_VALUES.MinWidth = 26
Me.colALLOW_NEW_VALUES.Name = "colALLOW_NEW_VALUES"
'
'colDESCRIPTION1
'
resources.ApplyResources(Me.colDESCRIPTION1, "colDESCRIPTION1")
Me.colDESCRIPTION1.FieldName = "DESCRIPTION"
Me.colDESCRIPTION1.MinWidth = 26
Me.colDESCRIPTION1.Name = "colDESCRIPTION1"
'
'colACTIVE
'
Me.colACTIVE.FieldName = "ACTIVE"
Me.colACTIVE.MinWidth = 26
Me.colACTIVE.Name = "colACTIVE"
resources.ApplyResources(Me.colACTIVE, "colACTIVE")
'
'pgFinalIndexes
'
resources.ApplyResources(Me.pgFinalIndexes, "pgFinalIndexes")
Me.pgFinalIndexes.Cursor = System.Windows.Forms.Cursors.Default
resources.ApplyResources(Me.pgFinalIndexes, "pgFinalIndexes")
Me.pgFinalIndexes.MenuManager = Me.RibbonControl1
Me.pgFinalIndexes.Name = "pgFinalIndexes"
Me.pgFinalIndexes.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.[True]
Me.pgFinalIndexes.OptionsView.FixedLineWidth = 3
Me.pgFinalIndexes.OptionsView.MinRowAutoHeight = 12
'
'RibbonControl1
'
Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(39, 36, 39, 36)
Me.RibbonControl1.ExpandCollapseItem.Id = 0
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItemRefreshProfileData, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10, Me.BarButtonItem11, Me.BarButtonItem12, Me.BarButtonItem13, Me.BarButtonItem14, Me.BarButtonItem15, Me.BarButtonItem16, Me.BarButtonItem17, Me.BarButtonItem18, Me.BarButtonItem19, Me.tsbStaticInfo, Me.BarButtonItem20, Me.BarButtonItem21, Me.bbtnItemFinishSQL, Me.BarButtonItem22, Me.BarButtonItem23, Me.BarButtonItem24, Me.BarButtonItem25, Me.BarButtonItem26, Me.BarToggleSwitchItemEdit, Me.bbtnitmReject, Me.bbtnitmNotResponsible})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
Me.RibbonControl1.MaxItemId = 33
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.OptionsMenuMinWidth = 424
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage3})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowMoreCommandsButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -1883,7 +1865,6 @@ Partial Class frmAdministration
'
Me.GridControlNavigation.DataSource = Me.TBPM_PROFILEBindingSource
resources.ApplyResources(Me.GridControlNavigation, "GridControlNavigation")
Me.GridControlNavigation.EmbeddedNavigator.Margin = CType(resources.GetObject("GridControlNavigation.EmbeddedNavigator.Margin"), System.Windows.Forms.Padding)
Me.GridControlNavigation.MainView = Me.GridViewProfile
Me.GridControlNavigation.Name = "GridControlNavigation"
Me.GridControlNavigation.TabStop = False
@@ -1896,6 +1877,7 @@ Partial Class frmAdministration
Me.GridViewProfile.Appearance.FocusedRow.BackColor = System.Drawing.Color.Fuchsia
Me.GridViewProfile.Appearance.FocusedRow.Options.UseBackColor = True
Me.GridViewProfile.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colProfilGUID, Me.colNAME})
Me.GridViewProfile.DetailHeight = 295
Me.GridViewProfile.GridControl = Me.GridControlNavigation
Me.GridViewProfile.Name = "GridViewProfile"
Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
@@ -1912,14 +1894,13 @@ Partial Class frmAdministration
'
resources.ApplyResources(Me.colProfilGUID, "colProfilGUID")
Me.colProfilGUID.FieldName = "GUID"
Me.colProfilGUID.MinWidth = 26
Me.colProfilGUID.Name = "colProfilGUID"
'
'colNAME
'
resources.ApplyResources(Me.colNAME, "colNAME")
Me.colNAME.FieldName = "NAME"
Me.colNAME.MinWidth = 21
Me.colNAME.MinWidth = 16
Me.colNAME.Name = "colNAME"
'
'TBPM_KONFIGURATIONBindingSource

File diff suppressed because it is too large Load Diff

View File

@@ -32,7 +32,7 @@ Public Class frmAdministration
FORM_LOADED = False
UNSAVED_CHANGES_PROFILE = False
Try
FormDesigner = New frmFormDesigner()
FormHelper = New FormHelper(LOGCONFIG, Me)
TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
@@ -414,6 +414,7 @@ Public Class frmAdministration
End Sub
Private Sub frmProfileDesigner_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
FormDesigner = New frmFormDesigner()
TabControl1.SelectedIndex = 0
FORM_LOADED = True
rbnpggroupFinaIndexe.Enabled = False

View File

@@ -980,7 +980,9 @@ Public Class frmCockpitConfig
,[SQL_QUERY]
,[SQL_QUERY_COUNT]
,[COMMENT],
ADDED_WHO)
ADDED_WHO,
CFG_SEQUENCE,
ADDED_WHEN)
VALUES (
{Selected_Cockpit_ID},
0,
@@ -994,7 +996,9 @@ Public Class frmCockpitConfig
'',
'',
'',
'{USER_USERNAME}')"
'{USER_USERNAME}',
1,
GETDATE())"
If DatabaseFallback.ExecuteNonQueryECM(oInsert) Then
LOGGER.Debug($"Add_Node: {oVariant}-Knoten erfolgreich angelegt für Cockpit_ID={Selected_Cockpit_ID}")
Load_TBTF_CFG_COCKPIT_DEFINITION()

View File

@@ -80,6 +80,7 @@ Partial Class frmMain
Me.BarButtonItemCock_refresh = New DevExpress.XtraBars.BarButtonItem()
Me.Bchkitm_load_empty_wf = New DevExpress.XtraBars.BarCheckItem()
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.bbtnitm_Appservice = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -193,7 +194,6 @@ Partial Class frmMain
Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
Me.bbtnitm_Appservice = New DevExpress.XtraBars.BarButtonItem()
CType(Me.TreeList_Cockpit, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RepositoryItemProgressBar1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -689,6 +689,14 @@ Partial Class frmMain
Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem3.Name = "BarButtonItem3"
'
'bbtnitm_Appservice
'
resources.ApplyResources(Me.bbtnitm_Appservice, "bbtnitm_Appservice")
Me.bbtnitm_Appservice.Id = 61
Me.bbtnitm_Appservice.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm_Appservice.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitm_Appservice.Name = "bbtnitm_Appservice"
Me.bbtnitm_Appservice.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
'
'RibbonPageStart
'
Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4, Me.RibbonPageGroupAHW})
@@ -1606,14 +1614,6 @@ Partial Class frmMain
Me.BarButtonItem9.Name = "BarButtonItem9"
Me.BarButtonItem9.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
'
'bbtnitm_Appservice
'
resources.ApplyResources(Me.bbtnitm_Appservice, "bbtnitm_Appservice")
Me.bbtnitm_Appservice.Id = 61
Me.bbtnitm_Appservice.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem11.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.bbtnitm_Appservice.Name = "bbtnitm_Appservice"
Me.bbtnitm_Appservice.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
'
'frmMain
'
Me.Appearance.Options.UseFont = True

File diff suppressed because it is too large Load Diff

View File

@@ -1378,6 +1378,27 @@
b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs
MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2
Zz4L
</value>
</data>
<data name="bbtnitm_Appservice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABEDAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iU3RhdGlzdGljYWwiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg
MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7
fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8
cGF0aCBkPSJNNiwxM2MwLTEuNywxLjMtMywzLTNoMTNWNEgzQzIuNCw0LDIsMy42LDIsM2MwLTAuNiww
LjQtMSwxLTFoMTlWMWMwLTAuNi0wLjQtMS0xLTFIM0MxLjMsMCwwLDEuMywwLDN2MjAgIGMwLDEuNywx
LjMsMywzLDNoM1YxM3oiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEsMTJIOWMtMC41LDAt
MSwwLjUtMSwxdjE4YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWMTNDMzIsMTIuNSwz
MS41LDEyLDMxLDEyeiBNMzAsMzBIMTBWMTRoMjAgIFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBv
bHlnb24gcG9pbnRzPSIxMi43LDI3LjEgMTEuMywyNS43IDE3LDIwIDIwLDIzIDI1LDE4IDI4LjcsMjEu
NyAyNy4zLDIzLjEgMjUsMjAuOCAyMCwyNS44IDE3LDIyLjggIiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2
Zz4L
</value>
</data>
<data name="RibbonPageGroup1.Text" xml:space="preserve">
@@ -1496,7 +1517,7 @@
7g9duB90HMo+PKSE+c4Q6ouHIT5G+ijB3kZULi7PNViZZrtBlPPxZ5hhM7IpH21G9oebTGxElq0FH2yY
Rfz+uh5CyGvzT6+l6AQ9eXTR66bebwltCc/CfE/Q225BD7IUrVlqtBSeebv9DSPp72MGtFSzAAAAAElF
TkSuQmCCmAYAAIlQTkcNChoKAAAADUlIRFIAAAAYAAAAGAgGAAAA4Hc9+AAAAARnQU1BAACxjwv8YQUA
AAAJcEhZcwAADr4AAA6+AepCscAAAAY6SURBVEhLlVZ7TFNnFP90c1P3VOeyOA3Z/pjGTJNtWZZsxmXZ
AAAJcEhZcwAADr0AAA69AUf7kK0AAAY6SURBVEhLlVZ7TFNnFP90c1P3VOeyOA3Z/pjGTJNtWZZsxmXZ
I5mKj6n44CmMqQgTwflkMBWQTcZQC0oR5RFApTJwKM/CQCoPbWlLodhSSh/0/aCF0lYdv+W7thvLNNlO
8rv35t4vv9/5zjnfOZeQJ9s0Qsh0QsjThJBnCSGzCCGzfaDP9B39Rtf8L6PET+3Zkz4vK78+sKSyO+NG
i5Rff0s+0sRT3G9ol9lvtkplV2r4FacLGnYnZZa9896aNVT0PwlNCwj4eOapnJrVFyu6a/m9WuuI0QnH
@@ -1531,7 +1552,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAATQBBQE0AQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAATwBBQE8AQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -1573,37 +1594,37 @@
</value>
</data>
<data name="tsmiValidationProfil.Size" type="System.Drawing.Size, System.Drawing">
<value>317, 26</value>
<value>261, 26</value>
</data>
<data name="tsmiValidationProfil.Text" xml:space="preserve">
<value>Démarre la validation pour le profil</value>
</data>
<data name="cmsNavPane.Size" type="System.Drawing.Size, System.Drawing">
<value>318, 30</value>
<value>262, 30</value>
</data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>287, 30</value>
<value>241, 30</value>
</data>
<data name="PopupErinnerungInaktivierenToolStripMenuItem.Text" xml:space="preserve">
<value>Désactiver le rappel popup</value>
</data>
<data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
<value>284, 6</value>
<value>238, 6</value>
</data>
<data name="AnzeigenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>287, 30</value>
<value>241, 30</value>
</data>
<data name="AnzeigenToolStripMenuItem.Text" xml:space="preserve">
<value>Apporter au front</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
<value>287, 30</value>
<value>241, 30</value>
</data>
<data name="OutOfRangePMFixierenToolStripMenuItem.Text" xml:space="preserve">
<value>Out of Range - Rétablir les PM</value>
</data>
<data name="ContextMenuNotifyIcon.Size" type="System.Drawing.Size, System.Drawing">
<value>288, 100</value>
<value>242, 100</value>
</data>
<data name="NotifyIcon1.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

View File

@@ -1464,7 +1464,7 @@
<data name="bbtnitm_Appservice.Caption" xml:space="preserve">
<value>Appservice Monitor</value>
</data>
<data name="BarButtonItem11.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="bbtnitm_Appservice.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1513,7 +1513,7 @@
<value>Funktionen</value>
</data>
<data name="RibbonPageGroup5.Text" xml:space="preserve">
<value>Workflow Tabelle</value>
<value>Skalierung</value>
</data>
<data name="RibbonPageTabelle.Text" xml:space="preserve">
<value>Tabelle</value>
@@ -1728,7 +1728,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
CAAAAk1TRnQBSQFMAgEBAgEAAagBDAGoAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAAcABDAHAAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -2564,6 +2564,12 @@
<data name="&gt;&gt;BarButtonItem3.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;bbtnitm_Appservice.Name" xml:space="preserve">
<value>bbtnitm_Appservice</value>
</data>
<data name="&gt;&gt;bbtnitm_Appservice.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
<value>RibbonPageStart</value>
</data>
@@ -3170,12 +3176,6 @@
<data name="&gt;&gt;BarButtonItem9.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;bbtnitm_Appservice.Name" xml:space="preserve">
<value>bbtnitm_Appservice</value>
</data>
<data name="&gt;&gt;bbtnitm_Appservice.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmMain</value>
</data>

View File

@@ -250,7 +250,7 @@ Public Class frmMain
End If
Try
If CultureInfo.CurrentUICulture.ThreeLetterISOLanguageName = "eng" Then
LOGGER.Info("## CurrentUICulture.Name: " & CultureInfo.CurrentUICulture.Name, False)
LOGGER.Info("frmMainLoad CurrentUICulture.Name: " & CultureInfo.CurrentUICulture.Name, False)
INDEX_DMS_ERSTELLT = "DMS Created"
INDEX_DMS_ERSTELLT_ZEIT = "DMS Created Time"
My.Settings.Save()
@@ -264,7 +264,7 @@ Public Class frmMain
Thread.CurrentThread.CurrentUICulture = oCultureInfo
CultureInfo.DefaultThreadCurrentCulture = oCultureInfo
CultureInfo.DefaultThreadCurrentUICulture = oCultureInfo
LOGGER.Info("frmMainLoad USER_LANGUAGE: " & USER_LANGUAGE & " CurrentUICulture.Name: " & CultureInfo.CurrentUICulture.Name, False)
Catch ex As Exception
End Try
@@ -2223,6 +2223,12 @@ Public Class frmMain
LOGGER.Error(ex)
LOGGER.Info($"Error in Splash: {ex.Message}")
End Try
' ← HIER prüfen: Wenn Initialisierung fehlgeschlagen, sofort beenden
If ERROR_STATE <> String.Empty Then
LOGGER.Fatal($"Application startup aborted. ERROR_STATE = [{ERROR_STATE}]")
System.Environment.Exit(1)
Return
End If
' LookAndFeel ZUERST global setzen
ConfigureGlobalLookAndFeel()
Try
@@ -2233,6 +2239,9 @@ Public Class frmMain
Thread.CurrentThread.CurrentUICulture = cultureInfo
CultureInfo.DefaultThreadCurrentCulture = cultureInfo
CultureInfo.DefaultThreadCurrentUICulture = cultureInfo
LOGGER.Info("frmMainNew: USER_LANGUAGE: " & USER_LANGUAGE & " CurrentUICulture.Name: " & CultureInfo.CurrentUICulture.Name, False)
Else
LOGGER.Warn("USER_LANGUAGE is empty - using system default culture")
End If
Catch ex As Exception
LOGGER.Error(ex)

View File

@@ -116,13 +116,11 @@ Public NotInheritable Class frmSplash
End Sub
Private Sub bw_RunWorkerCompleted(sender As Object, e As System.ComponentModel.RunWorkerCompletedEventArgs)
' Bei Fehler MsgBox anzeigen und Programm beenden
If e.Error IsNot Nothing Then
LOGGER.Error(e.Error)
MsgBox(e.Error.Message & vbNewLine & e.Error.StackTrace.ToString, MsgBoxStyle.Critical, "Unexpected error in Initializing application")
Application.Exit()
ERROR_STATE = "INIT FAILED"
MsgBox(e.Error.Message, MsgBoxStyle.Critical, "Fehler beim Start der Anwendung " + ADDITIONAL_TITLE)
End If
' Wenn kein Fehler, Splashscreen schließen
Me.Close()
End Sub