ReceiverVM Vereinheitlichung

2025-09-16 08:05:50 +02:00 · 2025-09-16 08:05:50 +02:00 · 3ac61e75f5
commit 3ac61e75f5
parent 991943d6bd
12 changed files with 76 additions and 65 deletions
--- 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
--- 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)
--- 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
        '
--- 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
--- 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
--- a/EnvelopeGenerator.Service/App.config
+++ b/EnvelopeGenerator.Service/App.config
@ -5,7 +5,7 @@
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
  </configSections>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
  </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@ -62,4 +62,4 @@
    </providers>
    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
  </entityFramework>
-</configuration>
+</configuration>
--- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
+++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
@ -12,7 +12,7 @@
    <AssemblyName>EnvelopeGenerator.Service</AssemblyName>
    <FileAlignment>512</FileAlignment>
    <MyType>Console</MyType>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <TargetFrameworkProfile />
    <NuGetPackageImportStamp>
@ -55,19 +55,24 @@
      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
@ -176,8 +181,8 @@
    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Quartz, Version=3.8.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
-      <HintPath>..\packages\Quartz.3.8.0\lib\net462\Quartz.dll</HintPath>
+    <Reference Include="Quartz, Version=3.15.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Quartz.3.15.0\lib\net462\Quartz.dll</HintPath>
    </Reference>
    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
@ -330,9 +335,6 @@
      <Name>EnvelopeGenerator.Domain</Name>
    </ProjectReference>
  </ItemGroup>
-  <ItemGroup>
-    <Content Include="README.txt" />
-  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     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.
 ' </auto-generated>
 '------------------------------------------------------------------------------

--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     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.
 ' </auto-generated>
 '------------------------------------------------------------------------------

@ -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.
    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
+    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
    '''</summary>
    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@ -33,7 +33,7 @@ Namespace My.Resources
        Private resourceCulture As Global.System.Globalization.CultureInfo
        
        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
+        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@ -47,8 +47,8 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  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.
        '''</summary>
        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
        Friend Property Culture() As Global.System.Globalization.CultureInfo
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.14.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
--- a/EnvelopeGenerator.Service/README.txt
+++ b/EnvelopeGenerator.Service/README.txt
@ -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!!
--- a/EnvelopeGenerator.Service/packages.config
+++ b/EnvelopeGenerator.Service/packages.config
@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net48" />
-  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net48" />
-  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net48" />
-  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net48" />
-  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net48" />
-  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net48" />
  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net48" />
  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net48" />
  <package id="EntityFramework" version="6.4.4" targetFramework="net48" />
@ -24,7 +19,7 @@
  <package id="OpenMcdf" version="2.4.1" targetFramework="net48" />
  <package id="protobuf-net" version="3.2.46" targetFramework="net48" />
  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net48" />
-  <package id="Quartz" version="3.8.0" targetFramework="net462" />
+  <package id="Quartz" version="3.15.0" targetFramework="net462" />
  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net48" />
  <package id="System.Buffers" version="4.6.0" targetFramework="net48" />
  <package id="System.CodeDom" version="8.0.0" targetFramework="net48" />
@ -39,5 +34,5 @@
  <package id="System.Text.Encodings.Web" version="8.0.0" targetFramework="net48" />
  <package id="System.Text.Json" version="8.0.5" targetFramework="net48" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net48" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net48" requireReinstallation="true" />
 </packages>