refactor(.Form): Aktualisiert, um die Domain zu verwenden

2025-05-20 17:30:57 +02:00
parent 31c4a8a20f
commit a8a768d7d6
34 changed files with 296 additions and 270 deletions
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -3,9 +3,8 @@ Imports System.IO
 Imports DevExpress.XtraBars.Docking
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
-Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My
-Imports GdPicture14
+Imports EnvelopeGenerator.Domain.Constants

 Public Class EnvelopeEditorController
    Inherits BaseController
--- a/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/FieldEditorController.vb
@@ -1,6 +1,7 @@
 Imports DevExpress.XtraPrinting.Native
 Imports EnvelopeGenerator.Common
 Imports GdPicture14.Annotations
+Imports EnvelopeGenerator.Domain

 Public Class FieldEditorController
    Inherits BaseController
--- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
+++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
@@ -506,6 +506,10 @@
      <Project>{6ea0c51f-c2b1-4462-8198-3de0b32b74f8}</Project>
      <Name>EnvelopeGenerator.Common</Name>
    </ProjectReference>
+    <ProjectReference Include="..\EnvelopeGenerator.Domain\EnvelopeGenerator.Domain.csproj">
+      <Project>{4f32a98d-e6f0-4a09-bd97-1cf26107e837}</Project>
+      <Name>EnvelopeGenerator.Domain</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -1,24 +1,18 @@
 Imports System.ComponentModel
-Imports System.Data.SqlClient
 Imports System.IO
 Imports System.Text.RegularExpressions
-Imports DevExpress.Export.Xl
-Imports DevExpress.Utils.CommonDialogs
 Imports DevExpress.Utils.Drawing
-Imports DevExpress.Utils.Svg.CommonSvgImages
 Imports DevExpress.XtraEditors
-Imports DevExpress.XtraExport.Helpers
 Imports DevExpress.XtraGrid
-Imports DevExpress.XtraGrid.Columns
-Imports DevExpress.XtraGrid.Views.Base
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraSplashScreen
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
-Imports EnvelopeGenerator.Common.Constants
+Imports EnvelopeGenerator.Domain
 Imports EnvelopeGenerator.Common.My
 Imports GdPicture14
+Imports EnvelopeGenerator.Domain.Constants

 Partial Public Class frmEnvelopeEditor
    Public Property Envelope As Envelope
@@ -467,7 +461,7 @@ Partial Public Class frmEnvelopeEditor
        Dim oReceiver As EnvelopeReceiver = ViewReceivers.GetRow(e.RowHandle)

        Dim oUsedColors = Receivers.Select(Of Integer)(Function(r) r.ColorType).ToList()
-        Dim oAllColors = [Enum].GetValues(GetType(ColorType)).Cast(Of Integer).ToList()
+        Dim oAllColors = [Enum].GetValues(GetType(Domain.Constants.ColorType)).Cast(Of Integer).ToList()
        Dim oUnusedColors = oAllColors.Except(oUsedColors)
        If oUnusedColors.Any() Then
            oReceiver.ColorType = oUnusedColors.Min()
@@ -576,7 +570,7 @@ Partial Public Class frmEnvelopeEditor
                            CheckAccesscode(e.RowHandle, oAccessCode)
                        End If
                    Else
-                            Dim oMsg = Resources.Envelope.Error_email_Validation
+                        Dim oMsg = Resources.Envelope.Error_email_Validation
                        oMsg = oMsg.Replace("@Mail", oEmailAdress)
                        MsgBox(oMsg, MsgBoxStyle.Exclamation, Text)
                        ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle)
@@ -756,7 +750,7 @@ Partial Public Class frmEnvelopeEditor
    End Sub

    Private Sub btnShowFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnShowFile.ItemClick
-        showDocument
+        showdocument()
    End Sub
    Sub showdocument()
        If Not IsNothing(Documents) Then
--- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
@@ -2,6 +2,7 @@
 Imports EnvelopeGenerator.Common.My
 Imports EnvelopeGenerator.Common.Constants
 Imports System.ComponentModel
+Imports EnvelopeGenerator.Domain.Constants

 Public Class frmEnvelopeMainData
    Private FormLoaded As Boolean = False
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@@ -6,6 +6,7 @@ Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My
+Imports EnvelopeGenerator.Domain.Constants
 Imports GdPicture14
 Imports GdPicture14.Annotations

--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -10,12 +10,9 @@ Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.My
-Imports System.Diagnostics
 Imports System.ComponentModel
 Imports DevExpress.XtraPrinting
-Imports System.Web
-Imports EnvelopeGenerator.Common.Constants
-Imports System.Security.Cryptography
+Imports DigitalData.Domain

 Public Class frmMain
    Private ReadOnly LogConfig As LogConfig
@@ -306,12 +303,12 @@ Public Class frmMain
        End If

        Dim oEnvelope As Envelope = ViewEnvelopes.GetRow(e.RowHandle)
-        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopePartlySigned Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+        If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopePartlySigned Then
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
        End If

-        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeSent Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.ORANGE_300)
+        If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeQueued Or oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeSent Then
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.ORANGE_300)
        End If
    End Sub

@@ -327,10 +324,10 @@ Public Class frmMain
            Exit Sub
        End If

-        If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+        If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
        Else
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300)
        End If
    End Sub

@@ -340,12 +337,12 @@ Public Class frmMain
        End If

        Dim oEnvelope As Envelope = ViewCompleted.GetRow(e.RowHandle)
-        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+        If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeCompletelySigned Then
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
        End If

-        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeDeleted Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeWithdrawn Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeRejected Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
+        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)
        End If
    End Sub

@@ -361,10 +358,10 @@ Public Class frmMain
            Exit Sub
        End If

-        If oReceiver.Status = Common.Constants.ReceiverStatus.Signed Then
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
+        If oReceiver.Status = Domain.Constants.ReceiverStatus.Signed Then
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.GREEN_300)
        Else
-            e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
+            e.Appearance.BackColor = ColorTranslator.FromHtml(Domain.Constants.RED_300)
        End If
    End Sub

@@ -507,7 +504,7 @@ Public Class frmMain
        End If

        Dim oEnvelope As Envelope = ViewCompleted.GetRow(ViewCompleted.FocusedRowHandle)
-        If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeArchived Then
+        If oEnvelope.Status = Domain.Constants.EnvelopeStatus.EnvelopeArchived Then
            bbtnitmEB.Enabled = True
        Else
            bbtnitmEB.Enabled = False
@@ -811,16 +808,16 @@ Public Class frmMain
        Dim oMailToCreator = oEnvelope.FinalEmailToCreator
        Dim oMailToReceivers = oEnvelope.FinalEmailToReceivers

-        If oMailToCreator <> FinalEmailType.No Then
+        If oMailToCreator <> Domain.Constants.FinalEmailType.No Then
            MsgBox("Finale email an Creator könnten/würden gesendet werden!")
        Else
-            MsgBox("Finale email an Creator könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{FinalEmailType.No}]")
+            MsgBox("Finale email an Creator könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToCreator - oMailToCreator [{oMailToCreator}] <> [{Domain.Constants.FinalEmailType.No}]")
        End If

-        If oMailToReceivers <> FinalEmailType.No Then
+        If oMailToReceivers <> Domain.Constants.FinalEmailType.No Then
            MsgBox("Finale email an Unterzeichner könnten/würden gesendet werden!")
        Else
-            MsgBox("Finale email an Unterzeichner könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToReceivers - oMailToReceivers [{oMailToReceivers}] <> [{FinalEmailType.No}]")
+            MsgBox("Finale email an Unterzeichner könnte/würde nicht erzeugt werden!" & vbNewLine & $"No SendFinalEmailToReceivers - oMailToReceivers [{oMailToReceivers}] <> [{Domain.Constants.FinalEmailType.No}]")
        End If
    End Sub
    Private Function GetState() As State