Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator
This commit is contained in:
commit
8de0d70e7b
@ -1,5 +1,6 @@
|
|||||||
Public Class DbConfig
|
Public Class DbConfig
|
||||||
Public Property ExternalProgramName As String = "Sign Flow"
|
Public Property ExternalProgramName As String = "Sign Flow"
|
||||||
|
Public Property DocumentPathOrigin As String = ""
|
||||||
Public Property DocumentPath As String = ""
|
Public Property DocumentPath As String = ""
|
||||||
Public Property ExportPath As String = ""
|
Public Property ExportPath As String = ""
|
||||||
Public Property DocumentPath_DMZ As String = ""
|
Public Property DocumentPath_DMZ As String = ""
|
||||||
|
|||||||
@ -12,6 +12,10 @@ Imports EnvelopeGenerator.Common.Constants
|
|||||||
Imports DevExpress.XtraBars.Docking
|
Imports DevExpress.XtraBars.Docking
|
||||||
Imports System.ServiceModel
|
Imports System.ServiceModel
|
||||||
Imports DevExpress.XtraRichEdit.Export
|
Imports DevExpress.XtraRichEdit.Export
|
||||||
|
Imports DevExpress.Pdf.Native.BouncyCastle.Asn1.Cms
|
||||||
|
Imports DevExpress.DataAccess.Sql
|
||||||
|
Imports DevExpress.DataProcessing
|
||||||
|
Imports Quartz.Logging.OperationName
|
||||||
|
|
||||||
Namespace Jobs
|
Namespace Jobs
|
||||||
Public Class FinalizeDocumentJob
|
Public Class FinalizeDocumentJob
|
||||||
@ -35,7 +39,8 @@ Namespace Jobs
|
|||||||
Private PDFMerger As PDFMerger
|
Private PDFMerger As PDFMerger
|
||||||
Private ReportCreator As ReportCreator
|
Private ReportCreator As ReportCreator
|
||||||
|
|
||||||
Private ReadOnly CompleteWaitTimeInMinutes As Integer = 5
|
Private ReadOnly CompleteWaitTime As Integer = 5
|
||||||
|
Private ParentFolderUID As String = ""
|
||||||
|
|
||||||
Private Class EnvelopeData
|
Private Class EnvelopeData
|
||||||
Public EnvelopeId As Integer
|
Public EnvelopeId As Integer
|
||||||
@ -78,7 +83,8 @@ Namespace Jobs
|
|||||||
|
|
||||||
Logger.Debug("Loading ReportCreator..")
|
Logger.Debug("Loading ReportCreator..")
|
||||||
ReportCreator = New ReportCreator(LogConfig, oState)
|
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)
|
||||||
|
|
||||||
If My.Settings.RuninDMZ = True Then
|
If My.Settings.RuninDMZ = True Then
|
||||||
If Config.DocumentPath_DMZ <> String.Empty Then
|
If Config.DocumentPath_DMZ <> String.Empty Then
|
||||||
@ -90,14 +96,16 @@ Namespace Jobs
|
|||||||
End If
|
End If
|
||||||
Else
|
Else
|
||||||
If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
||||||
Logger.Debug("Using DMZRemotePath: [{0}] - Overwrite Document-Path", Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
Logger.Debug("Using DMZRemotePath: [{0}] - Overwrite Document-Path ...", Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
||||||
Config.DocumentPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
|
Config.DocumentPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
|
||||||
Config.NetUse_necessary = True
|
Config.NetUse_Finish = True
|
||||||
|
|
||||||
Else
|
Else
|
||||||
Config.DocumentPath = Config.DocumentPath
|
Config.DocumentPath = Config.DocumentPath
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
|
Logger.Debug("DocumentPath: [{0}]", Config.DocumentPath)
|
||||||
|
|
||||||
If My.Settings.RuninDMZ = True Then
|
If My.Settings.RuninDMZ = True Then
|
||||||
If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
|
If Config.FINISHED_PATH_EX_DMZ <> String.Empty Then
|
||||||
Logger.Debug("RuninDMZ - FINISHED_PATH_EX_DMZ configured: [{0}]", Config.FINISHED_PATH_EX_DMZ)
|
Logger.Debug("RuninDMZ - FINISHED_PATH_EX_DMZ configured: [{0}]", Config.FINISHED_PATH_EX_DMZ)
|
||||||
@ -109,20 +117,20 @@ Namespace Jobs
|
|||||||
Else
|
Else
|
||||||
Config.ExportPath = Config.ExportPath
|
Config.ExportPath = Config.ExportPath
|
||||||
End If
|
End If
|
||||||
|
|
||||||
ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
|
||||||
Logger.Debug("DOCUMENT_PATH_MOVE_AFTSEND configured: [{0}] - Overwrite ExportPath", Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
|
||||||
Config.ExportPath = Config.DOCUMENT_PATH_MOVE_AFTSEND
|
|
||||||
Config.NetUse_Finish = True
|
|
||||||
Else
|
Else
|
||||||
Config.ExportPath = Config.ExportPath
|
Config.ExportPath = Config.ExportPath
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|
||||||
Logger.Debug("ExportPath: [{0}]", Config.ExportPath)
|
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 oCompleteStatus As Integer = Constants.EnvelopeStatus.EnvelopeCompletelySigned
|
||||||
Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTimeInMinutes}"
|
Dim oSql = $"SELECT * FROM TBSIG_ENVELOPE WHERE STATUS = {oCompleteStatus} AND DATEDIFF(minute, CHANGED_WHEN, GETDATE()) >= {CompleteWaitTime}"
|
||||||
Dim oTable = Database.GetDatatable(oSql)
|
Dim oTable = Database.GetDatatable(oSql)
|
||||||
|
|
||||||
Dim oEnvelopeIds As List(Of Integer) = oTable.Rows.Cast(Of DataRow).
|
Dim oEnvelopeIds As List(Of Integer) = oTable.Rows.Cast(Of DataRow).
|
||||||
@ -149,12 +157,17 @@ Namespace Jobs
|
|||||||
Logger.Debug("Loading Envelope Data..")
|
Logger.Debug("Loading Envelope Data..")
|
||||||
Dim oEnvelopeData = GetEnvelopeData(oId)
|
Dim oEnvelopeData = GetEnvelopeData(oId)
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
If oEnvelopeData Is Nothing Then
|
If oEnvelopeData Is Nothing Then
|
||||||
Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
|
Logger.Warn("EnvelopeData could not be loaded for Id [{0}]!", oId)
|
||||||
Throw New ArgumentNullException("EnvelopeData")
|
Throw New ArgumentNullException("EnvelopeData")
|
||||||
End If
|
End If
|
||||||
|
|
||||||
Logger.Debug("Burning Annotations to pdf")
|
Logger.Debug("Burning Annotations to pdf ...")
|
||||||
Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
|
Dim oBurnedDocument As Byte() = BurnAnnotationsToPdf(oEnvelopeData)
|
||||||
If oBurnedDocument Is Nothing Then
|
If oBurnedDocument Is Nothing Then
|
||||||
Logger.Warn("Document could not be finalized!")
|
Logger.Warn("Document could not be finalized!")
|
||||||
@ -168,14 +181,16 @@ Namespace Jobs
|
|||||||
|
|
||||||
Logger.Debug("Creating report..")
|
Logger.Debug("Creating report..")
|
||||||
Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
|
Dim oReport As Byte() = ReportCreator.CreateReport(oEnvelope)
|
||||||
Logger.Debug("Report created.")
|
Logger.Debug("Report created!")
|
||||||
|
|
||||||
Logger.Debug("Merging documents..")
|
Logger.Debug("Merging documents ...")
|
||||||
Dim oMergedDocument As Byte() = PDFMerger.MergeDocuments(oBurnedDocument, oReport)
|
Dim oMergedDocument As Byte() = PDFMerger.MergeDocuments(oBurnedDocument, oReport)
|
||||||
Logger.Debug("Documents merged.")
|
Logger.Debug("Documents merged!")
|
||||||
|
|
||||||
Dim oOutputDirectoryPath = Config.ExportPath
|
|
||||||
|
|
||||||
|
Dim oOutputDirectoryPath = Path.Combine(Config.ExportPath, ParentFolderUID)
|
||||||
|
If Not Directory.Exists(oOutputDirectoryPath) Then
|
||||||
|
Directory.CreateDirectory(oOutputDirectoryPath)
|
||||||
|
End If
|
||||||
Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
|
Dim oOutputFilePath = Path.Combine(oOutputDirectoryPath, $"{oEnvelope.Uuid}.pdf")
|
||||||
Logger.Info("Writing finalized Pdf to disk..")
|
Logger.Info("Writing finalized Pdf to disk..")
|
||||||
Logger.Info("Output path is [{0}]", oOutputFilePath)
|
Logger.Info("Output path is [{0}]", oOutputFilePath)
|
||||||
@ -187,23 +202,30 @@ Namespace Jobs
|
|||||||
Throw New ExportDocumentException("Could not export final document to disk!", ex)
|
Throw New ExportDocumentException("Could not export final document to disk!", ex)
|
||||||
End Try
|
End Try
|
||||||
|
|
||||||
Logger.Info("Sending final Emails..")
|
|
||||||
|
|
||||||
If Config.NetUse_Finish = True Then
|
If Config.NetUse_Finish = True Then
|
||||||
If Config.FINISHED_PATH_EX_DMZ <> String.Empty 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
|
If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
|
||||||
Dim oReturnPath = MoveFileWithNetUse(oOutputFilePath, Config.FINISHED_PATH_EX_DMZ, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
|
Clean_DNZ_PAth(Config.FINISHED_PATH_EX_DMZ)
|
||||||
If oReturnPath <> String.Empty Then
|
'Dim oReturnPath = MoveFileWithNetUse(Config.FINISHED_PATH_EX_DMZ, oOutputFilePath, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
|
||||||
oOutputFilePath = oReturnPath
|
'If oReturnPath <> String.Empty Then
|
||||||
If Config.EML_PATH_EX_DMZ <> String.Empty Then
|
' oOutputFilePath = oReturnPath
|
||||||
oOutputFilePath = oOutputFilePath.Replace(Config.FINISHED_PATH_EX_DMZ, Config.EML_PATH_EX_DMZ)
|
' If Config.EML_PATH_EX_DMZ <> String.Empty Then
|
||||||
End If
|
' Logger.Debug($"Now replacing [{Config.FINISHED_PATH_EX_DMZ}] with ")
|
||||||
End If
|
' Logger.Debug($"............. [{Config.EML_PATH_EX_DMZ}] ")
|
||||||
|
' oOutputFilePath = oOutputFilePath.Replace(Config.FINISHED_PATH_EX_DMZ, Config.EML_PATH_EX_DMZ)
|
||||||
|
' Logger.Debug($"oOutputFilePath [{oOutputFilePath}] ")
|
||||||
|
' End If
|
||||||
|
'Else
|
||||||
|
' Logger.Info($"Exiting/Aborting FinalizeDocuments!")
|
||||||
|
' Return Task.FromResult(False)
|
||||||
|
'End If
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
Logger.Info("Sending finalized report-mails..")
|
||||||
|
|
||||||
If SendFinalEmails(oEnvelope, oOutputFilePath) = False Then
|
If SendFinalEmails(oEnvelope, oOutputFilePath) = False Then
|
||||||
Throw New ApplicationException("Final emails could not be sent!")
|
Throw New ApplicationException("Final emails could not be sent!")
|
||||||
@ -238,13 +260,10 @@ Namespace Jobs
|
|||||||
|
|
||||||
Return Task.FromResult(True)
|
Return Task.FromResult(True)
|
||||||
End Function
|
End Function
|
||||||
|
Private Function NetUse_Command(pDestinationPath As String, pUsername As String, pPassword As String)
|
||||||
Private Function MoveFileWithNetUse(pSourcePath As String, pDestinationPath As String, pUsername As String, pPassword As String) As String
|
|
||||||
Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
|
Dim oDectryptedPW = Helpers.Decrypt(My.Settings.NetUse_PW)
|
||||||
Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
|
|
||||||
|
|
||||||
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)
|
||||||
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
|
||||||
@ -255,40 +274,40 @@ Namespace Jobs
|
|||||||
|
|
||||||
' 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
|
||||||
' Verschiebe die Datei
|
Return True
|
||||||
Try
|
|
||||||
Dim oFilePath As String = pSourcePath
|
|
||||||
|
|
||||||
Dim split As String() = oFilePath.Split("\")
|
|
||||||
Dim parentFolder As String = split(split.Length - 2)
|
|
||||||
pDestinationPath &= "\" + parentFolder
|
|
||||||
If Not System.IO.Directory.Exists(pDestinationPath) Then
|
|
||||||
System.IO.Directory.CreateDirectory(pDestinationPath)
|
|
||||||
End If
|
|
||||||
pDestinationPath &= "\" + oFilename
|
|
||||||
If File.Exists(pDestinationPath) Then
|
|
||||||
File.Delete(pDestinationPath)
|
|
||||||
End If
|
|
||||||
Logger.Info($"MoveFileWithNetUse To {pDestinationPath} ...")
|
|
||||||
System.IO.File.Move(pSourcePath, pDestinationPath)
|
|
||||||
Return pDestinationPath
|
|
||||||
Catch ex As Exception
|
|
||||||
Logger.Error(ex)
|
|
||||||
Return ""
|
|
||||||
End Try
|
|
||||||
|
|
||||||
Else
|
Else
|
||||||
Logger.Warn("Error while connecting to network-path " & pDestinationPath)
|
Return False
|
||||||
Return ""
|
|
||||||
End If
|
End If
|
||||||
End Using
|
End Using
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Private Function Clean_DNZ_PAth(pSourcePath As String) As Boolean
|
||||||
|
Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
|
||||||
|
|
||||||
|
Logger.Debug("## Starting Clean_DNZ_PAth ...")
|
||||||
|
Logger.Debug("## pSourcePath {0}", pSourcePath)
|
||||||
|
|
||||||
|
Dim oDirectorySource = Path.Combine(pSourcePath, ParentFolderUID)
|
||||||
|
|
||||||
|
Try
|
||||||
|
Logger.Debug($"Deleting oDirectorySource {oDirectorySource} ...")
|
||||||
|
Directory.Delete(oDirectorySource, True)
|
||||||
|
Console.WriteLine($"Folder successfully deleted!")
|
||||||
|
Logger.Debug($"...Deleted!")
|
||||||
|
Return True
|
||||||
|
Catch ex As Exception
|
||||||
|
Logger.Error(ex)
|
||||||
|
Return False
|
||||||
|
End Try
|
||||||
|
|
||||||
|
|
||||||
|
End Function
|
||||||
Private Function SendFinalEmails(pEnvelope As Envelope, pAttachment As String) As Boolean
|
Private Function SendFinalEmails(pEnvelope As Envelope, pAttachment As String) As Boolean
|
||||||
Dim oMailToCreator = pEnvelope.FinalEmailToCreator
|
Dim oMailToCreator = pEnvelope.FinalEmailToCreator
|
||||||
Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
|
Dim oMailToReceivers = pEnvelope.FinalEmailToReceivers
|
||||||
|
|
||||||
If oMailToCreator <> FinalEmailType.No Then
|
If oMailToCreator <> FinalEmailType.No Then
|
||||||
Logger.Debug("Sending email to creator..")
|
Logger.Debug("Sending email to creator ...")
|
||||||
SendFinalEmailToCreator(pEnvelope, pAttachment)
|
SendFinalEmailToCreator(pEnvelope, pAttachment)
|
||||||
End If
|
End If
|
||||||
|
|
||||||
@ -352,9 +371,22 @@ Namespace Jobs
|
|||||||
|
|
||||||
Logger.Info("Burning [{0}] signatures", pData.AnnotationData.Count)
|
Logger.Info("Burning [{0}] signatures", pData.AnnotationData.Count)
|
||||||
Dim oAnnotations = pData.AnnotationData
|
Dim oAnnotations = pData.AnnotationData
|
||||||
Dim oInputPath = pData.DocumentPath
|
Dim oInputPath = ""
|
||||||
|
|
||||||
|
If My.Settings.RuninDMZ Then
|
||||||
|
oInputPath = pData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DocumentPath)
|
||||||
|
Logger.Debug("Replaced Path in pData.DocumentPath!")
|
||||||
|
ElseIf Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
||||||
|
oInputPath = pData.DocumentPath.Replace(Config.DocumentPathOrigin, Config.DOCUMENT_PATH_MOVE_AFTSEND)
|
||||||
|
Logger.Debug("Replaced Path in pData.DocumentPath!")
|
||||||
|
End If
|
||||||
|
|
||||||
Logger.Info("Input path: [{0}]", oInputPath)
|
Logger.Info("Input path: [{0}]", oInputPath)
|
||||||
|
Dim oDirectorySource As String = Path.GetDirectoryName(oInputPath)
|
||||||
|
Dim split As String() = oDirectorySource.Split("\")
|
||||||
|
ParentFolderUID = split(split.Length - 1)
|
||||||
|
|
||||||
|
Logger.Info("ParentFolderUID: [{0}]", ParentFolderUID)
|
||||||
Dim oInputDocumentBuffer As Byte()
|
Dim oInputDocumentBuffer As Byte()
|
||||||
Try
|
Try
|
||||||
oInputDocumentBuffer = File.ReadAllBytes(oInputPath)
|
oInputDocumentBuffer = File.ReadAllBytes(oInputPath)
|
||||||
|
|||||||
@ -17,6 +17,7 @@ Public Class ConfigModel
|
|||||||
|
|
||||||
Return New DbConfig() With {
|
Return New DbConfig() With {
|
||||||
.DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
|
.DocumentPath = oRow.ItemEx("DOCUMENT_PATH", ""),
|
||||||
|
.DocumentPathOrigin = oRow.ItemEx("DOCUMENT_PATH", ""),
|
||||||
.DocumentPath_DMZ = oRow.ItemEx("DOCUMENT_PATH_DMZ", ""),
|
.DocumentPath_DMZ = oRow.ItemEx("DOCUMENT_PATH_DMZ", ""),
|
||||||
.ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
|
.ExportPath = oRow.ItemEx("EXPORT_PATH", ""),
|
||||||
.ExportPath_DMZ = oRow.ItemEx("EXPORT_PATH_DMZ", ""),
|
.ExportPath_DMZ = oRow.ItemEx("EXPORT_PATH_DMZ", ""),
|
||||||
|
|||||||
@ -72,16 +72,13 @@ Namespace My
|
|||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
<Global.System.Configuration.UserScopedSettingAttribute(), _
|
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _
|
||||||
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
|
||||||
Global.System.Configuration.DefaultSettingValueAttribute("sY4vnATDXwosbTJGip6SqA==")> _
|
Global.System.Configuration.DefaultSettingValueAttribute("sY4vnATDXwosbTJGip6SqA==")> _
|
||||||
Public Property NetUse_PW() As String
|
Public ReadOnly Property NetUse_PW() As String
|
||||||
Get
|
Get
|
||||||
Return CType(Me("NetUse_PW"),String)
|
Return CType(Me("NetUse_PW"),String)
|
||||||
End Get
|
End Get
|
||||||
Set
|
|
||||||
Me("NetUse_PW") = value
|
|
||||||
End Set
|
|
||||||
End Property
|
End Property
|
||||||
End Class
|
End Class
|
||||||
End Namespace
|
End Namespace
|
||||||
|
|||||||
@ -8,7 +8,7 @@
|
|||||||
<Setting Name="NetUse_Usr" Type="System.String" Scope="Application">
|
<Setting Name="NetUse_Usr" Type="System.String" Scope="Application">
|
||||||
<Value Profile="(Default)">dd-gan\Administrator</Value>
|
<Value Profile="(Default)">dd-gan\Administrator</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
<Setting Name="NetUse_PW" Type="System.String" Scope="User">
|
<Setting Name="NetUse_PW" Type="System.String" Scope="Application">
|
||||||
<Value Profile="(Default)">sY4vnATDXwosbTJGip6SqA==</Value>
|
<Value Profile="(Default)">sY4vnATDXwosbTJGip6SqA==</Value>
|
||||||
</Setting>
|
</Setting>
|
||||||
</Settings>
|
</Settings>
|
||||||
|
|||||||
@ -5,9 +5,6 @@
|
|||||||
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
|
<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" />
|
<section name="EnvelopeGenerator.Common.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
|
||||||
</sectionGroup>
|
</sectionGroup>
|
||||||
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, 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" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
|
|
||||||
</sectionGroup>
|
|
||||||
</configSections>
|
</configSections>
|
||||||
<system.diagnostics>
|
<system.diagnostics>
|
||||||
<sources>
|
<sources>
|
||||||
@ -40,13 +37,9 @@
|
|||||||
<setting name="NetUse_Usr" serializeAs="String">
|
<setting name="NetUse_Usr" serializeAs="String">
|
||||||
<value>dd-gan\Administrator</value>
|
<value>dd-gan\Administrator</value>
|
||||||
</setting>
|
</setting>
|
||||||
</EnvelopeGenerator.Common.My.MySettings>
|
|
||||||
</applicationSettings>
|
|
||||||
<userSettings>
|
|
||||||
<EnvelopeGenerator.Common.My.MySettings>
|
|
||||||
<setting name="NetUse_PW" serializeAs="String">
|
<setting name="NetUse_PW" serializeAs="String">
|
||||||
<value>sY4vnATDXwosbTJGip6SqA==</value>
|
<value>sY4vnATDXwosbTJGip6SqA==</value>
|
||||||
</setting>
|
</setting>
|
||||||
</EnvelopeGenerator.Common.My.MySettings>
|
</EnvelopeGenerator.Common.My.MySettings>
|
||||||
</userSettings>
|
</applicationSettings>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@ -4,6 +4,7 @@ Imports EnvelopeGenerator.Common
|
|||||||
Imports System.Data.SqlClient
|
Imports System.Data.SqlClient
|
||||||
Imports DevExpress.DocumentView
|
Imports DevExpress.DocumentView
|
||||||
Imports System.Transactions
|
Imports System.Transactions
|
||||||
|
Imports System.IO
|
||||||
|
|
||||||
Public MustInherit Class BaseController
|
Public MustInherit Class BaseController
|
||||||
Inherits BaseClass
|
Inherits BaseClass
|
||||||
@ -143,6 +144,8 @@ Public MustInherit Class BaseController
|
|||||||
If IO.File.Exists(pDocument.Filepath) Then
|
If IO.File.Exists(pDocument.Filepath) Then
|
||||||
IO.File.Delete(pDocument.Filepath)
|
IO.File.Delete(pDocument.Filepath)
|
||||||
End If
|
End If
|
||||||
|
Dim oFolder As String = Path.GetDirectoryName(pDocument.Filepath)
|
||||||
|
Directory.Delete(oFolder)
|
||||||
|
|
||||||
Return True
|
Return True
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
|||||||
@ -33,6 +33,7 @@ Public Class TempFiles
|
|||||||
Private Function CleanUpFiles() As Boolean
|
Private Function CleanUpFiles() As Boolean
|
||||||
Try
|
Try
|
||||||
For Each fileItem As String In Directory.GetFiles(TempPath)
|
For Each fileItem As String In Directory.GetFiles(TempPath)
|
||||||
|
Logger.Debug("Deleting tempPath-file: {0} ...", fileItem)
|
||||||
File.Delete(fileItem)
|
File.Delete(fileItem)
|
||||||
Next
|
Next
|
||||||
|
|
||||||
@ -46,7 +47,8 @@ Public Class TempFiles
|
|||||||
|
|
||||||
Public Function CleanUp() As Boolean
|
Public Function CleanUp() As Boolean
|
||||||
Try
|
Try
|
||||||
Directory.Delete(TempPath)
|
Logger.Debug("Deleting tempPath-Data: {0} ...", TempPath)
|
||||||
|
Directory.Delete(TempPath, True)
|
||||||
Return True
|
Return True
|
||||||
|
|
||||||
Catch ex As Exception
|
Catch ex As Exception
|
||||||
|
|||||||
@ -1,3 +1,7 @@
|
|||||||
Module ModuleSettings
|
Imports DigitalData.Modules.Logging
|
||||||
|
|
||||||
|
Module ModuleSettings
|
||||||
Public DOCUMENT_PATH_MOVE_AFTSEND As String = ""
|
Public DOCUMENT_PATH_MOVE_AFTSEND As String = ""
|
||||||
|
Public CurrLogConfig As LogConfig
|
||||||
|
Public Directory2Delete As String = ""
|
||||||
End Module
|
End Module
|
||||||
|
|||||||
12
EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
generated
12
EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
generated
@ -56,6 +56,7 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
Me.txtCreatorEmailLabel = New DevExpress.XtraBars.BarStaticItem()
|
Me.txtCreatorEmailLabel = New DevExpress.XtraBars.BarStaticItem()
|
||||||
Me.txtEnvelopeIdLabel2 = New DevExpress.XtraBars.BarStaticItem()
|
Me.txtEnvelopeIdLabel2 = New DevExpress.XtraBars.BarStaticItem()
|
||||||
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
|
||||||
|
Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
|
||||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
@ -238,9 +239,9 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
'RibbonControl1
|
'RibbonControl1
|
||||||
'
|
'
|
||||||
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
Me.RibbonControl1.ExpandCollapseItem.Id = 0
|
||||||
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1})
|
Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1})
|
||||||
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
|
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
|
||||||
Me.RibbonControl1.MaxItemId = 13
|
Me.RibbonControl1.MaxItemId = 14
|
||||||
Me.RibbonControl1.Name = "RibbonControl1"
|
Me.RibbonControl1.Name = "RibbonControl1"
|
||||||
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
|
||||||
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||||
@ -329,6 +330,11 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
Me.BarButtonItem1.Id = 12
|
Me.BarButtonItem1.Id = 12
|
||||||
Me.BarButtonItem1.Name = "BarButtonItem1"
|
Me.BarButtonItem1.Name = "BarButtonItem1"
|
||||||
'
|
'
|
||||||
|
'BarStaticItem1
|
||||||
|
'
|
||||||
|
Me.BarStaticItem1.Id = 13
|
||||||
|
Me.BarStaticItem1.Name = "BarStaticItem1"
|
||||||
|
'
|
||||||
'RibbonPage1
|
'RibbonPage1
|
||||||
'
|
'
|
||||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
|
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
|
||||||
@ -373,6 +379,7 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
'
|
'
|
||||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCreatorEmailLabel)
|
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCreatorEmailLabel)
|
||||||
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtEnvelopeIdLabel2)
|
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtEnvelopeIdLabel2)
|
||||||
|
Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1)
|
||||||
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
|
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
|
||||||
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
|
||||||
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
|
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
|
||||||
@ -767,6 +774,7 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
Friend WithEvents txtEnvelopeIdLabel2 As DevExpress.XtraBars.BarStaticItem
|
Friend WithEvents txtEnvelopeIdLabel2 As DevExpress.XtraBars.BarStaticItem
|
||||||
Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn
|
Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn
|
||||||
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
|
||||||
|
Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
|
||||||
|
|
||||||
#End Region
|
#End Region
|
||||||
|
|
||||||
|
|||||||
@ -1043,6 +1043,12 @@
|
|||||||
<data name=">>BarButtonItem1.Type" xml:space="preserve">
|
<data name=">>BarButtonItem1.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>BarStaticItem1.Name" xml:space="preserve">
|
||||||
|
<value>BarStaticItem1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BarStaticItem1.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
||||||
<value>RibbonPage1</value>
|
<value>RibbonPage1</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -330,61 +330,115 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text)
|
MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text)
|
||||||
Else
|
Else
|
||||||
If MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information Or MsgBoxStyle.OkOnly, Text) = MsgBoxResult.Ok Then
|
If MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information Or MsgBoxStyle.OkOnly, Text) = MsgBoxResult.Ok Then
|
||||||
If DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
'If DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
|
||||||
If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
|
' If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
|
||||||
Dim oDecrypted = Decryption.Decrypt(My.Settings.NetUse_PW)
|
' Dim oDecrypted = Decryption.Decrypt(My.Settings.NetUse_PW)
|
||||||
For Each odoc In Controller.Envelope.Documents 'envelope ist leer!
|
' For Each odoc In Controller.Envelope.Documents 'envelope ist leer!
|
||||||
MoveFileWithNetUse(odoc.Filepath, DOCUMENT_PATH_MOVE_AFTSEND, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
|
' Directory2Delete = ""
|
||||||
Next
|
' If CopyFileWithNetUse(odoc.Filepath, DOCUMENT_PATH_MOVE_AFTSEND, My.Settings.NetUse_Usr, My.Settings.NetUse_PW) = False Then
|
||||||
End If
|
' BarStaticItem1.Caption = "ERROR while copying files to DMZ! Check Your log!"
|
||||||
|
' End If
|
||||||
|
' If Directory2Delete <> String.Empty Then
|
||||||
|
' Logger.Debug("Now Deleting SourcePath: {0} ...", Directory2Delete)
|
||||||
|
' Try
|
||||||
|
' System.IO.Directory.Delete(Directory2Delete, True)
|
||||||
|
' Logger.Debug("Successfully deleted Sourcepath!")
|
||||||
|
' Catch ex As Exception
|
||||||
|
' Logger.Warn("Unexpected Error while deleting SourcePath {0}", Directory2Delete)
|
||||||
|
' Logger.Warn("ErrorMessage: {0}", ex.Message)
|
||||||
|
' End Try
|
||||||
|
|
||||||
End If
|
' End If
|
||||||
|
' Next
|
||||||
|
' End If
|
||||||
|
|
||||||
|
'End If
|
||||||
Me.Close()
|
Me.Close()
|
||||||
End If
|
End If
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|
||||||
Sub MoveFileWithNetUse(pSourcePath As String, pDestinationPath As String, pUsername As String, pPassword As String)
|
Function CopyFileWithNetUse(pSourcePath As String, pDestinationPath As String, pUsername As String, pPassword As String) As Boolean
|
||||||
Dim oDectryptedPW = Decryption.Decrypt(pPassword)
|
Logger.Debug("EXECUTING CopyFileWithNetUse for " & pDestinationPath)
|
||||||
Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
|
Dim oDirectoryExists As Boolean = False
|
||||||
|
Try
|
||||||
Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
|
If Directory.Exists(pDestinationPath) Then
|
||||||
|
oDirectoryExists = True
|
||||||
Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
|
|
||||||
processInfo.RedirectStandardOutput = True
|
|
||||||
processInfo.UseShellExecute = False
|
|
||||||
processInfo.CreateNoWindow = True
|
|
||||||
|
|
||||||
Using process As Process = Process.Start(processInfo)
|
|
||||||
process.WaitForExit()
|
|
||||||
|
|
||||||
' Prüfe den Rückgabewert des net use Befehls
|
|
||||||
If process.ExitCode = 0 Then
|
|
||||||
' Verschiebe die Datei
|
|
||||||
Try
|
|
||||||
Dim oFilePath As String = pSourcePath
|
|
||||||
|
|
||||||
Dim split As String() = oFilePath.Split("\")
|
|
||||||
Dim parentFolder As String = split(split.Length - 2)
|
|
||||||
pDestinationPath &= "\" + parentFolder
|
|
||||||
If Not System.IO.Directory.Exists(pDestinationPath) Then
|
|
||||||
System.IO.Directory.CreateDirectory(pDestinationPath)
|
|
||||||
End If
|
|
||||||
pDestinationPath &= "\" + oFilename
|
|
||||||
If File.Exists(pDestinationPath) Then
|
|
||||||
File.Delete(pDestinationPath)
|
|
||||||
End If
|
|
||||||
System.IO.File.Move(pSourcePath, pDestinationPath)
|
|
||||||
Catch ex As Exception
|
|
||||||
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in MoveFileWithNetUse")
|
|
||||||
End Try
|
|
||||||
|
|
||||||
Else
|
|
||||||
MsgBox("Error while connecting to network: " & pDestinationPath, MsgBoxStyle.Critical, "Unexpected error in MoveFileWithNetUse")
|
|
||||||
End If
|
End If
|
||||||
End Using
|
Catch ex As Exception
|
||||||
End Sub
|
Logger.Warn("CopyFileWithNetUse - path not accessible or existing: {0}", ex.Message)
|
||||||
|
End Try
|
||||||
|
Logger.Debug("CopyFileWithNetUse - Folder accessible [{0}]", oDirectoryExists.ToString)
|
||||||
|
|
||||||
|
If oDirectoryExists = False Then
|
||||||
|
Dim oDectryptedPW = Decryption.Decrypt(pPassword)
|
||||||
|
Dim netUseCommand As String = $"net use {pDestinationPath} /user:{pUsername} {oDectryptedPW}"
|
||||||
|
Logger.Debug("netUseCommand " & netUseCommand)
|
||||||
|
Dim processInfo As New ProcessStartInfo("cmd.exe", $"/C {netUseCommand}")
|
||||||
|
processInfo.RedirectStandardOutput = True
|
||||||
|
processInfo.RedirectStandardInput = True
|
||||||
|
processInfo.UseShellExecute = False
|
||||||
|
processInfo.CreateNoWindow = True
|
||||||
|
Using oProcess As Process = Process.Start(processInfo)
|
||||||
|
oProcess.WaitForExit()
|
||||||
|
' Prüfe den Rückgabewert des net use Befehls
|
||||||
|
If oProcess.ExitCode = 0 Then
|
||||||
|
' Verschiebe die Datei
|
||||||
|
Try
|
||||||
|
Dim oReturn = COPY_TO_DMZ(pSourcePath, pDestinationPath)
|
||||||
|
oProcess.Close()
|
||||||
|
Return oReturn
|
||||||
|
Catch ex As Exception
|
||||||
|
oProcess.Close()
|
||||||
|
Logger.Warn("Unexpected error in CopyFileWithNetUse " & pDestinationPath)
|
||||||
|
MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in CopyFileWithNetUse")
|
||||||
|
|
||||||
|
Return False
|
||||||
|
End Try
|
||||||
|
|
||||||
|
Else
|
||||||
|
Logger.Warn("Error while connecting to network-path: " & pDestinationPath)
|
||||||
|
'MsgBox("Error while connecting to network: " & pDestinationPath, MsgBoxStyle.Critical, "Unexpected error in CopyFileWithNetUse")
|
||||||
|
Return False
|
||||||
|
End If
|
||||||
|
End Using
|
||||||
|
Else
|
||||||
|
Return COPY_TO_DMZ(pSourcePath, pDestinationPath)
|
||||||
|
End If
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
End Function
|
||||||
|
Private Function COPY_TO_DMZ(pSourcePath As String, pDestinationPath As String) As Boolean
|
||||||
|
Try
|
||||||
|
Dim oFilename = System.IO.Path.GetFileName(pSourcePath)
|
||||||
|
Dim oFilePath As String = pSourcePath
|
||||||
|
Dim oSourceDirectory As String = Path.GetDirectoryName(oFilePath)
|
||||||
|
Dim split As String() = oFilePath.Split("\")
|
||||||
|
Dim parentFolder As String = split(split.Length - 2)
|
||||||
|
pDestinationPath &= "\" + parentFolder
|
||||||
|
If Not System.IO.Directory.Exists(pDestinationPath) Then
|
||||||
|
System.IO.Directory.CreateDirectory(pDestinationPath)
|
||||||
|
End If
|
||||||
|
pDestinationPath &= "\" + oFilename
|
||||||
|
If File.Exists(pDestinationPath) Then
|
||||||
|
File.Delete(pDestinationPath)
|
||||||
|
End If
|
||||||
|
Logger.Debug("Now copying file ...")
|
||||||
|
Logger.Debug("from [{0}] ", pSourcePath)
|
||||||
|
Logger.Debug("to [{0}]... ", pDestinationPath)
|
||||||
|
System.IO.File.Copy(pSourcePath, pDestinationPath)
|
||||||
|
Logger.Debug("Successfully Copied!")
|
||||||
|
Directory2Delete = oSourceDirectory
|
||||||
|
Return True
|
||||||
|
Catch ex As Exception
|
||||||
|
Logger.Warn("COPY_TO_DMZ - Unexpected error {0}", ex.Message)
|
||||||
|
Return False
|
||||||
|
End Try
|
||||||
|
|
||||||
|
End Function
|
||||||
Private Sub btnCancel_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCancel.ItemClick
|
Private Sub btnCancel_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCancel.ItemClick
|
||||||
' Speichern?
|
' Speichern?
|
||||||
Dim oMessage = Resources.Envelope.Should_The_Envelope_Be_Saved
|
Dim oMessage = Resources.Envelope.Should_The_Envelope_Be_Saved
|
||||||
@ -523,4 +577,7 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub RibbonControl1_Click(sender As Object, e As EventArgs) Handles RibbonControl1.Click
|
||||||
|
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
26
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
26
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
@ -57,6 +57,7 @@ Partial Class frmMain
|
|||||||
Me.btnContactReceiver = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnContactReceiver = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem()
|
Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem()
|
||||||
Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnOpenLogDirectory = New DevExpress.XtraBars.BarButtonItem()
|
||||||
|
Me.BarCheckItem1 = New DevExpress.XtraBars.BarCheckItem()
|
||||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
||||||
Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
|
||||||
@ -81,6 +82,7 @@ Partial Class frmMain
|
|||||||
Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
|
Me.GridColumn5 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||||
Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
|
Me.GridColumn7 = New DevExpress.XtraGrid.Columns.GridColumn()
|
||||||
Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
|
Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
|
||||||
|
Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem()
|
||||||
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
|
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
|
||||||
Me.SplitContainerControl1.Panel1.SuspendLayout()
|
Me.SplitContainerControl1.Panel1.SuspendLayout()
|
||||||
@ -286,9 +288,9 @@ Partial Class frmMain
|
|||||||
Me.RibbonControl.ExpandCollapseItem.Id = 0
|
Me.RibbonControl.ExpandCollapseItem.Id = 0
|
||||||
Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
|
Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
|
||||||
Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
|
Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
|
||||||
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory})
|
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCreateEnvelope, Me.btnEditEnvelope, Me.btnDeleteEnvelope, Me.BarButtonItem1, Me.txtRefreshLabel, Me.btnShowDocument, Me.btnContactReceiver, Me.txtEnvelopeIdLabel, Me.btnOpenLogDirectory, Me.BarCheckItem1, Me.bsitmInfo})
|
||||||
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
|
resources.ApplyResources(Me.RibbonControl, "RibbonControl")
|
||||||
Me.RibbonControl.MaxItemId = 12
|
Me.RibbonControl.MaxItemId = 14
|
||||||
Me.RibbonControl.Name = "RibbonControl"
|
Me.RibbonControl.Name = "RibbonControl"
|
||||||
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
|
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage2})
|
||||||
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
|
||||||
@ -380,6 +382,14 @@ Partial Class frmMain
|
|||||||
Me.btnOpenLogDirectory.ImageOptions.SvgImage = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
|
Me.btnOpenLogDirectory.ImageOptions.SvgImage = CType(resources.GetObject("btnOpenLogDirectory.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
|
||||||
Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory"
|
Me.btnOpenLogDirectory.Name = "btnOpenLogDirectory"
|
||||||
'
|
'
|
||||||
|
'BarCheckItem1
|
||||||
|
'
|
||||||
|
resources.ApplyResources(Me.BarCheckItem1, "BarCheckItem1")
|
||||||
|
Me.BarCheckItem1.Id = 12
|
||||||
|
Me.BarCheckItem1.ImageOptions.Image = CType(resources.GetObject("BarCheckItem1.ImageOptions.Image"), System.Drawing.Image)
|
||||||
|
Me.BarCheckItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.LargeImage"), System.Drawing.Image)
|
||||||
|
Me.BarCheckItem1.Name = "BarCheckItem1"
|
||||||
|
'
|
||||||
'RibbonPage1
|
'RibbonPage1
|
||||||
'
|
'
|
||||||
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2})
|
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroup2})
|
||||||
@ -417,6 +427,7 @@ Partial Class frmMain
|
|||||||
'RibbonPageGroup3
|
'RibbonPageGroup3
|
||||||
'
|
'
|
||||||
Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenLogDirectory)
|
Me.RibbonPageGroup3.ItemLinks.Add(Me.btnOpenLogDirectory)
|
||||||
|
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarCheckItem1)
|
||||||
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
|
||||||
resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
|
resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
|
||||||
'
|
'
|
||||||
@ -424,6 +435,7 @@ Partial Class frmMain
|
|||||||
'
|
'
|
||||||
Me.RibbonStatusBar.ItemLinks.Add(Me.txtRefreshLabel)
|
Me.RibbonStatusBar.ItemLinks.Add(Me.txtRefreshLabel)
|
||||||
Me.RibbonStatusBar.ItemLinks.Add(Me.txtEnvelopeIdLabel)
|
Me.RibbonStatusBar.ItemLinks.Add(Me.txtEnvelopeIdLabel)
|
||||||
|
Me.RibbonStatusBar.ItemLinks.Add(Me.bsitmInfo)
|
||||||
resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
|
resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
|
||||||
Me.RibbonStatusBar.Name = "RibbonStatusBar"
|
Me.RibbonStatusBar.Name = "RibbonStatusBar"
|
||||||
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
|
Me.RibbonStatusBar.Ribbon = Me.RibbonControl
|
||||||
@ -561,6 +573,14 @@ Partial Class frmMain
|
|||||||
'
|
'
|
||||||
Me.RefreshTimer.Interval = 120000
|
Me.RefreshTimer.Interval = 120000
|
||||||
'
|
'
|
||||||
|
'bsitmInfo
|
||||||
|
'
|
||||||
|
Me.bsitmInfo.Id = 13
|
||||||
|
Me.bsitmInfo.ImageOptions.Image = CType(resources.GetObject("BarStaticItem1.ImageOptions.Image"), System.Drawing.Image)
|
||||||
|
Me.bsitmInfo.Name = "bsitmInfo"
|
||||||
|
Me.bsitmInfo.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
|
||||||
|
Me.bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||||
|
'
|
||||||
'frmMain
|
'frmMain
|
||||||
'
|
'
|
||||||
resources.ApplyResources(Me, "$this")
|
resources.ApplyResources(Me, "$this")
|
||||||
@ -650,4 +670,6 @@ Partial Class frmMain
|
|||||||
Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
|
Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
|
||||||
Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
|
||||||
Friend WithEvents colAccessCode As DevExpress.XtraGrid.Columns.GridColumn
|
Friend WithEvents colAccessCode As DevExpress.XtraGrid.Columns.GridColumn
|
||||||
|
Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem
|
||||||
|
Friend WithEvents bsitmInfo As DevExpress.XtraBars.BarStaticItem
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@ -565,6 +565,120 @@
|
|||||||
MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
|
MC40QzIuMSwyNS4zLDIuMiwyNS4zLDIuMiwyNS4yeiIgY2xhc3M9IlllbGxvdyIgLz4NCiAgPC9nPg0K
|
||||||
ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
|
ICA8cGF0aCBkPSJNMzEuMywxNEg5LjZMNCwyNmgyMS44YzAuNSwwLDEuMS0wLjMsMS4zLTAuN0wzMiwx
|
||||||
NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
|
NC43QzMyLjEsMTQuMywzMS44LDE0LDMxLjMsMTR6IiBjbGFzcz0iWWVsbG93IiAvPg0KPC9zdmc+Cw==
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="BarCheckItem1.Caption" xml:space="preserve">
|
||||||
|
<value>Log Debug</value>
|
||||||
|
</data>
|
||||||
|
<data name="BarCheckItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABN0RVh0VGl0
|
||||||
|
bGUAUHJvamVjdDtGaWxlOz37jYIAAAK6SURBVDhPfdNbSNNRHAfwv5bRNK3Ql1WEc5IgDLsIFk3LiIJK
|
||||||
|
Ic2XHlJLNC95mVpumCOWLrXUZJZu5g3NoqtYKJnhpZeSIHrIkuFDpRFl7eru+3bO2RouqMFn52Hn9/39
|
||||||
|
zuGMA+BTl7hFQLQo9vDn5fER8zLR+pbKGJ5g5Z6/0U8gsYpYrRBv1sp388skceHRxbFh0eUxwWUlgiAt
|
||||||
|
+S3Ii+4L8AtYGCyd0Pacg7anCCOydMx1FWLuVgE+dubjgyYfD4oOY1adh/cduXinOjNJG/kFTF85BevC
|
||||||
|
Sz+2b29g+TqD5cUZmBdew/TlFdOVd5TOHEqsIehEAdyINA362SF8firDp2Eps/iiEX39w7jaOYVGSuPR
|
||||||
|
oJlEg5pon0CtamyKBQ3mHoB2qAa92TvRlBKNtoxYvNXkoJ5sdLvh4yJfjMsNJ1Grek6n4XENh2JRtYOP
|
||||||
|
a6TYaZiAXMyHYl8klDfGWYHZ4mBMFidBVwccThcuXX9GA4K51uPxUGUkoO7gVphnMnB+VwTa0kVQtI6x
|
||||||
|
TqZlB4xeBrOHzeFCdeMIDQjhujOTMVqdjoq4jTgr5EEi2oBHhWLUNI2STm4YzXZSZIfe5ICerDqTHVa7
|
||||||
|
C1XKYU/AzRMJGMhJQnuqEB3HhFCnRuFhXgKk9U9YJz0p0Jls0Bk9fhHLVifKFY9pwDqu+YgI6rQ4NCfz
|
||||||
|
0UTt56MjbRsqLg/BYnf6in4aPJYMVhgtdhRfvEcDQjm5OGpamSSEMjEKdWIBavdGoiVlO0pr7sNMOi15
|
||||||
|
i5b0VvzwrnqzDQXSO54ANgbHhRMRK2wqlN1lN84KGQu+66wMnSincoAGhPmepN/z5Li1uRdus0v7cwfs
|
||||||
|
GASdhoZlS/r+GxCUWdI9frq8j23MkvQiq6wXmVQpUdKDk/nt9H/B+1dAAEHfezARQtBj0vNSYV48juMC
|
||||||
|
fwOJP3aHKtHXCAAAAABJRU5ErkJggg==
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="BarCheckItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
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
|
||||||
|
2zax9GEAAAAASUVORK5CYII=
|
||||||
|
</value>
|
||||||
|
</data>
|
||||||
|
<data name="BarStaticItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
|
<value>
|
||||||
|
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
|
||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
@ -583,7 +697,7 @@
|
|||||||
<value>Start</value>
|
<value>Start</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
<data name="RibbonPageGroup3.Text" xml:space="preserve">
|
||||||
<value>Verzeichnisse</value>
|
<value>Konfiguration</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="RibbonPage2.Text" xml:space="preserve">
|
<data name="RibbonPage2.Text" xml:space="preserve">
|
||||||
<value>Einstellungen</value>
|
<value>Einstellungen</value>
|
||||||
@ -1157,6 +1271,12 @@
|
|||||||
<data name=">>btnOpenLogDirectory.Type" xml:space="preserve">
|
<data name=">>btnOpenLogDirectory.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>BarCheckItem1.Name" xml:space="preserve">
|
||||||
|
<value>BarCheckItem1</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>BarCheckItem1.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarCheckItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
<data name=">>RibbonPage1.Name" xml:space="preserve">
|
||||||
<value>RibbonPage1</value>
|
<value>RibbonPage1</value>
|
||||||
</data>
|
</data>
|
||||||
@ -1283,6 +1403,12 @@
|
|||||||
<data name=">>RefreshTimer.Type" xml:space="preserve">
|
<data name=">>RefreshTimer.Type" xml:space="preserve">
|
||||||
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name=">>bsitmInfo.Name" xml:space="preserve">
|
||||||
|
<value>bsitmInfo</value>
|
||||||
|
</data>
|
||||||
|
<data name=">>bsitmInfo.Type" xml:space="preserve">
|
||||||
|
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
|
</data>
|
||||||
<data name=">>$this.Name" xml:space="preserve">
|
<data name=">>$this.Name" xml:space="preserve">
|
||||||
<value>frmMain</value>
|
<value>frmMain</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -331,4 +331,25 @@ Public Class frmMain
|
|||||||
Logger.Error(ex)
|
Logger.Error(ex)
|
||||||
End Try
|
End Try
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckItem1.CheckedChanged
|
||||||
|
If BarCheckItem1.Checked = True Then
|
||||||
|
If CurrLogConfig.Debug = False Then
|
||||||
|
CurrLogConfig.Debug = True
|
||||||
|
bsitmInfo.Caption = "DEBUG-Log is active"
|
||||||
|
bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
|
||||||
|
End If
|
||||||
|
Else
|
||||||
|
CurrLogConfig.Debug = False
|
||||||
|
bsitmInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
|
|
||||||
|
Private Sub frmMain_Shown(sender As Object, e As EventArgs) Handles MyBase.Shown
|
||||||
|
If CurrLogConfig.Debug Then
|
||||||
|
BarCheckItem1.Checked = True
|
||||||
|
Else
|
||||||
|
BarCheckItem1.Checked = False
|
||||||
|
End If
|
||||||
|
End Sub
|
||||||
End Class
|
End Class
|
||||||
@ -9,7 +9,7 @@ Imports EnvelopeGenerator.Common
|
|||||||
Imports System.ComponentModel
|
Imports System.ComponentModel
|
||||||
|
|
||||||
Public Class frmSplashScreen
|
Public Class frmSplashScreen
|
||||||
Private LogConfig As LogConfig
|
|
||||||
Private Logger As Logger
|
Private Logger As Logger
|
||||||
Private ConfigManager As ConfigManager(Of Config)
|
Private ConfigManager As ConfigManager(Of Config)
|
||||||
|
|
||||||
@ -23,14 +23,14 @@ Public Class frmSplashScreen
|
|||||||
|
|
||||||
Private Sub frmSplashScreen_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
Private Sub frmSplashScreen_Shown(sender As Object, e As EventArgs) Handles Me.Shown
|
||||||
Dim oLogPath = IO.Path.Combine(Application.LocalUserAppDataPath, "Log")
|
Dim oLogPath = IO.Path.Combine(Application.LocalUserAppDataPath, "Log")
|
||||||
LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, CompanyName:="Digital Data", ProductName:="Envelope Generator")
|
CurrLogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, CompanyName:="Digital Data", ProductName:="Envelope Generator")
|
||||||
Logger = LogConfig.GetLogger()
|
Logger = CurrLogConfig.GetLogger()
|
||||||
|
|
||||||
Try
|
Try
|
||||||
ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
|
ConfigManager = New ConfigManager(Of Config)(CurrLogConfig, Application.UserAppDataPath, Application.CommonAppDataPath, Application.StartupPath)
|
||||||
|
|
||||||
If ConfigManager.Config.ConnectionString = String.Empty Then
|
If ConfigManager.Config.ConnectionString = String.Empty Then
|
||||||
Dim oSQLConfig As New frmSQLConfig(LogConfig)
|
Dim oSQLConfig As New frmSQLConfig(CurrLogConfig)
|
||||||
If oSQLConfig.ShowDialog() = DialogResult.OK Then
|
If oSQLConfig.ShowDialog() = DialogResult.OK Then
|
||||||
ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
|
ConfigManager.Config.ConnectionString = oSQLConfig.ConnectionString
|
||||||
ConfigManager.Save()
|
ConfigManager.Save()
|
||||||
@ -46,7 +46,7 @@ Public Class frmSplashScreen
|
|||||||
Worker.RunWorkerAsync(New State() With {
|
Worker.RunWorkerAsync(New State() With {
|
||||||
.User = Nothing,
|
.User = Nothing,
|
||||||
.UserId = 0,
|
.UserId = 0,
|
||||||
.LogConfig = LogConfig,
|
.LogConfig = CurrLogConfig,
|
||||||
.Config = ConfigManager.Config,
|
.Config = ConfigManager.Config,
|
||||||
.Database = Nothing,
|
.Database = Nothing,
|
||||||
.DbConfig = New DbConfig()
|
.DbConfig = New DbConfig()
|
||||||
|
|||||||
@ -21,7 +21,7 @@ Public Class Service
|
|||||||
Try
|
Try
|
||||||
' === Initialize Logger ===
|
' === Initialize Logger ===
|
||||||
Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
|
Dim oLogPath = Path.Combine(My.Application.Info.DirectoryPath, "Log")
|
||||||
LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "EmailGenerator.Service")
|
LogConfig = New LogConfig(LogConfig.PathType.CustomPath, oLogPath, Nothing, "Digital Data", "EnvelopeGenerator.Service")
|
||||||
|
|
||||||
' === Initialize Config ===
|
' === Initialize Config ===
|
||||||
ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
|
ConfigManager = New ConfigManager(Of Config)(LogConfig, My.Application.Info.DirectoryPath)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user