diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 8b222b0f..4ef21983 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -28,6 +28,7 @@ MessageConfirmationSent = 3003 MessageDeletionSent = 3004 MessageCompletionSent = 3005 + DocumentMOD_RotationChanged = 4001 End Enum 'TODO: standardize in xwiki diff --git a/EnvelopeGenerator.Common/Services/ActionService.vb b/EnvelopeGenerator.Common/Services/ActionService.vb index b2fc149e..d76ea459 100644 --- a/EnvelopeGenerator.Common/Services/ActionService.vb +++ b/EnvelopeGenerator.Common/Services/ActionService.vb @@ -34,6 +34,12 @@ Public Class ActionService Return True End Function + Public Function SetStatusDocumentRotationChanged(pEnvelope As Envelope) As Boolean + If HistoryService.SetEnvelopeStatus(pEnvelope, Constants.EnvelopeStatus.DocumentMOD_RotationChanged, 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 diff --git a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb index fffe99c4..0f3de13d 100644 --- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb +++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb @@ -38,6 +38,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 diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 36f9e330..7beaad88 100644 --- 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 ' diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 27ecec05..15a9a956 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -939,7 +939,7 @@ 0 - 792, 17 + 17, 54 557, 17 diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index e5262c8c..54d05405 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -64,6 +64,7 @@ Partial Class frmMain Me.BarButtonItem2 = 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() @@ -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.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -468,6 +469,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}) @@ -708,6 +722,7 @@ Partial Class frmMain ' 'GroupControl1 ' + Me.GroupControl1.Controls.Add(Me.SimpleButton1) Me.GroupControl1.Controls.Add(Me.btnEnvelopes_All) Me.GroupControl1.Controls.Add(Me.btnEnvelopes_thisYear) Me.GroupControl1.Controls.Add(Me.btnEnvelopes_lastmonth) @@ -755,18 +770,10 @@ Partial Class frmMain ' Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" ' - 'BarStaticItemGhost + 'SimpleButton1 ' - 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 + resources.ApplyResources(Me.SimpleButton1, "SimpleButton1") + Me.SimpleButton1.Name = "SimpleButton1" ' 'frmMain ' @@ -894,4 +901,5 @@ Partial Class frmMain Friend WithEvents RibbonPageGroupFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarStaticItemGhost As DevExpress.XtraBars.BarStaticItem + Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 8d2b9ef6..8c26f6b5 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -1091,7 +1091,7 @@ 195 - 1088, 467 + 1088, 469 3 @@ -1109,7 +1109,7 @@ 0 - 1088, 467 + 1088, 469 Abgeschlossene Umschläge @@ -1139,7 +1139,7 @@ 0, 0 - 584, 388 + 584, 390 1 @@ -1187,7 +1187,7 @@ 1 - 1088, 388 + 1088, 390 2 @@ -1229,10 +1229,10 @@ 0 - 496, 5 + 605, 5 - 427, 68 + 318, 68 2 @@ -1252,6 +1252,30 @@ 0 + + 449, 26 + + + 75, 35 + + + 4 + + + SimpleButton1 + + + SimpleButton1 + + + DevExpress.XtraEditors.SimpleButton, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + GroupControl1 + + + 0 + 339, 26 @@ -1274,7 +1298,7 @@ GroupControl1 - 0 + 1 229, 26 @@ -1298,7 +1322,7 @@ GroupControl1 - 1 + 2 119, 26 @@ -1322,7 +1346,7 @@ GroupControl1 - 2 + 3 9, 26 @@ -1346,13 +1370,13 @@ GroupControl1 - 3 + 4 11, 5 - 453, 68 + 588, 68 1 @@ -1397,7 +1421,7 @@ 1 - 1088, 467 + 1088, 469 Auswertungen (Admin) - BETA @@ -1789,6 +1813,12 @@ DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarStaticItemGhost + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPage1 @@ -1933,12 +1963,6 @@ DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarStaticItemGhost - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmMain