refactor(Envelope): EnvelopeType in Type umbenennen

This commit is contained in:
tekh 2025-08-19 15:37:12 +02:00
parent c27337a6f5
commit ee98142405
5 changed files with 15 additions and 15 deletions

View File

@ -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

View File

@ -130,7 +130,7 @@ public class Envelope
#if NET
?
#endif
EnvelopeType { get; set; }
Type { get; set; }
#if NETFRAMEWORK
[NotMapped]

View File

@ -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

View File

@ -1053,7 +1053,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
});
});
modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
{
b.Property<int>("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");
});

View File

@ -1050,7 +1050,7 @@ namespace EnvelopeGenerator.Infrastructure.Migrations
});
});
modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.EnvelopeType", b =>
modelBuilder.Entity("EnvelopeGenerator.Domain.Entities.Type", b =>
{
b.Property<int>("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");
});