From 3e3c9d4c54f81c341cb5d653bc4331ab1a3d06ad Mon Sep 17 00:00:00 2001 From: TekH Date: Mon, 1 Sep 2025 13:00:03 +0200 Subject: [PATCH] Refactor Receiver to ReceiverVM in EnvelopeEditor and Main Updated the `oReceiver` variable type from `Receiver` to `ReceiverVM` in the `frmEnvelopeEditor` and `frmMain` classes to align with a view model pattern. Modified the `Controller.DeleteReceiver` method to use `oReceiver.Receiver`, reflecting the new structure. Additionally, created `BindingList` of `ReceiverVM` to support a more MVVM architecture. --- EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 4 ++-- EnvelopeGenerator.Form/frmMain.vb | 14 ++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 3c1da526..c43eb7e0 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -366,7 +366,7 @@ Partial Public Class frmEnvelopeEditor Exit Sub End If - Dim oReceiver As Receiver = ViewReceivers.GetFocusedRow() + Dim oReceiver As ReceiverVM = ViewReceivers.GetFocusedRow() If oReceiver Is Nothing Then Exit Sub @@ -381,7 +381,7 @@ Partial Public Class frmEnvelopeEditor Exit Sub End If - If Controller.DeleteReceiver(oReceiver) Then + If Controller.DeleteReceiver(oReceiver.Receiver) Then Receivers.Remove(oReceiver) Else MsgBox(Resources.Envelope.Recipient_could_not_be_deleted, MsgBoxStyle.Critical, Text) diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index cd9507d0..a481481b 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -331,7 +331,7 @@ Public Class frmMain End If Dim oView As GridView = DirectCast(sender, GridView) - Dim oReceiver As Receiver = oView.GetRow(e.RowHandle) + Dim oReceiver As ReceiverVM = oView.GetRow(e.RowHandle) If (oReceiver Is Nothing) Then Exit Sub @@ -365,7 +365,7 @@ Public Class frmMain End If Dim oView As GridView = DirectCast(sender, GridView) - Dim oReceiver As Receiver = oView.GetRow(e.RowHandle) + Dim oReceiver As ReceiverVM = oView.GetRow(e.RowHandle) If (oReceiver Is Nothing) Then Exit Sub @@ -624,9 +624,8 @@ Public Class frmMain Dim oController = New EnvelopeEditorController(State, oEnvelope) Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers As New BindingList(Of Receiver) - Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers) - For Each oReceiver As Receiver In Receivers + Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()) + For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.EmailAddress) @@ -873,9 +872,8 @@ Public Class frmMain If oEnvelope.UseAccessCode = True Then Dim oController = New EnvelopeEditorController(State, oEnvelope) Dim Documents As New BindingList(Of EnvelopeDocument) - Dim Receivers As New BindingList(Of Receiver) - Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers) - For Each oReceiver As Receiver In Receivers + Dim Receivers = New BindingList(Of ReceiverVM)(oController.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()) + For Each oReceiver As ReceiverVM In Receivers If oReceiver.EmailAddress = selReceiver.EmailAddress Then If oController.ActionService.ManuallySendAccessCode(oEnvelope, oReceiver) = True Then Dim oMsg = Resources.Envelope.AccessCode_successfully_send.Replace("@Mail", oReceiver.EmailAddress)