diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
index 01259b50..8532f9dc 100644
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -166,7 +166,7 @@ Public Class EnvelopeEditorController
DocumentRotationChanged()
Logger.Info("PageRotation has been reseted to 0.")
End If
- GdPicturePDF.FlattenFormFields()
+
Dim oFileInfo = New FileInfo(oFixedPath)
Dim oTempFiles As New TempFiles(State.LogConfig)
Dim oTempFilePath = Path.Combine(oTempFiles._TempPath, Guid.NewGuid().ToString + oFileInfo.Extension)
diff --git a/EnvelopeGenerator.Form/ModuleSettings.vb b/EnvelopeGenerator.Form/ModuleSettings.vb
index 3c8c97bd..46816b49 100644
--- a/EnvelopeGenerator.Form/ModuleSettings.vb
+++ b/EnvelopeGenerator.Form/ModuleSettings.vb
@@ -24,4 +24,6 @@ Module ModuleSettings
Public USER_GHOST_MODE_ACTIVE As Boolean = False
Public MyUserModel As UserModel
Public MyState As State
+ Public CurrentEnvelopID As Integer = 0
+ Public CurrentEnvelopetitle As String = ""
End Module
diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb
index 65c97e00..fab66a5f 100644
--- a/EnvelopeGenerator.Form/frmMain.Designer.vb
+++ b/EnvelopeGenerator.Form/frmMain.Designer.vb
@@ -688,7 +688,7 @@ Partial Class frmMain
'SplitContainerControl2.Panel2
'
resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
- Me.SplitContainerControl2.SplitterPosition = 584
+ Me.SplitContainerControl2.SplitterPosition = 819
'
'GridControlData
'
diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx
index 222eea3a..8b40dd05 100644
--- a/EnvelopeGenerator.Form/frmMain.resx
+++ b/EnvelopeGenerator.Form/frmMain.resx
@@ -1139,7 +1139,7 @@
0, 0
- 584, 390
+ 819, 390
1
diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index 827e7446..417e40b8 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -183,7 +183,11 @@ Public Class frmMain
Private Sub btnDeleteEnvelope_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeleteEnvelope.ItemClick
Try
Dim oSelectedRows = ViewEnvelopes.GetSelectedRows()
+ Dim oEnvelope As Envelope = DirectCast(ViewEnvelopes.GetRow(oSelectedRows.First), Envelope)
+
If oSelectedRows.Count > 0 Then
+ CurrentEnvelopID = oEnvelope.Id
+ CurrentEnvelopetitle = oEnvelope.Title
Dim ofrmAbort As New frmRueckruf
frmRueckruf.ShowDialog()
If frmRueckruf.Continue_Reject = True Then
@@ -203,36 +207,44 @@ Public Class frmMain
End Sub
Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControlMain.SelectedPageChanged
- RibbonPageGroupFunctions.Enabled = True
- RibbonPageEnvelopeActions.Enabled = True
- Select Case XtraTabControlMain.SelectedTabPageIndex
- Case 1
- btnEditEnvelope.Enabled = False
- btnDeleteEnvelope.Enabled = False
- btnContactReceiver.Enabled = False
- btnShowDocument.Enabled = False
- bbtnitm_ResendInvitation.Enabled = False
- bbtnitmInfoMail.Enabled = False
- bbtnitmEB.Enabled = True
- LoadEnvelopeData()
- Case 0
- If ViewEnvelopes.RowCount = 0 Then
- RibbonPageGroupFunctions.Enabled = False
- End If
- btnEditEnvelope.Enabled = True
- btnDeleteEnvelope.Enabled = True
- btnContactReceiver.Enabled = True
- btnShowDocument.Enabled = True
- bbtnitm_ResendInvitation.Enabled = True
- bbtnitmInfoMail.Enabled = True
- bbtnitmEB.Enabled = False
- LoadEnvelopeData()
- txtEnvelopeIdLabel.Caption = "No Envelope selected"
+ Dim oHandle = SplashScreenManager.ShowOverlayForm(Me)
+ Try
+ RibbonPageGroupFunctions.Enabled = True
+ RibbonPageEnvelopeActions.Enabled = True
+ Select Case XtraTabControlMain.SelectedTabPageIndex
+ Case 1
+ btnEditEnvelope.Enabled = False
+ btnDeleteEnvelope.Enabled = False
+ btnContactReceiver.Enabled = False
+ btnShowDocument.Enabled = False
+ bbtnitm_ResendInvitation.Enabled = False
+ bbtnitmInfoMail.Enabled = False
+ bbtnitmEB.Enabled = True
+ LoadEnvelopeData()
+ Case 0
+ If ViewEnvelopes.RowCount = 0 Then
+ RibbonPageGroupFunctions.Enabled = False
+ End If
+ btnEditEnvelope.Enabled = True
+ btnDeleteEnvelope.Enabled = True
+ btnContactReceiver.Enabled = True
+ btnShowDocument.Enabled = True
+ bbtnitm_ResendInvitation.Enabled = True
+ bbtnitmInfoMail.Enabled = True
+ bbtnitmEB.Enabled = False
+ LoadEnvelopeData()
+ txtEnvelopeIdLabel.Caption = "No Envelope selected"
+
+ Case 2
+ RibbonPageGroupFunctions.Enabled = False
+ RibbonPageEnvelopeActions.Enabled = False
+ End Select
+ Catch ex As Exception
+ Logger.Error(ex)
+ Finally
+ SplashScreenManager.CloseOverlayForm(oHandle)
+ End Try
- Case 2
- RibbonPageGroupFunctions.Enabled = False
- RibbonPageEnvelopeActions.Enabled = False
- End Select
End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@@ -621,7 +633,9 @@ Public Class frmMain
If SQL_REP_ENV_USER_TM <> String.Empty Then
Result_Execute(SQL_REP_ENV_USER_TM)
Else
+
GridControlData.DataSource = Nothing
+ GridViewData.Columns.Clear()
End If
End Sub
@@ -652,7 +666,9 @@ Public Class frmMain
Try
Dim oDT As DataTable = DB_DD_ECM.GetDatatable(mySQL)
If Not IsNothing(oDT) Then
-
+ If GridViewData.Columns.Count > 0 Then
+ GridViewData.Columns.Clear()
+ End If
GridControlData.DataSource = oDT
Else
GridControlData.DataSource = Nothing
@@ -734,4 +750,20 @@ Public Class frmMain
Public Shared Sub Save_Logfiles()
End Sub
+
+ Private Sub btnEvvallUs_thismonth_Click(sender As Object, e As EventArgs) Handles btnEvvallUs_thismonth.Click
+ If SQL_REP_ENV_ALL_USER_MONTH <> String.Empty Then
+ Result_Execute(SQL_REP_ENV_ALL_USER_MONTH)
+ Else
+ GridControlData.DataSource = Nothing
+ End If
+ End Sub
+
+ Private Sub btnEvvallUs_lastmonth_Click(sender As Object, e As EventArgs) Handles btnEvvallUs_lastmonth.Click
+ If SQL_REP_ENV_ALL_USER_LAST_MONTH <> String.Empty Then
+ Result_Execute(SQL_REP_ENV_ALL_USER_LAST_MONTH)
+ Else
+ GridControlData.DataSource = Nothing
+ End If
+ End Sub
End Class
\ No newline at end of file
diff --git a/EnvelopeGenerator.Form/frmRueckruf.Designer.vb b/EnvelopeGenerator.Form/frmRueckruf.Designer.vb
index 288d7939..f8de6e87 100644
--- a/EnvelopeGenerator.Form/frmRueckruf.Designer.vb
+++ b/EnvelopeGenerator.Form/frmRueckruf.Designer.vb
@@ -30,13 +30,17 @@ Partial Class frmRueckruf
Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
Me.tsstatus = New System.Windows.Forms.ToolStripStatusLabel()
Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
+ Me.Label3 = New System.Windows.Forms.Label()
+ Me.Label4 = New System.Windows.Forms.Label()
+ Me.lblID = New System.Windows.Forms.Label()
+ Me.lblTitle = New System.Windows.Forms.Label()
Me.StatusStrip1.SuspendLayout()
Me.SuspendLayout()
'
'Label2
'
Me.Label2.AutoSize = True
- Me.Label2.Location = New System.Drawing.Point(22, 20)
+ Me.Label2.Location = New System.Drawing.Point(28, 36)
Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0)
Me.Label2.Name = "Label2"
Me.Label2.Size = New System.Drawing.Size(380, 16)
@@ -46,7 +50,7 @@ Partial Class frmRueckruf
'txtReason
'
Me.txtReason.AcceptsReturn = True
- Me.txtReason.Location = New System.Drawing.Point(25, 40)
+ Me.txtReason.Location = New System.Drawing.Point(31, 56)
Me.txtReason.Margin = New System.Windows.Forms.Padding(4)
Me.txtReason.Multiline = True
Me.txtReason.Name = "txtReason"
@@ -66,7 +70,7 @@ Partial Class frmRueckruf
'
Me.btnCancel.Image = CType(resources.GetObject("btnCancel.Image"), System.Drawing.Image)
Me.btnCancel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
- Me.btnCancel.Location = New System.Drawing.Point(251, 134)
+ Me.btnCancel.Location = New System.Drawing.Point(260, 150)
Me.btnCancel.Name = "btnCancel"
Me.btnCancel.Size = New System.Drawing.Size(203, 44)
Me.btnCancel.TabIndex = 4
@@ -76,7 +80,7 @@ Partial Class frmRueckruf
'StatusStrip1
'
Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsstatus})
- Me.StatusStrip1.Location = New System.Drawing.Point(0, 185)
+ Me.StatusStrip1.Location = New System.Drawing.Point(0, 211)
Me.StatusStrip1.Name = "StatusStrip1"
Me.StatusStrip1.Size = New System.Drawing.Size(488, 22)
Me.StatusStrip1.TabIndex = 5
@@ -90,17 +94,59 @@ Partial Class frmRueckruf
'SimpleButton1
'
Me.SimpleButton1.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
- Me.SimpleButton1.Location = New System.Drawing.Point(25, 134)
+ Me.SimpleButton1.Location = New System.Drawing.Point(31, 150)
Me.SimpleButton1.Name = "SimpleButton1"
Me.SimpleButton1.Size = New System.Drawing.Size(220, 44)
Me.SimpleButton1.TabIndex = 6
Me.SimpleButton1.Text = "Umschlag zurückrufen"
'
+ 'Label3
+ '
+ Me.Label3.AutoSize = True
+ Me.Label3.Location = New System.Drawing.Point(28, 9)
+ Me.Label3.Name = "Label3"
+ Me.Label3.Size = New System.Drawing.Size(80, 16)
+ Me.Label3.TabIndex = 7
+ Me.Label3.Text = "Envelope-ID:"
+ '
+ 'Label4
+ '
+ Me.Label4.AutoSize = True
+ Me.Label4.Location = New System.Drawing.Point(158, 9)
+ Me.Label4.Name = "Label4"
+ Me.Label4.Size = New System.Drawing.Size(93, 16)
+ Me.Label4.TabIndex = 8
+ Me.Label4.Text = "Envelope-Titel:"
+ '
+ 'lblID
+ '
+ Me.lblID.AutoSize = True
+ Me.lblID.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblID.Location = New System.Drawing.Point(108, 9)
+ Me.lblID.Name = "lblID"
+ Me.lblID.Size = New System.Drawing.Size(49, 16)
+ Me.lblID.TabIndex = 9
+ Me.lblID.Text = "Label5"
+ '
+ 'lblTitle
+ '
+ Me.lblTitle.AutoSize = True
+ Me.lblTitle.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+ Me.lblTitle.Location = New System.Drawing.Point(257, 9)
+ Me.lblTitle.Name = "lblTitle"
+ Me.lblTitle.Size = New System.Drawing.Size(49, 16)
+ Me.lblTitle.TabIndex = 10
+ Me.lblTitle.Text = "Label5"
+ '
'frmRueckruf
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(488, 207)
+ Me.ClientSize = New System.Drawing.Size(488, 233)
+ Me.Controls.Add(Me.lblTitle)
+ Me.Controls.Add(Me.lblID)
+ Me.Controls.Add(Me.Label4)
+ Me.Controls.Add(Me.Label3)
Me.Controls.Add(Me.SimpleButton1)
Me.Controls.Add(Me.StatusStrip1)
Me.Controls.Add(Me.btnCancel)
@@ -129,4 +175,8 @@ Partial Class frmRueckruf
Friend WithEvents StatusStrip1 As StatusStrip
Friend WithEvents tsstatus As ToolStripStatusLabel
Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+ Friend WithEvents Label3 As Label
+ Friend WithEvents Label4 As Label
+ Friend WithEvents lblID As Label
+ Friend WithEvents lblTitle As Label
End Class
diff --git a/EnvelopeGenerator.Form/frmRueckruf.resx b/EnvelopeGenerator.Form/frmRueckruf.resx
index 2dbe5cb9..b4ba7d33 100644
--- a/EnvelopeGenerator.Form/frmRueckruf.resx
+++ b/EnvelopeGenerator.Form/frmRueckruf.resx
@@ -121,7 +121,7 @@
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- wQAADsEBuJFr7QAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
+ wAAADsABataJCQAAAUlJREFUOE+lU6GOg1AQ5BP6Cf2E+4QLnqQWV4EHjUJhGzxJJbICDxpFQvCHg4DA
Yd/tLPvK4wJ34iaZ9GVndxh4WwtYluVCfBIVcSYGLPwA1SPp0bxpIaiqSjmOw2zbdhMJdL4S6yzLlG3b
qigK6JHI3FCmacoi6HmeGscRSZAswDmOY9bQR7WXjK5AExJoAzBJEjTOXdexIWowoVpNvMjoChQg5Hm+
M8HT8Eo4G6muMrbHmQkIk2ma8PRPaT8G3Ikc1TSAKdWf0nYMGT5M4Lrun/E/iDM+nDlofgPf9/kDysgG
diff --git a/EnvelopeGenerator.Form/frmRueckruf.vb b/EnvelopeGenerator.Form/frmRueckruf.vb
index 3d1a1db8..1690fb4f 100644
--- a/EnvelopeGenerator.Form/frmRueckruf.vb
+++ b/EnvelopeGenerator.Form/frmRueckruf.vb
@@ -22,6 +22,8 @@ Public Class frmRueckruf
txtReason.Text = ""
tsstatus.Text = ""
Continue_Reject = False
+ lblID.Text = CurrentEnvelopID.ToString
+ lblTitle.Text = CurrentEnvelopetitle
End Sub
Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click
@@ -50,4 +52,8 @@ Public Class frmRueckruf
tsstatus.Text = "Please add a reason for aborting - " & Now
End If
End Sub
+
+ Private Sub Label2_Click(sender As Object, e As EventArgs) Handles Label2.Click
+
+ End Sub
End Class
\ No newline at end of file