diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb
index 5e3cf9cf..827e7446 100644
--- a/EnvelopeGenerator.Form/frmMain.vb
+++ b/EnvelopeGenerator.Form/frmMain.vb
@@ -13,6 +13,7 @@ Imports EnvelopeGenerator.Common.My
Imports System.Diagnostics
Imports System.ComponentModel
Imports DevExpress.XtraPrinting
+Imports System.Web
Public Class frmMain
Private ReadOnly LogConfig As LogConfig
@@ -85,8 +86,14 @@ Public Class frmMain
GridBuilder.SetReadOnlyOptions(ViewHistory)
GridBuilder.SetDefaults(ViewHistory)
-
GridEnvelopes.DataSource = Controller.ListEnvelopes()
+ If ViewEnvelopes.RowCount = 0 Then
+ RibbonPageGroupFunctions.Enabled = False
+ btnDeleteEnvelope.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+ Else
+ RibbonPageGroupFunctions.Enabled = True
+ btnDeleteEnvelope.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+ End If
Catch ex As Exception
Logger.Error(ex)
End Try
@@ -204,13 +211,20 @@ Public Class frmMain
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"
@@ -312,7 +326,7 @@ Public Class frmMain
e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.GREEN_300)
End If
- If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeDeleted Then
+ If oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeDeleted Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeWithdrawn Or oEnvelope.Status = Common.Constants.EnvelopeStatus.EnvelopeRejected Then
e.Appearance.BackColor = ColorTranslator.FromHtml(Common.Constants.RED_300)
End If
End Sub
@@ -538,31 +552,22 @@ Public Class frmMain
Dim oView As GridView = GridEnvelopes.FocusedView
If oView.Name = ViewReceivers.Name Then
Dim oReceiver As EnvelopeReceiver = oView.GetRow(oView.FocusedRowHandle)
- Dim oEnvelopeTitle As String = Net.WebUtility.UrlEncode(oEnvelope.Title)
- Dim oCode = oReceiver.AccessCode
- Dim oUID = oEnvelope.Uuid
+ Dim mailto As String = "mailto:support-flow@digitaldata.works"
+ Dim subject As String = Uri.EscapeDataString("signFLOW - Envelope issue - ID: " & oEnvelope.Id)
+ Dim body As String = Uri.EscapeDataString($"Dear Digital Data Team," & vbCrLf & "There is an error or misbehavin with following envelope and Receiver:" & vbCrLf &
+ $"Envelope-ID:{oEnvelope.Id}" & vbCrLf & $"Receiver: {oReceiver.Email}" & vbCrLf & "Issue/Description: Please describe the issue in Your own words...")
- ' E-Mail-Details konfigurieren
- Dim mailto As String = "support-flow@digitaldata.works"
- Dim subject As String = "signFLOW - Envelope issue"
- Dim body As String = $"Dear Digital Data Team,
There is an error or misbehavin with following envelope and Receiver: Envelope: {oUID}
Receiver: {oReceiver.Email}
-
Issue/Description: Please describe the issue in Your own words...
"
+ Dim mailtoUri As String = $"{mailto}?subject={subject}&body={body}"
- ' URL-encoding für Betreff und Inhalt der E-Mail
- 'Dim encodedSubject As String = Uri.EscapeDataString(subject)
- 'Dim encodedBody As String = Uri.EscapeDataString(body)
+ Dim psi As New ProcessStartInfo(mailtoUri)
+ psi.UseShellExecute = True
- ' mailto-Link erstellen
- Dim mailtoLink As String = $"{mailto}?subject={subject}&body={body}"
Try
- Process.Start(mailtoLink)
- Catch ex1 As Exception
- MsgBox(ex1.Message, MsgBoxStyle.Critical, Text)
+ Process.Start(psi)
+ Catch ex As Exception
+ MessageBox.Show("Error in creating mailto-Object: " & ex.Message)
End Try
- ' E-Mail-Client öffnen
-
- Process.Start($"mailto:{oReceiver.Email}?subject={oEnvelopeTitle}")
Else
MsgBox(Resources.Envelope.Please_select_a_recipient_from_the_Recipients_tab, MsgBoxStyle.Information, Text)
End If
@@ -572,7 +577,7 @@ Public Class frmMain
End Sub
- Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
+ Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitm_ResendInvitation.ItemClick
Dim oView As GridView = GridEnvelopes.FocusedView
Dim selReceiver As EnvelopeReceiver
If oView.Name = ViewReceivers.Name Then
@@ -657,7 +662,7 @@ Public Class frmMain
End Try
End Sub
- Private Sub LabelControl1_Click(sender As Object, e As EventArgs) Handles LabelControl1.Click
+ Private Sub LabelControl1_Click(sender As Object, e As EventArgs)
End Sub
diff --git a/EnvelopeGenerator.Form/frmSplashScreen.vb b/EnvelopeGenerator.Form/frmSplashScreen.vb
index e8545a40..64e3827a 100644
--- a/EnvelopeGenerator.Form/frmSplashScreen.vb
+++ b/EnvelopeGenerator.Form/frmSplashScreen.vb
@@ -88,6 +88,10 @@ Public Class frmSplashScreen
SQL_REP_ENV_USER_Y = oROW.Item("SQL_COMMAND")
ElseIf oROW.Item("TITLE") = "REPORT ENV USER ALL" Then
SQL_REP_ENV_USER_ALL = oROW.Item("SQL_COMMAND")
+ ElseIf oROW.Item("TITLE") = "REPORT ENV ALL_USER_THIS_MONTH" Then
+ SQL_REP_ENV_ALL_USER_MONTH = oROW.Item("SQL_COMMAND")
+ ElseIf oROW.Item("TITLE") = "REPORT ENV ALL_USER_LAST_MONTH" Then
+ SQL_REP_ENV_ALL_USER_LAST_MONTH = oROW.Item("SQL_COMMAND")
End If
Next