diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 52330804..6c91d499 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -161,26 +161,6 @@ NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM - MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 - YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu - MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x - LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= @@ -243,6 +223,26 @@ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM + MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 + YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu + MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x + LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index f46f1241..3b46b062 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -78,21 +78,17 @@ - - False - ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll + + ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - False - ..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -164,9 +160,15 @@ ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll True + + ..\packages\IndexRange.1.0.3\lib\net45\IndexRange.dll + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -177,8 +179,8 @@ ..\packages\NLog.5.0.5\lib\net46\NLog.dll - - ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll + + ..\packages\OpenMcdf.3.0.0\lib\netstandard2.0\OpenMcdf.dll diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index da0d0fe9..36fdccbd 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config index a99c4105..9ac55089 100644 --- a/Controls.DocumentViewer/packages.config +++ b/Controls.DocumentViewer/packages.config @@ -5,14 +5,16 @@ + + - + diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 3c468bb3..400e317f 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index 60e143c4..f89699ec 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -50,6 +50,7 @@ Partial Class frmLookupGrid ' Me.viewLookup.GridControl = Me.gridLookup Me.viewLookup.Name = "viewLookup" + Me.viewLookup.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False] Me.viewLookup.OptionsView.ShowGroupPanel = False ' 'Panel1 diff --git a/Services.EmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj index 03b284fd..9ff7f922 100644 --- a/Services.EmailService/DDEmailService.vbproj +++ b/Services.EmailService/DDEmailService.vbproj @@ -49,26 +49,22 @@ - ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll + + ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Encryption.dll + + ..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll + + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - - False - ..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + + ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb index d839b7df..70e657b6 100644 --- a/Services.EmailService/EmailService.vb +++ b/Services.EmailService/EmailService.vb @@ -119,6 +119,7 @@ Public Class EmailService If _AnyDatabaseInitialized Then _Logger.Info("Starting Initial Run...") + _ConfigManager.Save() _EmailQueue.RunWorkerAsync() End If Catch ex As Exception @@ -275,10 +276,10 @@ Public Class EmailService End Try End Function - Private Function SendEmailFrom(Database As DatabaseType, MSSQLInstance As MSSQLServer) + Private Function SendEmailFrom(pDatabase As DatabaseType, pMSSQLInstance As MSSQLServer) Try Dim oSQL As String = String.Empty - Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(Database, MSSQLInstance) + Dim oEmailAccounts As List(Of EmailAccount) = GetAccounts(pDatabase, pMSSQLInstance) Dim oEmailQueue As DataTable = Nothing If IsNothing(oEmailAccounts) Then @@ -291,7 +292,7 @@ Public Class EmailService Return False End If - Select Case Database + Select Case pDatabase Case DatabaseType.Firebird oSQL = "SELECT * FROM TBEDM_EMAIL_QUEUE WHERE EMAIL_SENT IS NULL and EMAIL_TO <> ''" oEmailQueue = _Firebird.GetDatatable(oSQL) @@ -300,10 +301,10 @@ Public Class EmailService _Logger.Debug("My.Settings.MSSQL_SELECT will be used..") oSQL = My.Settings.MSSQL_SELECT Else - oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> ''" + oSQL = "SELECT * FROM TBEMLP_EMAIL_OUT WHERE EMAIL_SENT IS NULL and EMAIL_ADRESS <> '' ORDER BY GUID" End If - oEmailQueue = MSSQLInstance.GetDatatable(oSQL) + oEmailQueue = pMSSQLInstance.GetDatatable(oSQL) End Select If IsNothing(oEmailQueue) Then @@ -326,7 +327,7 @@ Public Class EmailService Dim oAccountQueue As DataRow() - Select Case Database + Select Case pDatabase Case DatabaseType.Firebird oAccountQueue = oEmailQueue.Select($"EMAIL_ACCOUNT_ID = {oAccount.Guid}", "GUID ASC") Case Else @@ -339,7 +340,7 @@ Public Class EmailService Continue For End If - _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count) + _Logger.Info("Preparing to send [{0}] mails for Email-Account [{1}]", oAccountQueue.Count, oAccount.Guid) ' ======= Initialize Sender ======= @@ -356,7 +357,7 @@ Public Class EmailService Dim oResult As Mail.MailSession.SessionInfo = _MailSender.Connect(oAccount.Server, oAccount.Port, oAccount.Username, oAccount.Password, oAccount.AuthType, oOptions) If oResult.Connected = False Then - _Logger.Warn("Could not connect to server. Skipping.") + _Logger.Warn("Could not connect to server! (Method: Mail.MailSession.SessionInfo) # Skipping...") Continue For End If @@ -379,7 +380,7 @@ Public Class EmailService Dim ATT1_RELATED_ID = String.Empty Dim ATT1_REL_TYPE = String.Empty - Select Case Database + Select Case pDatabase Case DatabaseType.Firebird oGuid = oRow.Item("GUID") @@ -421,7 +422,7 @@ Public Class EmailService If ATT1_RELATED_ID <> String.Empty And ATT1_REL_TYPE <> String.Empty Then _Logger.Info($"Attachment via byte/ID [{ATT1_RELATED_ID}]...") If ATT1_REL_TYPE = "EnvelopeResult" Then - GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, MSSQLInstance) + GetEnvelope_Result_FileStreamByte(ATT1_RELATED_ID, pMSSQLInstance) End If If IsNothing(_AttachmentByteData) = False Then Dim oTempFolder = _TempFiles.TempPath @@ -455,13 +456,13 @@ Public Class EmailService oTotalSent.Add(oEmailTo) oSuccessfulSent.Add(oEmailTo) - Select Case Database + Select Case pDatabase Case DatabaseType.Firebird oSQL = GetFirebirdUpdateString(oComment, oGuid) _Firebird.ExecuteNonQuery(oSQL) Case DatabaseType.MSSQL oSQL = GetSQLUpdateString(oComment, oGuid) - MSSQLInstance.ExecuteNonQuery(oSQL) + pMSSQLInstance.ExecuteNonQuery(oSQL) End Select _Logger.Info($"EmailID [{oGuid.ToString}] has been send to: {oEmailTo}") @@ -469,7 +470,7 @@ Public Class EmailService oTotalSent.Add(oEmailTo) oFailedSent.Add(oEmailTo) - Select Case Database + Select Case pDatabase Case DatabaseType.MSSQL Dim oErrorMessage As String If String.IsNullOrEmpty(_limilab.ErrorMessage) = False Then @@ -478,7 +479,7 @@ Public Class EmailService oErrorMessage = $"Could not sent email to email adress. Check log!" End If oSQL = $"UPDATE TBEMLP_EMAIL_OUT SET EMAIL_SENT = GETDATE(), ERROR_TIMESTAMP = GETDATE(), ERROR_MSG = '{oErrorMessage}' WHERE GUID = {oGuid} " - MSSQLInstance.ExecuteNonQuery(oSQL) + pMSSQLInstance.ExecuteNonQuery(oSQL) End Select End If diff --git a/Services.EmailService/My Project/AssemblyInfo.vb b/Services.EmailService/My Project/AssemblyInfo.vb index 09977d54..0ec3e34e 100644 --- a/Services.EmailService/My Project/AssemblyInfo.vb +++ b/Services.EmailService/My Project/AssemblyInfo.vb @@ -32,4 +32,4 @@ Imports System.Runtime.InteropServices ' - +