Refactor contract type handling in EnvelopeType entity

Replaced Constants.ContractType enum with integer property in EnvelopeType. Updated related references in EnvelopeEditorController. Removed EnvelopeType variable from ModuleSettings. Made EnvelopeType property bindable and initialized in frmEnvelopeMainData to improve consistency and simplify contract type management.

EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb

@@ -50,17 +50,21 @@ Public Class EnvelopeEditorController
     Public Function ValidateEnvelopeForSending(pErrors As List(Of String)) As List(Of String)
         Dim oEnvelopeErrors = pErrors
 
-        If ElementModel.ElementsExist(Envelope.Id) = False Then
+        If Envelope.EnvelopeTypeId <> ContractType.ReadAndSign Then
-            oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
-        End If
 
-        If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
+            If ElementModel.ElementsExist(Envelope.Id) = False Then
+                oEnvelopeErrors.Add(Resources.Envelope.Missing_Elements)
+            End If
 
-            For Each receiverItem As Receiver In Envelope.Receivers
+            If ElementModel.OneElementPerReceiverExist(Envelope.Id) = False Then
-                If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
+
-                    oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
+                For Each receiverItem As Receiver In Envelope.Receivers
-                End If
+                    If ElementModel.ElementsExist(Envelope.Id, receiverItem.Id) = False Then
-            Next
+                        oEnvelopeErrors.Add(String.Format(Resources.Envelope.Missing_Elements_for_Receiver, receiverItem.Name))
+                    End If
+                Next
+
+            End If
 
         End If
 

EnvelopeGenerator.Form/frmEnvelopeMainData.vb

@@ -59,7 +59,7 @@ Public Class frmEnvelopeMainData
             cmbLanguage.Properties.Items.AddRange(New List(Of String) From {"de", "en"})
 
             groupAllOptions.Expanded = False
-            Dim EnvelopeType = oTypes.FirstOrDefault()
+            EnvelopeType = oTypes.FirstOrDefault()
             If NewEnvelopeMode = True Then
 
 
@@ -139,8 +139,8 @@ Public Class frmEnvelopeMainData
         Envelope.FinalEmailToCreator = cmbEmailToCreator.SelectedIndex
         Envelope.FinalEmailToReceivers = cmbEmailToReceivers.SelectedIndex
         Envelope.TFA_Enabled = chked_2Faktor.EditValue
-        ' ContractType kann zzt nicht über die Oberfläche gesetzt werden
+        ' ContractType kann zzt nicht über die Oberfläche gesetzt werden - jetzt sollte es gehen.
-        Envelope.ContractType = ContractType.Contract
+        Envelope.EnvelopeType = EnvelopeType
     End Sub
 
     Private Sub frmEnvelopeMainData_Shown(sender As Object, e As EventArgs) Handles Me.Shown