diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb index 42986d2e..b7e864b5 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb @@ -61,7 +61,15 @@ Public Class EnvelopeModel oEnvelope.DocResult = Nothing End If oEnvelope.User = UserModel.SelectUser(oEnvelope.UserId) - oEnvelope.EnvelopeReceivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) + + + oEnvelope.EnvelopeReceivers = New List(Of EnvelopeReceiver) + + For Each rcv In ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) + oEnvelope.EnvelopeReceivers.Add(rcv) + Next + + oEnvelope.Documents = DocumentModel.List(oEnvelope.Id) oEnvelope.Histories = HistoryModel.List(oEnvelope.Id) oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId) @@ -185,7 +193,7 @@ Public Class EnvelopeModel oSql += " [SEND_REMINDER_EMAILS] = @SEND_REMINDER_EMAILS, " oSql += " [USE_ACCESS_CODE] = @USE_ACCESS_CODE, " oSql += " [CHANGED_WHEN] = GETDATE(), " - oSql += " [TfaEnabled] = @TfaEnabled" + oSql += " [TFA_ENABLED] = @TfaEnabled" oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID" @@ -210,7 +218,7 @@ Public Class EnvelopeModel oCommand.Parameters.Add("REMINDER_INTERVAL_DAYS", SqlDbType.Int).Value = pEnvelope.ReminderIntervalDays oCommand.Parameters.Add("SEND_REMINDER_EMAILS", SqlDbType.Bit).Value = pEnvelope.SendReminderEmails oCommand.Parameters.Add("USE_ACCESS_CODE", SqlDbType.Bit).Value = pEnvelope.UseAccessCode - oCommand.Parameters.Add("TFA_ENABLED", SqlDbType.Bit).Value = pEnvelope.TfaEnabled + oCommand.Parameters.Add("TfaEnabled", SqlDbType.Bit).Value = pEnvelope.TfaEnabled Return Database.ExecuteNonQuery(oCommand, pTransaction) Catch ex As Exception diff --git a/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb index cb5b98df..2d2395c9 100644 --- a/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/ReceiverModel.vb @@ -23,6 +23,7 @@ Public Class ReceiverModel End If End If + Return New ReceiverVM() With { .Id = pRow.ItemEx("GUID", 0), .EmailAddress = pRow.ItemEx("EMAIL_ADDRESS", ""), @@ -162,15 +163,25 @@ Public Class ReceiverModel If pReceiversFromGrid.Count = 0 Then Return New List(Of Receiver) End If - + Dim oReceiverList As New List(Of ReceiverVM) Dim oAddresses = pReceiversFromGrid.Select(Function(r) $"'{r.EmailAddress}'").JoinToString(",") Dim oSql = $"SELECT * FROM [dbo].[TBSIG_RECEIVER] WHERE EMAIL_ADDRESS IN ({oAddresses})" Dim oTable = Database.GetDatatable(oSql) + 'Dim oIndex = 0 + 'For Each oRow As DataRow In oTable.Rows + ' ' oEnvelope.EnvelopeReceivers.Add(rcv) + ' Dim oReceiver As ReceiverVM = ToReceiver(oRow) + ' oReceiverList.Add(oReceiver) + ' oIndex += + 'Next - Return oTable?.Rows.Cast(Of DataRow). - Select(AddressOf ToReceiver). - ToList() + Dim rcvs = New List(Of Receiver) + For Each r_vm In pReceiversFromGrid + rcvs.Add(r_vm.Receiver) + Next + + Return rcvs Catch ex As Exception Logger.Error(ex) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 3b3fc32a..2ce08480 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -486,8 +486,8 @@ Partial Public Class frmEnvelopeEditor ' 'EnvelopeReceiverBindingSource ' - Me.EnvelopeReceiverBindingSource.DataMember = "EnvelopeReceivers" - Me.EnvelopeReceiverBindingSource.DataSource = GetType(EnvelopeGenerator.Form.frmEnvelopeEditor) + 'Me.EnvelopeReceiverBindingSource.DataMember = "EnvelopeReceivers" + 'Me.EnvelopeReceiverBindingSource.DataSource = GetType(EnvelopeGenerator.Form.frmEnvelopeEditor) ' 'ViewReceivers ' diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index 309eb075..43593faa 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -132,10 +132,10 @@ Public Class frmEnvelopeMainData Envelope.Language = cmbLanguage.EditValue Envelope.UseAccessCode = chkUseAccessCode.EditValue Envelope.SendReminderEmails = chkSendReminderEmails.EditValue - Envelope.FirstReminderDays = spnFirstReminderDays.EditValue - Envelope.ReminderIntervalDays = spnReminderIntervalDays.EditValue - Envelope.ExpiresWhenDays = spnExpiresDays.EditValue - Envelope.ExpiresWarningWhenDays = spnExpiresWarningDays.EditValue + Envelope.FirstReminderDays = CInt(spnFirstReminderDays.EditValue) + Envelope.ReminderIntervalDays = CInt(spnReminderIntervalDays.EditValue) + Envelope.ExpiresWhenDays = CInt(spnExpiresDays.EditValue) + Envelope.ExpiresWarningWhenDays = CInt(spnExpiresWarningDays.EditValue) Envelope.FinalEmailToCreator = cmbEmailToCreator.SelectedIndex Envelope.FinalEmailToReceivers = cmbEmailToReceivers.SelectedIndex Envelope.TfaEnabled = chked_2Faktor.EditValue diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index a848ca6d..612319d7 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -129,17 +129,17 @@ Public Class frmMain End Sub Private Sub btnCreateEnvelope_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCreateEnvelope.ItemClick - Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) - Try - Dim oForm As New frmEnvelopeEditor() With {.State = State} + 'Dim oHandle = SplashScreenManager.ShowOverlayForm(Me) + 'Try + Dim oForm As New frmEnvelopeEditor() With {.State = State} oForm.ShowDialog() LoadEnvelopeData() - Catch ex As Exception - Logger.Error(ex) - Finally - SplashScreenManager.CloseOverlayForm(oHandle) - End Try + ' Catch ex As Exception + 'Logger.Error(ex) + 'Finally + 'SplashScreenManager.CloseOverlayForm(oHandle) + 'End Try End Sub Private Sub btnEditEnvelope_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnEditEnvelope.ItemClick @@ -623,7 +623,7 @@ Public Class frmMain Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) Dim oController = New EnvelopeEditorController(State, oEnvelope) - Dim Documents As New BindingList(Of Document) + Dim Documents As New BindingList(Of Domain.Entities.Document) Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList()) For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then @@ -871,7 +871,7 @@ Public Class frmMain Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle) If oEnvelope.UseAccessCode = True Then Dim oController = New EnvelopeEditorController(State, oEnvelope) - Dim Documents As New BindingList(Of Document) + Dim Documents As New BindingList(Of Domain.Entities.Document) Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.EnvelopeReceivers.Select(Function(r) ReceiverVM.From(r)).ToList()) For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then diff --git a/EnvelopeGenerator.Service/App.config b/EnvelopeGenerator.Service/App.config index 3e53bd64..9f4a6566 100644 --- a/EnvelopeGenerator.Service/App.config +++ b/EnvelopeGenerator.Service/App.config @@ -5,7 +5,7 @@
- + @@ -62,4 +62,4 @@ - \ No newline at end of file + diff --git a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj index eae174ef..2df76490 100644 --- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj +++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj @@ -12,7 +12,7 @@ EnvelopeGenerator.Service 512 Console - v4.8 + v4.6.2 true @@ -55,19 +55,24 @@ ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll - ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll + False + ..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll + False + ..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll + False + ..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll + False + ..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + False + ..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -176,8 +181,8 @@ ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll - - ..\packages\Quartz.3.8.0\lib\net462\Quartz.dll + + ..\packages\Quartz.3.15.0\lib\net462\Quartz.dll ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll @@ -330,9 +335,6 @@ EnvelopeGenerator.Domain - - - diff --git a/EnvelopeGenerator.Service/My Project/Application.Designer.vb b/EnvelopeGenerator.Service/My Project/Application.Designer.vb index 88dd01c7..8ab460ba 100644 --- a/EnvelopeGenerator.Service/My Project/Application.Designer.vb +++ b/EnvelopeGenerator.Service/My Project/Application.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ diff --git a/EnvelopeGenerator.Service/My Project/Resources.Designer.vb b/EnvelopeGenerator.Service/My Project/Resources.Designer.vb index 6bdb5758..b08dad5c 100644 --- a/EnvelopeGenerator.Service/My Project/Resources.Designer.vb +++ b/EnvelopeGenerator.Service/My Project/Resources.Designer.vb @@ -1,10 +1,10 @@ '------------------------------------------------------------------------------ ' -' This code was generated by a tool. -' Runtime Version:4.0.30319.42000 +' Dieser Code wurde von einem Tool generiert. +' Laufzeitversion:4.0.30319.42000 ' -' Changes to this file may cause incorrect behavior and will be lost if -' the code is regenerated. +' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn +' der Code erneut generiert wird. ' '------------------------------------------------------------------------------ @@ -15,12 +15,12 @@ Imports System Namespace My.Resources - 'This class was auto-generated by the StronglyTypedResourceBuilder - 'class via a tool like ResGen or Visual Studio. - 'To add or remove a member, edit your .ResX file then rerun ResGen - 'with the /str option, or rebuild your VS project. + 'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert + '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. + 'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen + 'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. ''' - ''' A strongly-typed resource class, for looking up localized strings, etc. + ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - ''' Returns the cached ResourceManager instance used by this class. + ''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' _ Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager @@ -47,8 +47,8 @@ Namespace My.Resources End Property ''' - ''' Overrides the current thread's CurrentUICulture property for all - ''' resource lookups using this strongly typed resource class. + ''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle + ''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' _ Friend Property Culture() As Global.System.Globalization.CultureInfo diff --git a/EnvelopeGenerator.Service/My Project/Settings.Designer.vb b/EnvelopeGenerator.Service/My Project/Settings.Designer.vb index 372c6a03..85775795 100644 --- a/EnvelopeGenerator.Service/My Project/Settings.Designer.vb +++ b/EnvelopeGenerator.Service/My Project/Settings.Designer.vb @@ -15,7 +15,7 @@ Option Explicit On Namespace My _ Partial Friend NotInheritable Class MySettings Inherits Global.System.Configuration.ApplicationSettingsBase diff --git a/EnvelopeGenerator.Service/README.txt b/EnvelopeGenerator.Service/README.txt deleted file mode 100644 index 58cbced4..00000000 --- a/EnvelopeGenerator.Service/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -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/EnvelopeGenerator.Service/packages.config b/EnvelopeGenerator.Service/packages.config index 4c6a6449..35054cb4 100644 --- a/EnvelopeGenerator.Service/packages.config +++ b/EnvelopeGenerator.Service/packages.config @@ -1,11 +1,6 @@  - - - - - @@ -24,7 +19,7 @@ - + @@ -39,5 +34,5 @@ - + \ No newline at end of file