From 1b539bce132a83c919c532ebd896f0274f15094d Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 5 Feb 2025 08:09:10 +0100 Subject: [PATCH] MS Release FillIDNexe --- app/TaskFlow/ClassParamRefresh.vb | 3 +- app/TaskFlow/ModuleMySettings.vb | 1 + app/TaskFlow/My Project/AssemblyInfo.vb | 2 +- app/TaskFlow/TaskFlow.vbproj | 9 + app/TaskFlow/clsPatterns.vb | 5 +- app/TaskFlow/frmDashboard1.Designer.vb | 231 ++++++++++++++++++++++++ app/TaskFlow/frmDashboard1.resx | 126 +++++++++++++ app/TaskFlow/frmDashboard1.vb | 3 + app/TaskFlow/frmMain.resx | 4 +- app/TaskFlow/frmMain.vb | 9 +- app/TaskFlow/frmValidator.vb | 6 +- 11 files changed, 390 insertions(+), 9 deletions(-) create mode 100644 app/TaskFlow/frmDashboard1.Designer.vb create mode 100644 app/TaskFlow/frmDashboard1.resx create mode 100644 app/TaskFlow/frmDashboard1.vb diff --git a/app/TaskFlow/ClassParamRefresh.vb b/app/TaskFlow/ClassParamRefresh.vb index 8828a4e..454467f 100644 --- a/app/TaskFlow/ClassParamRefresh.vb +++ b/app/TaskFlow/ClassParamRefresh.vb @@ -230,7 +230,8 @@ Public Class ClassParamRefresh ElseIf oMode.StartsWith("PM.ButtonExport2Folder_RootFolder") Then Dim oAfterReplace = oMode.Replace("PM.ButtonExport2Folder_RootFolder=", "") ButtonExport2Folder_RootFolder = oAfterReplace - + ElseIf oMode = "MAINFORM_ALLOW_LOGFILES" Then + MAINFORM_CREATE_LOG_FILES = True Else LOGGER.Info($"Wrong oMode: {oMode}") End If diff --git a/app/TaskFlow/ModuleMySettings.vb b/app/TaskFlow/ModuleMySettings.vb index e8fc482..f0fbf36 100644 --- a/app/TaskFlow/ModuleMySettings.vb +++ b/app/TaskFlow/ModuleMySettings.vb @@ -24,4 +24,5 @@ Public Property WMSESSION_STARTSTOP_STARTUP As Boolean = False Public Property SYS_LOCKED_MAINTENANCE As Boolean = False + Public Property MAINFORM_CREATE_LOG_FILES As Boolean = False End Module diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index dd3161e..8e89faf 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/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index b78ef39..1311e55 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -372,6 +372,12 @@ Form + + frmDashboard1.vb + + + Form + frmDesignerLayout.vb @@ -628,6 +634,9 @@ frmColumn_Detail.vb + + frmDashboard1.vb + frmDesignerLayout.vb diff --git a/app/TaskFlow/clsPatterns.vb b/app/TaskFlow/clsPatterns.vb index 0b56458..285ee06 100644 --- a/app/TaskFlow/clsPatterns.vb +++ b/app/TaskFlow/clsPatterns.vb @@ -79,13 +79,16 @@ Public Class clsPatterns LOGGER.Debug($"input BEFORE replacing: [{result}]") result = ReplaceInternalValues(result) - result = ReplaceControlValues(result, panel, is_SQL) + If Not IsNothing(CURRENT_WMFILE) Then result = ReplaceWindreamIndicies(result, CURRENT_WMFILE, is_SQL) End If If IDB_ACTIVE = True Then result = ReplaceIDBAttributes(result, is_SQL) End If + 'vorher hinter result = ReplaceInternalValues(result) + result = ReplaceControlValues(result, panel, is_SQL) + If Not IsNothing(result) Then result = ReplaceUserValues(result) LOGGER.Debug($"input AFTER replacing: [{result}]") diff --git a/app/TaskFlow/frmDashboard1.Designer.vb b/app/TaskFlow/frmDashboard1.Designer.vb new file mode 100644 index 0000000..e1daead --- /dev/null +++ b/app/TaskFlow/frmDashboard1.Designer.vb @@ -0,0 +1,231 @@ + _ +Partial Class frmDashboard1 + Inherits DevExpress.XtraEditors.XtraForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim TileItemElement1 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement2 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Dim TileItemElement3 As DevExpress.XtraEditors.TileItemElement = New DevExpress.XtraEditors.TileItemElement() + Me.TileBar1 = New DevExpress.XtraBars.Navigation.TileBar() + Me.TileBarGroup2 = New DevExpress.XtraBars.Navigation.TileBarGroup() + Me.TileBarItem1 = New DevExpress.XtraBars.Navigation.TileBarItem() + Me.TileBarItem2 = New DevExpress.XtraBars.Navigation.TileBarItem() + Me.TileBarGroup3 = New DevExpress.XtraBars.Navigation.TileBarGroup() + Me.TileBarItem3 = New DevExpress.XtraBars.Navigation.TileBarItem() + Me.NavigationPane1 = New DevExpress.XtraBars.Navigation.NavigationPane() + Me.NavigationPage1 = New DevExpress.XtraBars.Navigation.NavigationPage() + Me.NavigationPage2 = New DevExpress.XtraBars.Navigation.NavigationPage() + Me.RadialMenu1 = New DevExpress.XtraBars.Ribbon.RadialMenu(Me.components) + Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.NavigationPane1.SuspendLayout() + CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'TileBar1 + ' + Me.TileBar1.Dock = System.Windows.Forms.DockStyle.Top + Me.TileBar1.DropDownOptions.BeakColor = System.Drawing.Color.Empty + Me.TileBar1.Groups.Add(Me.TileBarGroup2) + Me.TileBar1.Groups.Add(Me.TileBarGroup3) + Me.TileBar1.Location = New System.Drawing.Point(0, 0) + Me.TileBar1.MaxId = 3 + Me.TileBar1.Name = "TileBar1" + Me.TileBar1.ScrollMode = DevExpress.XtraEditors.TileControlScrollMode.ScrollButtons + Me.TileBar1.Size = New System.Drawing.Size(796, 133) + Me.TileBar1.TabIndex = 0 + Me.TileBar1.Text = "TileBar1" + ' + 'TileBarGroup2 + ' + Me.TileBarGroup2.Items.Add(Me.TileBarItem1) + Me.TileBarGroup2.Items.Add(Me.TileBarItem2) + Me.TileBarGroup2.Name = "TileBarGroup2" + Me.TileBarGroup2.Text = "Gruppe 1" + ' + 'TileBarItem1 + ' + Me.TileBarItem1.DropDownOptions.BeakColor = System.Drawing.Color.Empty + TileItemElement1.Text = "TileBarItem1" + Me.TileBarItem1.Elements.Add(TileItemElement1) + Me.TileBarItem1.Id = 0 + Me.TileBarItem1.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium + Me.TileBarItem1.Name = "TileBarItem1" + ' + 'TileBarItem2 + ' + Me.TileBarItem2.DropDownOptions.BeakColor = System.Drawing.Color.Empty + TileItemElement2.Text = "TileBarItem2" + Me.TileBarItem2.Elements.Add(TileItemElement2) + Me.TileBarItem2.Id = 1 + Me.TileBarItem2.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Wide + Me.TileBarItem2.Name = "TileBarItem2" + ' + 'TileBarGroup3 + ' + Me.TileBarGroup3.Items.Add(Me.TileBarItem3) + Me.TileBarGroup3.Name = "TileBarGroup3" + Me.TileBarGroup3.Text = "Gruppe 2" + ' + 'TileBarItem3 + ' + Me.TileBarItem3.AppearanceItem.Normal.BackColor = System.Drawing.Color.DarkTurquoise + Me.TileBarItem3.AppearanceItem.Normal.Options.UseBackColor = True + Me.TileBarItem3.DropDownOptions.BeakColor = System.Drawing.Color.Empty + TileItemElement3.Text = "TileBarItem3" + Me.TileBarItem3.Elements.Add(TileItemElement3) + Me.TileBarItem3.Id = 2 + Me.TileBarItem3.ItemSize = DevExpress.XtraBars.Navigation.TileBarItemSize.Medium + Me.TileBarItem3.Name = "TileBarItem3" + ' + 'NavigationPane1 + ' + Me.NavigationPane1.Controls.Add(Me.NavigationPage1) + Me.NavigationPane1.Controls.Add(Me.NavigationPage2) + Me.NavigationPane1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.NavigationPane1.Location = New System.Drawing.Point(0, 343) + Me.NavigationPane1.Name = "NavigationPane1" + Me.NavigationPane1.Pages.AddRange(New DevExpress.XtraBars.Navigation.NavigationPageBase() {Me.NavigationPage1, Me.NavigationPage2}) + Me.NavigationPane1.RegularSize = New System.Drawing.Size(796, 150) + Me.NavigationPane1.SelectedPage = Me.NavigationPage1 + Me.NavigationPane1.Size = New System.Drawing.Size(796, 150) + Me.NavigationPane1.TabIndex = 1 + Me.NavigationPane1.Text = "NavigationPane1" + ' + 'NavigationPage1 + ' + Me.NavigationPage1.Caption = "NavigationPage1" + Me.NavigationPage1.Name = "NavigationPage1" + Me.NavigationPage1.Size = New System.Drawing.Size(660, 77) + ' + 'NavigationPage2 + ' + Me.NavigationPage2.Caption = "NavigationPage2" + Me.NavigationPage2.Name = "NavigationPage2" + Me.NavigationPage2.PageText = "sdsdsd" + Me.NavigationPage2.Size = New System.Drawing.Size(660, 77) + ' + 'RadialMenu1 + ' + Me.RadialMenu1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem2)}) + Me.RadialMenu1.Manager = Me.BarManager1 + Me.RadialMenu1.Name = "RadialMenu1" + ' + 'BarManager1 + ' + Me.BarManager1.DockControls.Add(Me.barDockControlTop) + Me.BarManager1.DockControls.Add(Me.barDockControlBottom) + Me.BarManager1.DockControls.Add(Me.barDockControlLeft) + Me.BarManager1.DockControls.Add(Me.barDockControlRight) + Me.BarManager1.Form = Me + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarButtonItem1, Me.BarButtonItem2}) + Me.BarManager1.MaxItemId = 2 + ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top + Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) + Me.barDockControlTop.Manager = Me.BarManager1 + Me.barDockControlTop.Size = New System.Drawing.Size(796, 0) + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 493) + Me.barDockControlBottom.Manager = Me.BarManager1 + Me.barDockControlBottom.Size = New System.Drawing.Size(796, 0) + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 0) + Me.barDockControlLeft.Manager = Me.BarManager1 + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 493) + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right + Me.barDockControlRight.Location = New System.Drawing.Point(796, 0) + Me.barDockControlRight.Manager = Me.BarManager1 + Me.barDockControlRight.Size = New System.Drawing.Size(0, 493) + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "BarButtonItem1" + Me.BarButtonItem1.Id = 0 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "BarButtonItem2" + Me.BarButtonItem2.Id = 1 + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'frmDashboard1 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(796, 493) + Me.Controls.Add(Me.NavigationPane1) + Me.Controls.Add(Me.TileBar1) + Me.Controls.Add(Me.barDockControlLeft) + Me.Controls.Add(Me.barDockControlRight) + Me.Controls.Add(Me.barDockControlBottom) + Me.Controls.Add(Me.barDockControlTop) + Me.Name = "frmDashboard1" + Me.Text = "frmDashboard1" + CType(Me.NavigationPane1, System.ComponentModel.ISupportInitialize).EndInit() + Me.NavigationPane1.ResumeLayout(False) + CType(Me.RadialMenu1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents TileBar1 As DevExpress.XtraBars.Navigation.TileBar + Friend WithEvents TileBarGroup2 As DevExpress.XtraBars.Navigation.TileBarGroup + Friend WithEvents TileBarItem1 As DevExpress.XtraBars.Navigation.TileBarItem + Friend WithEvents TileBarItem2 As DevExpress.XtraBars.Navigation.TileBarItem + Friend WithEvents TileBarGroup3 As DevExpress.XtraBars.Navigation.TileBarGroup + Friend WithEvents TileBarItem3 As DevExpress.XtraBars.Navigation.TileBarItem + Friend WithEvents NavigationPane1 As DevExpress.XtraBars.Navigation.NavigationPane + Friend WithEvents NavigationPage1 As DevExpress.XtraBars.Navigation.NavigationPage + Friend WithEvents NavigationPage2 As DevExpress.XtraBars.Navigation.NavigationPage + Friend WithEvents RadialMenu1 As DevExpress.XtraBars.Ribbon.RadialMenu + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager + Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl +End Class diff --git a/app/TaskFlow/frmDashboard1.resx b/app/TaskFlow/frmDashboard1.resx new file mode 100644 index 0000000..81ea7c9 --- /dev/null +++ b/app/TaskFlow/frmDashboard1.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 140, 17 + + \ No newline at end of file diff --git a/app/TaskFlow/frmDashboard1.vb b/app/TaskFlow/frmDashboard1.vb new file mode 100644 index 0000000..0f426c5 --- /dev/null +++ b/app/TaskFlow/frmDashboard1.vb @@ -0,0 +1,3 @@ +Public Class frmDashboard1 + +End Class \ No newline at end of file diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 3a2b4cd..a3aa3bf 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAAQgBCwEIAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAARABCwEQAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -1278,7 +1278,7 @@ Sprache ändern - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index a3decc6..9919d9b 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -478,6 +478,9 @@ Public Class frmMain Else RibbonPageGroupBasicConf.Visible = True End If + If MAINFORM_CREATE_LOG_FILES = True Then + barbtnitmsaveLogfiles.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + End If If EXCEL_OVERVIEW = True Then BarButtonItemExportExcel.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else @@ -1939,7 +1942,7 @@ Public Class frmMain End If If oSQLOverview.ToString.Contains("GROUP_TEXT") = False Then LOGGER.Info($"SQL SO FAR: {oSQLOverview} ") - FormHelper.ShowInfoMessage("Incomplete Overview-Source (No Group-Columns). Please reload manually!", omsgTitleWarning) + FormHelper.ShowInfoMessage("Incomplete Overview-Source (No Group-Columns). Column", omsgTitleWarning) NO_WORKFLOWITEMS = True GridControlWorkflows.Visible = False @@ -2452,6 +2455,10 @@ FROM VWPM_PROFILE_ACTIVE T WHERE T.GUID IN (SELECT PROFILE_ID FROM [dbo].[FNPM_G oStopWatch.Done() End Sub Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown + If USER_USERNAME = "SchreiberM" Then + frmDashboard1.Show() + End If ' + If RIBBON_COLOR_SCHEME <> "" Then Me.LookAndFeel.UseDefaultLookAndFeel = False If RIBBON_COLOR_SCHEME = "Blue".ToUpper Then diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 5ef28f1..27b5053 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -690,7 +690,7 @@ Public Class frmValidator Dim name As String = row.Item("NAME") Dim oGUID As String = row.Item("GUID") Dim oReadOnly As Boolean = row.Item("READ_ONLY") - + Logger.Debug($"LoadSQLData for Control [{name}] with GUID [{oGUID}] ...") 'If clsPatterns.HasComplexPatterns(row.Item("SQL_UEBERPRUEFUNG")) Then ' Logger.Debug($"SQL [{row.Item("SQL_UEBERPRUEFUNG")}] has complex patterns - GUID: {oGUID}") ' Continue For @@ -2674,12 +2674,12 @@ Public Class frmValidator End If End If - 'FillIndexValues(first) + FillIndexValues(first) For Each oControl As Control In PanelValidatorControl.Controls LoadSQLData(oControl, DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid) Next - FillIndexValues(first) + Logger.Debug("Indexmask loaded") 'Nun loggen das das Profil geladen wurde