diff --git a/EnvelopeGenerator.Common/Constants.vb b/EnvelopeGenerator.Common/Constants.vb index 79e1d420..0e0d3933 100644 --- a/EnvelopeGenerator.Common/Constants.vb +++ b/EnvelopeGenerator.Common/Constants.vb @@ -73,6 +73,8 @@ Portrait = 0 Landscape = 1 End Enum + + #End Region diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index 19648a7b..909ea346 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -3,7 +3,7 @@ Public Property UserId As Integer Public Property Title As String = "" Public Property EnvelopeType As Integer - Public Property ContractType As Constants.ContractType + Public Property ContractType As Integer Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated Public Property Uuid As String = Guid.NewGuid.ToString() Public Property UseAccessCode As Boolean = False diff --git a/EnvelopeGenerator.Common/Entities/EnvelopeType.vb b/EnvelopeGenerator.Common/Entities/EnvelopeType.vb new file mode 100644 index 00000000..bd3b5bf0 --- /dev/null +++ b/EnvelopeGenerator.Common/Entities/EnvelopeType.vb @@ -0,0 +1,26 @@ +Public Class EnvelopeType + + Public Property Id As Integer = 0 + Public Property Title As String + Public Property UseAccessCode As Boolean + Public Property ContractType As Integer ' Unbenutzt + + Public Property Language As String + Public Property CertificationType As Constants.CertificationType = Constants.CertificationType.ElectronicSignature + Public Property SendReminderEmails As Boolean = False + Public Property FirstReminderDays As Integer = 0 + Public Property ReminderIntervalDays As Integer = 0 + + Public Property ExpiresWhen As Date + Public Property ExpiresWarningWhen As Date + Public Property ExpiresWhenDays As Integer + Public Property ExpiresWarningWhenDays As Integer + + Public Property FinalEmailToCreator As Constants.FinalEmailType + Public Property FinalEmailToReceivers As Constants.FinalEmailType + + Public Overrides Function ToString() As String + Return Title + End Function + +End Class diff --git a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj index b4b27ccb..39da6d18 100644 --- a/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj +++ b/EnvelopeGenerator.Common/EnvelopeGenerator.Common.vbproj @@ -136,6 +136,7 @@ + @@ -155,6 +156,7 @@ + diff --git a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb index bfcf9256..f7c8a932 100644 --- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb @@ -26,11 +26,11 @@ Public Class EnvelopeModel .Id = pRow.ItemEx("GUID", 0), .Title = pRow.ItemEx("TITLE", ""), .EnvelopeType = pRow.ItemEx("ENVELOPE_TYPE", 0), - .ContractType = ObjectEx.ToEnum(Of Constants.ContractType)(pRow.ItemEx("CONTRACT_TYPE", Constants.ContractType.Contract.ToString())), + .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0), .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""), .Message = pRow.ItemEx("MESSAGE", ""), .UserId = pRow.ItemEx("USER_ID", 0), - .Language = pRow.ItemEx("MESSAGE", "de-DE"), + .Language = pRow.ItemEx("LANGUAGE", "de-DE"), .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())), .AddedWhen = pRow.Item("ADDED_WHEN"), .CertificationType = ObjectEx.ToEnum(Of Constants.CertificationType)(pRow.ItemEx("CERTIFICATION_TYPE", Constants.CertificationType.ElectronicSignature.ToString())), @@ -132,16 +132,13 @@ Public Class EnvelopeModel Public Function Insert(pEnvelope As Envelope) As Boolean Try - Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, LANGUAGE, CERTIFICATION_TYPE, CONTRACT_TYPE) " - oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID, @LANGUAGE, @CERTIFICATION_TYPE, @CONTRACT_TYPE)" + Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID) " + oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID)" Dim oCommand As New SqlCommand(oSql) 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 oCommand.Parameters.Add("USER_ID", SqlDbType.Int).Value = pEnvelope.UserId - oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language - oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType - oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType If Database.ExecuteNonQuery(oCommand) Then pEnvelope.Id = GetEnvelopeId(pEnvelope) diff --git a/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb b/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb new file mode 100644 index 00000000..45ed7c85 --- /dev/null +++ b/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb @@ -0,0 +1,37 @@ +Imports DigitalData.Modules.Base + +Public Class EnvelopeTypeModel + Inherits BaseModel + + Public Sub New(pState As State) + MyBase.New(pState) + End Sub + + Private Function ToEnvelopeType(pRow As DataRow) As EnvelopeType + Return New EnvelopeType() With { + .Id = pRow.ItemEx("GUID", 0), + .Title = pRow.ItemEx("TITLE", ""), + .UseAccessCode = pRow.ItemEx("USE_ACCESS_CODE", False), + .Language = pRow.ItemEx("LANGUAGE", "de"), + .ExpiresWhenDays = pRow.ItemEx("EXPIRES_DAYS", 0), + .ExpiresWarningWhenDays = pRow.ItemEx("EXPIRES_WARNING_DAYS", 0), + .SendReminderEmails = pRow.ItemEx("SEND_REMINDER_EMAILS", 0), + .FirstReminderDays = pRow.ItemEx("FIRST_REMINDER_DAYS", 0), + .ReminderIntervalDays = pRow.ItemEx("REMINDER_INTERVAL_DAYS", 0), + .FinalEmailToCreator = pRow.ItemEx("FINAL_EMAIL_TO_CREATOR", 0), + .FinalEmailToReceivers = pRow.ItemEx("FINAL_EMAIL_TO_RECEIVERS", 0), + .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0), + .CertificationType = pRow.ItemEx("CERTIFICATION_TYPE", 0) + } + End Function + + Public Function List() As IEnumerable(Of EnvelopeType) + Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE" + Dim oTable As DataTable = Database.GetDatatable(oSql) + + Return oTable.Rows. + Cast(Of DataRow). + Select(AddressOf ToEnvelopeType). + ToList() + End Function +End Class diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index ddfa98e1..187e92dd 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -99,6 +99,7 @@ + diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 924136f9..a02fbb26 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -70,6 +70,7 @@ Partial Public Class frmEnvelopeEditor Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() Me.colName = New DevExpress.XtraGrid.Columns.GridColumn() + Me.colAccessCode = 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() @@ -343,7 +344,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem5.Control = Me.GridDocuments Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem5.Name = "LayoutControlItem5" - Me.LayoutControlItem5.Size = New System.Drawing.Size(229, 511) + Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 507) Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem5.TextVisible = False ' @@ -395,7 +396,7 @@ Partial Public Class frmEnvelopeEditor 'ViewReceivers ' Me.ViewReceivers.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple - Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colColor, Me.colEmail, Me.colName}) + Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colColor, Me.colEmail, Me.colName, Me.colAccessCode}) Me.ViewReceivers.GridControl = Me.GridReceivers Me.ViewReceivers.Name = "ViewReceivers" Me.ViewReceivers.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[True] @@ -447,6 +448,12 @@ Partial Public Class frmEnvelopeEditor Me.colName.Name = "colName" Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False] ' + 'colAccessCode + ' + resources.ApplyResources(Me.colAccessCode, "colAccessCode") + Me.colAccessCode.FieldName = "AccessCode" + Me.colAccessCode.Name = "colAccessCode" + ' 'RepositoryItemEmailEdit ' resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit") @@ -499,7 +506,7 @@ Partial Public Class frmEnvelopeEditor Me.LayoutControlItem2.Control = Me.GridReceivers Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(877, 208) + Me.LayoutControlItem2.Size = New System.Drawing.Size(875, 204) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -680,6 +687,7 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents RepositoryItemImageEdit1 As Repository.RepositoryItemImageEdit Friend WithEvents RepositoryItemPictureEdit2 As Repository.RepositoryItemPictureEdit Friend WithEvents RepositoryItemComboBox1 As Repository.RepositoryItemComboBox + Friend WithEvents colAccessCode As DevExpress.XtraGrid.Columns.GridColumn #End Region diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 4d4da872..9d502c6a 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -126,7 +126,7 @@ 0, 132 - 13, 33 + 14, 35 Dateiname @@ -378,7 +378,7 @@ 1 - 225, 507 + 223, 503 0 @@ -450,7 +450,7 @@ 338, 17 - 13, 33 + 14, 35 @@ -487,7 +487,7 @@ 0 - 40 + 37 False @@ -502,7 +502,7 @@ 1 - 362 + 341 Anrede Email @@ -514,7 +514,19 @@ 2 - 444 + 344 + + + Passwort + + + True + + + 3 + + + 147 False @@ -532,7 +544,7 @@ Combo - 873, 204 + 871, 200 0 @@ -792,9 +804,6 @@ 1164, 684 - - Segoe UI, 8.25pt - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 @@ -987,6 +996,12 @@ DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + colAccessCode + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RepositoryItemEmailEdit diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index ce8a5a7b..ce25c0a6 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -64,12 +64,14 @@ Partial Public Class frmEnvelopeEditor Controller = New EnvelopeEditorController(State) ' Get additional data - Dim oDataForm As New frmEnvelopeMainData() With {.State = State, .NewEnvelopeMode = True} + Dim oDataForm As New frmEnvelopeMainData() With { + .State = State, + .Envelope = Controller.Envelope, + .NewEnvelopeMode = True + } + Dim oResult As DialogResult = oDataForm.ShowDialog() - If oResult = DialogResult.OK Then - Controller.Envelope.Title = oDataForm.EnvelopeTitle - Controller.Envelope.ContractType = oDataForm.EnvelopeContractType - Else + If oResult = DialogResult.Cancel Then Controller.DeleteEnvelopeFromDisk(Controller.Envelope) Me.Close() End If @@ -329,15 +331,10 @@ Partial Public Class frmEnvelopeEditor Dim oForm As New frmEnvelopeMainData() With { .State = State, - .EnvelopeTitle = Controller.Envelope.Title, - .EnvelopeContractType = Controller.Envelope.ContractType, + .Envelope = Controller.Envelope, .NewEnvelopeMode = False } - - If oForm.ShowDialog() = DialogResult.OK Then - Controller.Envelope.Title = oForm.EnvelopeTitle - Controller.Envelope.ContractType = oForm.EnvelopeContractType - End If + oForm.ShowDialog() SetFormTitle(Controller.Envelope.Title) End Sub @@ -446,7 +443,10 @@ Partial Public Class frmEnvelopeEditor If oNameCellValue Is Nothing Then Dim oEmailAdress As String = DirectCast(e.Value, String) Dim oLastName As String = Controller.GetLastNameByEmailAdress(oEmailAdress) + Dim oAccessCode As String = Guid.NewGuid().ToString("d").Substring(1, 6).ToUpper() + ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("Name"), oLastName) + ViewReceivers.SetRowCellValue(e.RowHandle, ViewReceivers.Columns("AccessCode"), oAccessCode) End If End If End If diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.Designer.vb index 0fdbf762..d10ed1b5 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.Designer.vb @@ -26,19 +26,19 @@ Partial Class frmEnvelopeMainData Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEnvelopeMainData)) Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.txtTitle = New DevExpress.XtraEditors.TextEdit() - Me.cmbContractType = New DevExpress.XtraEditors.ComboBoxEdit() + Me.cmbEnvelopeType = New DevExpress.XtraEditors.ComboBoxEdit() Me.btOK = New DevExpress.XtraEditors.SimpleButton() Me.btCancel = New DevExpress.XtraEditors.SimpleButton() - Me.ComboBoxEdit2 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit() - Me.SpinEdit1 = New DevExpress.XtraEditors.SpinEdit() - Me.SpinEdit2 = New DevExpress.XtraEditors.SpinEdit() - Me.SpinEdit3 = New DevExpress.XtraEditors.SpinEdit() - Me.SpinEdit4 = New DevExpress.XtraEditors.SpinEdit() - Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.CheckEdit3 = New DevExpress.XtraEditors.CheckEdit() - Me.ComboBoxEdit3 = New DevExpress.XtraEditors.ComboBoxEdit() - Me.ComboBoxEdit4 = New DevExpress.XtraEditors.ComboBoxEdit() + Me.cmbCertificationType = New DevExpress.XtraEditors.ComboBoxEdit() + Me.chkSendReminderEmails = New DevExpress.XtraEditors.CheckEdit() + Me.spnFirstReminderDays = New DevExpress.XtraEditors.SpinEdit() + Me.spnReminderIntervalDays = New DevExpress.XtraEditors.SpinEdit() + Me.spnExpiresDays = New DevExpress.XtraEditors.SpinEdit() + Me.spnExpiresWarningDays = New DevExpress.XtraEditors.SpinEdit() + Me.cmbLanguage = New DevExpress.XtraEditors.ComboBoxEdit() + Me.chkUseAccessCode = New DevExpress.XtraEditors.CheckEdit() + Me.cmbEmailToCreator = New DevExpress.XtraEditors.ComboBoxEdit() + Me.cmbEmailToReceivers = New DevExpress.XtraEditors.ComboBoxEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() @@ -66,17 +66,17 @@ Partial Class frmEnvelopeMainData CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() CType(Me.txtTitle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.cmbContractType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SpinEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SpinEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SpinEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbEnvelopeType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbCertificationType.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.chkSendReminderEmails.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.spnFirstReminderDays.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.spnReminderIntervalDays.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.spnExpiresDays.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.spnExpiresWarningDays.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbLanguage.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.chkUseAccessCode.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbEmailToCreator.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbEmailToReceivers.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -106,19 +106,19 @@ Partial Class frmEnvelopeMainData 'LayoutControl1 ' Me.LayoutControl1.Controls.Add(Me.txtTitle) - Me.LayoutControl1.Controls.Add(Me.cmbContractType) + Me.LayoutControl1.Controls.Add(Me.cmbEnvelopeType) Me.LayoutControl1.Controls.Add(Me.btOK) Me.LayoutControl1.Controls.Add(Me.btCancel) - Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit2) - Me.LayoutControl1.Controls.Add(Me.CheckEdit1) - Me.LayoutControl1.Controls.Add(Me.SpinEdit1) - Me.LayoutControl1.Controls.Add(Me.SpinEdit2) - Me.LayoutControl1.Controls.Add(Me.SpinEdit3) - Me.LayoutControl1.Controls.Add(Me.SpinEdit4) - Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit1) - Me.LayoutControl1.Controls.Add(Me.CheckEdit3) - Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit3) - Me.LayoutControl1.Controls.Add(Me.ComboBoxEdit4) + Me.LayoutControl1.Controls.Add(Me.cmbCertificationType) + Me.LayoutControl1.Controls.Add(Me.chkSendReminderEmails) + Me.LayoutControl1.Controls.Add(Me.spnFirstReminderDays) + Me.LayoutControl1.Controls.Add(Me.spnReminderIntervalDays) + Me.LayoutControl1.Controls.Add(Me.spnExpiresDays) + Me.LayoutControl1.Controls.Add(Me.spnExpiresWarningDays) + Me.LayoutControl1.Controls.Add(Me.cmbLanguage) + Me.LayoutControl1.Controls.Add(Me.chkUseAccessCode) + Me.LayoutControl1.Controls.Add(Me.cmbEmailToCreator) + Me.LayoutControl1.Controls.Add(Me.cmbEmailToReceivers) resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(855, 189, 650, 400) @@ -130,13 +130,13 @@ Partial Class frmEnvelopeMainData Me.txtTitle.Name = "txtTitle" Me.txtTitle.StyleController = Me.LayoutControl1 ' - 'cmbContractType + 'cmbEnvelopeType ' - resources.ApplyResources(Me.cmbContractType, "cmbContractType") - Me.cmbContractType.Name = "cmbContractType" - Me.cmbContractType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbContractType.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.cmbContractType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor - Me.cmbContractType.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.cmbEnvelopeType, "cmbEnvelopeType") + Me.cmbEnvelopeType.Name = "cmbEnvelopeType" + Me.cmbEnvelopeType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbEnvelopeType.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbEnvelopeType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor + Me.cmbEnvelopeType.StyleController = Me.LayoutControl1 ' 'btOK ' @@ -152,75 +152,75 @@ Partial Class frmEnvelopeMainData Me.btCancel.Name = "btCancel" Me.btCancel.StyleController = Me.LayoutControl1 ' - 'ComboBoxEdit2 + 'cmbCertificationType ' - resources.ApplyResources(Me.ComboBoxEdit2, "ComboBoxEdit2") - Me.ComboBoxEdit2.Name = "ComboBoxEdit2" - Me.ComboBoxEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit2.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.ComboBoxEdit2.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.cmbCertificationType, "cmbCertificationType") + Me.cmbCertificationType.Name = "cmbCertificationType" + Me.cmbCertificationType.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbCertificationType.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbCertificationType.StyleController = Me.LayoutControl1 ' - 'CheckEdit1 + 'chkSendReminderEmails ' - resources.ApplyResources(Me.CheckEdit1, "CheckEdit1") - Me.CheckEdit1.Name = "CheckEdit1" - Me.CheckEdit1.Properties.Caption = resources.GetString("CheckEdit1.Properties.Caption") - Me.CheckEdit1.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.chkSendReminderEmails, "chkSendReminderEmails") + Me.chkSendReminderEmails.Name = "chkSendReminderEmails" + Me.chkSendReminderEmails.Properties.Caption = resources.GetString("chkSendReminderEmails.Properties.Caption") + Me.chkSendReminderEmails.StyleController = Me.LayoutControl1 ' - 'SpinEdit1 + 'spnFirstReminderDays ' - resources.ApplyResources(Me.SpinEdit1, "SpinEdit1") - Me.SpinEdit1.Name = "SpinEdit1" - Me.SpinEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SpinEdit1.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.SpinEdit1.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.spnFirstReminderDays, "spnFirstReminderDays") + Me.spnFirstReminderDays.Name = "spnFirstReminderDays" + Me.spnFirstReminderDays.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("spnFirstReminderDays.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.spnFirstReminderDays.StyleController = Me.LayoutControl1 ' - 'SpinEdit2 + 'spnReminderIntervalDays ' - resources.ApplyResources(Me.SpinEdit2, "SpinEdit2") - Me.SpinEdit2.Name = "SpinEdit2" - Me.SpinEdit2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SpinEdit2.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.SpinEdit2.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.spnReminderIntervalDays, "spnReminderIntervalDays") + Me.spnReminderIntervalDays.Name = "spnReminderIntervalDays" + Me.spnReminderIntervalDays.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("spnReminderIntervalDays.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.spnReminderIntervalDays.StyleController = Me.LayoutControl1 ' - 'SpinEdit3 + 'spnExpiresDays ' - resources.ApplyResources(Me.SpinEdit3, "SpinEdit3") - Me.SpinEdit3.Name = "SpinEdit3" - Me.SpinEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SpinEdit3.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.SpinEdit3.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.spnExpiresDays, "spnExpiresDays") + Me.spnExpiresDays.Name = "spnExpiresDays" + Me.spnExpiresDays.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("spnExpiresDays.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.spnExpiresDays.StyleController = Me.LayoutControl1 ' - 'SpinEdit4 + 'spnExpiresWarningDays ' - resources.ApplyResources(Me.SpinEdit4, "SpinEdit4") - Me.SpinEdit4.Name = "SpinEdit4" - Me.SpinEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("SpinEdit4.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.SpinEdit4.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.spnExpiresWarningDays, "spnExpiresWarningDays") + Me.spnExpiresWarningDays.Name = "spnExpiresWarningDays" + Me.spnExpiresWarningDays.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("spnExpiresWarningDays.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.spnExpiresWarningDays.StyleController = Me.LayoutControl1 ' - 'ComboBoxEdit1 + 'cmbLanguage ' - resources.ApplyResources(Me.ComboBoxEdit1, "ComboBoxEdit1") - Me.ComboBoxEdit1.Name = "ComboBoxEdit1" - Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit1.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.ComboBoxEdit1.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.cmbLanguage, "cmbLanguage") + Me.cmbLanguage.Name = "cmbLanguage" + Me.cmbLanguage.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbLanguage.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbLanguage.StyleController = Me.LayoutControl1 ' - 'CheckEdit3 + 'chkUseAccessCode ' - resources.ApplyResources(Me.CheckEdit3, "CheckEdit3") - Me.CheckEdit3.Name = "CheckEdit3" - Me.CheckEdit3.Properties.Caption = resources.GetString("CheckEdit3.Properties.Caption") - Me.CheckEdit3.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.chkUseAccessCode, "chkUseAccessCode") + Me.chkUseAccessCode.Name = "chkUseAccessCode" + Me.chkUseAccessCode.Properties.Caption = resources.GetString("chkUseAccessCode.Properties.Caption") + Me.chkUseAccessCode.StyleController = Me.LayoutControl1 ' - 'ComboBoxEdit3 + 'cmbEmailToCreator ' - resources.ApplyResources(Me.ComboBoxEdit3, "ComboBoxEdit3") - Me.ComboBoxEdit3.Name = "ComboBoxEdit3" - Me.ComboBoxEdit3.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit3.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.ComboBoxEdit3.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.cmbEmailToCreator, "cmbEmailToCreator") + Me.cmbEmailToCreator.Name = "cmbEmailToCreator" + Me.cmbEmailToCreator.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbEmailToCreator.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbEmailToCreator.StyleController = Me.LayoutControl1 ' - 'ComboBoxEdit4 + 'cmbEmailToReceivers ' - resources.ApplyResources(Me.ComboBoxEdit4, "ComboBoxEdit4") - Me.ComboBoxEdit4.Name = "ComboBoxEdit4" - Me.ComboBoxEdit4.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("ComboBoxEdit4.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.ComboBoxEdit4.StyleController = Me.LayoutControl1 + resources.ApplyResources(Me.cmbEmailToReceivers, "cmbEmailToReceivers") + Me.cmbEmailToReceivers.Name = "cmbEmailToReceivers" + Me.cmbEmailToReceivers.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("cmbEmailToReceivers.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.cmbEmailToReceivers.StyleController = Me.LayoutControl1 ' 'Root ' @@ -250,7 +250,7 @@ Partial Class frmEnvelopeMainData Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2}) Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(571, 131) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(571, 93) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem1 @@ -258,21 +258,17 @@ Partial Class frmEnvelopeMainData Me.LayoutControlItem1.Control = Me.txtTitle Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 5) - Me.LayoutControlItem1.Size = New System.Drawing.Size(547, 43) + Me.LayoutControlItem1.Size = New System.Drawing.Size(547, 24) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem1.TextSize = New System.Drawing.Size(168, 13) ' 'LayoutControlItem2 ' - Me.LayoutControlItem2.Control = Me.cmbContractType - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 43) + Me.LayoutControlItem2.Control = Me.cmbEnvelopeType + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(2, 2, 2, 5) - Me.LayoutControlItem2.Size = New System.Drawing.Size(547, 43) + Me.LayoutControlItem2.Size = New System.Drawing.Size(547, 24) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") - Me.LayoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top Me.LayoutControlItem2.TextSize = New System.Drawing.Size(168, 13) ' 'LayoutControlItem4 @@ -306,10 +302,10 @@ Partial Class frmEnvelopeMainData Me.groupAllOptions.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[False] Me.groupAllOptions.ExpandButtonVisible = True Me.groupAllOptions.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem2, Me.groupFinalEmail, Me.groupExpiration, Me.groupReminders, Me.groupOptions}) - Me.groupAllOptions.Location = New System.Drawing.Point(0, 131) + Me.groupAllOptions.Location = New System.Drawing.Point(0, 93) Me.groupAllOptions.Name = "groupAllOptions" Me.groupAllOptions.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0) - Me.groupAllOptions.Size = New System.Drawing.Size(571, 493) + Me.groupAllOptions.Size = New System.Drawing.Size(571, 531) resources.ApplyResources(Me.groupAllOptions, "groupAllOptions") ' 'EmptySpaceItem2 @@ -317,7 +313,7 @@ Partial Class frmEnvelopeMainData Me.EmptySpaceItem2.AllowHotTrack = False Me.EmptySpaceItem2.Location = New System.Drawing.Point(0, 416) Me.EmptySpaceItem2.Name = "EmptySpaceItem2" - Me.EmptySpaceItem2.Size = New System.Drawing.Size(565, 50) + Me.EmptySpaceItem2.Size = New System.Drawing.Size(565, 88) Me.EmptySpaceItem2.TextSize = New System.Drawing.Size(0, 0) ' 'groupFinalEmail @@ -331,7 +327,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem9 ' - Me.LayoutControlItem9.Control = Me.ComboBoxEdit3 + Me.LayoutControlItem9.Control = Me.cmbEmailToCreator Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem9.Name = "LayoutControlItem9" Me.LayoutControlItem9.Size = New System.Drawing.Size(541, 24) @@ -340,7 +336,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem14 ' - Me.LayoutControlItem14.Control = Me.ComboBoxEdit4 + Me.LayoutControlItem14.Control = Me.cmbEmailToReceivers Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" Me.LayoutControlItem14.Size = New System.Drawing.Size(541, 24) @@ -358,7 +354,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem10 ' - Me.LayoutControlItem10.Control = Me.SpinEdit3 + Me.LayoutControlItem10.Control = Me.spnExpiresDays Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Size = New System.Drawing.Size(541, 24) @@ -367,7 +363,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem11 ' - Me.LayoutControlItem11.Control = Me.SpinEdit4 + Me.LayoutControlItem11.Control = Me.spnExpiresWarningDays Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Size = New System.Drawing.Size(541, 24) @@ -385,7 +381,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem5 ' - Me.LayoutControlItem5.Control = Me.CheckEdit1 + Me.LayoutControlItem5.Control = Me.chkSendReminderEmails Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Size = New System.Drawing.Size(541, 22) @@ -394,7 +390,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem6 ' - Me.LayoutControlItem6.Control = Me.SpinEdit1 + Me.LayoutControlItem6.Control = Me.spnFirstReminderDays Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 22) Me.LayoutControlItem6.Name = "LayoutControlItem6" Me.LayoutControlItem6.Size = New System.Drawing.Size(541, 24) @@ -403,7 +399,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem7 ' - Me.LayoutControlItem7.Control = Me.SpinEdit2 + Me.LayoutControlItem7.Control = Me.spnReminderIntervalDays Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 46) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Size = New System.Drawing.Size(541, 24) @@ -421,7 +417,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem8 ' - Me.LayoutControlItem8.Control = Me.ComboBoxEdit2 + Me.LayoutControlItem8.Control = Me.cmbCertificationType Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Size = New System.Drawing.Size(541, 24) @@ -430,7 +426,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem12 ' - Me.LayoutControlItem12.Control = Me.ComboBoxEdit1 + Me.LayoutControlItem12.Control = Me.cmbLanguage Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Size = New System.Drawing.Size(541, 24) @@ -439,7 +435,7 @@ Partial Class frmEnvelopeMainData ' 'LayoutControlItem13 ' - Me.LayoutControlItem13.Control = Me.CheckEdit3 + Me.LayoutControlItem13.Control = Me.chkUseAccessCode Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 48) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Size = New System.Drawing.Size(541, 22) @@ -464,17 +460,17 @@ Partial Class frmEnvelopeMainData CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) CType(Me.txtTitle.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.cmbContractType.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SpinEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SpinEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SpinEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SpinEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.CheckEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ComboBoxEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbEnvelopeType.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbCertificationType.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.chkSendReminderEmails.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.spnFirstReminderDays.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.spnReminderIntervalDays.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.spnExpiresDays.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.spnExpiresWarningDays.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbLanguage.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.chkUseAccessCode.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbEmailToCreator.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbEmailToReceivers.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() @@ -505,7 +501,7 @@ Partial Class frmEnvelopeMainData Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl Friend WithEvents txtTitle As DevExpress.XtraEditors.TextEdit - Friend WithEvents cmbContractType As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents cmbEnvelopeType As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents btOK As DevExpress.XtraEditors.SimpleButton Friend WithEvents btCancel As DevExpress.XtraEditors.SimpleButton Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup @@ -515,14 +511,14 @@ Partial Class frmEnvelopeMainData Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents emptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem Friend WithEvents AdornerUIManager1 As DevExpress.Utils.VisualEffects.AdornerUIManager - Friend WithEvents ComboBoxEdit2 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit - Friend WithEvents SpinEdit1 As DevExpress.XtraEditors.SpinEdit - Friend WithEvents SpinEdit2 As DevExpress.XtraEditors.SpinEdit - Friend WithEvents SpinEdit3 As DevExpress.XtraEditors.SpinEdit - Friend WithEvents SpinEdit4 As DevExpress.XtraEditors.SpinEdit - Friend WithEvents ComboBoxEdit1 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents CheckEdit3 As DevExpress.XtraEditors.CheckEdit + Friend WithEvents cmbCertificationType As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents chkSendReminderEmails As DevExpress.XtraEditors.CheckEdit + Friend WithEvents spnFirstReminderDays As DevExpress.XtraEditors.SpinEdit + Friend WithEvents spnReminderIntervalDays As DevExpress.XtraEditors.SpinEdit + Friend WithEvents spnExpiresDays As DevExpress.XtraEditors.SpinEdit + Friend WithEvents spnExpiresWarningDays As DevExpress.XtraEditors.SpinEdit + Friend WithEvents cmbLanguage As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents chkUseAccessCode As DevExpress.XtraEditors.CheckEdit Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents groupOptions As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem @@ -535,8 +531,8 @@ Partial Class frmEnvelopeMainData Friend WithEvents groupExpiration As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents ComboBoxEdit3 As DevExpress.XtraEditors.ComboBoxEdit - Friend WithEvents ComboBoxEdit4 As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents cmbEmailToCreator As DevExpress.XtraEditors.ComboBoxEdit + Friend WithEvents cmbEmailToReceivers As DevExpress.XtraEditors.ComboBoxEdit Friend WithEvents groupFinalEmail As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem14 As DevExpress.XtraLayout.LayoutControlItem diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.resx b/EnvelopeGenerator.Form/frmEnvelopeMainData.resx index 12043afb..ed77259e 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.resx @@ -119,10 +119,10 @@ - 24, 61 + 195, 45 - 543, 20 + 372, 20 @@ -140,29 +140,29 @@ 4 - - 24, 104 + + 195, 69 - + Combo - - 543, 20 + + 372, 20 - + 5 - - cmbContractType + + cmbEnvelopeType - + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 5 @@ -220,256 +220,256 @@ 7 - - 207, 200 + + 207, 162 - + Combo - + 357, 20 - + 10 - - ComboBoxEdit2 + + cmbCertificationType - + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 8 - - 27, 315 + + 27, 277 - + Erinnerungen senden - + 537, 18 - + 11 - - CheckEdit1 + + chkSendReminderEmails - + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 9 - + 0 - - 207, 337 + + 207, 299 - + Combo - + 357, 20 - + 12 - - SpinEdit1 + + spnFirstReminderDays - + DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 10 - + 0 - - 207, 361 + + 207, 323 - + Combo - + 357, 20 - + 13 - - SpinEdit2 + + spnReminderIntervalDays - + DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 11 - + 0 - - 207, 430 + + 207, 392 - + Combo - + 357, 20 - + 15 - - SpinEdit3 + + spnExpiresDays - + DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 12 - + 0 - - 207, 454 + + 207, 416 - + Combo - + 357, 20 - + 16 - - SpinEdit4 + + spnExpiresWarningDays - + DevExpress.XtraEditors.SpinEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 13 - - 207, 224 + + 207, 186 - + Combo - + 357, 20 - + 17 - - ComboBoxEdit1 + + cmbLanguage - + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 14 - - 27, 248 + + 27, 210 - + Passwort geschützt - + 537, 18 - + 18 - - CheckEdit3 + + chkUseAccessCode - + DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 15 - - 207, 523 + + 207, 485 - + Combo - + 357, 20 - + 19 - - ComboBoxEdit3 + + cmbEmailToCreator - + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 16 - - 207, 547 + + 207, 509 - + Combo - + 357, 20 - + 20 - - ComboBoxEdit4 + + cmbEmailToReceivers - + DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + LayoutControl1 - + 17 @@ -478,6 +478,75 @@ 0, 0 + + TopLeft + + + layoutControlItem1 + + + layoutControlItem1 + + + Titel + + + Vertragstyp + + + Basis Informationen + + + TopLeft + + + layoutControlItem2 + + + layoutControlItem2 + + + emptySpaceItem1 + + + An Ersteller + + + An Empfänger + + + Abschluss Email + + + Ablauf (in Tagen) + + + Erinnerung vor Ablauf (in Tagen) + + + Ablauf + + + Erste Erinnerung (in Tagen) + + + Erinnerungsintervall (in Tagen) + + + Erinnerungen + + + Zertifizierungstyp + + + Sprache + + + Allgemein + + + Optionen + 591, 671 @@ -499,75 +568,6 @@ 0 - - TopLeft - - - layoutControlItem1 - - - layoutControlItem1 - - - Basis Informationen - - - Titel - - - Vertragstyp - - - TopLeft - - - layoutControlItem2 - - - layoutControlItem2 - - - emptySpaceItem1 - - - Optionen - - - Abschluss Email - - - An Ersteller - - - An Empfänger - - - Ablauf - - - Ablauf (in Tagen) - - - Erinnerung vor Ablauf (in Tagen) - - - Erinnerungen - - - Erste Erinnerung (in Tagen) - - - Erinnerungsintervall (in Tagen) - - - Allgemein - - - Zertifizierungstyp - - - Sprache - 17, 17 diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index 6c1e8006..b58c7a0e 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -1,13 +1,18 @@ Imports EnvelopeGenerator.Common Imports EnvelopeGenerator.Common.My Imports EnvelopeGenerator.Common.Constants +Imports System.ComponentModel Public Class frmEnvelopeMainData - Public Property EnvelopeTitle As String - Public Property EnvelopeContractType As ContractType = ContractType.Contract + Public Property Envelope As Envelope = New Envelope() Public Property NewEnvelopeMode As Boolean = True + Private Property EnvelopeTypeModel As EnvelopeTypeModel + + + Private Property EnvelopeType As New EnvelopeType + Public Property State As State Public Sub New() @@ -19,18 +24,22 @@ Public Class frmEnvelopeMainData Me.Text = Resources.Envelope.New_Envelope Else Me.Text = Resources.Envelope.Edit_Envelope - cmbContractType.ReadOnly = True + cmbEnvelopeType.ReadOnly = True End If + EnvelopeTypeModel = New EnvelopeTypeModel(State) + Dim oTypes = EnvelopeTypeModel.List() + + cmbEnvelopeType.Properties.Items.AddRange(oTypes.ToList) + cmbCertificationType.Properties.Items.AddRange([Enum].GetValues(GetType(CertificationType)).Cast(Of CertificationType).ToList()) + cmbEmailToCreator.Properties.Items.AddRange([Enum].GetValues(GetType(FinalEmailType)).Cast(Of FinalEmailType).ToList()) + cmbEmailToReceivers.Properties.Items.AddRange([Enum].GetValues(GetType(FinalEmailType)).Cast(Of FinalEmailType).ToList()) + cmbLanguage.Properties.Items.AddRange(New List(Of String) From {"de", "en"}) + groupAllOptions.Expanded = False - Dim contractTypeList = [Enum].GetValues(GetType(ContractType)).Cast(Of ContractType)() - Dim oTranslatedList = contractTypeList.Select(AddressOf TranslateContractType).ToList() - - cmbContractType.Properties.Items.AddRange(oTranslatedList) - - txtTitle.EditValue = EnvelopeTitle - cmbContractType.EditValue = TranslateContractType(EnvelopeContractType) + txtTitle.EditValue = Envelope.Title + cmbEnvelopeType.EditValue = oTypes.FirstOrDefault() End Sub Private Function TranslateContractType(pType As ContractType) As String @@ -48,8 +57,21 @@ Public Class frmEnvelopeMainData Return End If - EnvelopeTitle = txtTitle.EditValue - EnvelopeContractType = cmbContractType.SelectedIndex + 1 + Envelope.Title = txtTitle.EditValue.ToString + Envelope.EnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType).Id + Envelope.CertificationType = cmbCertificationType.EditValue + Envelope.Language = cmbLanguage.EditValue + Envelope.UseAccessCode = chkUseAccessCode.EditValue + Envelope.SendReminderEmails = chkSendReminderEmails.EditValue + Envelope.FirstReminderDays = spnFirstReminderDays.EditValue + Envelope.ReminderIntervalDays = spnReminderIntervalDays.EditValue + Envelope.ExpiresWhenDays = spnExpiresDays.EditValue + Envelope.ExpiresWarningWhenDays = spnExpiresWarningDays.EditValue + Envelope.FinalEmailToCreator = cmbEmailToCreator.EditValue + Envelope.FinalEmailToReceivers = cmbEmailToReceivers.EditValue + + ' ContractType kann zzt nicht über die Oberfläche gesetzt werden + Envelope.ContractType = ContractType.Contract End Sub Private Sub frmEnvelopeMainData_Shown(sender As Object, e As EventArgs) Handles Me.Shown @@ -66,4 +88,25 @@ Public Class frmEnvelopeMainData End If End Sub + + Private Sub cmbContractType_SelectedValueChanged(sender As Object, e As EventArgs) Handles cmbEnvelopeType.SelectedValueChanged + Dim oSelectedType As EnvelopeType = cmbEnvelopeType.SelectedItem + + If oSelectedType Is Nothing Then + Exit Sub + End If + + EnvelopeType = oSelectedType + + cmbCertificationType.EditValue = oSelectedType.CertificationType + cmbLanguage.EditValue = oSelectedType.Language + chkUseAccessCode.EditValue = oSelectedType.UseAccessCode + chkSendReminderEmails.EditValue = oSelectedType.SendReminderEmails + spnFirstReminderDays.EditValue = oSelectedType.FirstReminderDays + spnReminderIntervalDays.EditValue = oSelectedType.ReminderIntervalDays + spnExpiresDays.EditValue = oSelectedType.ExpiresWhenDays + spnExpiresWarningDays.EditValue = oSelectedType.ExpiresWarningWhenDays + cmbEmailToCreator.EditValue = oSelectedType.FinalEmailToCreator + cmbEmailToReceivers.EditValue = oSelectedType.FinalEmailToReceivers + End Sub End Class \ No newline at end of file diff --git a/EnvelopeGenerator.Web/wwwroot/js/annotation.js b/EnvelopeGenerator.Web/wwwroot/js/annotation.js index 7f0e672a..eede16bc 100644 --- a/EnvelopeGenerator.Web/wwwroot/js/annotation.js +++ b/EnvelopeGenerator.Web/wwwroot/js/annotation.js @@ -124,6 +124,7 @@ const dateString = date.toLocaleString('de-DE') const signatureLength = 100 * scale + const signatureString = receiverSignature.substring(0, 15) + "…" ctx.beginPath() @@ -144,9 +145,9 @@ ctx.fillStyle = 'black' ctx.font = `${fontSize * scale}px sans-serif` - ctx.fillText('Signed by', 30 * scale, 10 * scale) + ctx.fillText('Signed by', 15 * scale, 10 * scale) ctx.fillText(receiverName, 15 * scale, 60 * scale) - ctx.fillText(dateString, 15 * scale, 70 * scale) + ctx.fillText(signatureString, 15 * scale, 70 * scale) return new Promise((resolve) => { canvas.toBlob((blob) => {