From 888c04b5c9518e3fb5debaa2c65f5311e4b8ab0a Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 14 Jul 2025 13:45:14 +0200 Subject: [PATCH] EnvelopeDomain Add Comment --- .../Models/EnvelopeModel.vb | 1 + EnvelopeGenerator.Domain/Entities/Envelope.cs | 3 +++ .../EnvelopeGenerator.Domain.csproj | 2 ++ EnvelopeGenerator.Form/frmMain.Designer.vb | 11 +++++++- EnvelopeGenerator.Form/frmMain.resx | 26 ++++++++++++++++--- 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb index 34155090..87da7d2f 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb @@ -27,6 +27,7 @@ Public Class EnvelopeModel Dim oEnvelope = New Envelope() With { .Id = pRow.ItemEx("GUID", 0), .Title = pRow.ItemEx("TITLE", ""), + .Comment = pRow.ItemEx("COMMENT", ""), .EnvelopeTypeId = pRow.ItemEx("ENVELOPE_TYPE", 0), .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0), .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""), diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index 8b95d027..4cafadf1 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -56,6 +56,9 @@ namespace EnvelopeGenerator.Domain.Entities [Column("TITLE", TypeName = "nvarchar(128)")] public string Title { get; set; } = string.Empty; + [Column("COMMENT", TypeName = "nvarchar(128)")] + public string Comment { get; set; } = string.Empty; + [Column("CONTRACT_TYPE")] public int ContractType { get; set; } diff --git a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj index ebc6be5c..c2c9f726 100644 --- a/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj +++ b/EnvelopeGenerator.Domain/EnvelopeGenerator.Domain.csproj @@ -2,6 +2,8 @@ net462;net7.0;net8.0;net9.0 + 1.4.0 + 1.4.0 diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 23e1a287..5afaccae 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -111,6 +111,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.GridColumn6 = New DevExpress.XtraGrid.Columns.GridColumn() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -662,7 +663,7 @@ Partial Class frmMain ' 'ViewCompleted ' - Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1}) + Me.ViewCompleted.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn3, Me.GridColumn6, Me.GridColumn4, Me.GridColumn5, Me.GridColumn7, Me.GridColumn1}) Me.ViewCompleted.GridControl = Me.GridCompleted Me.ViewCompleted.Name = "ViewCompleted" Me.ViewCompleted.OptionsBehavior.Editable = False @@ -841,6 +842,13 @@ Partial Class frmMain ' Me.XtraSaveFileDialog1.FileName = "XtraSaveFileDialog1" ' + 'GridColumn6 + ' + resources.ApplyResources(Me.GridColumn6, "GridColumn6") + Me.GridColumn6.FieldName = "Comment" + Me.GridColumn6.MinWidth = 80 + Me.GridColumn6.Name = "GridColumn6" + ' 'frmMain ' resources.ApplyResources(Me, "$this") @@ -976,4 +984,5 @@ Partial Class frmMain Friend WithEvents Label1 As Label Friend WithEvents Button1 As Button Friend WithEvents txtEnvID As TextBox + Friend WithEvents GridColumn6 As DevExpress.XtraGrid.Columns.GridColumn End Class diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index 29833266..30837731 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -1098,11 +1098,23 @@ True - 2 + 3 100 + + Kommentar + + + True + + + 1 + + + 80 + Status @@ -1110,7 +1122,7 @@ True - 1 + 2 163 @@ -1134,7 +1146,7 @@ True - 3 + 4 120 @@ -1146,7 +1158,7 @@ True - 4 + 5 120 @@ -2132,6 +2144,12 @@ DevExpress.XtraEditors.XtraSaveFileDialog, DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + GridColumn6 + + + DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + frmMain