AppStd/EnvelopeGenerator
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor receiver handling and update solution structure

Browse Source 
- Updated `BaseController.vb` to use `Receiver.Id` for deletion.
- Changed `Receivers` property in `frmEnvelopeEditor.vb` to `BindingList(Of ReceiverVM)` and adjusted initialization and usage throughout the file.
- Modified `frmFieldEditor.vb` to use `List(Of ReceiverVM)` for receivers and updated related methods.
- Adjusted color assignment logic in `frmMain.vb` to utilize a new `Value` class.
- Added new project for `EnvelopeGenerator.Form` in the solution file.
- Introduced new enums `ContractType` and `PageOrientation` in their respective files.
This commit is contained in:
tekh
2025-09-01 12:55:15 +02:00
parent 7a84726a3b
commit 33fa4b76f5
7 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EnvelopeGenerator.Form/Controllers/BaseController.vb
View File

@@ -76,7 +76,7 @@ Public MustInherit Class BaseController
End If
Dim oResult2 = pEnvelope.Receivers.
Select(Function(r) ReceiverModel.Delete(r.Id, pEnvelope.Id, oTransaction)).
Select(Function(r) ReceiverModel.Delete(r.Receiver.Id, pEnvelope.Id, oTransaction)).
All(Function(r) r = True)
If oResult2 = False Then

10
EnvelopeGenerator.Form/frmEnvelopeEditor.vb
View File

@@ -18,7 +18,7 @@ Imports EnvelopeGenerator.Domain.Entities
Partial Public Class frmEnvelopeEditor
Public Property Envelope As Envelope
Public Property Documents As New BindingList(Of EnvelopeDocument)
Public Property Receivers As New BindingList(Of Receiver)
Public Property Receivers As New BindingList(Of ReceiverVM)
Private AllReceiverEmails As New List(Of String)
@@ -105,7 +105,7 @@ Partial Public Class frmEnvelopeEditor
Else
Controller = New EnvelopeEditorController(State, Envelope)
Documents = New BindingList(Of EnvelopeDocument)(Controller.Envelope.Documents)
Receivers = New BindingList(Of Receiver)(Controller.Envelope.Receivers)
Receivers = New BindingList(Of ReceiverVM)(Controller.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList())
For Each docItem As EnvelopeDocument In Documents
If Not File.Exists(docItem.Filepath) Then
@@ -233,7 +233,7 @@ Partial Public Class frmEnvelopeEditor
.Document = Controller.Envelope.Documents.
Where(Function(d) d.Filename = oDocument.Filename).
SingleOrDefault(),
.Receivers = Controller.Envelope.Receivers.ToList
.Receivers = Controller.Envelope.Receivers.Select(Function(r) ReceiverVM.From(r)).ToList()
}
oForm.ShowDialog()
@@ -335,7 +335,7 @@ Partial Public Class frmEnvelopeEditor
If Controller.SaveReceivers(oEnvelope, Receivers.ToList) = False Then
If Controller.SaveReceivers(oEnvelope, Receivers.Select(Function(vm) vm.Receiver).ToList()) = False Then
MsgBox(Resources.Envelope.Error_when_saving_the_recipients, MsgBoxStyle.Critical, Text)
Return False
End If
@@ -459,7 +459,7 @@ Partial Public Class frmEnvelopeEditor
End Sub
Private Sub ViewReceivers_InitNewRow(sender As Object, e As InitNewRowEventArgs) Handles ViewReceivers.InitNewRow
Dim oReceiver As Receiver = ViewReceivers.GetRow(e.RowHandle)
Dim oReceiver As ReceiverVM = ViewReceivers.GetRow(e.RowHandle)
Dim oUsedColors = Receivers.Select(Of Integer)(Function(r) r.ColorType).ToList()
Dim oAllColors = [Enum].GetValues(GetType(Domain.Constants.ColorType)).Cast(Of Integer).ToList()

14
EnvelopeGenerator.Form/frmFieldEditor.vb
View File

@@ -19,8 +19,8 @@ Partial Public Class frmFieldEditor
Private Controller As FieldEditorController
Public Property Document As EnvelopeDocument = Nothing
Public Property Receivers As List(Of Receiver)
Public Property SelectedReceiver As Receiver = Nothing
Public Property Receivers As List(Of ReceiverVM)
Public Property SelectedReceiver As ReceiverVM = Nothing
Private UnsavedChanges As Boolean = False
@@ -106,7 +106,7 @@ Partial Public Class frmFieldEditor
UnsavedChanges = True
End Sub
Private Function CreateBarItem(pReceiver As Receiver) As BarItem
Private Function CreateBarItem(pReceiver As ReceiverVM) As BarItem
Dim oItem = New BarButtonItem(BarManager1, pReceiver.Name)
Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0)
Dim oColorCircle = Helpers.GetColorCircle(oBaseCircle, pReceiver.Color)
@@ -121,7 +121,7 @@ Partial Public Class frmFieldEditor
Private Sub ReceiverItem_Click(sender As Object, e As ItemClickEventArgs)
Me.SuspendLayout()
Dim oSelectedReceiver As Receiver = e.Item.Tag
Dim oSelectedReceiver As ReceiverVM = e.Item.Tag
Dim oCurrentPage = GDViewer.CurrentPage
Dim oCurrentPosition = GDViewer.GetVScrollBarPosition()
@@ -153,7 +153,7 @@ Partial Public Class frmFieldEditor
Me.ResumeLayout()
End Sub
Private Sub SetReceiver(pReceiver As Receiver)
Private Sub SetReceiver(pReceiver As ReceiverVM)
Dim oBaseCircle As SvgImage = SvgImageCollection1.Item(0)
txtReceiver.Caption = pReceiver.Name
@@ -435,6 +435,4 @@ Partial Public Class frmFieldEditor
End Select
End If
End Sub
End Class
End Class

20
EnvelopeGenerator.Form/frmMain.vb
View File

@@ -1,5 +1,4 @@
Imports System.ComponentModel
Imports System.IdentityModel.Metadata
Imports System.IO
Imports System.Text
Imports DevExpress.LookAndFeel
@@ -14,6 +13,7 @@ Imports DigitalData.Modules.Base
Imports DigitalData.Modules.Logging
Imports EnvelopeGenerator.CommonServices
Imports EnvelopeGenerator.CommonServices.My
Imports EnvelopeGenerator.Domain.Constants
Imports EnvelopeGenerator.Domain.Entities
Public Class frmMain
@@ -317,11 +317,11 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(e.RowHandle)
If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopePartlySigned Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.GREEN_300)
End If
If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeSent Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.ORANGE_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.ORANGE_300)
End If
End Sub
@@ -337,10 +337,10 @@ Public Class frmMain
Exit Sub
End If
If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
If oReceiver.Status = ReceiverStatus.Signed Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.GREEN_300)
Else
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.RED_300)
End If
End Sub
@@ -351,11 +351,11 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewCompleted.GetRow(e.RowHandle)
If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.GREEN_300)
End If
If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeDeleted Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeWithdrawn Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeRejected Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.RED_300)
End If
End Sub
@@ -372,9 +372,9 @@ Public Class frmMain
End If
If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.GREEN_300)
Else
e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300)
e.Appearance.BackColor = ColorTranslator.FromHtml(Value.RED_300)
End If
End Sub