From 71ec7b4a51d65dcc5b6c2e630ea836b0049bf4c3 Mon Sep 17 00:00:00 2001 From: pitzm Date: Mon, 4 Dec 2023 11:56:47 +0100 Subject: [PATCH] 2023-12-04 - Anpassungen Main Form - Titel wird initial in das Subject geschrieben --- EnvelopeGenerator.Common/Entities/Envelope.vb | 4 -- EnvelopeGenerator.Form/frmEnvelopeEditor.vb | 1 + EnvelopeGenerator.Form/frmMain.Designer.vb | 30 ++++++--- EnvelopeGenerator.Form/frmMain.resx | 62 +++++++++++++------ 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/EnvelopeGenerator.Common/Entities/Envelope.vb b/EnvelopeGenerator.Common/Entities/Envelope.vb index 746491b9..b9cc17d5 100644 --- a/EnvelopeGenerator.Common/Entities/Envelope.vb +++ b/EnvelopeGenerator.Common/Entities/Envelope.vb @@ -29,8 +29,6 @@ End Get End Property - - Public Function ValidateReceiverDocumentData() As List(Of String) Dim oErrors As New List(Of String) @@ -45,6 +43,4 @@ Return oErrors End Function - - End Class diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index a21f62d2..30d53cae 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -57,6 +57,7 @@ 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 Me.Close() End If diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index ac2b0e49..be90bff2 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -27,8 +27,9 @@ Partial Class frmMain Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() Me.GridEnvelopes = New DevExpress.XtraGrid.GridControl() Me.ViewReceivers = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.ColEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.ColReceiverStatus = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColName = New DevExpress.XtraGrid.Columns.GridColumn() + Me.ColEmail = New DevExpress.XtraGrid.Columns.GridColumn() Me.ViewEnvelopes = New DevExpress.XtraGrid.Views.Grid.GridView() Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn() Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn() @@ -109,26 +110,38 @@ Partial Class frmMain Me.GridEnvelopes.MainView = Me.ViewEnvelopes Me.GridEnvelopes.MenuManager = Me.RibbonControl Me.GridEnvelopes.Name = "GridEnvelopes" + Me.GridEnvelopes.ShowOnlyPredefinedDetails = True Me.GridEnvelopes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewReceivers, Me.ViewEnvelopes}) ' 'ViewReceivers ' - Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColEmail, Me.ColReceiverStatus}) + Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.ColReceiverStatus, Me.ColName, Me.ColEmail}) Me.ViewReceivers.GridControl = Me.GridEnvelopes Me.ViewReceivers.Name = "ViewReceivers" + Me.ViewReceivers.OptionsDetail.AllowZoomDetail = False + Me.ViewReceivers.OptionsView.ShowDetailButtons = False + Me.ViewReceivers.OptionsView.ShowGroupPanel = False + Me.ViewReceivers.OptionsView.ShowIndicator = False resources.ApplyResources(Me.ViewReceivers, "ViewReceivers") ' - 'ColEmail - ' - resources.ApplyResources(Me.ColEmail, "ColEmail") - Me.ColEmail.FieldName = "Email" - Me.ColEmail.Name = "ColEmail" - ' 'ColReceiverStatus ' resources.ApplyResources(Me.ColReceiverStatus, "ColReceiverStatus") Me.ColReceiverStatus.FieldName = "Status" Me.ColReceiverStatus.Name = "ColReceiverStatus" + Me.ColReceiverStatus.OptionsColumn.AllowEdit = False + ' + 'ColName + ' + resources.ApplyResources(Me.ColName, "ColName") + Me.ColName.FieldName = "Name" + Me.ColName.Name = "ColName" + ' + 'ColEmail + ' + resources.ApplyResources(Me.ColEmail, "ColEmail") + Me.ColEmail.FieldName = "Email" + Me.ColEmail.Name = "ColEmail" ' 'ViewEnvelopes ' @@ -327,4 +340,5 @@ Partial Class frmMain Friend WithEvents GridColumn5 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn Friend WithEvents GridColumn7 As DevExpress.XtraGrid.Columns.GridColumn + Friend WithEvents ColName As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index e77b0599..a34bf77d 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -134,25 +134,43 @@ Fill - - Email + + Status - + True - + 0 - - Status + + 145 - + + Name + + True - + 1 + + 456 + + + Email + + + True + + + 2 + + + 460 + Empfänger @@ -169,7 +187,7 @@ 0 - 133 + 120 Status @@ -181,7 +199,7 @@ 1 - 54 + 119 Titel @@ -193,7 +211,7 @@ 2 - 159 + 352 Betreff @@ -205,7 +223,7 @@ 3 - 159 + 352 Erstellt am @@ -217,7 +235,7 @@ 4 - 51 + 118 Neuer Umschlag @@ -574,18 +592,24 @@ DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ColEmail - - - DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ColReceiverStatus DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ColName + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ColEmail + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ViewEnvelopes