From 70c9bbe11aa22bed8d869cf707287f147a3f3b46 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Thu, 18 Jun 2026 12:57:02 +0200 Subject: [PATCH] GDPicture Update. GridControl.vb Conenction_ID auf 1 --- app/TaskFlow/App.config | 24 +-- app/TaskFlow/ControlCreator/GridControl.vb | 7 +- app/TaskFlow/TaskFlow.vbproj | 185 ++++++++++----------- app/TaskFlow/packages.config | 39 ++--- 4 files changed, 131 insertions(+), 124 deletions(-) diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index c7b0bd5..6167992 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -124,19 +124,19 @@ - + - + - + - + @@ -152,15 +152,15 @@ - + - + - + @@ -176,7 +176,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -196,7 +196,11 @@ - + + + + + diff --git a/app/TaskFlow/ControlCreator/GridControl.vb b/app/TaskFlow/ControlCreator/GridControl.vb index 59ff8fc..8c2ef1e 100644 --- a/app/TaskFlow/ControlCreator/GridControl.vb +++ b/app/TaskFlow/ControlCreator/GridControl.vb @@ -256,7 +256,7 @@ Namespace ControlCreator Public Function FillGridTables(pColumnTable As DataTable, pControlId As Integer, pControlName As String) As Dictionary(Of Integer, Dictionary(Of String, RepositoryItem)) For Each oRow As DataRow In pColumnTable.Rows ' Fetch and cache Combobox results - Dim oConnectionId As Integer = oRow.ItemEx("CONNECTION_ID", 0) + Dim oConnectionId As Integer = oRow.ItemEx("CONNECTION_ID", 1) Dim oSqlCommand As String = oRow.ItemEx("SQL_COMMAND", "") If oSqlCommand <> "" Then @@ -292,7 +292,10 @@ Namespace ControlCreator _Logger.Warn("⚠️ Could not load data for column {0} in control {1}", oRow.Item("SPALTENNAME"), pControlName) _Logger.Error(ex) End Try + Else + _Logger.Debug("No SQL_COMMAND for Column[{0}] – skipping.", oRow.Item("SPALTENNAME")) End If + Next Return _GridTables @@ -665,7 +668,7 @@ Namespace ControlCreator _FormulaColumnNames.Add(oColName) _Logger.Debug("[ConfigureViewEvents] Column [{0}] registered as FORMULA_EXPRESSION column.", oColName) ElseIf oSql_FORMULA <> String.Empty Then - Dim oConnectionId As Integer = r.ItemEx("CONNECTION_ID", 0) + Dim oConnectionId As Integer = r.ItemEx("CONNECTION_ID", 1) _FormulaSqlColumns(oColName) = New FormulaSqlDefinition() With { .SqlTemplate = oSql_FORMULA, .ReferencedColumns = GetReferencedSqlColumnNames(oSql_FORMULA), diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 93a2702..a2b82c5 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -227,84 +227,71 @@ M:\Bibliotheken\3rdParty\FormsUtils.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.Markdown.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll - True + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.RTF.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.4.4\lib\net462\GdPicture.NET.14.wia.gateway.dll True @@ -329,11 +316,14 @@ M:\Bibliotheken\3rdParty\Limilabs\Mail.dll - - ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.AsyncInterfaces.10.0.5\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll - - ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll + + ..\packages\Microsoft.Bcl.Cryptography.10.0.5\lib\net462\Microsoft.Bcl.Cryptography.dll + + + ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll @@ -342,6 +332,15 @@ ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Exceptions.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Settings.dll + + + ..\packages\GdPicture.14.4.4\lib\net462\NativeSDK.Settings.Edition.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -351,8 +350,8 @@ ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll + + ..\packages\OpenMcdf.3.1.4\lib\netstandard2.0\OpenMcdf.dll ..\packages\Oracle.ManagedDataAccess.21.15.0\lib\net462\Oracle.ManagedDataAccess.dll @@ -367,14 +366,14 @@ ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll - - ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll ..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll - - ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.10.0.5\lib\net462\System.Collections.Immutable.dll @@ -389,53 +388,53 @@ - - ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll + + ..\packages\System.Formats.Asn1.10.0.5\lib\net462\System.Formats.Asn1.dll - - ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.10.0.5\lib\net462\System.IO.Packaging.dll - - ..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll + + ..\packages\System.IO.Pipelines.10.0.5\lib\net462\System.IO.Pipelines.dll - - ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll - - ..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll + + ..\packages\System.Security.Cryptography.Pkcs.10.0.5\lib\net462\System.Security.Cryptography.Pkcs.dll - - ..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll + + ..\packages\System.Text.Encodings.Web.10.0.5\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.10.0.5\lib\net462\System.Text.Json.dll - - ..\packages\System.Threading.Channels.8.0.0\lib\net462\System.Threading.Channels.dll + + ..\packages\System.Threading.Channels.10.0.5\lib\net462\System.Threading.Channels.dll - - ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + ..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll - - ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + + ..\packages\System.ValueTuple.4.6.1\lib\net462\System.ValueTuple.dll @@ -1366,10 +1365,10 @@ - + - +