diff --git a/app/TaskFlow/App.config b/app/TaskFlow/App.config index 317fb5a..fef9ba9 100644 --- a/app/TaskFlow/App.config +++ b/app/TaskFlow/App.config @@ -8,6 +8,8 @@
+ +
@@ -29,31 +31,40 @@ Custom/Digital Data - + + - + + - + + - + + - + + - + + - + + - + + - + + @@ -146,7 +157,7 @@ - + @@ -172,6 +183,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + \ No newline at end of file diff --git a/app/TaskFlow/ClassControlCreator.vb b/app/TaskFlow/ClassControlCreator.vb index f43c87f..d7a498c 100644 --- a/app/TaskFlow/ClassControlCreator.vb +++ b/app/TaskFlow/ClassControlCreator.vb @@ -512,7 +512,7 @@ Public Class ClassControlCreator oView.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CellSelect oView.OptionsSelection.MultiSelect = True oView.OptionsClipboard.CopyColumnHeaders = DefaultBoolean.False - + 'oView.OptionsView.ColumnAutoWidth = True If oView.OptionsBehavior.ReadOnly = False Then If row.Item("VKT_ADD_ITEM") = True Then oView.OptionsBehavior.AllowAddRows = DefaultBoolean.True diff --git a/app/TaskFlow/ClassInit.vb b/app/TaskFlow/ClassInit.vb index 2089c87..52d60ad 100644 --- a/app/TaskFlow/ClassInit.vb +++ b/app/TaskFlow/ClassInit.vb @@ -208,6 +208,7 @@ Public Class ClassInit ' We initialize the Class in anycase. ' If there is no client, it will fall back to the db by itself DatabaseFallback = New DatabaseWithFallback(LOGCONFIG, _Client, Database_ECM, Database_IDB) + If dbECMInitialized = True And CONNECTION_STRING_IDB = String.Empty Then Return True ElseIf dbECMInitialized = True And CONNECTION_STRING_IDB <> String.Empty Then @@ -501,7 +502,6 @@ Public Class ClassInit BASEDATA_DT_GUI_LANGUAGE_PHRASES = DatabaseFallback.GetDatatable("TBDD_GUI_LANGUAGE_PHRASE", New GetDatatableOptions(oSql, DatabaseType.ECM)) oStep = "TBPM_PROFILE_SEARCH" oSql = "select * from TBPM_PROFILE_SEARCH where TYPE = 'DOC' AND ACTIVE = 1 ORDER BY PROFILE_ID,TAB_INDEX" - 'BASEDATA_DT_PROFILES_SEARCHES_DOC = DataASorDB.GetDatatable("DD_ECM", oSql, "TBPM_PROFILE_SEARCH", "TYPE = 'DOC'", "PROFILE_ID,TAB_INDEX") BASEDATA_DT_PROFILES_SEARCHES_DOC = DatabaseFallback.GetDatatable("TBPM_PROFILE_SEARCH", New GetDatatableOptions(oSql, DatabaseType.ECM) With { .FilterExpression = "TYPE = 'DOC'", .SortByColumn = "PROFILE_ID,TAB_INDEX" diff --git a/app/TaskFlow/ClassSQLEditor.vb b/app/TaskFlow/ClassSQLEditor.vb index b7c1ed6..b62a97e 100644 --- a/app/TaskFlow/ClassSQLEditor.vb +++ b/app/TaskFlow/ClassSQLEditor.vb @@ -29,13 +29,21 @@ Public Class ClassSQLEditor oForm.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST. ToDictionary(Function(name) name, Function(name) name) + If IDB_ACTIVE = False Then + oForm.ATTRIBUTE_STORE = "WM" + oForm.PlaceholdersWindream = MVSource_AllIndicies + Else + oForm.ATTRIBUTE_STORE = "IDB" + End If If oService.ShowDialog(oForm) = DialogResult.OK Then Dim sql As New SQLValue(oForm.SQLCommand) ', oForm.SQLConnection ' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection ' CURRENT_CONN_ID = oForm.SQLConnection value = sql End If + End Using + End If Return value diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll new file mode 100644 index 0000000..2ad8950 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll new file mode 100644 index 0000000..387246a Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.ML.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll new file mode 100644 index 0000000..b9ba4a3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll new file mode 100644 index 0000000..8f60b41 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.Imaging.Rendering.Skia.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll new file mode 100644 index 0000000..a96a316 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll new file mode 100644 index 0000000..6d24c8b Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.1d.reader.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll new file mode 100644 index 0000000..2287de5 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll new file mode 100644 index 0000000..4984254 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.barcode.2d.reader.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.filters.64.dll b/app/TaskFlow/GdPicture.NET.14.filters.64.dll new file mode 100644 index 0000000..0f3e367 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.filters.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.filters.dll b/app/TaskFlow/GdPicture.NET.14.filters.dll new file mode 100644 index 0000000..938c3f3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.filters.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll new file mode 100644 index 0000000..80b0cf9 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll new file mode 100644 index 0000000..88eeff8 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.image.gdimgplug.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll b/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll new file mode 100644 index 0000000..af684ac Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.machine.vision.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.machine.vision.dll b/app/TaskFlow/GdPicture.NET.14.machine.vision.dll new file mode 100644 index 0000000..da04adb Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.machine.vision.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll b/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll new file mode 100644 index 0000000..045fdd3 Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.twain.client.64.dll differ diff --git a/app/TaskFlow/GdPicture.NET.14.twain.client.dll b/app/TaskFlow/GdPicture.NET.14.twain.client.dll new file mode 100644 index 0000000..51d630b Binary files /dev/null and b/app/TaskFlow/GdPicture.NET.14.twain.client.dll differ diff --git a/app/TaskFlow/ModuleRuntimeVariables.vb b/app/TaskFlow/ModuleRuntimeVariables.vb index 7db4ba6..66cad3a 100644 --- a/app/TaskFlow/ModuleRuntimeVariables.vb +++ b/app/TaskFlow/ModuleRuntimeVariables.vb @@ -181,4 +181,6 @@ Module ModuleRuntimeVariables Public LIC_MODULES As String = "NONE" Public oSQLLoginAttempt As String + + Public MVSource_AllIndicies As List(Of String) End Module diff --git a/app/TaskFlow/My Project/AssemblyInfo.vb b/app/TaskFlow/My Project/AssemblyInfo.vb index 4055fbe..2be1fb8 100644 --- a/app/TaskFlow/My Project/AssemblyInfo.vb +++ b/app/TaskFlow/My Project/AssemblyInfo.vb @@ -14,7 +14,7 @@ Imports System.Runtime.InteropServices - + diff --git a/app/TaskFlow/README.txt b/app/TaskFlow/README.txt new file mode 100644 index 0000000..58cbced --- /dev/null +++ b/app/TaskFlow/README.txt @@ -0,0 +1,5 @@ +BASE MODULE +=========== + +This module is intended for often used constants and datastructures. +Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/app/TaskFlow/TaskFlow.vbproj b/app/TaskFlow/TaskFlow.vbproj index 8270885..3493f1f 100644 --- a/app/TaskFlow/TaskFlow.vbproj +++ b/app/TaskFlow/TaskFlow.vbproj @@ -1,5 +1,6 @@  + Debug x86 @@ -148,9 +149,8 @@ False - - False - ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\packages\DigitalData.Controls.DocumentViewer.1.9.8\lib\net462\DigitalData.Controls.DocumentViewer.dll ..\..\..\..\2_DLL Projekte\DDMonorepo\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll @@ -158,27 +158,26 @@ ..\..\..\DDMonorepo\Controls.SnapPanel\bin\Debug\DigitalData.Controls.SnapPanel.dll - - False - ..\..\..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + + ..\packages\DigitalData.GUIs.Common.2.6.2\lib\net462\DigitalData.GUIs.Common.dll - - ..\..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + + ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll ..\..\..\..\2_DLL Projekte\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll + + ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + + + ..\packages\DigitalData.Modules.Filesystem.1.3.3\lib\net462\DigitalData.Modules.Filesystem.dll ..\..\..\..\2_DLL Projekte\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll @@ -190,12 +189,18 @@ ..\..\..\..\2_DLL Projekte\DDModules\License\bin\Debug\DigitalData.Modules.License.dll - - False - ..\..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll - - ..\..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + False + ..\..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + + ..\packages\DigitalData.Modules.Patterns.1.3.1\lib\net462\DigitalData.Modules.Patterns.dll + + + ..\packages\DigitalData.Modules.Windows.1.5.1\lib\net462\DigitalData.Modules.Windows.dll ..\..\..\..\2_DLL Projekte\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll @@ -212,68 +217,84 @@ ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll + + + ..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll + + + ..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll + + + ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll + P:\Visual Studio Projekte\Bibliotheken\FormsUtils.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll - - ..\packages\GdPicture.14.3.1\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll + + + ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + True P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll @@ -291,6 +312,9 @@ P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll True + + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Limilabs\Mail.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -298,8 +322,11 @@ ..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll - - ..\packages\GdPicture.14.3.1\lib\net462\Microsoft.Win32.Registry.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -320,14 +347,17 @@ P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll - ..\packages\protobuf-net.3.2.45\lib\net462\protobuf-net.dll + ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll - ..\packages\protobuf-net.Core.3.2.45\lib\net462\protobuf-net.Core.dll + ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll @@ -342,6 +372,9 @@ + + ..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll + @@ -351,6 +384,7 @@ ..\packages\System.Formats.Asn1.9.0.0\lib\net462\System.Formats.Asn1.dll + ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll @@ -378,9 +412,6 @@ ..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll - - ..\packages\GdPicture.14.3.1\lib\net462\System.Security.Principal.Windows.dll - ..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll @@ -1161,6 +1192,22 @@ + + + + + + + + + + + + + + + + PreserveNewest @@ -1188,6 +1235,7 @@ + @@ -1260,13 +1308,16 @@ - + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + + + +