From 0cca734cd09595170ad5eb56b65926ca490cf1c1 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Thu, 15 May 2025 17:03:36 +0200 Subject: [PATCH] Support Link wird aus der DB geholt und ist nicht mehr hardcoded - frmKonfig --- .vs/VSWorkspaceState.json | 2 +- app/TaskFlow/App.config | 88 ++++++++++++++++++------------------ app/TaskFlow/TaskFlow.vbproj | 60 +++++++++++++++++++++--- app/TaskFlow/frmKonfig.resx | 20 ++++---- app/TaskFlow/frmKonfig.vb | 25 ++++++++-- app/TaskFlow/frmMain.resx | 2 +- app/TaskFlow/frmMain.vb | 87 +++++++++++++++++++++++++++++------ 7 files changed, 203 insertions(+), 81 deletions(-) diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json index 5ddea5d..309a9ec 100644 --- a/.vs/VSWorkspaceState.json +++ b/.vs/VSWorkspaceState.json @@ -2,6 +2,6 @@ "ExpandedNodes": [ "" ], - "SelectedNode": "\\.gitignore", + "SelectedNode": "\\TaskFlow.sln", "PreviewInSolutionExplorer": false } \ No newline at end of file diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 317fb5a..cbcfbd9 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -1,12 +1,12 @@ - + -
-
+
+
-
+
@@ -60,28 +60,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + @@ -90,10 +90,10 @@ - + - + @@ -141,36 +141,36 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index d9feacc..195597b 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -156,7 +156,7 @@ ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll - ..\..\..\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll + ..\..\..\..\2_DLL Projekte\DDMonoRepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll False @@ -183,9 +183,8 @@ ..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll ..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll @@ -749,21 +748,27 @@ frmAdminPasswort.vb + Designer frmAdmin_notResponsibleConfig.vb + Designer frmAdmin_rejectionConfig.vb + Designer frmAnnotations.vb + Designer frmClientLogin.vb + Designer frmClientLogin.vb + Designer frmConnection.vb @@ -771,30 +776,39 @@ frmColumn_Detail.vb + Designer frmDashboard1.vb + Designer frmDesignerLayout.vb + Designer frmDatasourceEditor.vb + Designer frmStaticListEditor.vb + Designer frmError.vb + Designer frmError.vb + Designer frmError.vb + Designer frmFileInfo.vb + Designer frmFormDesigner.vb @@ -802,6 +816,7 @@ frmGhostMode.vb + Designer frmGhostMode.vb @@ -809,21 +824,27 @@ frmInvDashboard.vb + Designer frmLicense.vb + Designer frmLoginAdmin.vb + Designer frmMain.vb + Designer frmMain.vb + Designer frmMassValidator.vb + Designer frmAdministration.vb @@ -831,45 +852,58 @@ frmKonfig.vb + Designer frmKonfig.vb + Designer frmKonfig.vb + Designer frmMetadataFile.vb + Designer frmMonitor.vb frmPreviewHtml.vb + Designer frmRegexEditor.vb + Designer frmRejectionCommit.vb + Designer frmRejectionCommit.vb + Designer frmRejectionCommit.vb + Designer frmSplash.vb + Designer frmSQL_Admin.vb + Designer frmSQL_Admin.vb + Designer frmSQL_Admin.vb + Designer frmMain.vb @@ -889,9 +923,11 @@ frmValidatorSearch.vb + Designer frmValidatorSearch.vb + Designer frmValidatorSearch.vb @@ -899,18 +935,23 @@ frmValidator_Messages.vb + Designer frmWorkflow.vb + Designer frmYesNo.vb + Designer frmYesNo.vb + Designer frmYesNo.vb + Designer @@ -929,16 +970,23 @@ My.Resources ResXFileCodeGenerator frmMain_Strings.Designer.vb + Designer + + + Designer + + + Designer - - My.Resources ResXFileCodeGenerator frmValidator_Strings.Designer.vb + Designer XtraReport1.vb + Designer diff --git a/app/TaskFlow/frmKonfig.resx b/app/TaskFlow/frmKonfig.resx index 810184f..2f254d4 100644 --- a/app/TaskFlow/frmKonfig.resx +++ b/app/TaskFlow/frmKonfig.resx @@ -442,7 +442,7 @@ 8, 156 - 744, 25 + 624, 25 33 @@ -487,7 +487,7 @@ 3, 3, 3, 3 - 832, 318 + 712, 318 1 @@ -508,7 +508,7 @@ 0 - 119, 108 + 236, 162 120, 25 @@ -693,7 +693,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG + vAAADrwBlbxySQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG h/1NomAOS0+RPuLfRcjMlFJ/BUNJMJQEQ0kwlARDSTCUBEMy9vR9v9PUJ243B0My5ujyweHE7eZgSPhB pVye5ypJEo/93O3mYEj44cNcNHyz2arb9f7mJwu4b0j4cJv9dAE7bMjXC+gv1rbAkl5gaQss6QXmfPBY 0RZ4/vZHKsiyzBsU0h7aqAuUVFBVlTcopCjKqAssqKDrOm9QyHq1jrcAHV1wpZI0Tb1hIefTxTxjLWCu @@ -758,7 +758,7 @@ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG + vAAADrwBlbxySQAAAR5JREFUWEfF1LENwjAQBVBGYRSULdIhGCBDgFImI1CmIxukIjVNGmAIoElrfBZG h/1NomAOS0+RPuLfRcjMlFJ/BUNJMJQEQ0kwlARDSTCUBEMy9vR9v9PUJ243B0My5ujyweHE7eZgSPhB pVye5ypJEo/93O3mYEj44cNcNHyz2arb9f7mJwu4b0j4cJv9dAE7bMjXC+gv1rbAkl5gaQss6QXmfPBY 0RZ4/vZHKsiyzBsU0h7aqAuUVFBVlTcopCjKqAssqKDrOm9QyHq1jrcAHV1wpZI0Tb1hIefTxTxjLWCu @@ -851,7 +851,7 @@ 3, 3, 3, 3 - 832, 318 + 712, 318 2 @@ -905,7 +905,7 @@ 3, 3 - 826, 312 + 706, 312 0 @@ -929,7 +929,7 @@ 3, 3, 3, 3 - 832, 318 + 712, 318 3 @@ -956,7 +956,7 @@ 0, 0 - 840, 348 + 720, 348 21 @@ -998,7 +998,7 @@ 7, 17 - 840, 348 + 720, 348 Segoe UI, 9.75pt diff --git a/app/TaskFlow/frmKonfig.vb b/app/TaskFlow/frmKonfig.vb index 4196678..902cce1 100644 --- a/app/TaskFlow/frmKonfig.vb +++ b/app/TaskFlow/frmKonfig.vb @@ -168,10 +168,27 @@ Public Class frmKonfig End Function Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked - ' Specify that the link was visited. - Me.LinkLabel1.LinkVisited = True - ' Navigate to a URL. - System.Diagnostics.Process.Start("http://www.didalog.de/Support") + Try + Me.LinkLabel1.LinkVisited = True + + Using connection As New SqlClient.SqlConnection(CONNECTION_STRING_ECM) + connection.Open() + + Dim oSql As String = "SELECT CAT_STRING FROM TBDD_CATALOG WHERE CAT_TITLE = 'DDSUPPORT_PORTAL'" + Dim oCmd As New SqlClient.SqlCommand(oSql, connection) + Dim oSupportLinkObj As Object = oCmd.ExecuteScalar + Dim oSupportLink As String = If(oSupportLinkObj IsNot Nothing, oSupportLinkObj.ToString, "") + + If Not String.IsNullOrEmpty(oSupportLink) Then + Process.Start(oSupportLink) + Else + MsgBox("Support-Link nicht gefunden.", MsgBoxStyle.Information) + End If + + End Using + Catch ex As Exception + MsgBox("Fehler beim Öffnen des Support-Links: " & ex.Message, MsgBoxStyle.Critical) + End Try End Sub Private Sub Button3_Click(sender As Object, e As EventArgs) Handles btnOpenAppDataFolder.Click diff --git a/app/TaskFlow/frmMain.resx b/app/TaskFlow/frmMain.resx index 6779dcf..49414b9 100644 --- a/app/TaskFlow/frmMain.resx +++ b/app/TaskFlow/frmMain.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw - CAAAAk1TRnQBSQFMAgEBAgEAARgBCwEYAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAASABCwEgAQsBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/app/TaskFlow/frmMain.vb b/app/TaskFlow/frmMain.vb index b788e78..4aae7d9 100644 --- a/app/TaskFlow/frmMain.vb +++ b/app/TaskFlow/frmMain.vb @@ -18,6 +18,7 @@ Imports DevExpress.XtraBars.Ribbon Imports DigitalData.Modules.ZooFlow Imports DevExpress.LookAndFeel Imports DigitalData.Modules.Base +Imports DevExpress.XtraGrid.Views.Base Public Class frmMain Private Property FormHelper As FormHelper @@ -753,13 +754,13 @@ Public Class frmMain Try oReducedColName = LAST_EDITED_COLUMN.Replace("[", "") oReducedColName = oReducedColName.Replace("]", "") - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime + 'GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" Catch ex As Exception Try If oReducedColName <> "Zuletzt bearbeitet" Then - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime + 'GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" End If Catch ex1 As Exception LOGGER.Warn($"(ResetLayout)Column [{oReducedColName}] or [Zuletzt bearbeitet] not part of OverviewSQL") @@ -1145,12 +1146,12 @@ Public Class frmMain Try Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "") oReducedColName = oReducedColName.Replace("]", "") - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime + 'GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" Catch ex As Exception Try - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime + 'GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" Catch ex1 As Exception LOGGER.Warn("(CreateBasicView)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL") End Try @@ -2117,13 +2118,13 @@ Public Class frmMain Try Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "") oReducedColName = oReducedColName.Replace("]", "") - If Not IsNothing(GridViewWorkflows.Columns(oReducedColName)) Then - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" - ElseIf Not IsNothing(GridViewWorkflows.Columns("Zuletzt bearbeitet")) Then - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime - GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" - End If + 'If Not IsNothing(GridViewWorkflows.Columns(oReducedColName)) Then + ' GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime + ' GridViewWorkflows.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'ElseIf Not IsNothing(GridViewWorkflows.Columns("Zuletzt bearbeitet")) Then + ' GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime + ' GridViewWorkflows.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + 'End If Catch ex As Exception LOGGER.Warn("(Warning LoadGridOverview)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL") @@ -2155,6 +2156,62 @@ Public Class frmMain End Try End If RestoreLayout() + + + 'Dim oSQl = "SELECT * FROM TBDD_COLUMNS_FORMAT where MODULE = 'taskFLOW'" + 'Dim DTColumsFormat As DataTable = DatabaseFallback.GetDatatable("TBDD_COLUMNS_FORMAT", New GetDatatableOptions(oSQl, DatabaseType.ECM)) + + 'For Each oColumn As Columns.GridColumn In GridViewWorkflows.Columns + ' For Each oRow As DataRow In DTColumsFormat.Rows + + ' Dim oColumnName = oColumn.FieldName + ' If oColumnName = oRow.Item("COLUMN_TITLE").ToString Then + + ' Dim oFormat = oRow.Item("TYPE2FORMAT").ToString + ' If oFormat = "DateTime" Then + + ' If DT_CURR_WF_ITEMS.Columns.Contains(oColumnName) Then + ' Dim oColumnType = DT_CURR_WF_ITEMS.Columns(oColumnName).DataType + ' If oColumnType IsNot GetType(DateTime) Then + ' Continue For + ' End If + ' End If + + ' If oColumn.DisplayFormat.FormatType <> FormatType.DateTime Then + ' oColumn.DisplayFormat.FormatType = FormatType.DateTime + ' oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss" + ' End If + + ' End If + ' End If + ' Next + 'Next + + + 'For Each oColumn As Columns.GridColumn In GridViewWorkflows.Columns + + ' If DT_CURR_WF_ITEMS.Columns.Contains(oColumn.FieldName) Then + ' Dim dtColumn As DataColumn = DT_CURR_WF_ITEMS.Columns(oColumn.FieldName) + + ' If dtColumn.DataType Is GetType(String) Then + ' For Each row As DataRow In DT_CURR_WF_ITEMS.Rows + ' Dim cellValue = row(oColumn.FieldName).ToString() + ' Dim dateValue As DateTime + + ' If DateTime.TryParse(cellValue, dateValue) Then + ' row(oColumn.FieldName) = dateValue + ' End If + ' Next + + ' dtColumn.DataType = GetType(DateTime) + + ' oColumn.DisplayFormat.FormatType = FormatType.DateTime + ' oColumn.DisplayFormat.FormatString = "dd.MM.yyyy HH:mm:ss" + ' End If + ' End If + 'Next + + oStopWatch.Done() Catch ex As Exception LOGGER.Error(ex)