Neues Release plus Flatternformfleds RO

DocumentRotationChanged
Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator
2025-04-24 08:56:33 +02:00 · 2025-04-23 12:40:28 +02:00 · 2025-04-23 12:38:02 +02:00 · 2025-04-23 12:37:57 +02:00
28 changed files with 280 additions and 327 deletions
--- a/EnvelopeGenerator.Common/Constants.vb
+++ b/EnvelopeGenerator.Common/Constants.vb
@@ -13,6 +13,8 @@
        EnvelopeReportCreated = 1007
        EnvelopeArchived = 1008
        EnvelopeDeleted = 1009
+        EnvelopeRejected = 10007
+        EnvelopeWithdrawn = 10009
        AccessCodeRequested = 2001
        AccessCodeCorrect = 2002
        AccessCodeIncorrect = 2003
@@ -28,6 +30,7 @@
        MessageConfirmationSent = 3003
        MessageDeletionSent = 3004
        MessageCompletionSent = 3005
+        DocumentMod_Rotation = 4001
    End Enum

    'TODO: standardize in xwiki
--- a/EnvelopeGenerator.Common/Services/ActionService.vb
+++ b/EnvelopeGenerator.Common/Services/ActionService.vb
@@ -1,5 +1,6 @@
 Imports DevExpress.DataAccess.Native.Web
 Imports DigitalData.Modules.Base
+Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My.Resources

 Public Class ActionService
@@ -34,6 +35,12 @@ Public Class ActionService

        Return True
    End Function
+    Public Function SetStatusDocumentRotationChanged(pEnvelope As Envelope) As Boolean
+        If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentMod_Rotation, pEnvelope.User.Email) = False Then
+            Return False
+        End If
+        Return True
+    End Function
    Public Function Resend_Receiver(pEnvelope As Envelope, pmail As String) As Boolean
        If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeQueued, pEnvelope.User.Email) = False Then
            Return False
@@ -50,7 +57,13 @@ Public Class ActionService


    Public Function DeleteEnvelope(pEnvelope As Envelope, pReason As String) As Boolean
-        If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.EnvelopeDeleted, pEnvelope.User.Email) = False Then
+        Dim oStatus As EnvelopeStatus
+        If pEnvelope.IsAlreadySent Then
+            oStatus = Constants.EnvelopeStatus.EnvelopeWithdrawn
+        Else
+            oStatus = Constants.EnvelopeStatus.EnvelopeDeleted
+        End If
+        If HistoryService.SetEnvelopeStatus(pEnvelope, oStatus, pEnvelope.User.Email) = False Then
            Return False
        End If

--- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx
+++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx
@@ -121,7 +121,7 @@
    <value>Please select the PDF documents you would like to link/concat:</value>
  </data>
  <data name="Do you really want to delete this envelope" xml:space="preserve">
-    <value>Do you really want to delete this envelope?</value>
+    <value>Do you really want to withdraw/delete this envelope?</value>
  </data>
  <data name="Do you really want to remove this document" xml:space="preserve">
    <value>Do you really want to remove this document?</value>
--- a/EnvelopeGenerator.Common/Strings/Envelope.resx
+++ b/EnvelopeGenerator.Common/Strings/Envelope.resx
@@ -121,7 +121,7 @@
    <value>Bitte wählen Sie die PDF-Dokumente die Sie verketten möchten:</value>
  </data>
  <data name="Do you really want to delete this envelope" xml:space="preserve">
-    <value>Wollen Sie diesen Umschlag wirklich löschen?</value>
+    <value>Wollen Sie diesen Umschlag wirklich zurückrufen/löschen?</value>
  </data>
  <data name="Do you really want to remove this document" xml:space="preserve">
    <value>Wollen Sie dieses Dokument wirklich entfernen?</value>
--- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
+++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb
@@ -74,7 +74,7 @@ Namespace My.Resources
        End Property
        
        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Wollen Sie diesen Umschlag wirklich löschen? ähnelt.
+        '''  Sucht eine lokalisierte Zeichenfolge, die Wollen Sie diesen Umschlag wirklich zurückrufen/löschen? ähnelt.
        '''</summary>
        Public Shared ReadOnly Property Do_you_really_want_to_delete_this_envelope() As String
            Get
--- a/EnvelopeGenerator.Common/Strings/Model.Designer.vb
+++ b/EnvelopeGenerator.Common/Strings/Model.Designer.vb
@@ -136,6 +136,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument Rotation geändert ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property DocumentMod_Rotation() As String
+            Get
+                Return ResourceManager.GetString("DocumentMod_Rotation", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument geöffnet ähnelt.
        '''</summary>
@@ -145,6 +154,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Unterzeichnung abgelehnt ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property DocumentRejected() As String
+            Get
+                Return ResourceManager.GetString("DocumentRejected", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Dokument unterzeichnet ähnelt.
        '''</summary>
@@ -217,6 +235,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag abgelehnt ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property EnvelopeRejected() As String
+            Get
+                Return ResourceManager.GetString("EnvelopeRejected", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Signierungszertifikat erstellt ähnelt.
        '''</summary>
@@ -244,6 +271,15 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Zeichenfolge, die Umschlag zurückgezogen ähnelt.
+        '''</summary>
+        Public Shared ReadOnly Property EnvelopeWithdrawn() As String
+            Get
+                Return ResourceManager.GetString("EnvelopeWithdrawn", resourceCulture)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Zeichenfolge, die Zugriffscode versendet ähnelt.
        '''</summary>
--- a/EnvelopeGenerator.Common/Strings/Model.en.resx
+++ b/EnvelopeGenerator.Common/Strings/Model.en.resx
@@ -138,9 +138,15 @@
  <data name="Created" xml:space="preserve">
    <value>Created</value>
  </data>
+  <data name="DocumentMod_Rotation" xml:space="preserve">
+    <value>Document rotation adapted</value>
+  </data>
  <data name="DocumentOpened" xml:space="preserve">
    <value>Document opened</value>
  </data>
+  <data name="DocumentRejected" xml:space="preserve">
+    <value>Signing rejected</value>
+  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Document signed</value>
  </data>
@@ -154,16 +160,19 @@
    <value>Completely signed</value>
  </data>
  <data name="EnvelopeCreated" xml:space="preserve">
-    <value>Created</value>
+    <value>Envelope Created</value>
  </data>
  <data name="EnvelopeDeleted" xml:space="preserve">
-    <value>Deleted</value>
+    <value>Envelope Deleted</value>
  </data>
  <data name="EnvelopePartlySigned" xml:space="preserve">
    <value>Partly signed</value>
  </data>
  <data name="EnvelopeQueued" xml:space="preserve">
-    <value>Queued</value>
+    <value>Envelope Queued</value>
+  </data>
+  <data name="EnvelopeRejected" xml:space="preserve">
+    <value>Envelope Rejected</value>
  </data>
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signature certificate created</value>
@@ -174,6 +183,9 @@
  <data name="EnvelopeSent" xml:space="preserve">
    <value>Sent</value>
  </data>
+  <data name="EnvelopeWithdrawn" xml:space="preserve">
+    <value>Withdrawn</value>
+  </data>
  <data name="MessageAccessCodeSent" xml:space="preserve">
    <value>Accesscode sent</value>
  </data>
--- a/EnvelopeGenerator.Common/Strings/Model.resx
+++ b/EnvelopeGenerator.Common/Strings/Model.resx
@@ -141,9 +141,15 @@
  <data name="Created" xml:space="preserve">
    <value>Erstellt</value>
  </data>
+  <data name="DocumentMod_Rotation" xml:space="preserve">
+    <value>Dokument Rotation geändert</value>
+  </data>
  <data name="DocumentOpened" xml:space="preserve">
    <value>Dokument geöffnet</value>
  </data>
+  <data name="DocumentRejected" xml:space="preserve">
+    <value>Unterzeichnung abgelehnt</value>
+  </data>
  <data name="DocumentSigned" xml:space="preserve">
    <value>Dokument unterzeichnet</value>
  </data>
@@ -168,6 +174,9 @@
  <data name="EnvelopeQueued" xml:space="preserve">
    <value>Umschlag in Queue</value>
  </data>
+  <data name="EnvelopeRejected" xml:space="preserve">
+    <value>Umschlag abgelehnt</value>
+  </data>
  <data name="EnvelopeReportCreated" xml:space="preserve">
    <value>Signierungszertifikat erstellt</value>
  </data>
@@ -177,6 +186,9 @@
  <data name="EnvelopeSent" xml:space="preserve">
    <value>Gesendet</value>
  </data>
+  <data name="EnvelopeWithdrawn" xml:space="preserve">
+    <value>Umschlag zurückgezogen</value>
+  </data>
  <data name="MessageAccessCodeSent" xml:space="preserve">
    <value>Zugriffscode versendet</value>
  </data>
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@@ -1,9 +1,11 @@
 Imports System.Data.SqlClient
 Imports System.IO
+Imports DevExpress.XtraBars.Docking
 Imports DigitalData.Modules.Logging
 Imports EnvelopeGenerator.Common
 Imports EnvelopeGenerator.Common.Constants
 Imports EnvelopeGenerator.Common.My
+Imports GdPicture14

 Public Class EnvelopeEditorController
    Inherits BaseController
@@ -38,6 +40,9 @@ Public Class EnvelopeEditorController
    Public Function SendEnvelope() As Boolean
        Return ActionService.SendEnvelope(Envelope)
    End Function
+    Public Function DocumentRotationChanged() As Boolean
+        Return ActionService.SetStatusDocumentRotationChanged(Envelope)
+    End Function
    Public Function ResendReceiverInvitation(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) As Boolean
        Return ActionService.ResendReceiver(pEnvelope, pReceiver)
    End Function
@@ -158,8 +163,10 @@ Public Class EnvelopeEditorController
        Try
            Dim oFixedPath = FixPageRotation.FixPageRotation(pDocumentFilePath)
            If oFixedPath <> pDocumentFilePath Then
+                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)
--- a/EnvelopeGenerator.Form/ModuleSettings.vb
+++ b/EnvelopeGenerator.Form/ModuleSettings.vb
@@ -16,6 +16,8 @@ Module ModuleSettings
    Public SQL_REP_ENV_USER_TM As String = ""
    Public SQL_REP_ENV_USER_Y As String = ""
    Public SQL_REP_ENV_USER_ALL As String = ""
+    Public SQL_REP_ENV_ALL_USER_MONTH As String = ""
+    Public SQL_REP_ENV_ALL_USER_LAST_MONTH As String = ""
    Public DT_CHARTS As DataTable
    Public MyLogger As Logger
    Public USER_GHOST_MODE_USRNAME As String = ""
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
@@ -632,6 +632,7 @@ Partial Public Class frmEnvelopeEditor
        resources.ApplyResources(Me.txtMessage, "txtMessage")
        Me.txtMessage.MenuManager = Me.RibbonControl1
        Me.txtMessage.Name = "txtMessage"
+        Me.txtMessage.Properties.AcceptsTab = True
        Me.txtMessage.Properties.Appearance.Font = CType(resources.GetObject("txtMessage.Properties.Appearance.Font"), System.Drawing.Font)
        Me.txtMessage.Properties.Appearance.Options.UseFont = True
        Me.txtMessage.StyleController = Me.LayoutControl1
@@ -664,7 +665,7 @@ Partial Public Class frmEnvelopeEditor
        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216)
        resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
        Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(49, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(46, 13)
        '
        'FrmEditorBindingSource
        '
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
@@ -939,7 +939,7 @@
    <value>0</value>
  </data>
  <metadata name="FrmEditorBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>792, 17</value>
+    <value>17, 54</value>
  </metadata>
  <metadata name="EnvelopeDocumentBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>557, 17</value>
--- a/EnvelopeGenerator.Form/frmMain.Designer.vb
+++ b/EnvelopeGenerator.Form/frmMain.Designer.vb
@@ -61,9 +61,10 @@ Partial Class frmMain
        Me.bsitmInfo = New DevExpress.XtraBars.BarStaticItem()
        Me.bbtnitmEB = New DevExpress.XtraBars.BarButtonItem()
        Me.bbtnitmInfoMail = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bbtnitm_ResendInvitation = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarStaticItemGhost = New DevExpress.XtraBars.BarStaticItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -93,8 +94,8 @@ Partial Class frmMain
        Me.GridViewData = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl()
        Me.GroupControl2 = New DevExpress.XtraEditors.GroupControl()
-        Me.LabelControl1 = New DevExpress.XtraEditors.LabelControl()
        Me.GroupControl1 = New DevExpress.XtraEditors.GroupControl()
+        Me.btnEvvallUs_thismonth = New DevExpress.XtraEditors.SimpleButton()
        Me.btnEnvelopes_All = New DevExpress.XtraEditors.SimpleButton()
        Me.btnEnvelopes_thisYear = New DevExpress.XtraEditors.SimpleButton()
        Me.btnEnvelopes_lastmonth = New DevExpress.XtraEditors.SimpleButton()
@@ -102,7 +103,7 @@ Partial Class frmMain
        Me.RefreshTimer = New System.Windows.Forms.Timer(Me.components)
        Me.SaveFileDialog1 = New System.Windows.Forms.SaveFileDialog()
        Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
-        Me.BarStaticItemGhost = New DevExpress.XtraBars.BarStaticItem()
+        Me.btnEvvallUs_lastmonth = New DevExpress.XtraEditors.SimpleButton()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -322,7 +323,7 @@ Partial Class frmMain
        Me.RibbonControl.ExpandCollapseItem.Id = 0
        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.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, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost})
+        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, Me.bbtnitmEB, Me.bbtnitmInfoMail, Me.bbtnitm_ResendInvitation, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarStaticItemGhost})
        resources.ApplyResources(Me.RibbonControl, "RibbonControl")
        Me.RibbonControl.MaxItemId = 20
        Me.RibbonControl.Name = "RibbonControl"
@@ -446,13 +447,14 @@ Partial Class frmMain
        Me.bbtnitmInfoMail.Id = 15
        Me.bbtnitmInfoMail.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmInfoMail.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.bbtnitmInfoMail.Name = "bbtnitmInfoMail"
+        Me.bbtnitmInfoMail.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
        '
-        'BarButtonItem2
+        'bbtnitm_ResendInvitation
        '
-        resources.ApplyResources(Me.BarButtonItem2, "BarButtonItem2")
-        Me.BarButtonItem2.Id = 16
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        resources.ApplyResources(Me.bbtnitm_ResendInvitation, "bbtnitm_ResendInvitation")
+        Me.bbtnitm_ResendInvitation.Id = 16
+        Me.bbtnitm_ResendInvitation.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitm_ResendInvitation.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitm_ResendInvitation.Name = "bbtnitm_ResendInvitation"
        '
        'BarButtonItem3
        '
@@ -468,6 +470,19 @@ Partial Class frmMain
        Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonItem4.Name = "BarButtonItem4"
        '
+        'BarStaticItemGhost
+        '
+        resources.ApplyResources(Me.BarStaticItemGhost, "BarStaticItemGhost")
+        Me.BarStaticItemGhost.Id = 19
+        Me.BarStaticItemGhost.ItemAppearance.Normal.BackColor = System.Drawing.Color.Yellow
+        Me.BarStaticItemGhost.ItemAppearance.Normal.Font = CType(resources.GetObject("BarStaticItemGhost.ItemAppearance.Normal.Font"), System.Drawing.Font)
+        Me.BarStaticItemGhost.ItemAppearance.Normal.ForeColor = System.Drawing.Color.Black
+        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseBackColor = True
+        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseFont = True
+        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseForeColor = True
+        Me.BarStaticItemGhost.Name = "BarStaticItemGhost"
+        Me.BarStaticItemGhost.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions, Me.RibbonPageGroup1, Me.RibbonPageGroupFunctions})
@@ -493,7 +508,7 @@ Partial Class frmMain
        'RibbonPageGroupFunctions
        '
        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnShowDocument)
-        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitm_ResendInvitation)
        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.btnContactReceiver)
        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmEB)
        Me.RibbonPageGroupFunctions.ItemLinks.Add(Me.bbtnitmInfoMail)
@@ -697,15 +712,11 @@ Partial Class frmMain
        '
        'GroupControl2
        '
-        Me.GroupControl2.Controls.Add(Me.LabelControl1)
+        Me.GroupControl2.Controls.Add(Me.btnEvvallUs_lastmonth)
+        Me.GroupControl2.Controls.Add(Me.btnEvvallUs_thismonth)
        resources.ApplyResources(Me.GroupControl2, "GroupControl2")
        Me.GroupControl2.Name = "GroupControl2"
        '
-        'LabelControl1
-        '
-        resources.ApplyResources(Me.LabelControl1, "LabelControl1")
-        Me.LabelControl1.Name = "LabelControl1"
-        '
        'GroupControl1
        '
        Me.GroupControl1.Controls.Add(Me.btnEnvelopes_All)
@@ -715,6 +726,13 @@ Partial Class frmMain
        resources.ApplyResources(Me.GroupControl1, "GroupControl1")
        Me.GroupControl1.Name = "GroupControl1"
        '
+        'btnEvvallUs_thismonth
+        '
+        Me.btnEvvallUs_thismonth.Appearance.BackColor = System.Drawing.Color.MediumSlateBlue
+        Me.btnEvvallUs_thismonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEvvallUs_thismonth, "btnEvvallUs_thismonth")
+        Me.btnEvvallUs_thismonth.Name = "btnEvvallUs_thismonth"
+        '
        'btnEnvelopes_All
        '
        Me.btnEnvelopes_All.Appearance.BackColor = System.Drawing.Color.MediumTurquoise
@@ -755,18 +773,12 @@ Partial Class frmMain
        '
        Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1"
        '
-        'BarStaticItemGhost
+        'btnEvvallUs_lastmonth
        '
-        resources.ApplyResources(Me.BarStaticItemGhost, "BarStaticItemGhost")
-        Me.BarStaticItemGhost.Id = 19
-        Me.BarStaticItemGhost.ItemAppearance.Normal.BackColor = System.Drawing.Color.Yellow
-        Me.BarStaticItemGhost.ItemAppearance.Normal.Font = CType(resources.GetObject("BarStaticItemGhost.ItemAppearance.Normal.Font"), System.Drawing.Font)
-        Me.BarStaticItemGhost.ItemAppearance.Normal.ForeColor = System.Drawing.Color.Black
-        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseBackColor = True
-        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseFont = True
-        Me.BarStaticItemGhost.ItemAppearance.Normal.Options.UseForeColor = True
-        Me.BarStaticItemGhost.Name = "BarStaticItemGhost"
-        Me.BarStaticItemGhost.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        Me.btnEvvallUs_lastmonth.Appearance.BackColor = System.Drawing.Color.MediumPurple
+        Me.btnEvvallUs_lastmonth.Appearance.Options.UseBackColor = True
+        resources.ApplyResources(Me.btnEvvallUs_lastmonth, "btnEvvallUs_lastmonth")
+        Me.btnEvvallUs_lastmonth.Name = "btnEvvallUs_lastmonth"
        '
        'frmMain
        '
@@ -809,7 +821,6 @@ Partial Class frmMain
        Me.PanelControl1.ResumeLayout(False)
        CType(Me.GroupControl2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupControl2.ResumeLayout(False)
-        Me.GroupControl2.PerformLayout()
        CType(Me.GroupControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.GroupControl1.ResumeLayout(False)
        Me.ResumeLayout(False)
@@ -876,7 +887,7 @@ Partial Class frmMain
    Friend WithEvents SaveFileDialog1 As SaveFileDialog
    Friend WithEvents bbtnitmEB As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents bbtnitmInfoMail As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents bbtnitm_ResendInvitation As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents XtraTabPageAdmin As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl
    Friend WithEvents GroupControl1 As DevExpress.XtraEditors.GroupControl
@@ -888,10 +899,11 @@ Partial Class frmMain
    Friend WithEvents GridViewData As DevExpress.XtraGrid.Views.Grid.GridView
    Friend WithEvents GroupControl2 As DevExpress.XtraEditors.GroupControl
    Friend WithEvents SplitContainerControl2 As DevExpress.XtraEditors.SplitContainerControl
-    Friend WithEvents LabelControl1 As DevExpress.XtraEditors.LabelControl
    Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents XtraSaveFileDialog1 As DevExpress.XtraEditors.XtraSaveFileDialog
    Friend WithEvents RibbonPageGroupFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarStaticItemGhost As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents btnEvvallUs_thismonth As DevExpress.XtraEditors.SimpleButton
+    Friend WithEvents btnEvvallUs_lastmonth As DevExpress.XtraEditors.SimpleButton
 End Class
--- a/EnvelopeGenerator.Form/frmMain.resx
+++ b/EnvelopeGenerator.Form/frmMain.resx
@@ -365,7 +365,7 @@
 </value>
  </data>
  <data name="btnDeleteEnvelope.Caption" xml:space="preserve">
-    <value>Umschlag zurückrufen</value>
+    <value>Umschlag zurückrufen/löschen</value>
  </data>
  <data name="btnDeleteEnvelope.ImageOptions.ImageIndex" type="System.Int32, mscorlib">
    <value>0</value>
@@ -733,10 +733,10 @@
        IDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
-  <data name="BarButtonItem2.Caption" xml:space="preserve">
+  <data name="bbtnitm_ResendInvitation.Caption" xml:space="preserve">
    <value>Einladung erneut versenden</value>
  </data>
-  <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="bbtnitm_ResendInvitation.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -1091,7 +1091,7 @@
    <value>195</value>
  </data>
  <data name="GridCompleted.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 467</value>
+    <value>1088, 469</value>
  </data>
  <data name="GridCompleted.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
@@ -1109,7 +1109,7 @@
    <value>0</value>
  </data>
  <data name="XtraTabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 467</value>
+    <value>1088, 469</value>
  </data>
  <data name="XtraTabPage2.Text" xml:space="preserve">
    <value>Abgeschlossene Umschläge</value>
@@ -1139,7 +1139,7 @@
    <value>0, 0</value>
  </data>
  <data name="GridControlData.Size" type="System.Drawing.Size, System.Drawing">
-    <value>584, 388</value>
+    <value>584, 390</value>
  </data>
  <data name="GridControlData.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1187,7 +1187,7 @@
    <value>1</value>
  </data>
  <data name="SplitContainerControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 388</value>
+    <value>1088, 390</value>
  </data>
  <data name="SplitContainerControl2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -1204,41 +1204,65 @@
  <data name="&gt;&gt;SplitContainerControl2.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="LabelControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>17, 37</value>
+  <data name="btnEvvallUs_lastmonth.Location" type="System.Drawing.Point, System.Drawing">
+    <value>109, 26</value>
  </data>
-  <data name="LabelControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 13</value>
+  <data name="btnEvvallUs_lastmonth.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 35</value>
  </data>
-  <data name="LabelControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="btnEvvallUs_lastmonth.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
  </data>
-  <data name="LabelControl1.Text" xml:space="preserve">
-    <value>Function not active so far</value>
+  <data name="btnEvvallUs_lastmonth.Text" xml:space="preserve">
+    <value>Letzter Monat</value>
  </data>
-  <data name="&gt;&gt;LabelControl1.Name" xml:space="preserve">
-    <value>LabelControl1</value>
+  <data name="&gt;&gt;btnEvvallUs_lastmonth.Name" xml:space="preserve">
+    <value>btnEvvallUs_lastmonth</value>
  </data>
-  <data name="&gt;&gt;LabelControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.LabelControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="&gt;&gt;btnEvvallUs_lastmonth.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;LabelControl1.Parent" xml:space="preserve">
+  <data name="&gt;&gt;btnEvvallUs_lastmonth.Parent" xml:space="preserve">
    <value>GroupControl2</value>
  </data>
-  <data name="&gt;&gt;LabelControl1.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;btnEvvallUs_lastmonth.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
+  <data name="btnEvvallUs_thismonth.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 26</value>
+  </data>
+  <data name="btnEvvallUs_thismonth.Size" type="System.Drawing.Size, System.Drawing">
+    <value>98, 35</value>
+  </data>
+  <data name="btnEvvallUs_thismonth.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="btnEvvallUs_thismonth.Text" xml:space="preserve">
+    <value>Dieser Monat</value>
+  </data>
+  <data name="&gt;&gt;btnEvvallUs_thismonth.Name" xml:space="preserve">
+    <value>btnEvvallUs_thismonth</value>
+  </data>
+  <data name="&gt;&gt;btnEvvallUs_thismonth.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;btnEvvallUs_thismonth.Parent" xml:space="preserve">
+    <value>GroupControl2</value>
+  </data>
+  <data name="&gt;&gt;btnEvvallUs_thismonth.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
  <data name="GroupControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>496, 5</value>
+    <value>474, 5</value>
  </data>
  <data name="GroupControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>427, 68</value>
+    <value>318, 68</value>
  </data>
  <data name="GroupControl2.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
  <data name="GroupControl2.Text" xml:space="preserve">
-    <value>Diagramme</value>
+    <value>Umschläge alle User</value>
  </data>
  <data name="&gt;&gt;GroupControl2.Name" xml:space="preserve">
    <value>GroupControl2</value>
@@ -1352,7 +1376,7 @@
    <value>11, 5</value>
  </data>
  <data name="GroupControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>453, 68</value>
+    <value>457, 68</value>
  </data>
  <data name="GroupControl1.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -1397,7 +1421,7 @@
    <value>1</value>
  </data>
  <data name="XtraTabPageAdmin.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1088, 467</value>
+    <value>1088, 469</value>
  </data>
  <data name="XtraTabPageAdmin.Text" xml:space="preserve">
    <value>Auswertungen (Admin) - BETA</value>
@@ -1771,10 +1795,10 @@
  <data name="&gt;&gt;bbtnitmInfoMail.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem2.Name" xml:space="preserve">
-    <value>BarButtonItem2</value>
+  <data name="&gt;&gt;bbtnitm_ResendInvitation.Name" xml:space="preserve">
+    <value>bbtnitm_ResendInvitation</value>
  </data>
-  <data name="&gt;&gt;BarButtonItem2.Type" xml:space="preserve">
+  <data name="&gt;&gt;bbtnitm_ResendInvitation.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="&gt;&gt;BarButtonItem3.Name" xml:space="preserve">
@@ -1789,6 +1813,12 @@
  <data name="&gt;&gt;BarButtonItem4.Type" xml:space="preserve">
    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="&gt;&gt;BarStaticItemGhost.Name" xml:space="preserve">
+    <value>BarStaticItemGhost</value>
+  </data>
+  <data name="&gt;&gt;BarStaticItemGhost.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="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
    <value>RibbonPage1</value>
  </data>
@@ -1933,12 +1963,6 @@
  <data name="&gt;&gt;XtraSaveFileDialog1.Type" xml:space="preserve">
    <value>DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="&gt;&gt;BarStaticItemGhost.Name" xml:space="preserve">
-    <value>BarStaticItemGhost</value>
-  </data>
-  <data name="&gt;&gt;BarStaticItemGhost.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="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmMain</value>
  </data>
--- 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 = $"<html><body>Dear Digital Data Team, <br> There is an error or misbehavin with following envelope and Receiver: <p> Envelope: <b>{oUID}</b> <br> Receiver: <b>{oReceiver.Email}</b> 
-<p>Issue/Description: Please describe the issue in Your own words...</p></body></html>"
+                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

--- 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
--- a/EnvelopeGenerator.Web/Controllers/ConfigController.cs
+++ b/EnvelopeGenerator.Web/Controllers/ConfigController.cs
@@ -1,5 +1,4 @@
-using EnvelopeGenerator.Web.Models.Annotation;
-using Microsoft.AspNetCore.Authorization;
+using EnvelopeGenerator.Web.Models;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;

@@ -7,7 +6,6 @@ namespace EnvelopeGenerator.Web.Controllers;

 [Route("api/[controller]")]
 [ApiController]
-[Authorize]
 public class ConfigController : ControllerBase
 {
    private readonly AnnotationParams _annotParams;
@@ -20,6 +18,6 @@ public class ConfigController : ControllerBase
    [HttpGet("Annotations")]
    public IActionResult GetAnnotationParams()
    {
-        return Ok(_annotParams.AnnotationJSObject);
+        return Ok(_annotParams.AnnotationDictionary);
    }
 }
--- a/EnvelopeGenerator.Web/Models/Annotation/Annotation.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/Annotation.cs
@@ -1,8 +1,8 @@
 using System.Text.Json.Serialization;

-namespace EnvelopeGenerator.Web.Models.Annotation;
+namespace EnvelopeGenerator.Web.Models;

-public record Annotation : IAnnotation
+public record Annotation
 {
    public required string Name { get; init; }

@@ -60,16 +60,6 @@ public record Annotation : IAnnotation
    public Annotation? VerBoundAnnot { get; set; }
    #endregion

-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
    [JsonIgnore]
    internal Annotation Default 
    { 
--- a/EnvelopeGenerator.Web/Models/Annotation/Background.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/Background.cs
@@ -1,58 +0,0 @@
-using System.Text.Json.Serialization;
-
-namespace EnvelopeGenerator.Web.Models.Annotation;
-
-/// <summary>
-/// The Background is an annotation for the PSPDF Kit. However, it has no function.
-/// It is only the first annotation as a background for other annotations.
-/// </summary>
-public record Background : IAnnotation
-{
-    [JsonIgnore]
-    public double Margin { get; init; }
-
-    public string Name { get; } = "Background";
-
-    public double? Width { get; set; }
-
-    public double? Height { get; set; }
-
-    public double Left { get; set; }
-
-    public double Top { get; set; }
-
-    public Color? BackgroundColor { get; init; }
-
-    #region Border
-    public Color? BorderColor { get; init; }
-
-    public string? BorderStyle { get; init; }
-
-    public int? BorderWidth { get; set; }
-    #endregion
-
-    public void Locate(IEnumerable<IAnnotation> annotations)
-    {
-        // set Top
-        if (annotations.MinBy(a => a.Top)?.Top is double minTop)
-            Top = minTop;
-
-        // set Left
-        if (annotations.MinBy(a => a.Left)?.Left is double minLeft)
-            Left = minLeft;
-
-        // set Width
-        if(annotations.MaxBy(a => a.GetRight())?.GetRight() is double maxRight)
-            Width = maxRight - Left;
-
-        // set Height
-        if (annotations.MaxBy(a => a.GetBottom())?.GetBottom() is double maxBottom)
-            Height = maxBottom - Top;
-
-        // add margins
-        Top -= Margin;
-        Left -= Margin;
-        Width += Margin * 2;
-        Height += Margin * 2;
-    }
-}
--- a/EnvelopeGenerator.Web/Models/Annotation/Color.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/Color.cs
@@ -1,10 +0,0 @@
-namespace EnvelopeGenerator.Web.Models.Annotation;
-
-public record Color
-{
-    public int R { get; init; } = 0;
-
-    public int G { get; init; } = 0;
-
-    public int B { get; init; } = 0;
-}
--- a/EnvelopeGenerator.Web/Models/Annotation/Extensions.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/Extensions.cs
@@ -1,8 +0,0 @@
-namespace EnvelopeGenerator.Web.Models.Annotation;
-
-public static class Extensions
-{
-    public static double GetRight(this IAnnotation annotation) => annotation.Left + annotation?.Width ?? 0;
-
-    public static double GetBottom(this IAnnotation annotation) => annotation.Top + annotation?.Height ?? 0;
-}
--- a/EnvelopeGenerator.Web/Models/Annotation/IAnnotation.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/IAnnotation.cs
@@ -1,22 +0,0 @@
-namespace EnvelopeGenerator.Web.Models.Annotation;
-
-public interface IAnnotation
-{
-    string Name { get; }
-
-    double? Width { get; }
-
-    double? Height { get; }
-
-    double Left { get; }
-
-    double Top { get; }
-
-    Color? BackgroundColor { get; }
-
-    Color? BorderColor { get; }
-
-    string? BorderStyle { get; }
-
-    int? BorderWidth { get; }
-}
--- a/EnvelopeGenerator.Web/Models/Annotation/AnnotationParams.cs
+++ b/EnvelopeGenerator.Web/Models/Annotation/AnnotationParams.cs
@@ -1,21 +1,15 @@
 using System.Text.Json.Serialization;

-namespace EnvelopeGenerator.Web.Models.Annotation;
+namespace EnvelopeGenerator.Web.Models;

 public class AnnotationParams
 {
-    public AnnotationParams()
-    {
-        _AnnotationJSObjectInitor = new(CreateAnnotationJSObject);
-    }
-
-    public Background? Background { get; init; }
-
-    #region Annotation
    [JsonIgnore]
    public Annotation? DefaultAnnotation { get; init; }

-    private readonly List<Annotation> _annots = new List<Annotation>();
+    private readonly IEnumerable<Annotation> _annots = new List<Annotation>();
+
+    public Annotation this[string name] => _annots.First(a => a.Name == name);

    public bool TryGet(string name, out Annotation annotation)
    {
@@ -30,50 +24,34 @@ public class AnnotationParams
        get => _annots;
        init
        {
-            _annots = value.ToList();
+            _annots = value;

            if (DefaultAnnotation is not null)
                foreach (var annot in _annots)
                    annot.Default = DefaultAnnotation;

-            for (int i = 0; i < _annots.Count; i++)
+            foreach (var annot in _annots)
            {
                #region set bound annotations
                // horizontal
-                if (_annots[i].HorBoundAnnotName is string horBoundAnnotName)
+                if (annot.HorBoundAnnotName is string horBoundAnnotName)
                    if (TryGet(horBoundAnnotName, out var horBoundAnnot))
-                        _annots[i].HorBoundAnnot = horBoundAnnot;
+                        annot.HorBoundAnnot = horBoundAnnot;
                    else
                        throw new InvalidOperationException($"{horBoundAnnotName} added as bound anotation. However, it is not defined.");

                // vertical
-                if (_annots[i].VerBoundAnnotName is string verBoundAnnotName)
+                if (annot.VerBoundAnnotName is string verBoundAnnotName)
                    if (TryGet(verBoundAnnotName, out var verBoundAnnot))
-                        _annots[i].VerBoundAnnot = verBoundAnnot;
+                        annot.VerBoundAnnot = verBoundAnnot;
                    else
                        throw new InvalidOperationException($"{verBoundAnnotName} added as bound anotation. However, it is not defined.");
                #endregion
            }
+
+            AnnotationDictionary = _annots.ToDictionary(a => a.Name.ToLower(), a => a);
        }
    }
-    #endregion

-    #region AnnotationJSObject
-    private Dictionary<string, IAnnotation> CreateAnnotationJSObject()
-    {
-        var dict = _annots.ToDictionary(a => a.Name.ToLower(), a => a as IAnnotation);
-
-        if (Background is not null)
-        {
-            Background.Locate(_annots);
-            dict.Add(Background.Name.ToLower(), Background);
-        }            
-
-        return dict;
-    }
-
-    private readonly Lazy<Dictionary<string, IAnnotation>> _AnnotationJSObjectInitor;
-
-    public Dictionary<string, IAnnotation> AnnotationJSObject => _AnnotationJSObjectInitor.Value;
-    #endregion
+    public Dictionary<string, Annotation> AnnotationDictionary { get; private init; } = new();
 }
--- a/EnvelopeGenerator.Web/Program.cs
+++ b/EnvelopeGenerator.Web/Program.cs
@@ -15,7 +15,6 @@ using DigitalData.EmailProfilerDispatcher;
 using EnvelopeGenerator.Infrastructure;
 using EnvelopeGenerator.Web.Sanitizers;
 using EnvelopeGenerator.Application.Contracts.Services;
-using EnvelopeGenerator.Web.Models.Annotation;

 var logger = LogManager.Setup().LoadConfigurationFromAppSettings().GetCurrentClassLogger();
 logger.Info("Logging initialized!");
--- a/EnvelopeGenerator.Web/appsettings.json
+++ b/EnvelopeGenerator.Web/appsettings.json
@@ -151,21 +151,6 @@
  },
  "MainPageTitle": null,
  "AnnotationParams": {
-    "Background": {
-      "Margin": 0.20,
-      "BackgroundColor": {
-        "R": 222,
-        "G": 220,
-        "B": 215
-      },
-      "BorderColor": {
-        "R": 204,
-        "G": 202,
-        "B": 198
-      },
-      "BorderStyle": "underline",
-      "BorderWidth": 4
-    },
    "DefaultAnnotation": {
      "Width": 1,
      "Height": 0.5,
--- a/EnvelopeGenerator.Web/wwwroot/js/annotation.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/annotation.js
@@ -5,34 +5,6 @@ async function createAnnotations(document, instance) {
    for(var element of document.elements) {
        const annotParams = await getAnnotationParams(element.left, element.top);
        const page = element.page - 1
-        
-        //background
-        if(annotParams.background){
-            let background = annotParams.background;
-            const id_background = PSPDFKit.generateInstantId();
-            const annotation_background = new PSPDFKit.Annotations.WidgetAnnotation({
-                id: id_background,
-                pageIndex: page,
-                formFieldName: id_background,
-                backgroundColor: background?.backgroundColor ? new PSPDFKit.Color(background.backgroundColor) : null,
-                blendMode: 'normal',
-                boundingBox: new PSPDFKit.Geometry.Rect(background),
-                fontSize: 8,
-                borderStyle: background.borderStyle,
-                borderWidth: background.borderWidth,
-                borderColor: background?.borderColor ? new PSPDFKit.Color(background.borderColor) : null
-            });
-    
-            const formFieldBackground = new PSPDFKit.FormFields.ButtonFormField({
-                name: id_background,
-                annotationIds: PSPDFKit.Immutable.List([annotation_background.id]),
-                value: "",
-                readOnly: false
-            });
-
-            signatures.push(annotation_background)
-            signatures.push(formFieldBackground)
-        }

        //signatures
        const id = PSPDFKit.generateInstantId()
@@ -40,8 +12,8 @@ async function createAnnotations(document, instance) {
            id: id,
            pageIndex: page,
            formFieldName: id,
-            backgroundColor: PSPDFKit.Color.LIGHT_YELLOW,
-            blendMode: 'normal',
+            backgroundColor: PSPDFKit.Color.YELLOW,
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.signature),
        })

@@ -57,7 +29,7 @@ async function createAnnotations(document, instance) {
            pageIndex: page,
            formFieldName: id_position,
            backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.position),
            fontSize: 8
        })
@@ -76,7 +48,7 @@ async function createAnnotations(document, instance) {
            pageIndex: page,
            formFieldName: id_city,
            backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.city),
            fontSize: 8
        })
@@ -95,7 +67,7 @@ async function createAnnotations(document, instance) {
            pageIndex: page,
            formFieldName: id_date,
            backgroundColor: PSPDFKit.Color.DarkBlue,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.date),
            fontSize: 8,
            backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -125,7 +97,7 @@ async function createAnnotations(document, instance) {
            id: id_date_label,
            pageIndex: page,
            formFieldName: id_date_label,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.datelabel),
            fontSize: 8,
            backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -147,7 +119,7 @@ async function createAnnotations(document, instance) {
            id: id_city_label,
            pageIndex: page,
            formFieldName: id_city_label,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.citylabel),
            fontSize: 8,
            backgroundColor: PSPDFKit.Color.TRANSPARENT,
@@ -159,8 +131,7 @@ async function createAnnotations(document, instance) {
            name: id_city_label,
            annotationIds: PSPDFKit.Immutable.List([annotation_city_label.id]),
            value: "Ort",
-            readOnly: true,
-            color: PSPDFKit.Color.BLACK
+            readOnly: true
        })

        //position label
@@ -169,7 +140,7 @@ async function createAnnotations(document, instance) {
            id: id_position_label,
            pageIndex: page,
            formFieldName: id_position_label,
-            blendMode: 'normal',
+            blendMode: 'multiply',
            boundingBox: new PSPDFKit.Geometry.Rect(annotParams.positionlabel),
            fontSize: 8,
            backgroundColor: PSPDFKit.Color.TRANSPARENT,
--- a/EnvelopeGenerator.Web/wwwroot/js/network.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/network.js
@@ -175,21 +175,21 @@ async function setLanguage(language) {
            'Content-Type': 'application/json'
        }
    })
-        .then(res => res.json())
-        .then(langs => langs.includes(language))
-        .catch(err => false);
+    .then(res => res.json())
+    .then(langs => langs.includes(language))
+    .catch(err => false);

-    if (hasLang)
+    if(hasLang)
        return await fetch(`/lang/${language}`, {
            method: 'POST',
            headers: { 'Content-Type': 'application/json' }
        })
-            .then(response => {
-                if (response.redirected)
-                    window.location.href = response.url;
-                else if (!response.ok)
-                    return Promise.reject('Failed to set language');
-            });
+        .then(response => {
+            if (response.redirected)
+                window.location.href = response.url;
+            else if (!response.ok)
+                return Promise.reject('Failed to set language');
+        });
 }

 async function logout() {
@@ -204,23 +204,22 @@ async function logout() {
    });
 }

-
-async function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
-
-    const annotParams = await fetch(`${window.location.origin}/api/Config/Annotations`, {
+function getAnnotationParams(leftInInch = 0, topInInch = 0, inchToPointFactor = 72) {
+    return fetch(`${window.location.origin}/api/Config/Annotations`, {
        credentials: 'include',
        method: 'GET'
    })
-        .then(res => res.json());
-
-    for (var key in annotParams) {
-        var annot = annotParams[key];
-        annot.width *= inchToPointFactor;
-        annot.height *= inchToPointFactor;
-        annot.left += leftInInch - 0.7;
-        annot.left *= inchToPointFactor;
-        annot.top += topInInch - 0.5;
-        annot.top *= inchToPointFactor;
-    }
-    return annotParams;
+    .then(res => res.json())
+    .then(annotParams => {
+        for(var key in annotParams){
+            var annot = annotParams[key];
+            annot.width *= inchToPointFactor;
+            annot.height *= inchToPointFactor;
+            annot.left += leftInInch;
+            annot.left *= inchToPointFactor;
+            annot.top += topInInch;
+            annot.top *= inchToPointFactor;
+        }
+        return annotParams;
+    });
 }
--- a/EnvelopeGenerator.Web/wwwroot/js/network.min.js
+++ b/EnvelopeGenerator.Web/wwwroot/js/network.min.js
@@ -1 +1 @@
-async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}async function getAnnotationParams(n=0,t=0,i=72){var f,r;const u=await fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json());for(f in u)r=u[f],r.width*=i,r.height*=i,r.left+=n-.7,r.left*=i,r.top+=t-.5,r.top*=i;return u}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n){const t=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...t}};return fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}
+async function setLangAsync(n,t){document.getElementById("selectedFlag").className="fi "+t+" me-2";await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}})}async function setLanguage(n){const t=await fetch("/lang",{method:"GET",headers:{"Content-Type":"application/json"}}).then(n=>n.json()).then(t=>t.includes(n)).catch(()=>!1);if(t)return await fetch(`/lang/${n}`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{if(n.redirected)window.location.href=n.url;else if(!n.ok)return Promise.reject("Failed to set language")})}async function logout(){return await fetch(`/auth/logout`,{method:"POST",headers:{"Content-Type":"application/json"}}).then(n=>{n.ok&&(window.location.href="/")})}function getAnnotationParams(n=0,t=0,i=72){return fetch(`${window.location.origin}/api/Config/Annotations`,{credentials:"include",method:"GET"}).then(n=>n.json()).then(r=>{var f,u;for(f in r)u=r[f],u.width*=i,u.height*=i,u.left+=n,u.left*=i,u.top+=t,u.top*=i;return r})}class Network{async getEnvelope(n){return this.getRequest(`/api/envelope/${n}`).then(this.wrapJsonResponse.bind(this))}async postEnvelope(n,t,i){return this.postRequest(`/api/envelope/${n}?index=${t}`,i).then(this.wrapJsonResponse.bind(this))}async getDocument(n,t){return this.getRequest(`/api/document/${n}?index=${t}`).then(this.wrapBinaryResponse.bind(this))}async openDocument(n){return this.postRequest(`/api/document/${n}`,{}).then(this.wrapJsonResponse.bind(this))}withCSRFToken(n){const t=getCSRFToken;let i=n.headers;return n.headers={...i,...t},n}getCSRFToken(){const n=document.getElementsByName("__RequestVerificationToken")[0].value;return{"X-XSRF-TOKEN":n}}getRequest(n){const t=this.getCSRFToken(),i={credentials:"include",method:"GET",headers:{...t}};return fetch(n,i)}postRequest(n,t){const i=this.getCSRFToken(),r={credentials:"include",method:"POST",headers:{...i,"Content-Type":"application/json; charset=utf-8"},body:JSON.stringify(t)};return fetch(n,r)}async wrapJsonResponse(n){return await this.wrapResponse(n,async n=>await n.json())}async wrapBinaryResponse(n){return await this.wrapResponse(n,async n=>await n.arrayBuffer())}async wrapResponse(n,t){let i;if(n.status===200){const r=await t(n);i=new WrappedResponse(r,null)}else if(n.status===403){const t=await n.json();i=new WrappedResponse(null,t)}else i=new WrappedResponse(null,null);return i}}class WrappedResponse{constructor(n,t){this.data=n;this.error=t;this.fatal=n===null&&t===null}}
Author	SHA1	Message	Date
Developer01	3c5f5cb5f5	Neues Release plus Flatternformfleds RO	2025-04-24 08:56:33 +02:00
Developer01	4e2682a75d	DocumentRotationChanged	2025-04-23 12:40:28 +02:00
Developer01	278d56c58d	Merge branch 'master' of http://git.dd:3000/AppStd/EnvelopeGenerator	2025-04-23 12:38:02 +02:00
Developer01	9f71579c78	MS Neue Konstante	2025-04-23 12:37:57 +02:00