MS Removed PathColumns

EnvelopeGenerator.Common/Entities/DbConfig.vb

@@ -3,13 +3,6 @@
     Public Property DocumentPathOrigin As String = ""
     Public Property DocumentPath As String = ""
     Public Property ExportPath As String = ""
-    Public Property DocumentPath_DMZ As String = ""
-    Public Property ExportPath_DMZ As String = ""
-    Public Property DOCUMENT_PATH_MOVE_AFTSEND As String = ""
-    Public Property FINISHED_PATH_EX_DMZ As String = ""
-    Public Property EML_PATH_EX_DMZ As String = ""
     Public Property SendingProfile As Integer = 0
     Public Property SignatureHost As String = ""
-    Public Property NetUse_necessary As Boolean = False
-    Public Property NetUse_Finish As Boolean = False
 End Class

EnvelopeGenerator.Common/Jobs/FinalizeDocument/FinalizeDocumentJob.vb

@@ -82,49 +82,14 @@ Namespace Jobs
 
                 Logger.Debug("Loading ReportCreator..")
                 ReportCreator = New ReportCreator(LogConfig, oState)
-                Logger.Debug("My.Settings.RuninDMZ: [{0}]", My.Settings.RuninDMZ.ToString)
-                Logger.Debug("My.Settings.NetUse_Usr: [{0}]", My.Settings.NetUse_Usr)
 
+                Config.DocumentPath = Config.DocumentPath
 
-                If My.Settings.RuninDMZ = True Then
-                    If Config.DocumentPath_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - Using DocumentPath_DMZ: [{0}] - Overwrite Document-Path", Config.DocumentPath_DMZ)
-                        Config.DocumentPath = Config.DocumentPath_DMZ
-                        Config.NetUse_necessary = True
-                    Else
-                        Config.DocumentPath = Config.DocumentPath
-                    End If
-                Else
-                    If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                        Logger.Debug("Using DMZRemotePath: [{0}] - Overwrite Document-Path ...", Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                        Config.DocumentPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
-                        Config.NetUse_Finish = True
-
-                    Else
-                        Config.DocumentPath = Config.DocumentPath
-                    End If
-                End If
                 Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
 
-                If My.Settings.RuninDMZ = True Then
-                    If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - FINISHED_PATH_EX_DMZ configured: [{0}]", Config.FINISHED_PATH_EX_DMZ)
-                        Config.NetUse_Finish = True
-                    End If
-                    If Config.ExportPath_DMZ <> String.Empty Then
-                        Logger.Debug("RuninDMZ - Using ExportPath_DMZ: [{0}] - Overwrite ExportPath", Config.ExportPath_DMZ)
-                        Config.ExportPath = Config.ExportPath_DMZ
-                    End If
-                End If
 
                 Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
 
-                If Config.NetUse_Finish = True Then
-                    If NetUse_Command(Config.DocumentPath, My.Settings.NetUse_Usr, My.Settings.NetUse_PW) = True Then
-                        Logger.Debug("NetUse_Finish = successful!")
-                    End If
-                End If
-
                 Dim oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
                 Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime} ORDER BY GUID"
                 Dim oTable = Database.GetDatatable(oSql)
@@ -157,10 +122,6 @@ Namespace Jobs
                             Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
                             Throw New ArgumentNullException("EnvelopeData")
                         End If
-                        If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                            oEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                            Logger.Debug("Replaced Path in oEnvelopeData.DocumentPath!")
-                        End If
                         Logger.Debug("Burning Annotations to pdf ...")
                         Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
                         If oBurnedDocument Is Nothing Then
@@ -196,13 +157,6 @@ Namespace Jobs
                             Throw New ExportDocumentException("Could not export final document to disk!", ex)
                         End Try
 
-                        If Config.NetUse_Finish = True Then
-                            If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
-                                If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
-                                    Clean_DNZ_PAth(Config.FINISHED_PATH_EX_DMZ)
-                                End If
-                            End If
-                        End If
                         Logger.Info("Writing EB-bytes to database...")
                         Update_File_DB(oOutputFilePath, oEnvelope.Id)
 
@@ -287,48 +241,48 @@ Namespace Jobs
             data = br.ReadBytes(CInt(numBytes))
             Return data
         End Function
-        Private Function NetUse_Command(pDestinationPath As String, pUsername As String, pPassword As String)
+        'Private Function NetUse_Command(pDestinationPath As String, pUsername As String, pPassword As String)
-            Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
+        '    Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
-            Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
+        '    Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
-            Logger.Debug("EXECUTING NetUse_Command for " & pDestinationPath)
+        '    Logger.Debug("EXECUTING NetUse_Command for " & pDestinationPath)
-            Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
+        '    Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
-            processInfo.RedirectStandardOutput = True
+        '    processInfo.RedirectStandardOutput = True
-            processInfo.UseShellExecute = False
+        '    processInfo.UseShellExecute = False
-            processInfo.CreateNoWindow = True
+        '    processInfo.CreateNoWindow = True
 
-            Using process As Process = Process.Start(processInfo)
+        '    Using process As Process = Process.Start(processInfo)
-                process.WaitForExit()
+        '        process.WaitForExit()
 
-                ' Prüfe den Rückgabewert des net use Befehls
+        '        ' Prüfe den Rückgabewert des net use Befehls
-                If process.ExitCode = 0 Then
+        '        If process.ExitCode = 0 Then
-                    Return True
+        '            Return True
-                Else
+        '        Else
-                    Return False
+        '            Return False
-                End If
+        '        End If
-            End Using
+        '    End Using
-        End Function
+        'End Function
 
-        Private Function Clean_DNZ_PAth(pSourcePath As String) As Boolean
+        'Private Function Clean_DNZ_PAth(pSourcePath As String) As Boolean
-            Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
+        '    Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
 
-            Logger.Debug("## Starting Clean_DNZ_PAth ...")
+        '    Logger.Debug("## Starting Clean_DNZ_PAth ...")
-            Logger.Debug("## pSourcePath {0}", pSourcePath)
+        '    Logger.Debug("## pSourcePath {0}", pSourcePath)
 
-            Dim oDirectorySource = Path.Combine(pSourcePath, ParentFolderUID)
+        '    Dim oDirectorySource = Path.Combine(pSourcePath, ParentFolderUID)
 
-            Try
+        '    Try
-                Logger.Debug($"Deleting oDirectorySource {oDirectorySource} ...")
+        '        Logger.Debug($"Deleting oDirectorySource {oDirectorySource} ...")
-                Directory.Delete(oDirectorySource, True)
+        '        Directory.Delete(oDirectorySource, True)
-                Console.WriteLine($"Folder successfully deleted!")
+        '        Console.WriteLine($"Folder successfully deleted!")
-                Logger.Debug($"...Deleted!")
+        '        Logger.Debug($"...Deleted!")
-                Return True
+        '        Return True
-            Catch ex As Exception
+        '    Catch ex As Exception
-                Logger.Error(ex)
+        '        Logger.Error(ex)
-                Return False
+        '        Return False
-            End Try
+        '    End Try
 
 
-        End Function
+        'End Function
         Private Function SendFinalEmails(pEnvelope As Envelope) As Boolean ', pAttachment As String
             Dim oMailToCreator = pEnvelope.FinalEmailToCreator
             Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
@@ -398,15 +352,7 @@ Namespace Jobs
             Dim oAnnotations = pEnvelopeData.AnnotationData
             Dim oInputPath = ""
             If IsNothing(pEnvelopeData.DocAsByte) Then
-                If My.Settings.RuninDMZ Then
+                oInputPath = pEnvelopeData.DocumentPath
-                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DocumentPath)
-                ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
-                    Logger.Debug("Replacing Path in pData.DocumentPath ...")
-                    oInputPath = pEnvelopeData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
-                Else
-                    oInputPath = pEnvelopeData.DocumentPath
-                End If
                 Logger.Info($"Input path: [{oInputPath}]")
             Else
                 Logger.Info($"we got bytes..")

EnvelopeGenerator.Common/Models/ConfigModel.vb

@@ -16,17 +16,12 @@ Public Class ConfigModel
             Dim oRow As DataRow = oTable.Rows.Item(0)
 
             Return New DbConfig() With {
-                .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
+              .DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
-               .DocumentPathOrigin = oRow.ItemEx("DOCUMENT_PATH", ""),
+              .DocumentPathOrigin = oRow.ItemEx("DOCUMENT_PATH", ""),
-                .DocumentPath_DMZ = oRow.ItemEx("DOCUMENT_PATH_DMZ", ""),
+              .ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
-                .ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
+              .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
-                .ExportPath_DMZ = oRow.ItemEx("EXPORT_PATH_DMZ", ""),
+              .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
-                .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0),
+              .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", "")
-                .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""),
-                .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""),
-                .DOCUMENT_PATH_MOVE_AFTSEND = oRow.ItemEx("DOCUMENT_PATH_MOVE_AFTSEND", ""),
-                .FINISHED_PATH_EX_DMZ = oRow.ItemEx("FINISHED_PATH_EX_DMZ", ""),
-                .EML_PATH_EX_DMZ = oRow.ItemEx("EML_PATH_EX_DMZ", "")
             }
         Catch ex As Exception
             Logger.Error(ex)

EnvelopeGenerator.Common/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' indem Sie "*" wie unten gezeigt eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.9.5.0")>
+<Assembly: AssemblyVersion("2.0.0.0")>
-<Assembly: AssemblyFileVersion("1.9.5.0")>
+<Assembly: AssemblyFileVersion("2.0.0.0")>

EnvelopeGenerator.Common/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -53,33 +53,6 @@ Namespace My
                 Return defaultInstance
             End Get
         End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("False")>  _
-        Public ReadOnly Property RuninDMZ() As Boolean
-            Get
-                Return CType(Me("RuninDMZ"),Boolean)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("dd-gan\Administrator")>  _
-        Public ReadOnly Property NetUse_Usr() As String
-            Get
-                Return CType(Me("NetUse_Usr"),String)
-            End Get
-        End Property
-        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("sY4vnATDXwosbTJGip6SqA==")>  _
-        Public ReadOnly Property NetUse_PW() As String
-            Get
-                Return CType(Me("NetUse_PW"),String)
-            End Get
-        End Property
     End Class
 End Namespace
 

EnvelopeGenerator.Common/My Project/Settings.settings

@@ -1,15 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="My" GeneratedClassName="MySettings" UseMySettingsClassName="true">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
   <Profiles />
-  <Settings>
+  <Settings />
-    <Setting Name="RuninDMZ" Type="System.Boolean" Scope="Application">
-      <Value Profile="(Default)">False</Value>
-    </Setting>
-    <Setting Name="NetUse_Usr" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">dd-gan\Administrator</Value>
-    </Setting>
-    <Setting Name="NetUse_PW" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">sY4vnATDXwosbTJGip6SqA==</Value>
-    </Setting>
-  </Settings>
 </SettingsFile>

EnvelopeGenerator.Common/Strings/Envelope.en.resx

@@ -169,7 +169,7 @@
     <value>Envelope-Editor</value>
   </data>
   <data name="Error email Validation" xml:space="preserve">
-    <value>This email could not be validated!</value>
+    <value>The email  [ @Mail ] could not be varified!</value>
   </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Error sending the envelope:</value>

EnvelopeGenerator.Common/Strings/Envelope.resx

@@ -169,7 +169,7 @@
     <value>Umschlag-Editor</value>
   </data>
   <data name="Error email Validation" xml:space="preserve">
-    <value>Die Email-Adresse konnte nicht validiert werden!</value>
+    <value>Die Email-Adresse [ @Mail ] konnte nicht validiert werden!</value>
   </data>
   <data name="Error sending the envelope" xml:space="preserve">
     <value>Fehler beim Senden des Umschlags:</value>

EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb

@@ -218,7 +218,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Die Email-Adresse konnte nicht validiert werden! ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Die Email-Adresse [ @Mail ] konnte nicht validiert werden! ähnelt.
         '''</summary>
         Public Shared ReadOnly Property Error_email_Validation() As String
             Get

EnvelopeGenerator.Common/app.config

@@ -2,9 +2,6 @@
 <configuration>
 
     <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="EnvelopeGenerator.Common.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
     </configSections>
     <system.diagnostics>
         <sources>
@@ -29,17 +26,4 @@
         </sharedListeners>
     </system.diagnostics>
 
-    <applicationSettings>
-        <EnvelopeGenerator.Common.My.MySettings>
-            <setting name="RuninDMZ" serializeAs="String">
-                <value>False</value>
-            </setting>
-            <setting name="NetUse_Usr" serializeAs="String">
-                <value>dd-gan\Administrator</value>
-            </setting>
-            <setting name="NetUse_PW" serializeAs="String">
-                <value>sY4vnATDXwosbTJGip6SqA==</value>
-            </setting>
-        </EnvelopeGenerator.Common.My.MySettings>
-    </applicationSettings>
 </configuration>

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -4,9 +4,12 @@ Imports System.IO
 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
@@ -41,30 +44,30 @@ Partial Public Class frmEnvelopeEditor
         'SaveEnvelopeWithValidation()
         ' If Not IsNothing(Envelope) Then
         Try
-                ' prüfen ob es schon eine Datei gibt
+            ' prüfen ob es schon eine Datei gibt
-                If Documents.Count > 0 Then
+            If Documents.Count > 0 Then
-                    MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
+                MsgBox(Resources.Envelope.Only_one_file_is_allowed, MsgBoxStyle.Information, Text)
-                    Return
+                Return
+            End If
+
+            If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+                Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
+
+                If oDocument IsNot Nothing Then
+                    Documents.Add(oDocument)
+                    ' Update_File_DB(OpenFileDialog1.FileName)
+                Else
+                    MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
                 End If
+            End If
 
-                If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+        Catch ex As Exception
-                    Dim oDocument = Await Controller.CreateDocument(OpenFileDialog1.FileName)
+            Logger.Error(ex)
+        Finally
+            SplashScreenManager.CloseOverlayForm(oHandle)
 
-                    If oDocument IsNot Nothing Then
+            RibbonPageGroupAddSignature_Enabled()
-                        Documents.Add(oDocument)
+        End Try
-                        ' Update_File_DB(OpenFileDialog1.FileName)
-                    Else
-                        MsgBox(Resources.Envelope.Document_Could_Not_Be_Saved, MsgBoxStyle.Critical, Text)
-                    End If
-                End If
-
-            Catch ex As Exception
-                Logger.Error(ex)
-            Finally
-                SplashScreenManager.CloseOverlayForm(oHandle)
-
-                RibbonPageGroupAddSignature_Enabled()
-            End Try
         ' Else
         ' SplashScreenManager.CloseOverlayForm(oHandle)
         ' End If
@@ -531,7 +534,12 @@ Partial Public Class frmEnvelopeEditor
         RibbonPageGroupAddSignature_Enabled()
     End Sub
     Dim CellValueChanged As Boolean = False
+    Private Sub ViewReceivers_ColumnPositionChanged(sender As Object, e As EventArgs) Handles ViewReceivers.ColumnPositionChanged
+
+
+    End Sub
     Private Sub ViewReceivers_CellValueChanged(sender As Object, e As Views.Base.CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanged
+
         If e.Column.FieldName = COL_EMAIL And CellValueChanged = False Then
             If e.Value Is Nothing Then
                 ' Keine E-Mail-Adresse, also weg damit
@@ -552,14 +560,20 @@ Partial Public Class frmEnvelopeEditor
                         ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns.Item(COL_CODE), oAccessCode)
                         CellValueChanged = False
                     Else
-                        MsgBox(Resources.Envelope.Error_email_Validation, MsgBoxStyle.Exclamation, Text)
+                        Dim oMsg = Resources.Envelope.Error_email_Validation
-                        ViewReceivers.SetFocusedValue("")
+                        oMsg = oMsg.Replace("@Mail", oEmailAdress)
+                        MsgBox(oMsg, MsgBoxStyle.Exclamation, Text)
+                        ViewReceivers.DeleteRow(ViewReceivers.FocusedRowHandle)
                     End If
 
                 End If
             End If
         End If
     End Sub
+    Private Sub email_validation()
+
+    End Sub
+
     Private Function IsValidEmailAddress(pEmailAddress As String) As Boolean
         Try
             If pEmailAddress.Contains("@") Then
@@ -584,4 +598,10 @@ Partial Public Class frmEnvelopeEditor
     Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick
 
     End Sub
+
+    Private Sub ViewReceivers_CellValueChanging(sender As Object, e As CellValueChangedEventArgs) Handles ViewReceivers.CellValueChanging
+
+    End Sub
+
+
 End Class