From ee9814240523829aff69010fdf43a3889e3d0b2b Mon Sep 17 00:00:00 2001 From: TekH Date: Tue, 19 Aug 2025 15:37:12 +0200 Subject: [PATCH] refactor(Envelope): EnvelopeType in Type umbenennen --- .../Models/EnvelopeModel.vb | 2 +- EnvelopeGenerator.Domain/Entities/Envelope.cs | 2 +- EnvelopeGenerator.Form/frmEnvelopeMainData.vb | 14 +++++++------- .../20250701151754_InitialCreate.Designer.cs | 6 +++--- .../Migrations/EGDbContextModelSnapshot.cs | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb index 87da7d2f..1f898a32 100644 --- a/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb +++ b/EnvelopeGenerator.CommonServices/Models/EnvelopeModel.vb @@ -64,7 +64,7 @@ Public Class EnvelopeModel oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id) oEnvelope.Documents = DocumentModel.List(oEnvelope.Id) oEnvelope.History = HistoryModel.List(oEnvelope.Id) - oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId) + oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId) Return oEnvelope End Function diff --git a/EnvelopeGenerator.Domain/Entities/Envelope.cs b/EnvelopeGenerator.Domain/Entities/Envelope.cs index 8d23e81d..55cb9f2e 100644 --- a/EnvelopeGenerator.Domain/Entities/Envelope.cs +++ b/EnvelopeGenerator.Domain/Entities/Envelope.cs @@ -130,7 +130,7 @@ public class Envelope #if NET ? #endif - EnvelopeType { get; set; } + Type { get; set; } #if NETFRAMEWORK [NotMapped] diff --git a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb index 2c891414..410f9756 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb @@ -68,17 +68,17 @@ Public Class frmEnvelopeMainData chked_2Faktor.EditValue = DEF_TF_ENABLED Else - If IsNothing(Envelope.EnvelopeType) Then - Envelope.EnvelopeType = EnvelopeType + If IsNothing(Envelope.Type) Then + Envelope.Type = EnvelopeType End If - If Envelope.EnvelopeType.ContractType = 0 Then + If Envelope.Type.ContractType = 0 Then cmbEnvelopeType.EditValue = EnvelopeType Else ' This will trigger loading values from the type - cmbEnvelopeType.EditValue = Envelope.EnvelopeType - ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.EnvelopeType) - 1 + cmbEnvelopeType.EditValue = Envelope.Type + ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1 ' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1 - ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of EnvelopeType).Where(Function(i) i.Id = Envelope.EnvelopeType.Id).SingleOrDefault() + ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault() End If @@ -126,7 +126,7 @@ Public Class frmEnvelopeMainData oEnvelopeType = EnvelopeType End If Envelope.Title = txtTitle.EditValue.ToString - Envelope.EnvelopeType = oEnvelopeType + Envelope.Type = oEnvelopeType Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id) Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1 Envelope.Language = cmbLanguage.EditValue diff --git a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs index 0ececa31..dc8c2fc4 100644 --- a/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs +++ b/EnvelopeGenerator.Infrastructure/Migrations/20250701151754_InitialCreate.Designer.cs @@ -1053,7 +1053,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations }); }); - modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b => + modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1271,7 +1271,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b => { - b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType") + b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type") .WithMany() .HasForeignKey("EnvelopeTypeId") .OnDelete(DeleteBehavior.Cascade) @@ -1283,7 +1283,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("EnvelopeType"); + b.Navigation("Type"); b.Navigation("User"); }); diff --git a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs index e7a0df87..95ccdc14 100644 --- a/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs +++ b/EnvelopeGenerator.Infrastructure/Migrations/EGDbContextModelSnapshot.cs @@ -1050,7 +1050,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations }); }); - modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b => + modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b => { b.Property("Id") .ValueGeneratedOnAdd() @@ -1268,7 +1268,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Envelope", b => { - b.HasOne("EnvelopeGenerator.Domain.Entities.EnvelopeType", "EnvelopeType") + b.HasOne("EnvelopeGenerator.Domain.Entities.Type", "Type") .WithMany() .HasForeignKey("EnvelopeTypeId") .OnDelete(DeleteBehavior.Cascade) @@ -1280,7 +1280,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations .OnDelete(DeleteBehavior.Cascade) .IsRequired(); - b.Navigation("EnvelopeType"); + b.Navigation("Type"); b.Navigation("User"); });