From f42ef8107c612927a4afe94354404df6e5d1164d Mon Sep 17 00:00:00 2001 From: pitzm Date: Wed, 6 Dec 2023 14:02:20 +0100 Subject: [PATCH] Subject raus Button Handling --- .../Entities/EmailData.vb | 2 +- EnvelopeGenerator.Common/Entities/Envelope.vb | 1 - .../Models/CertificateModel.vb | 2 +- .../Models/EnvelopeModel.vb | 8 +-- .../Strings/Envelope.en.resx | 3 - .../Strings/Envelope.resx | 3 - .../Strings/Envelope1.Designer.vb | 9 --- .../frmEnvelopeEditor.Designer.vb | 61 ++++++------------- EnvelopeGenerator.Form/frmEnvelopeEditor.resx | 59 +++++------------- EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 20 ++---- EnvelopeGenerator.Form/frmMain.Designer.vb | 10 +-- EnvelopeGenerator.Form/frmMain.resx | 20 +----- EnvelopeGenerator.Form/frmMain.vb | 4 ++ 13 files changed, 49 insertions(+), 153 deletions(-) diff --git a/EnvelopeGenerator.Common/Entities/EmailData.vb b/EnvelopeGenerator.Common/Entities/EmailData.vb index 7c129a12..8f8d6c47 100644 --- a/EnvelopeGenerator.Common/Entities/EmailData.vb +++ b/EnvelopeGenerator.Common/Entities/EmailData.vb @@ -16,7 +16,7 @@ Public Class EmailData Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver) EmailAdress = pReceiver.Email - EmailSubject = pEnvelope.Subject + EmailSubject = String.Empty Message = pEnvelope.Message ReferenceID = pEnvelope.Id ReferenceString = pEnvelope.Uuid diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index e6bd1fb3..4dea5b6b 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -6,7 +6,6 @@ Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated Public Property Uuid As String = Guid.NewGuid.ToString() - Public Property Subject As String = My.Resources.Envelope.You_received_a_document_to_sign_ Public Property Message As String = My.Resources.Envelope.Please_read_and_sign_this_document Public Property AddedWhen As Date diff --git a/EnvelopeGenerator.Common/Models/CertificateModel.vb b/EnvelopeGenerator.Common/Models/CertificateModel.vb index 3801c569..99ad7612 100644 --- a/EnvelopeGenerator.Common/Models/CertificateModel.vb +++ b/EnvelopeGenerator.Common/Models/CertificateModel.vb @@ -31,7 +31,7 @@ Public Class CertificateModel Dim oCommand As New SqlCommand(oSql) oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id oCommand.Parameters.Add("ENVELOPE_UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid - oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject + oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = String.Empty oCommand.Parameters.Add("CREATOR_ID", SqlDbType.Int).Value = pEnvelope.UserId oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.FullName oCommand.Parameters.Add("CREATOR_EMAIL", SqlDbType.NVarChar).Value = pEnvelope.User.Email diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index 754e18fe..9b46f907 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -27,7 +27,6 @@ Public Class EnvelopeModel .Title = pRow.ItemEx("TITLE", ""), .ContractType = ObjectEx.ToEnum(Of Constants.ContractType)(pRow.ItemEx("CONTRACT_TYPE", Constants.ContractType.Contract.ToString())), .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""), - .Subject = pRow.ItemEx("SUBJECT", ""), .Message = pRow.ItemEx("MESSAGE", ""), .UserId = pRow.ItemEx("USER_ID", 0), .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())), @@ -120,10 +119,9 @@ Public Class EnvelopeModel Public Function Insert(pEnvelope As Envelope) As Boolean Try - Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (SUBJECT, MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) " - oSql += " VALUES (@SUBJECT, @MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)" + Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) " + oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)" Dim oCommand As New SqlCommand(oSql) - oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = String.Empty oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty oCommand.Parameters.Add("UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.EnvelopeCreated @@ -148,7 +146,6 @@ Public Class EnvelopeModel Public Function Update(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean Try Dim oSql = "UPDATE [dbo].[TBSIG_ENVELOPE] SET " - oSql += " [SUBJECT] = @SUBJECT, " oSql += " [MESSAGE] = @MESSAGE, " oSql += " [STATUS] = @STATUS, " oSql += " [TITLE] = @TITLE, " @@ -156,7 +153,6 @@ Public Class EnvelopeModel oSql += " [CHANGED_WHEN] = GETDATE() " oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID" Dim oCommand As New SqlCommand(oSql) - oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = pEnvelope.Message oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = pEnvelope.Status oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index f1604e1e..181a757d 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -183,9 +183,6 @@ Missing Receivers - - Missing Subject - Only one file is allowed! diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index 54b37892..6b903d8b 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -183,9 +183,6 @@ Fehlende Empfänger - - Fehlender Betreff - Es ist nur eine Datei zulässig! diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 6d65057c..245fc065 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -262,15 +262,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Fehlender Betreff ähnelt. - ''' - Public Shared ReadOnly Property Missing_Subject() As String - Get - Return ResourceManager.GetString("Missing Subject", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Zeichenfolge, die Es ist nur eine Datei zulässig! ähnelt. ''' diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 3974596a..8f213d82 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -68,8 +68,9 @@ Partial Public Class frmEnvelopeEditor Me.colColor = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit() Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn() - Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() + Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() + Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit() Me.RepositoryItemPictureEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit() Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit() Me.RepositoryItemImageEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageEdit() @@ -79,16 +80,13 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.txtSubject = New DevExpress.XtraEditors.TextEdit() Me.txtMessage = New DevExpress.XtraEditors.MemoEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.FrmEditorBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -117,6 +115,7 @@ Partial Public Class frmEnvelopeEditor CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -129,15 +128,12 @@ Partial Public Class frmEnvelopeEditor Me.PanelControl2.SuspendLayout() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.txtSubject.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplashScreenManager1 @@ -436,17 +432,23 @@ Partial Public Class frmEnvelopeEditor Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] resources.ApplyResources(Me.colEmail, "colEmail") ' - 'RepositoryItemEmailEdit + 'RepositoryItemComboBox1 ' - resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit") - Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit" + resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") + Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" ' 'colName ' + resources.ApplyResources(Me.colName, "colName") Me.colName.FieldName = "Name" Me.colName.Name = "colName" Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] - resources.ApplyResources(Me.colName, "colName") + ' + 'RepositoryItemEmailEdit + ' + resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit") + Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit" ' 'RepositoryItemPictureEdit1 ' @@ -507,19 +509,11 @@ Partial Public Class frmEnvelopeEditor ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.txtSubject) Me.LayoutControl1.Controls.Add(Me.txtMessage) resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root ' - 'txtSubject - ' - resources.ApplyResources(Me.txtSubject, "txtSubject") - Me.txtSubject.MenuManager = Me.RibbonControl1 - Me.txtSubject.Name = "txtSubject" - Me.txtSubject.StyleController = Me.LayoutControl1 - ' 'txtMessage ' resources.ApplyResources(Me.txtMessage, "txtMessage") @@ -539,31 +533,20 @@ Partial Public Class frmEnvelopeEditor ' 'LayoutControlGroup1 ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3}) + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 285) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' - 'LayoutControlItem1 - ' - Me.LayoutControlItem1.Control = Me.txtSubject - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(873, 56) - resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(45, 13) - ' 'LayoutControlItem3 ' Me.LayoutControlItem3.Control = Me.txtMessage - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 56) + Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 182) + Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 238) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem3.TextSize = New System.Drawing.Size(45, 13) @@ -582,12 +565,6 @@ Partial Public Class frmEnvelopeEditor Me.OpenFileDialog1.FileName = "OpenFileDialog1" resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1") ' - 'RepositoryItemComboBox1 - ' - resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1") - Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1" - ' 'frmEnvelopeEditor ' resources.ApplyResources(Me, "$this") @@ -625,6 +602,7 @@ Partial Public Class frmEnvelopeEditor CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).EndInit() @@ -637,15 +615,12 @@ Partial Public Class frmEnvelopeEditor Me.PanelControl2.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.txtSubject.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -662,9 +637,7 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents Root As LayoutControlGroup Friend WithEvents GridReceivers As DevExpress.XtraGrid.GridControl Friend WithEvents ViewReceivers As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents txtSubject As TextEdit Friend WithEvents txtMessage As MemoEdit - Friend WithEvents LayoutControlItem1 As LayoutControlItem Friend WithEvents LayoutControlItem3 As LayoutControlItem Friend WithEvents colFilename As DevExpress.XtraGrid.Columns.TileViewColumn Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 500e0b93..30bf05ae 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -504,6 +504,9 @@ 362 + + Anrede Email + True @@ -621,32 +624,11 @@ 0 - - 23, 60 - - - 853, 20 - - - 0 - - - txtSubject - - - DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 4 - - 23, 116 + 23, 60 - 853, 146 + 853, 202 2 @@ -661,7 +643,7 @@ LayoutControl1 - 5 + 4 Fill @@ -669,9 +651,6 @@ 2, 2 - - Betreff - Nachricht @@ -990,11 +969,11 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RepositoryItemEmailEdit + + RepositoryItemComboBox1 - - DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a colName @@ -1002,6 +981,12 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RepositoryItemEmailEdit + + + DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RepositoryItemPictureEdit1 @@ -1056,12 +1041,6 @@ DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - LayoutControlItem1 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - LayoutControlItem3 @@ -1086,12 +1065,6 @@ System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - RepositoryItemComboBox1 - - - DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.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 6f1b71b7..d780f1b2 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -57,7 +57,6 @@ Partial Public Class frmEnvelopeEditor If oResult = DialogResult.OK Then Controller.Envelope.Title = oDataForm.EnvelopeTitle Controller.Envelope.ContractType = oDataForm.EnvelopeContractType - Controller.Envelope.Subject += " " + oDataForm.EnvelopeTitle Else Controller.DeleteEnvelopeFromDisk(Controller.Envelope) Me.Close() @@ -80,7 +79,6 @@ Partial Public Class frmEnvelopeEditor End If txtMessage.EditValue = Controller.Envelope.Message - txtSubject.EditValue = Controller.Envelope.Subject GridDocuments.DataSource = Documents GridReceivers.DataSource = Receivers @@ -174,15 +172,10 @@ Partial Public Class frmEnvelopeEditor End Function Private Function ValidateEnvelope() As List(Of String) - Dim oSubject = GetEditValueFromTextControl(txtSubject) Dim oMessage = GetEditValueFromTextControl(txtMessage) Dim oErrors As New List(Of String) - If String.IsNullOrWhiteSpace(oSubject) Then - oErrors.Add(Resources.Envelope.Missing_Subject) - End If - If String.IsNullOrWhiteSpace(oMessage) Then oErrors.Add(Resources.Envelope.Missing_Message) End If @@ -205,7 +198,6 @@ Partial Public Class frmEnvelopeEditor End Function Private Function SaveEnvelope(pWithValidation As Boolean) As Boolean - Dim oSubject = GetEditValueFromTextControl(txtSubject) Dim oMessage = GetEditValueFromTextControl(txtMessage) ' Ensure all receivers are saved @@ -220,7 +212,6 @@ Partial Public Class frmEnvelopeEditor End If Dim oEnvelope = Controller.Envelope - oEnvelope.Subject = oSubject oEnvelope.Message = oMessage oEnvelope.Documents = Documents.ToList @@ -364,10 +355,11 @@ Partial Public Class frmEnvelopeEditor SendEnvelopeButton_Enable() End Sub Private Sub RibbonPageGroupAddSignature_Enabled() - If ViewDocuments.GetSelectedRows().Count = 0 Then - RibbonPageGroupAddSignature.Enabled = False - Else + If ViewDocuments.RowCount > 0 And + ViewReceivers.SelectedRowsCount > 0 Then RibbonPageGroupAddSignature.Enabled = True + Else + RibbonPageGroupAddSignature.Enabled = False End If End Sub @@ -387,8 +379,6 @@ Partial Public Class frmEnvelopeEditor btnNewFile.Enabled = False btnDeleteFile.Enabled = True End If - - RibbonPageGroupAddSignature_Enabled() End Sub Private Sub SendEnvelopeButton_Enable() @@ -418,11 +408,13 @@ Partial Public Class frmEnvelopeEditor Private Sub ViewReceivers_RowCountChanged(sender As Object, e As EventArgs) Handles ViewReceivers.RowCountChanged RibbonPageGroupReceiver_Enable() SendEnvelopeButton_Enable() + RibbonPageGroupAddSignature_Enabled() End Sub Private Sub ViewDocuments_RowCountChanged(sender As Object, e As EventArgs) Handles ViewDocuments.RowCountChanged DocumentButtons_Enable() SendEnvelopeButton_Enable() + RibbonPageGroupAddSignature_Enabled() End Sub End Class diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 445708e4..6aa48823 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -45,7 +45,6 @@ Partial Class frmMain Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn() Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn() Me.colTitle = New DevExpress.XtraGrid.Columns.GridColumn() - Me.colSubject = New DevExpress.XtraGrid.Columns.GridColumn() Me.colAddedWhen = New DevExpress.XtraGrid.Columns.GridColumn() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() Me.btnCreateEnvelope = New DevExpress.XtraBars.BarButtonItem() @@ -227,7 +226,7 @@ Partial Class frmMain ' 'ViewEnvelopes ' - Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colSubject, Me.colAddedWhen}) + Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen}) Me.ViewEnvelopes.GridControl = Me.GridEnvelopes Me.ViewEnvelopes.Name = "ViewEnvelopes" Me.ViewEnvelopes.OptionsBehavior.Editable = False @@ -257,12 +256,6 @@ Partial Class frmMain Me.colTitle.FieldName = "Title" Me.colTitle.Name = "colTitle" ' - 'colSubject - ' - resources.ApplyResources(Me.colSubject, "colSubject") - Me.colSubject.FieldName = "Subject" - Me.colSubject.Name = "colSubject" - ' 'colAddedWhen ' resources.ApplyResources(Me.colAddedWhen, "colAddedWhen") @@ -542,7 +535,6 @@ Partial Class frmMain Friend WithEvents btnEditEnvelope As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnDeleteEnvelope As DevExpress.XtraBars.BarButtonItem Friend WithEvents colTitle As DevExpress.XtraGrid.Columns.GridColumn - Friend WithEvents colSubject As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colAddedWhen As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colContractType As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents colStatus As DevExpress.XtraGrid.Columns.GridColumn diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index e2a045d0..b21e038c 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -258,18 +258,6 @@ 352 - - Betreff - - - True - - - 3 - - - 352 - Erstellt am @@ -277,7 +265,7 @@ True - 4 + 3 118 @@ -898,12 +886,6 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - colSubject - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - colAddedWhen diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index b6f36214..f432127f 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -192,9 +192,13 @@ Public Class frmMain Case 1 btnEditEnvelope.Enabled = False btnDeleteEnvelope.Enabled = False + btnContactReceiver.Enabled = False + btnShowDocument.Enabled = False Case 0 btnEditEnvelope.Enabled = True btnDeleteEnvelope.Enabled = True + btnContactReceiver.Enabled = True + btnShowDocument.Enabled = True End Select End Sub