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

refactor(EnvelopeReceiver): unbenutzte Eigenschaften entfernen und in Receiver umbenennen

Browse Source
This commit is contained in:
Developer 02
2025-05-21 18:41:42 +02:00
parent d34a1016c4
commit 806b990556
13 changed files with 59 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
View File

@@ -42,7 +42,7 @@ Public Class EnvelopeEditorController
Public Function DocumentRotationChanged() As Boolean
Return ActionService.SetStatusDocumentRotationChanged(Envelope)
End Function
Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As Receiver) As Boolean
Return ActionService.ResendReceiver(pEnvelope, pReceiver)
End Function
@@ -55,7 +55,7 @@ Public Class EnvelopeEditorController
If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
For Each receiverItem As EnvelopeReceiver In Envelope.Receivers
For Each receiverItem As Receiver In Envelope.Receivers
If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
End If
@@ -89,8 +89,8 @@ Public Class EnvelopeEditorController
End If
End Function
Public Function SaveReceivers(pEnvelope As Envelope, pReceiversFromGrid As List(Of EnvelopeReceiver)) As Boolean
Dim oExistingReceivers As List(Of EnvelopeReceiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
Public Function SaveReceivers(pEnvelope As Envelope, pReceiversFromGrid As List(Of Receiver)) As Boolean
Dim oExistingReceivers As List(Of Receiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
Dim oExistingAddresses = oExistingReceivers.Select(Function(r) r.Email)
Logger.Debug($"oExistingReceivers.count: {oExistingReceivers.Count}")
Logger.Debug($"oExistingAddresses.count: {oExistingAddresses.Count}")
@@ -103,7 +103,7 @@ Public Class EnvelopeEditorController
Return False
End If
Dim oAllReceivers As List(Of EnvelopeReceiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
Dim oAllReceivers As List(Of Receiver) = ReceiverModel.ListReceivers(pReceiversFromGrid).ToList()
pEnvelope.Receivers.Clear()
@@ -276,7 +276,7 @@ Public Class EnvelopeEditorController
Return ReceiverModel.ListAllEnvelopeReceiverAddresses(pUserId)
End Function
Public Function CreateNewReceivers(pNewReceivers As List(Of EnvelopeReceiver)) As Boolean
Public Function CreateNewReceivers(pNewReceivers As List(Of Receiver)) As Boolean
If pNewReceivers.Count = 0 Then
Return True
End If
@@ -350,7 +350,7 @@ Public Class EnvelopeEditorController
End Try
End Function
Public Function DeleteReceiver(pReceiver As EnvelopeReceiver) As Boolean
Public Function DeleteReceiver(pReceiver As Receiver) As Boolean
Dim oConnection As SqlConnection = Database.GetConnection()
Dim oTransaction As SqlTransaction = oConnection.BeginTransaction()
@@ -381,7 +381,7 @@ Public Class EnvelopeEditorController
Return ElementModel.ElementsExist(Envelope.Id, pReceiverId)
End Function
Private Function InsertReceivers(pReceivers As List(Of EnvelopeReceiver), pTransaction As SqlTransaction) As Boolean
Private Function InsertReceivers(pReceivers As List(Of Receiver), pTransaction As SqlTransaction) As Boolean
Try
Return pReceivers.
Select(Function(r) InsertReceiver(r, pTransaction)).
@@ -404,7 +404,7 @@ Public Class EnvelopeEditorController
End Function
Private Function InsertReceiver(pReceiver As EnvelopeReceiver, pTransaction As SqlTransaction) As Boolean
Private Function InsertReceiver(pReceiver As Receiver, pTransaction As SqlTransaction) As Boolean
If pReceiver.HasId = False Then
Return ReceiverModel.Insert(pReceiver, pTransaction)
Else

8
EnvelopeGenerator.Form/frmEnvelopeEditor.vb
View File

@@ -17,7 +17,7 @@ Imports EnvelopeGenerator.Domain.Constants
Partial Public Class frmEnvelopeEditor
Public Property Envelope As Envelope
Public Property Documents As New BindingList(Of EnvelopeDocument)
Public Property Receivers As New BindingList(Of EnvelopeReceiver)
Public Property Receivers As New BindingList(Of Receiver)
Private AllReceiverEmails As New List(Of String)
@@ -104,7 +104,7 @@ Partial Public Class frmEnvelopeEditor
Else
Controller = New EnvelopeEditorController(State, Envelope)
Documents = New BindingList(Of EnvelopeDocument)(Controller.Envelope.Documents)
Receivers = New BindingList(Of EnvelopeReceiver)(Controller.Envelope.Receivers)
Receivers = New BindingList(Of Receiver)(Controller.Envelope.Receivers)
For Each docItem As EnvelopeDocument In Documents
If Not File.Exists(docItem.Filepath) Then
@@ -365,7 +365,7 @@ Partial Public Class frmEnvelopeEditor
Exit Sub
End If
Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetFocusedRow()
Dim oReceiver As Receiver = ViewReceivers.GetFocusedRow()
If oReceiver Is Nothing Then
Exit Sub
@@ -458,7 +458,7 @@ Partial Public Class frmEnvelopeEditor
End Sub
Private Sub ViewReceivers_InitNewRow(sender As Object, e As InitNewRowEventArgs) Handles ViewReceivers.InitNewRow
Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle)
Dim oReceiver As Receiver = 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()

10
EnvelopeGenerator.Form/frmFieldEditor.vb
View File

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

18
EnvelopeGenerator.Form/frmMain.vb
View File

@@ -318,7 +318,7 @@ Public Class frmMain
End If
Dim oView As GridView = DirectCast(sender, GridView)
Dim oReceiver As EnvelopeReceiver = oView.GetRow(e.RowHandle)
Dim oReceiver As Receiver = oView.GetRow(e.RowHandle)
If (oReceiver Is Nothing) Then
Exit Sub
@@ -352,7 +352,7 @@ Public Class frmMain
End If
Dim oView As GridView = DirectCast(sender, GridView)
Dim oReceiver As EnvelopeReceiver = oView.GetRow(e.RowHandle)
Dim oReceiver As Receiver = oView.GetRow(e.RowHandle)
If (oReceiver Is Nothing) Then
Exit Sub
@@ -384,7 +384,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
Process.Start($"mailto:{oReceiver.Email}?subject={oEnvelopeTitle}")
Else
@@ -567,7 +567,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim mailto As String = "mailto:support-flow@digitaldata.works"
Dim subject As String = Uri.EscapeDataString("signFLOW - Envelope issue - ID: " & oEnvelope.Id)
Dim body As String = Uri.EscapeDataString($"Dear Digital Data Team," & vbCrLf & "There is an error or misbehavin with following envelope and Receiver:" & vbCrLf &
@@ -595,7 +595,7 @@ Public Class frmMain
Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
Dim oView As GridView = GridEnvelopes.FocusedView
Dim selReceiver As EnvelopeReceiver
Dim selReceiver As Receiver
If oView.Name = ViewReceivers.Name Then
selReceiver = oView.GetRow(oView.FocusedRowHandle)
Else
@@ -608,9 +608,9 @@ Public Class frmMain
Dim oController = New EnvelopeEditorController(State, oEnvelope)
Dim Documents As New BindingList(Of EnvelopeDocument)
Dim Receivers As New BindingList(Of EnvelopeReceiver)
Receivers = New BindingList(Of EnvelopeReceiver)(oController.Envelope.Receivers)
For Each oReceiver As EnvelopeReceiver In Receivers
Dim Receivers As New BindingList(Of Receiver)
Receivers = New BindingList(Of Receiver)(oController.Envelope.Receivers)
For Each oReceiver As Receiver In Receivers
If oReceiver.Email = selReceiver.Email Then
If oController.ActionService.ResendReceiver(oEnvelope, oReceiver) = True Then
Dim oMsg = Resources.Envelope.Invitation_successfully_resend.Replace("@Mail", oReceiver.Email)
@@ -779,7 +779,7 @@ Public Class frmMain
Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(ViewEnvelopes.FocusedRowHandle)
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
Dim oReceiver As Receiver = oView.GetRow(oView.FocusedRowHandle)
Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
Dim oDT As DataTable = DB_DD_ECM.GetDatatable($"SELECT * FROM TBSIG_RECEIVER WHERE EMAIL_ADDRESS = '{oReceiver.Email}'")
If Not IsNothing(oDT) Then