diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index 51f34e5..c3d9ac6 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -156,8 +156,7 @@ - - + @@ -325,7 +324,22 @@ - + + + + + + + + + + @@ -349,6 +363,8 @@ + + diff --git a/app/TaskFlow.sln b/app/TaskFlow.sln index 35ece71..b61a2d2 100644 --- a/app/TaskFlow.sln +++ b/app/TaskFlow.sln @@ -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 diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 7bb25bf..ed086e0 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -103,7 +103,8 @@ - + diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index 2c6b9c1..4579e29 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -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")) diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 418cb1f..3551e0f 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/TaskFlow/My Project/Settings.Designer.vb b/app/TaskFlow/My Project/Settings.Designer.vb index 12ad0fa..8a6b6b2 100644 --- a/app/TaskFlow/My Project/Settings.Designer.vb +++ b/app/TaskFlow/My Project/Settings.Designer.vb @@ -199,8 +199,9 @@ Namespace My _ + 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) diff --git a/app/TaskFlow/My Project/Settings.settings b/app/TaskFlow/My Project/Settings.settings index 3cfe9af..bd9c08d 100644 --- a/app/TaskFlow/My Project/Settings.settings +++ b/app/TaskFlow/My Project/Settings.settings @@ -41,10 +41,10 @@ <?xml version="1.0" encoding="utf-16"?> <SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <ConnectionString>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False</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</ConnectionString> <ProviderName>System.Data.SqlClient</ProviderName> </SerializableConnectionString> - Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd;Encrypt=False + Data Source=SDD-VHP04-SQL19\DD_TESTING01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=123456789dD!;Encrypt=False;TrustServerCertificate=True 0, 0 diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 4981e03..23f4bff 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -151,9 +151,8 @@ False - - False - ..\..\..\..\2_DLL Projekte\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll @@ -935,6 +934,7 @@ frmMain.vb + Designer frmMain.vb diff --git a/app/TaskFlow/frmAdmin_AppserviceTest.Designer.vb b/app/TaskFlow/frmAdmin_AppserviceTest.Designer.vb index 9db4708..0296189 100644 --- a/app/TaskFlow/frmAdmin_AppserviceTest.Designer.vb +++ b/app/TaskFlow/frmAdmin_AppserviceTest.Designer.vb @@ -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 diff --git a/app/TaskFlow/frmAdmin_AppserviceTest.vb b/app/TaskFlow/frmAdmin_AppserviceTest.vb index 1895afb..dfe36e7 100644 --- a/app/TaskFlow/frmAdmin_AppserviceTest.vb +++ b/app/TaskFlow/frmAdmin_AppserviceTest.vb @@ -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 diff --git a/app/TaskFlow/frmAdministration.Designer.vb b/app/TaskFlow/frmAdministration.Designer.vb index c57ce2d..9fa2fe8 100644 --- a/app/TaskFlow/frmAdministration.Designer.vb +++ b/app/TaskFlow/frmAdministration.Designer.vb @@ -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 diff --git a/app/TaskFlow/frmAdministration.resx b/app/TaskFlow/frmAdministration.resx index cd0e9d9..f6e7035 100644 --- a/app/TaskFlow/frmAdministration.resx +++ b/app/TaskFlow/frmAdministration.resx @@ -126,14 +126,10 @@ - 21, 19 - - - - 4, 0, 4, 0 + 16, 16 - 34, 21 + 24, 16 0 @@ -153,14 +149,12 @@ 3 + Fill - 4, 4 - - - 4, 4, 4, 4 + 3, 3 Horizontal @@ -177,11 +171,8 @@ Fill - - 4, 4, 4, 4 - - 0, 30 + 0, 25 Vorname @@ -192,6 +183,9 @@ 0 + + 58 + Name @@ -201,6 +195,9 @@ 1 + + 58 + Benutzername @@ -210,6 +207,9 @@ 2 + + 58 + Email @@ -219,6 +219,9 @@ 3 + + 58 + Kommentar @@ -228,6 +231,9 @@ 4 + + 58 + Kurzname @@ -237,11 +243,11 @@ 5 - - 4, 4, 4, 4 + + 58 - 1292, 275 + 1002, 226 3 @@ -264,11 +270,8 @@ 0, 0 - - 4, 0, 4, 0 - - 249, 30 + 194, 25 0 @@ -297,11 +300,8 @@ 0, 0 - - 4, 4, 4, 4 - - 1292, 30 + 1002, 25 4 @@ -339,11 +339,8 @@ Fill - - 4, 4, 4, 4 - - 0, 30 + 0, 25 Vorname @@ -354,6 +351,9 @@ 0 + + 58 + Name @@ -363,6 +363,9 @@ 1 + + 58 + Benutzername @@ -372,6 +375,9 @@ 2 + + 58 + Email @@ -381,6 +387,9 @@ 3 + + 58 + Kommentar @@ -390,6 +399,9 @@ 4 + + 58 + Kurzname @@ -399,11 +411,11 @@ 5 - - 4, 4, 4, 4 + + 58 - 1292, 249 + 1002, 206 5 @@ -426,11 +438,8 @@ 0, 0 - - 4, 0, 4, 0 - - 249, 30 + 194, 25 0 @@ -459,11 +468,8 @@ 0, 0 - - 4, 4, 4, 4 - - 1292, 30 + 1002, 25 6 @@ -493,13 +499,10 @@ 1 - 1292, 589 + 1002, 486 - 305 - - - 5 + 251 0 @@ -520,10 +523,7 @@ Fill - 4, 4 - - - 4, 4, 4, 4 + 3, 3 Horizontal @@ -537,11 +537,8 @@ Fill - - 4, 4, 4, 4 - - 0, 30 + 0, 25 Name @@ -552,6 +549,9 @@ 0 + + 58 + Kommentar @@ -561,11 +561,11 @@ 1 - - 4, 4, 4, 4 + + 58 - 1290, 240 + 1003, 202 3 @@ -591,11 +591,8 @@ 0, 0 - - 4, 0, 4, 0 - - 249, 30 + 194, 25 0 @@ -624,11 +621,8 @@ 0, 0 - - 4, 4, 4, 4 - - 1290, 30 + 1003, 25 4 @@ -666,11 +660,8 @@ Fill - - 4, 4, 4, 4 - - 0, 30 + 0, 25 Name @@ -681,6 +672,9 @@ 0 + + 58 + Kommentar @@ -690,11 +684,11 @@ 1 - - 4, 4, 4, 4 + + 58 - 1290, 282 + 1003, 239 0 @@ -720,11 +714,8 @@ 0, 0 - - 4, 0, 4, 0 - - 249, 30 + 194, 25 0 @@ -753,11 +744,8 @@ 0, 0 - - 4, 4, 4, 4 - - 1290, 30 + 1003, 25 6 @@ -787,13 +775,10 @@ 1 - 1290, 587 + 1003, 495 - 270 - - - 5 + 227 1 @@ -816,9 +801,6 @@ 0, 0 - - 4, 4, 4, 4 - 1273, 134 @@ -828,21 +810,9 @@ Fill - - 4, 4, 4, 4 - 0, 0 - - 96 - - - 96 - - - 96 - Index @@ -853,7 +823,7 @@ 0 - 149 + 116 Fester Wert @@ -865,26 +835,20 @@ 2 - 310 + 241 SQL Befehl - 193 + 150 Doppelte Werte vermeiden - - 96 - Neue Werte erlauben - - 96 - Beschreibung @@ -895,16 +859,10 @@ 1 - 316 - - - 96 - - - 4, 4, 4, 4 + 246 - 651, 445 + 506, 370 93 @@ -936,18 +894,12 @@ 0 - - 3 - Fill 0, 0 - - 4, 4, 4, 4 - Aktualisieren @@ -1850,9 +1802,6 @@ 0, 0 - - 4, 4, 4, 4 - Bearbeitungs-Modus @@ -1875,16 +1824,13 @@ Grundeinstellungen - 1679, 194 + 1306, 158 - 0, 854 - - - 4, 4, 4, 4 + 0, 721 - 1679, 28 + 1306, 22 RibbonStatusBar1 @@ -1911,7 +1857,7 @@ 2 - 595, 445 + 463, 370 92 @@ -1944,7 +1890,7 @@ 1 - 1258, 445 + 979, 370 94 @@ -1968,13 +1914,10 @@ True - 136, 19 - - - 4, 0, 4, 0 + 106, 16 - 102, 21 + 79, 16 2 @@ -2004,13 +1947,10 @@ Tahoma, 9.75pt - 21, 300 - - - 4, 0, 4, 0 + 16, 253 - 102, 21 + 77, 16 18 @@ -2040,13 +1980,10 @@ Tahoma, 9.75pt - 575, 300 - - - 4, 0, 4, 0 + 447, 253 - 114, 21 + 86, 16 20 @@ -2076,13 +2013,10 @@ Tahoma, 9.75pt - 19, 337 - - - 4, 0, 4, 0 + 15, 284 - 119, 21 + 92, 16 22 @@ -2112,13 +2046,10 @@ Tahoma, 9.75pt - 575, 337 - - - 4, 0, 4, 0 + 447, 284 - 131, 21 + 101, 16 24 @@ -2145,13 +2076,10 @@ True - 136, 51 - - - 4, 0, 4, 0 + 106, 43 - 49, 21 + 37, 16 27 @@ -2181,13 +2109,10 @@ Tahoma, 9.75pt - 8, 78 - - - 4, 0, 4, 0 + 6, 66 - 185, 21 + 141, 16 0 @@ -2217,13 +2142,10 @@ Tahoma, 9.75pt - 21, 53 - - - 4, 0, 4, 0 + 16, 45 - 101, 21 + 76, 16 84 @@ -2253,13 +2175,10 @@ Tahoma, 9.75pt - 707, 18 - - - 4, 0, 4, 0 + 550, 15 - 43, 21 + 33, 16 93 @@ -2298,13 +2217,10 @@ Tahoma, 9.75pt - 21, 18 - - - 4, 0, 4, 0 + 16, 15 - 88, 21 + 66, 16 77 @@ -2328,13 +2244,10 @@ Tahoma, 9.75pt - 260, 14 - - - 4, 4, 4, 4 + 202, 12 - 442, 27 + 345, 24 0 @@ -2355,13 +2268,10 @@ Tahoma, 9.75pt - 24, 191 - - - 4, 4, 4, 4 + 19, 161 - 242, 28 + 188, 24 0 @@ -2385,13 +2295,10 @@ Tahoma, 9.75pt - 260, 191 - - - 4, 4, 4, 4 + 202, 161 - 700, 27 + 545, 23 8 @@ -2418,16 +2325,13 @@ MiddleLeft - 1017, 120 - - - 4, 4, 4, 4 + 791, 101 - 0, 0, 3, 2 + 0, 0, 2, 2 - 143, 27 + 111, 23 7 @@ -2454,13 +2358,10 @@ Tahoma, 9.75pt - 969, 120 - - - 4, 4, 4, 4 + 754, 101 - 40, 27 + 31, 23 6 @@ -2481,13 +2382,10 @@ 25 - 247, 48 - - - 4, 4, 4, 4 + 192, 40 - 656, 27 + 511, 23 1 @@ -2505,13 +2403,10 @@ 8 - 60, 15 - - - 4, 4, 4, 4 + 47, 13 - 67, 27 + 53, 23 1 @@ -2529,13 +2424,10 @@ 1 - 247, 15 - - - 4, 4, 4, 4 + 192, 13 - 656, 27 + 511, 23 0 @@ -2556,13 +2448,10 @@ Tahoma, 9.75pt - 260, 86 - - - 4, 4, 4, 4 + 202, 72 - 701, 27 + 546, 23 4 @@ -2583,13 +2472,10 @@ Tahoma, 9.75pt - 260, 120 - - - 4, 4, 4, 4 + 202, 101 - 701, 27 + 546, 23 5 @@ -2607,13 +2493,10 @@ 19 - 923, 15 - - - 4, 4, 4, 4 + 718, 13 - 84, 28 + 65, 24 2 @@ -2637,13 +2520,10 @@ Tahoma, 9.75pt - 260, 297 - - - 4, 4, 4, 4 + 202, 250 - 301, 27 + 235, 23 19 @@ -2664,13 +2544,10 @@ Tahoma, 9.75pt - 712, 297 - - - 4, 4, 4, 4 + 554, 250 - 248, 27 + 194, 23 21 @@ -2691,13 +2568,10 @@ Tahoma, 9.75pt - 260, 334 - - - 4, 4, 4, 4 + 202, 281 - 301, 27 + 235, 23 23 @@ -2718,13 +2592,10 @@ Tahoma, 9.75pt - 711, 334 - - - 4, 4, 4, 4 + 553, 281 - 248, 27 + 194, 23 25 @@ -2760,13 +2631,10 @@ True - 1026, 15 - - - 4, 4, 4, 4 + 798, 13 - 199, 28 + 155, 24 28 @@ -2799,13 +2667,10 @@ Tahoma, 8.25pt - 968, 21 - - - 4, 0, 4, 0 + 753, 18 - 200, 17 + 157, 13 95 @@ -2835,13 +2700,10 @@ 2 - 890, 14 - - - 4, 4, 4, 4 + 692, 12 - 70, 27 + 55, 24 94 @@ -2865,13 +2727,10 @@ Tahoma, 9.75pt - 21, 160 - - - 4, 0, 4, 0 + 16, 135 - 80, 21 + 61, 16 93 @@ -2898,13 +2757,10 @@ Tahoma, 9.75pt - 260, 157 - - - 4, 4, 4, 4 + 202, 132 - 700, 27 + 545, 23 92 @@ -2931,13 +2787,10 @@ Tahoma, 9.75pt - 21, 89 - - - 4, 0, 4, 0 + 16, 75 - 115, 21 + 88, 16 91 @@ -2964,13 +2817,10 @@ NoControl - 969, 157 - - - 4, 4, 4, 4 + 754, 132 - 40, 27 + 31, 23 90 @@ -3000,13 +2850,10 @@ Tahoma, 9.75pt - 21, 124 - - - 4, 0, 4, 0 + 16, 104 - 58, 21 + 44, 16 89 @@ -3033,13 +2880,10 @@ Tahoma, 9.75pt - 19, 229 - - - 4, 0, 4, 0 + 15, 193 - 168, 21 + 129, 16 88 @@ -3066,13 +2910,10 @@ Tahoma, 9.75pt - 21, 265 - - - 4, 0, 4, 0 + 16, 223 - 119, 21 + 91, 16 87 @@ -3111,13 +2952,10 @@ AdHoc BlindFile Detail - 260, 50 - - - 4, 4, 4, 4 + 202, 42 - 442, 27 + 345, 24 3 @@ -3138,13 +2976,10 @@ Tahoma, 9.75pt - 260, 261 - - - 4, 4, 4, 4 + 202, 220 - 442, 27 + 345, 24 10 @@ -3165,13 +3000,10 @@ Tahoma, 9.75pt - 260, 226 - - - 4, 4, 4, 4 + 202, 190 - 442, 27 + 345, 24 9 @@ -3192,16 +3024,13 @@ Tahoma, 9.75pt, style=Bold - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1290, 501 + 1001, 426 0 @@ -3228,13 +3057,10 @@ Top, Bottom, Left, Right - 4, 27 - - - 4, 4, 4, 4 + 3, 23 - 1258, 445 + 979, 370 94 @@ -3258,13 +3084,10 @@ Segoe UI, 9.75pt, style=Italic - 4, 4 - - - 4, 0, 4, 0 + 3, 3 - 1264, 460 + 982, 379 75 @@ -3288,16 +3111,13 @@ Tahoma, 9pt - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1272, 468 + 988, 385 0 @@ -3324,13 +3144,10 @@ Segoe UI, 9pt - 12, 25 - - - 4, 4, 4, 4 + 9, 21 - 1107, 27 + 862, 23 0 @@ -3354,13 +3171,10 @@ NoControl - 1128, 25 - - - 4, 4, 4, 4 + 877, 21 - 37, 27 + 29, 23 72 @@ -3384,16 +3198,10 @@ Tahoma, 9.75pt - 12, 7 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 9, 6 - 1210, 68 + 941, 57 74 @@ -3417,13 +3225,10 @@ Tahoma, 9.75pt - 12, 171 - - - 4, 4, 4, 4 + 9, 144 - 334, 28 + 260, 24 11 @@ -3447,13 +3252,10 @@ Tahoma, 9.75pt - 12, 135 - - - 4, 4, 4, 4 + 9, 114 - 375, 28 + 292, 24 9 @@ -3474,13 +3276,10 @@ 2 - 12, 101 - - - 4, 4, 4, 4 + 9, 85 - 1124, 27 + 875, 23 1 @@ -3498,16 +3297,13 @@ 4 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1270, 467 + 989, 391 1 @@ -3534,13 +3330,10 @@ Tahoma, 9.75pt, style=Bold - 4, 4 - - - 4, 4, 4, 4 + 3, 3 - 1280, 500 + 996, 414 92 @@ -3558,16 +3351,13 @@ 0 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1288, 508 + 1002, 420 1 @@ -3588,13 +3378,10 @@ 1 - 4, 83 - - - 4, 4, 4, 4 + 3, 70 - 1298, 533 + 1009, 455 6 @@ -3615,13 +3402,10 @@ Tahoma, 9.75pt - 923, 48 - - - 4, 4, 4, 4 + 718, 40 - 306, 28 + 238, 24 3 @@ -3645,13 +3429,10 @@ Fill - 4, 4 - - - 4, 4, 4, 4 + 3, 3 - 1308, 620 + 1016, 528 28 @@ -3669,16 +3450,13 @@ 0 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1316, 628 + 1022, 534 0 @@ -3699,16 +3477,13 @@ 0 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1300, 597 + 1008, 492 0 @@ -3729,16 +3504,13 @@ 0 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1298, 595 + 1009, 501 1 @@ -3762,13 +3534,10 @@ Fill - 4, 4 - - - 4, 4, 4, 4 + 3, 3 - 1308, 629 + 1016, 521 1 @@ -3786,16 +3555,13 @@ 0 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1316, 637 + 1022, 527 1 @@ -3825,13 +3591,10 @@ NoControl - 1099, 62 - - - 4, 0, 4, 0 + 855, 52 - 51, 21 + 40, 16 38 @@ -3855,13 +3618,10 @@ NoControl - 1155, 192 - - - 4, 4, 4, 4 + 898, 162 - 37, 27 + 29, 23 37 @@ -3882,13 +3642,10 @@ NoControl - 1155, 156 - - - 4, 4, 4, 4 + 898, 131 - 37, 27 + 29, 23 36 @@ -3909,13 +3666,10 @@ NoControl - 1155, 121 - - - 4, 4, 4, 4 + 898, 102 - 37, 27 + 29, 23 35 @@ -3933,13 +3687,10 @@ 3 - 1155, 83 - - - 4, 4, 4, 4 + 898, 70 - 37, 27 + 29, 23 34 @@ -3957,13 +3708,10 @@ 4 - 1103, 192 - - - 4, 4, 4, 4 + 858, 162 - 44, 27 + 34, 23 33 @@ -3981,13 +3729,10 @@ 5 - 1103, 157 - - - 4, 4, 4, 4 + 858, 132 - 44, 27 + 34, 23 32 @@ -4005,13 +3750,10 @@ 6 - 1102, 121 - - - 4, 4, 4, 4 + 857, 102 - 44, 27 + 34, 23 31 @@ -4029,13 +3771,10 @@ 7 - 1103, 84 - - - 4, 4, 4, 4 + 858, 71 - 44, 27 + 34, 23 30 @@ -4053,13 +3792,10 @@ 8 - 823, 191 - - - 4, 4, 4, 4 + 640, 161 - 270, 27 + 211, 23 29 @@ -4083,13 +3819,10 @@ NoControl - 235, 191 - - - 4, 4, 4, 4 + 183, 161 - 80, 28 + 62, 24 28 @@ -4113,13 +3846,10 @@ 10 - 573, 192 - - - 4, 4, 4, 4 + 446, 162 - 241, 27 + 188, 23 27 @@ -4152,13 +3882,10 @@ Doughnut - 72, 191 - - - 4, 4, 4, 4 + 56, 161 - 154, 27 + 121, 24 26 @@ -4176,13 +3903,10 @@ 12 - 324, 192 - - - 4, 4, 4, 4 + 252, 162 - 241, 27 + 188, 23 25 @@ -4200,13 +3924,10 @@ 13 - 12, 192 - - - 4, 4, 4, 4 + 9, 162 - 52, 27 + 41, 23 24 @@ -4224,13 +3945,10 @@ 14 - 823, 156 - - - 4, 4, 4, 4 + 640, 131 - 270, 27 + 211, 23 23 @@ -4254,13 +3972,10 @@ NoControl - 235, 156 - - - 4, 4, 4, 4 + 183, 131 - 80, 28 + 62, 24 22 @@ -4284,13 +3999,10 @@ 16 - 573, 157 - - - 4, 4, 4, 4 + 446, 132 - 241, 27 + 188, 23 21 @@ -4323,13 +4035,10 @@ Doughnut - 72, 156 - - - 4, 4, 4, 4 + 56, 131 - 154, 27 + 121, 24 20 @@ -4347,13 +4056,10 @@ 18 - 324, 157 - - - 4, 4, 4, 4 + 252, 132 - 241, 27 + 188, 23 19 @@ -4371,13 +4077,10 @@ 19 - 12, 157 - - - 4, 4, 4, 4 + 9, 132 - 52, 27 + 41, 23 18 @@ -4395,13 +4098,10 @@ 20 - 823, 120 - - - 4, 4, 4, 4 + 640, 101 - 270, 27 + 211, 23 17 @@ -4425,13 +4125,10 @@ NoControl - 235, 120 - - - 4, 4, 4, 4 + 183, 101 - 80, 28 + 62, 24 16 @@ -4455,13 +4152,10 @@ 22 - 573, 121 - - - 4, 4, 4, 4 + 446, 102 - 241, 27 + 188, 23 15 @@ -4494,13 +4188,10 @@ Doughnut - 72, 120 - - - 4, 4, 4, 4 + 56, 101 - 154, 27 + 121, 24 14 @@ -4518,13 +4209,10 @@ 24 - 324, 121 - - - 4, 4, 4, 4 + 252, 102 - 241, 27 + 188, 23 13 @@ -4542,13 +4230,10 @@ 25 - 12, 121 - - - 4, 4, 4, 4 + 9, 102 - 52, 27 + 41, 23 12 @@ -4566,13 +4251,10 @@ 26 - 823, 84 - - - 4, 4, 4, 4 + 640, 71 - 270, 27 + 211, 23 11 @@ -4596,13 +4278,10 @@ NoControl - 819, 62 - - - 4, 0, 4, 0 + 637, 52 - 49, 21 + 37, 16 10 @@ -4626,13 +4305,10 @@ MiddleLeft - 235, 84 - - - 4, 4, 4, 4 + 183, 71 - 80, 28 + 62, 24 9 @@ -4656,13 +4332,10 @@ 29 - 573, 86 - - - 4, 4, 4, 4 + 446, 72 - 241, 27 + 188, 23 8 @@ -4686,13 +4359,10 @@ NoControl - 570, 63 - - - 4, 0, 4, 0 + 443, 53 - 111, 21 + 86, 16 7 @@ -4728,13 +4398,10 @@ Doughnut - 72, 84 - - - 4, 4, 4, 4 + 56, 71 - 154, 27 + 121, 24 6 @@ -4758,13 +4425,10 @@ NoControl - 72, 62 - - - 4, 0, 4, 0 + 56, 52 - 89, 21 + 69, 16 5 @@ -4785,13 +4449,10 @@ 33 - 324, 86 - - - 4, 4, 4, 4 + 252, 72 - 241, 27 + 188, 23 4 @@ -4815,13 +4476,10 @@ NoControl - 320, 63 - - - 4, 0, 4, 0 + 249, 53 - 143, 21 + 110, 16 3 @@ -4842,13 +4500,10 @@ 35 - 12, 86 - - - 4, 4, 4, 4 + 9, 72 - 52, 27 + 41, 23 2 @@ -4869,13 +4524,10 @@ True - 8, 62 - - - 4, 0, 4, 0 + 6, 52 - 34, 21 + 24, 16 1 @@ -4899,13 +4551,10 @@ True - 8, 23 - - - 4, 0, 4, 0 + 6, 19 - 383, 21 + 295, 16 0 @@ -4926,13 +4575,7 @@ 38 - 8, 106 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 6, 89 0, 0 @@ -4962,13 +4605,10 @@ Tahoma, 9.75pt, style=Bold, Italic - 152, 61 - - - 4, 0, 4, 0 + 118, 51 - 189, 21 + 139, 16 2 @@ -4995,13 +4635,10 @@ Tahoma, 9.75pt, style=Bold, Italic - 152, 42 - - - 4, 0, 4, 0 + 118, 35 - 386, 21 + 276, 16 1 @@ -5025,13 +4662,10 @@ True - 8, 23 - - - 4, 0, 4, 0 + 6, 19 - 336, 63 + 258, 48 0 @@ -5054,16 +4688,10 @@ Top Kreditoren: 2 - 8, 7 - - - 4, 4, 4, 4 - - - 4, 4, 4, 4 + 6, 6 - 1265, 91 + 984, 77 0 @@ -5084,16 +4712,13 @@ Top Kreditoren: 1 - 4, 28 - - - 4, 4, 4, 4 + 4, 25 - 4, 4, 4, 4 + 3, 3, 3, 3 - 1316, 637 + 1022, 527 2 @@ -5117,13 +4742,10 @@ Top Kreditoren: Fill - 355, 0 - - - 4, 4, 4, 4 + 276, 0 - 1324, 660 + 1030, 563 3 @@ -5143,18 +4765,12 @@ Top Kreditoren: Left - - 4, 4, 4, 4 - 0, 0 GridColumn5 - - 96 - Profil-Name @@ -5165,13 +4781,10 @@ Top Kreditoren: 0 - 166 - - - 4, 4, 4, 4 + 129 - 355, 660 + 276, 563 84 @@ -5210,13 +4823,10 @@ Top Kreditoren: Fill - 0, 194 - - - 4, 4, 4, 4 + 0, 158 - 1679, 660 + 1306, 563 4 @@ -5279,10 +4889,10 @@ Top Kreditoren: 91 - 9, 19 + 7, 16 - 1679, 882 + 1306, 743 Tahoma, 9.75pt @@ -5371,7 +4981,7 @@ Top Kreditoren: - 4, 5, 4, 5 + 3, 4, 3, 4 Profil-Verwaltung diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index acffdb2..ca05c4a 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -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 diff --git a/app/TaskFlow/frmCockpitConfig.vb b/app/TaskFlow/frmCockpitConfig.vb index a07c67c..581ab1e 100644 --- a/app/TaskFlow/frmCockpitConfig.vb +++ b/app/TaskFlow/frmCockpitConfig.vb @@ -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() diff --git a/app/TaskFlow/frmMain.Designer.vb b/app/TaskFlow/frmMain.Designer.vb index bf1164a..bcd95c2 100644 --- a/app/TaskFlow/frmMain.Designer.vb +++ b/app/TaskFlow/frmMain.Designer.vb @@ -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 diff --git a/app/TaskFlow/frmMain.en.resx b/app/TaskFlow/frmMain.en.resx index 86f2db6..5aeac35 100644 --- a/app/TaskFlow/frmMain.en.resx +++ b/app/TaskFlow/frmMain.en.resx @@ -117,6 +117,20 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + -1 + + + -1 + + + + + + + + Refresh view @@ -132,6 +146,9 @@ 1SSwVh//7Idal7KmPwAAAABJRU5ErkJggg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -147,6 +164,12 @@ EErzA//k8vrkws0EAAAAAElFTkSuQmCC + + -1 + + + + profiles and administration @@ -162,6 +185,9 @@ O+jGJTbU6ivEv8vL3QPJ34Ov/CfZcCD26DMX0AAAAABJRU5ErkJggg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -181,6 +207,12 @@ hhPFGVj5Vy6iZnAGBLlmx55OKQ3YLtW7iusQGPDIx0jw+hg/ANcjMp4jWSD2AAAAAElFTkSuQmCC + + -1 + + + + configuration @@ -194,6 +226,9 @@ CRDEyO89gPxlgu4b4DwDlDT0Cy3xOngTmebf7LDQAkwPYM4AAAAASUVORK5CYII= + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -208,6 +243,12 @@ AABJRU5ErkJggg== + + -1 + + + + user config @@ -222,6 +263,9 @@ TNYAAAAASUVORK5CYII= + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -236,6 +280,12 @@ 6OevT+mEBOxwXwgJdO1wH+h6Beomc1A3mYO6yRzUzTcKdExBDdX0MAAAAABJRU5ErkJggg== + + -1 + + + + About @@ -248,6 +298,9 @@ xaDaQoNBaqF7iN3XCF0PCbqf8mXy+TPlvPrOB0ynVNG/VjQvAAAAAElFTkSuQmCC + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -261,6 +314,51 @@ WH6h6cUkpdnVzLPc5bQlv7HyoLzqqqMwAAAAAElFTkSuQmCC + + -1 + + + + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + No Sync so far @@ -274,6 +372,9 @@ u2tEXQ/JQ35+ylXf/0w9egLh6HbzGZy0yQAAAABJRU5ErkJggg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -288,6 +389,12 @@ rkJggg== + + -1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -297,6 +404,9 @@ 0IexaWsAqRhDgFQMAFQmr891c2MAAAAAAElFTkSuQmCC + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -308,6 +418,21 @@ AABJRU5ErkJggg== + + -1 + + + + + + -1 + + + -1 + + + + metadata @@ -320,6 +445,9 @@ dVMAAAAASUVORK5CYII= + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -330,9 +458,30 @@ XwD2lt4zA8NC1PIUyAvKAAAAAElFTkSuQmCC + + -1 + + + + Sync in Progress + + -1 + + + -1 + + + + + + -1 + + + -1 + @@ -377,6 +526,9 @@ gg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABB0RVh0VGl0 @@ -428,9 +580,21 @@ GHf/DSjjlAkq11PRoaJGFaNjW55zzP8CvolKuDm1y9wAAAAASUVORK5CYII= + + -1 + + + + GhostMode active + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -470,6 +634,9 @@ NAAAAABJRU5ErkJggg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -487,9 +654,21 @@ NbGvswCwwU3n3fTGTX8SXDPGvVg/XoDV5D9CJeF2Ag9R6AAAAABJRU5ErkJggg== + + -1 + + + + Search + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -513,6 +692,12 @@ Search2 + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -533,6 +718,12 @@ LDI2LDI0LDI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -555,6 +746,21 @@ NSw0LDI3LDR6IE04LDhINlY2aDJWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + -1 + + + -1 + + + + + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -583,9 +789,24 @@ Show quick filters + + -1 + + + -1 + + + + Show quick filters + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -612,6 +833,12 @@ Column selection + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -632,6 +859,12 @@ Y2siIC8+DQogICAgPC9nPg0KICA8L2c+DQo8L3N2Zz4L + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -654,6 +887,12 @@ Save layout + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -676,6 +915,12 @@ Export Overview + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -744,6 +989,12 @@ Reset filters + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -767,6 +1018,12 @@ Column selection dialog + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -810,6 +1067,9 @@ EUWIMBHxIizmD3hg45eT+sNQAAAAAElFTkSuQmCC + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -858,6 +1118,12 @@ rkJggg== + + -1 + + + + Start profile @@ -880,6 +1146,9 @@ J6IZ/8F6LGyPfy9XvQekr1WaAAAAAElFTkSuQmCC + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACF0RVh0VGl0 @@ -922,9 +1191,21 @@ RK5CYII= + + -1 + + + + send object as link + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -956,6 +1237,12 @@ Start mass finish + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -992,6 +1279,12 @@ Show search + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1015,6 +1308,30 @@ Font Size + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1035,6 +1352,12 @@ DQogIDwvZz4NCjwvc3ZnPgs= + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1055,6 +1378,12 @@ DQogIDwvZz4NCjwvc3ZnPgs= + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1075,6 +1404,12 @@ DQogIDwvZz4NCjwvc3ZnPgs= + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1098,6 +1433,12 @@ Change language + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1135,6 +1476,12 @@ MC41VjExLjd6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1189,6 +1536,9 @@ 7FrH7n/Y40hP9iOZ4A/Okl4iTyU/vgAAAABJRU5ErkJggg== + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAA90RVh0VGl0 @@ -1228,6 +1578,12 @@ AAAAAElFTkSuQmCC + + -1 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAADp0RVh0VGl0 @@ -1245,6 +1601,9 @@ DirysDviWD4hZBtbTB/1L/ID+IKCaAHtjub11f4NwOQcQA+BjDAAAAAASUVORK5CYII= + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAADp0RVh0VGl0 @@ -1282,9 +1641,21 @@ yHsheegQSE69kDw7Xljgf8Vv4mCuwrW4A3kAAAAASUVORK5CYII= + + -1 + + + + Create log-files + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1302,9 +1673,24 @@ OCAyNCwyIDI0LDYgMTYsNiAgIiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + -1 + + + -1 + + + + Refresh Cockpit + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1329,6 +1715,12 @@ Hide empty workflows + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1351,6 +1743,12 @@ MnYxNGg2di0ySDE2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -1372,6 +1770,33 @@ b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2 Zz4L + + + + -1 + + + -1 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABEDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iU3RhdGlzdGljYWwiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg + MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7 + fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8 + cGF0aCBkPSJNNiwxM2MwLTEuNywxLjMtMywzLTNoMTNWNEgzQzIuNCw0LDIsMy42LDIsM2MwLTAuNiww + LjQtMSwxLTFoMTlWMWMwLTAuNi0wLjQtMS0xLTFIM0MxLjMsMCwwLDEuMywwLDN2MjAgIGMwLDEuNywx + LjMsMywzLDNoM1YxM3oiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEsMTJIOWMtMC41LDAt + MSwwLjUtMSwxdjE4YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWMTNDMzIsMTIuNSwz + MS41LDEyLDMxLDEyeiBNMzAsMzBIMTBWMTRoMjAgIFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBv + bHlnb24gcG9pbnRzPSIxMi43LDI3LjEgMTEuMywyNS43IDE3LDIwIDIwLDIzIDI1LDE4IDI4LjcsMjEu + NyAyNy4zLDIzLjEgMjUsMjAuOCAyMCwyNS44IDE3LDIyLjggIiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2 + Zz4L @@ -1398,6 +1823,12 @@ Actions + + + + + + @@ -1484,7 +1915,7 @@ 7g9duB90HMo+PKSE+c4Q6ouHIT5G+ijB3kZULi7PNViZZrtBlPPxZ5hhM7IpH21G9oebTGxElq0FH2yY Rfz+uh5CyGvzT6+l6AQ9eXTR66bebwltCc/CfE/Q225BD7IUrVlqtBSeebv9DSPp72MGtFSzAAAAAElF TkSuQmCCmAYAAIlQTkcNChoKAAAADUlIRFIAAAAYAAAAGAgGAAAA4Hc9+AAAAARnQU1BAACxjwv8YQUA - AAAJcEhZcwAADr8AAA6/ATgFUyQAAAY6SURBVEhLlVZ7TFNnFP90c1P3VOeyOA3Z/pjGTJNtWZZsxmXZ + AAAJcEhZcwAADr4AAA6+AepCscAAAAY6SURBVEhLlVZ7TFNnFP90c1P3VOeyOA3Z/pjGTJNtWZZsxmXZ I5mKj6n44CmMqQgTwflkMBWQTcZQC0oR5RFApTJwKM/CQCoPbWlLodhSSh/0/aCF0lYdv+W7thvLNNlO 8rv35t4vv9/5zjnfOZeQJ9s0Qsh0QsjThJBnCSGzCCGzfaDP9B39Rtf8L6PET+3Zkz4vK78+sKSyO+NG i5Rff0s+0sRT3G9ol9lvtkplV2r4FacLGnYnZZa9896aNVT0PwlNCwj4eOapnJrVFyu6a/m9WuuI0QnH @@ -1514,12 +1945,61 @@ AKYAsKWkAAAAAElFTkSuQmCCCw== + + + + + + + + + + + Default + + + Top, Left + + + + + + Tile + + + Inherit + + + 0, 0 + + + + Center + + + + + + None + + + + + + + + + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAATwBBQE8AQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAUQBBQFEAQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1560,38 +2040,50 @@ AR8B+AEfBAAE/wQACw== + + + + + + - 231, 26 + 194, 26 Start profile validation - 232, 30 + 195, 30 + + + - 297, 30 + 249, 30 Deactivate Popup reminder - 294, 6 + 246, 6 - 297, 30 + 249, 30 Bring to Front - 297, 30 + 249, 30 Out of Range - Restore Window - 298, 100 + 250, 100 + + + @@ -1759,6 +2251,15 @@ AAA= + + + + + + + + + AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAgCUAABMLAAATCwAAAAAAAAAA @@ -1925,6 +2426,9 @@ AAA= + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu @@ -1935,285 +2439,825 @@ none + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Stop Stop + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Document overview Document overview + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Thumbnail Thumbnail + + -1 + + + -1 + + + + Search Search + + -1 + + + -1 + + + + Formfield Highlight formfield + + -1 + + + -1 + + + + Customize Customize + + -1 + + + -1 + + + + Open Open a document + + -1 + + + -1 + + + + Save Saves the document + + -1 + + + -1 + + + + &Print… Print + + -1 + + + -1 + + + + &Print Print now + + -1 + + + -1 + + + + &Pagesettings… Pagesettings + + -1 + + + -1 + + + + Header and Footer Header and Footer + + -1 + + + -1 + + + + Scaling Scaling + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Magnifier Magnifier + + -1 + + + -1 + + + + Shrink Shrink + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Enlarge Enlarge + + -1 + + + -1 + + + + First Page First Page + + -1 + + + -1 + + + + Previous page Previous page + + -1 + + + -1 + + + + Next Page Next Page + + -1 + + + -1 + + + + Last page Last page + + -1 + + + -1 + + + + Multiple pages Multiple pages + + -1 + + + -1 + + + + &Color… Background + + -1 + + + -1 + + + + &Watermark… Watermark + + -1 + + + -1 + + + + Export document… Export document… + + -1 + + + -1 + + + + Send email… Send email… + + -1 + + + -1 + + + + &Exit Close print preview + + -1 + + + -1 + + + + &File + + -1 + + + -1 + + + + &View + + -1 + + + -1 + + + + &Page Layout + + -1 + + + -1 + + + + Single + + -1 + + + -1 + + + + Ongoing + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + &Background + + -1 + + + -1 + + + + PDF Document PDF Document + + -1 + + + -1 + + + + HTML Document HTML Document + + -1 + + + -1 + + + + MHT Document MHT Document + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Word 2007 Document Word 2007 Document + + -1 + + + -1 + + + + Excel Document Excel Document + + -1 + + + -1 + + + + Excel 2007 Document Excel 2007 Document + + -1 + + + -1 + + + + CSV Document CSV Document + + -1 + + + -1 + + + + Text Document Text Document + + -1 + + + -1 + + + + Graphic document Graphic document + + -1 + + + -1 + + + + PDF Document PDF Document + + -1 + + + -1 + + + + MHT Document MHT Document + + -1 + + + -1 + + + + + + -1 + + + -1 + + + + Word 2007 Document Word 2007 Document + + -1 + + + -1 + + + + Excel Document Excel Document + + -1 + + + -1 + + + + Excel 2007 Document Excel 2007 Document + + -1 + + + -1 + + + + CSV Document CSV Document + + -1 + + + -1 + + + + Text Document Text Document + + -1 + + + -1 + + + + Graphic document Graphic document + + -1 + + + -1 + + + + + + + PDF Files (*.pdf*)|*.pdf + + -1 + + + -1 + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -2253,6 +3297,9 @@ SRE9BPO4mQYHKdgf4L4N6v/gt/gCKxaXjHckb5sAAAAASUVORK5CYII= + + -1 + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m @@ -2269,4 +3316,10 @@ Nkh02WBdNC2ywaj5C1UrX/GNAlVkAAAAAElFTkSuQmCC + + -1 + + + + \ No newline at end of file diff --git a/app/TaskFlow/frmMain.fr.resx b/app/TaskFlow/frmMain.fr.resx index d7991f4..ee25cd9 100644 --- a/app/TaskFlow/frmMain.fr.resx +++ b/app/TaskFlow/frmMain.fr.resx @@ -1378,6 +1378,27 @@ b3ciIC8+DQogICAgPHBvbHlnb24gcG9pbnRzPSIxNCwxNiAxNCwxNCAxMCwxNCAxMCwxMCA4LDEwIDgs MjYgMTQsMjYgMTQsMjQgMTAsMjQgMTAsMTYgICIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2 Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABEDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iU3RhdGlzdGljYWwiIHN0eWxlPSJlbmFibGUtYmFja2dyb3VuZDpuZXcg + MCAwIDMyIDMyIj4NCiAgPHN0eWxlIHR5cGU9InRleHQvY3NzIj4KCS5HcmVlbntmaWxsOiMwMzlDMjM7 + fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8 + cGF0aCBkPSJNNiwxM2MwLTEuNywxLjMtMywzLTNoMTNWNEgzQzIuNCw0LDIsMy42LDIsM2MwLTAuNiww + LjQtMSwxLTFoMTlWMWMwLTAuNi0wLjQtMS0xLTFIM0MxLjMsMCwwLDEuMywwLDN2MjAgIGMwLDEuNywx + LjMsMywzLDNoM1YxM3oiIGNsYXNzPSJCbHVlIiAvPg0KICA8cGF0aCBkPSJNMzEsMTJIOWMtMC41LDAt + MSwwLjUtMSwxdjE4YzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWMTNDMzIsMTIuNSwz + MS41LDEyLDMxLDEyeiBNMzAsMzBIMTBWMTRoMjAgIFYzMHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgPHBv + bHlnb24gcG9pbnRzPSIxMi43LDI3LjEgMTEuMywyNS43IDE3LDIwIDIwLDIzIDI1LDE4IDI4LjcsMjEu + NyAyNy4zLDIzLjEgMjUsMjAuOCAyMCwyNS44IDE3LDIyLjggIiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2 + Zz4L @@ -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 @@ - 317, 26 + 261, 26 Démarre la validation pour le profil - 318, 30 + 262, 30 - 287, 30 + 241, 30 Désactiver le rappel popup - 284, 6 + 238, 6 - 287, 30 + 241, 30 Apporter au front - 287, 30 + 241, 30 Out of Range - Rétablir les PM - 288, 100 + 242, 100 diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index d52b21b..8ef0cea 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -1464,7 +1464,7 @@ Appservice Monitor - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl @@ -1513,7 +1513,7 @@ Funktionen - Workflow Tabelle + Skalierung Tabelle @@ -1728,7 +1728,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAagBDAGoAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAcABDAHAAQwBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -2564,6 +2564,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + bbtnitm_Appservice + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageStart @@ -3170,12 +3176,6 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - bbtnitm_Appservice - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index 3adc81c..2fe3277 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -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) diff --git a/app/TaskFlow/frmSplash.vb b/app/TaskFlow/frmSplash.vb index e73b6e7..d5d71b1 100644 --- a/app/TaskFlow/frmSplash.vb +++ b/app/TaskFlow/frmSplash.vb @@ -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