fix: Pull-Konflikte in Constant.vb gelöst.

2024-10-16 09:43:41 +02:00 · 2024-10-16 09:43:41 +02:00 · 04b8d0ef5d
commit 04b8d0ef5d
parent 891f6368f1 683ff03a0f
15 changed files with 93 additions and 48 deletions
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@ -18,6 +18,7 @@
        AccessCodeIncorrect = 2003
        DocumentOpened = 2004
        DocumentSigned = 2005
+        DocumentForwarded = 4001
        SignatureConfirmed = 2006
        DocumentRejected = 2007
        EnvelopeShared = 2008
@ -100,6 +101,14 @@
        DocumentShared
    End Enum

+    Public Enum EncodeType
+        EnvelopeReceiver
+        EnvelopeReceiverReadOnly
+        Undefined
+        DocumentForwarded
+        DocumentShared
+    End Enum
+
    Public Enum EncodeType
        EnvelopeReceiver
        EnvelopeReceiverReadOnly
--- a/EnvelopeGenerator.Common/Entities/DbConfig.vb
+++ b/EnvelopeGenerator.Common/Entities/DbConfig.vb
@ -1,5 +1,5 @@
 Public Class DbConfig
-    Public Property ExternalProgramName As String = "Sign Flow"
+    Public Property ExternalProgramName As String = "signFLOW"
    Public Property DocumentPathOrigin As String = ""
    Public Property DocumentPath As String = ""
    Public Property ExportPath As String = ""
--- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx
+++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx
@ -138,6 +138,9 @@
  <data name="Document Could Not Be Saved" xml:space="preserve">
    <value>Document could not be saved!</value>
  </data>
+  <data name="Document forwarded" xml:space="preserve">
+    <value>Document forwarded to receiver: {0}</value>
+  </data>
  <data name="Edit Envelope" xml:space="preserve">
    <value>Edit Envelope</value>
  </data>
--- a/EnvelopeGenerator.Common/Strings/Envelope.resx
+++ b/EnvelopeGenerator.Common/Strings/Envelope.resx
@ -138,6 +138,9 @@
  <data name="Document Could Not Be Saved" xml:space="preserve">
    <value>Dokument konnte nicht gespeichert werden!</value>
  </data>
+  <data name="Document forwarded" xml:space="preserve">
+    <value>Umschlag an Empfänger {0} weitergeleitet.</value>
+  </data>
  <data name="Edit Envelope" xml:space="preserve">
    <value>Bearbeite Umschlag</value>
  </data>
--- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
+++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
@ -127,6 +127,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag an Empfänger {0} weitergeleitet. ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property Document_forwarded() As String
+            Get
+                Return ResourceManager.GetString("Document forwarded", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Bearbeite Umschlag ähnelt.
        '''</summary>
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@ -158,6 +158,7 @@ Public Class EnvelopeEditorController
            Dim oTempFilePath = Path.Combine(oTempFiles.TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)

            Await Helpers.CopyFileAsync(oFileInfo.FullName, oTempFilePath)
+
            'File.Copy(oFileInfo.FullName, oTempFilePath, True)

            Dim oFileInfoTemp = New FileInfo(oTempFilePath)
@ -175,6 +176,7 @@ Public Class EnvelopeEditorController

        Catch ex As Exception
            Logger.Error(ex)
+            Logger.Warn($"error in CreateDocument: {ex.Message}")
            Return Nothing
        End Try
    End Function
@ -288,7 +290,9 @@ Public Class EnvelopeEditorController
 #End Region
    Private Function GetEnvelopePath(pEnvelope As Envelope) As String
        Try
-            Dim oEnvelopePath As String = Path.Combine(State.DbConfig.DocumentPath, pEnvelope.Uuid)
+            Dim oTempFiles As New TempFiles(State.LogConfig)
+            Dim oTempFolderPath = oTempFiles.TempPath
+            Dim oEnvelopePath As String = Path.Combine(oTempFolderPath, pEnvelope.Uuid)

            If Not Directory.Exists(oEnvelopePath) Then
                Directory.CreateDirectory(oEnvelopePath)
--- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
+++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj
@ -71,8 +71,9 @@
    <Reference Include="DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraPrinting.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="DigitalData.Controls.DocumentViewer">
-      <HintPath>..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
+    <Reference Include="DigitalData.Controls.DocumentViewer, Version=1.9.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll</HintPath>
    </Reference>
    <Reference Include="DigitalData.GUIs.Common">
      <HintPath>..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll</HintPath>
@ -99,8 +100,8 @@
      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\EnvelopeGenerator.Common\bin\Debug\EnvelopeGenerator.Common.dll</HintPath>
    </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.2.90.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
@ -271,12 +272,12 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
    <PropertyGroup>
      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.90\build\net462\GdPicture.runtimes.windows.targets'))" />
  </Target>
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/EnvelopeGenerator.Form/app.config
+++ b/EnvelopeGenerator.Form/app.config
@ -72,7 +72,7 @@
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
      <dependentAssembly>
        <assemblyIdentity name="GdPicture.NET.14" publicKeyToken="f52a2e60ad468dbb" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-14.2.89.0" newVersion="14.2.89.0" />
+        <bindingRedirect oldVersion="0.0.0.0-14.2.90.0" newVersion="14.2.90.0" />
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
@ -878,7 +878,7 @@
    <value>0</value>
  </data>
  <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 54</value>
+    <value>792, 17</value>
  </metadata>
  <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>557, 17</value>
--- a/EnvelopeGenerator.Form/packages.config
+++ b/EnvelopeGenerator.Form/packages.config
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GdPicture" version="14.2.89" targetFramework="net462" />
-  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net462" />
+  <package id="GdPicture" version="14.2.90" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.2.90" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>
--- a/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
+++ b/EnvelopeGenerator.Service/EnvelopeGenerator.Service.vbproj
@ -14,6 +14,8 @@
    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@ -66,9 +68,8 @@
    <Reference Include="DigitalData.Modules.Messaging">
      <HintPath>..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
    </Reference>
-    <Reference Include="GdPicture.NET.14, Version=14.1.0.152, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="GdPicture.NET.14, Version=14.2.89.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
@ -177,4 +178,11 @@
    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.2.89\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
 </Project>
--- a/EnvelopeGenerator.Service/My
+++ b/EnvelopeGenerator.Service/My
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.7.0.0")>
-<Assembly: AssemblyFileVersion("1.7.0.0")>
+<Assembly: AssemblyVersion("1.7.1.0")>
+<Assembly: AssemblyFileVersion("1.7.1.0")>
--- a/EnvelopeGenerator.Service/Scheduler.vb
+++ b/EnvelopeGenerator.Service/Scheduler.vb
@ -26,47 +26,52 @@ Public Class Scheduler
    End Sub

    Public Async Function Start(pInterval As Integer) As Task
-        Logger.Debug("Starting Scheduler..")
+        Try
+            Logger.Debug("Starting Scheduler..")

-        Dim oProperties As New NameValueCollection()
+            Dim oProperties As New NameValueCollection()

-        Scheduler = Await SchedulerBuilder.Create(oProperties).
-            UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5).
-            BuildScheduler()
+            Scheduler = Await SchedulerBuilder.Create(oProperties).
+                UseDefaultThreadPool(Sub(x) x.MaxConcurrency = 5).
+                BuildScheduler()

-        Dim oJobKey = New JobKey(JobName)
-        Dim oJobData = New JobDataMap() From {
-            {Common.Constants.GDPICTURE, LicenseKey},
-            {Common.Constants.LOGCONFIG, LogConfig},
-            {Common.Constants.DATABASE, ConnectionString},
-            {Common.Constants.IGNORED_LABELS, _ignoredLabels}
-        }
+            Dim oJobKey = New JobKey(JobName)
+            Dim oJobData = New JobDataMap() From {
+                {Common.Constants.GDPICTURE, LicenseKey},
+                {Common.Constants.LOGCONFIG, LogConfig},
+                {Common.Constants.DATABASE, ConnectionString},
+                {Common.Constants.IGNORED_LABELS, _ignoredLabels}
+            }

-        Logger.Debug("Initialized Job [{0}]", JobName)
+            Logger.Debug("Initialized Job [{0}]", JobName)

-        Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob).
-            UsingJobData(oJobData).
-            WithIdentity(oJobKey).
-            Build()
+            Dim oJob As IJobDetail = JobBuilder.Create(Of FinalizeDocumentJob).
+                UsingJobData(oJobData).
+                WithIdentity(oJobKey).
+                Build()

-        Dim oTrigger As ITrigger = TriggerBuilder.Create().
-            ForJob(oJobKey).
-            WithIdentity($"{JobName}-trigger").
-            WithSimpleSchedule(Sub(s) s.
-                RepeatForever().
-                WithIntervalInMinutes(pInterval)).
-            StartNow().
-            Build()
+            Dim oTrigger As ITrigger = TriggerBuilder.Create().
+                ForJob(oJobKey).
+                WithIdentity($"{JobName}-trigger").
+                WithSimpleSchedule(Sub(s) s.
+                    RepeatForever().
+                    WithIntervalInMinutes(pInterval)).
+                StartNow().
+                Build()

-        Logger.Debug("Initialized Trigger")
+            Logger.Debug("Initialized Trigger")

-        Await Scheduler.ScheduleJob(oJob, oTrigger)
+            Await Scheduler.ScheduleJob(oJob, oTrigger)

-        Logger.Debug("Job scheduled.")
+            Logger.Debug("Job scheduled.")

-        Await Scheduler.Start()
+            Await Scheduler.Start()
+
+            Logger.Info("Scheduler started!")
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try

-        Logger.Info("Scheduler started!")
    End Function

    Public Async Function [Stop]() As Task
--- a/EnvelopeGenerator.Service/Service.vb
+++ b/EnvelopeGenerator.Service/Service.vb
@ -37,13 +37,14 @@ Public Class Service
            TempFiles.Create()

            ' === Initialize Databases ===
-            Logger.Info("Inititalize Databases")
+            Logger.Info("Inititalize Database ...")

            If Config.ConnectionString = String.Empty Then
                Throw New ApplicationException("Connection String is empty!")
            End If

            Database = New MSSQLServer(LogConfig, Config.ConnectionString)
+            Logger.Debug("Database initialized")

            If Database.DBInitialized = False Then
                Throw New ApplicationException("Database connection could not be established!")
--- a/EnvelopeGenerator.Service/packages.config
+++ b/EnvelopeGenerator.Service/packages.config
@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="GdPicture" version="14.2.89" targetFramework="net48" />
+  <package id="GdPicture.runtimes.windows" version="14.2.89" targetFramework="net48" />
  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net462" />
  <package id="NLog" version="5.0.5" targetFramework="net461" />
  <package id="Quartz" version="3.8.0" targetFramework="net462" />