From 55f2a6a775910b5ae6293dcfe2f714352dfe2580 Mon Sep 17 00:00:00 2001 From: SchreiberM Date: Tue, 27 Feb 2024 16:18:00 +0100 Subject: [PATCH] MS Config --- EnvelopeGenerator.Common/Entities/DbConfig.vb | 3 +++ .../Models/ConfigModel.vb | 3 ++- .../frmEnvelopeEditor.Designer.vb | 22 ++++++++++++++++--- EnvelopeGenerator.Form/frmEnvelopeEditor.resx | 18 +++++++++++++++ EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 14 +++++++++++- 5 files changed, 55 insertions(+), 5 deletions(-) diff --git a/EnvelopeGenerator.Common/Entities/DbConfig.vb b/EnvelopeGenerator.Common/Entities/DbConfig.vb index 26a1460b..441218ae 100644 --- a/EnvelopeGenerator.Common/Entities/DbConfig.vb +++ b/EnvelopeGenerator.Common/Entities/DbConfig.vb @@ -4,7 +4,10 @@ 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 SignedMail_Path As String = "" Public Property SendingProfile As Integer = 0 Public Property SignatureHost As String = "" + + End Class diff --git a/EnvelopeGenerator.Common/Models/ConfigModel.vb b/EnvelopeGenerator.Common/Models/ConfigModel.vb index 5d0eec06..ad38df88 100644 --- a/EnvelopeGenerator.Common/Models/ConfigModel.vb +++ b/EnvelopeGenerator.Common/Models/ConfigModel.vb @@ -23,7 +23,8 @@ Public Class ConfigModel .SendingProfile = oRow.ItemEx("SENDING_PROFILE", 0), .SignatureHost = oRow.ItemEx("SIGNATURE_HOST", ""), .ExternalProgramName = oRow.ItemEx("EXTERNAL_PROGRAM_NAME", ""), - .SignedMail_Path = oRow.ItemEx("SIGNED_MAIL_PATH", "") + .SignedMail_Path = oRow.ItemEx("SIGNED_MAIL_PATH", ""), + .DOCUMENT_PATH_MOVE_AFTSEND = oRow.ItemEx("DOCUMENT_PATH_MOVE_AFTSEND", "") } Catch ex As Exception Logger.Error(ex) diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 64cf6897..606556f1 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -95,6 +95,8 @@ Partial Public Class frmEnvelopeEditor Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -237,9 +239,9 @@ Partial Public Class frmEnvelopeEditor 'RibbonControl1 ' 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.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}) resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 12 + Me.RibbonControl1.MaxItemId = 13 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] @@ -324,7 +326,7 @@ Partial Public Class frmEnvelopeEditor ' '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, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -638,6 +640,18 @@ Partial Public Class frmEnvelopeEditor Me.txtEnvelopeIdLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.txtEnvelopeIdLabel.Tag = "Envelope-ID: {0}" ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") + ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 12 + Me.BarButtonItem1.Name = "BarButtonItem1" + ' 'frmEnvelopeEditor ' resources.ApplyResources(Me, "$this") @@ -759,6 +773,8 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents txtEnvelopeIdLabel As DevExpress.XtraBars.BarStaticItem Friend WithEvents txtEnvelopeIdLabel2 As DevExpress.XtraBars.BarStaticItem Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup #End Region diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index ea5213aa..1c2bbd38 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -408,6 +408,9 @@ ICA8L2c+DQo8L3N2Zz4L + + BarButtonItem1 + 0, 0 @@ -426,6 +429,9 @@ Empfänger + + RibbonPageGroup2 + Start @@ -1226,6 +1232,18 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPageGroup2 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmEnvelopeEditor diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index e32d37e7..fe829102 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -21,6 +21,7 @@ Partial Public Class frmEnvelopeEditor Private Controller As EnvelopeEditorController Private Logger As Logger + Private Config As DbConfig Private Const COL_NAME = "Name" Private Const COL_EMAIL = "Email" @@ -329,9 +330,14 @@ Partial Public Class frmEnvelopeEditor MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text) Else If MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information Or MsgBoxStyle.OkOnly, Text) = MsgBoxResult.Ok Then + If Config.DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then + For Each odoc In Envelope.Documents + + Next + End If Me.Close() End If - End If + End If End Sub Private Sub btnCancel_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCancel.ItemClick @@ -471,4 +477,10 @@ Partial Public Class frmEnvelopeEditor End If End If End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + For Each odoc In Envelope.Documents + MsgBox(odoc.Filename & vbNewLine & odoc.Filepath) + Next + End Sub End Class