Refactor Envelope.Type to Envelope.Defaults
Replaced all references to `Envelope.Type` with `Envelope.Defaults` across the application for consistency and clarity. - Updated `MappingProfile` to map `Defaults.Title` instead of `Type.Title` for `EnvelopeTypeTitle`. - Modified `ReadEnvelopeQueryHandler` to use `Defaults` in place of `Type` and updated query includes. - Renamed `Type` to `Defaults` in the `Envelope` entity while preserving its foreign key relationship. - Updated `EnvelopeModel` to retrieve `Defaults` using `EnvelopeTypeModel.GetById`. - Refactored `frmEnvelopeMainData` to replace all `Type` references with `Defaults` and adjusted logic for `ContractType` and `EnvelopeType`. These changes ensure consistent naming and improve code readability.
This commit is contained in:
@@ -30,7 +30,7 @@ public class MappingProfile : Profile
|
|||||||
CreateMap<EmailTemplate, EmailTemplateDto>();
|
CreateMap<EmailTemplate, EmailTemplateDto>();
|
||||||
CreateMap<Envelope, EnvelopeDto>()
|
CreateMap<Envelope, EnvelopeDto>()
|
||||||
.ForMember(dest => dest.EnvelopeTypeTitle,
|
.ForMember(dest => dest.EnvelopeTypeTitle,
|
||||||
opt => opt.MapFrom(src => src.Type != null ? src.Type.Title : null));
|
opt => opt.MapFrom(src => src.Defaults != null ? src.Defaults.Title : null));
|
||||||
CreateMap<Document, DocumentDto>();
|
CreateMap<Document, DocumentDto>();
|
||||||
CreateMap<Document, DocumentDetailsDto>();
|
CreateMap<Document, DocumentDetailsDto>();
|
||||||
CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
CreateMap<History, HistoryDto>().ForMember(dest => dest.ActionDate, opt => opt.MapFrom(src => src.ChangedWhen));
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
|
|||||||
ExpiresWarningWhenDays = e.ExpiresWarningWhenDays,
|
ExpiresWarningWhenDays = e.ExpiresWarningWhenDays,
|
||||||
UseAccessCode = e.UseAccessCode ?? true,
|
UseAccessCode = e.UseAccessCode ?? true,
|
||||||
TFAEnabled = e.TfaEnabled ?? false,
|
TFAEnabled = e.TfaEnabled ?? false,
|
||||||
EnvelopeTypeTitle = e.Type != null ? e.Type.Title : null,
|
EnvelopeTypeTitle = e.Defaults != null ? e.Defaults.Title : null,
|
||||||
IsAlreadySent = false,
|
IsAlreadySent = false,
|
||||||
DocResult = null,
|
DocResult = null,
|
||||||
Documents = null,
|
Documents = null,
|
||||||
@@ -237,7 +237,7 @@ public class ReadEnvelopeQueryHandler : IRequestHandler<ReadEnvelopeQuery, IEnum
|
|||||||
}
|
}
|
||||||
|
|
||||||
var envelopes = await query
|
var envelopes = await query
|
||||||
.Include(e => e.Type)
|
.Include(e => e.Defaults)
|
||||||
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
.Include(e => e.EnvelopeReceivers).ThenInclude(er => er.Receiver)
|
||||||
.Include(e => e.Histories)
|
.Include(e => e.Histories)
|
||||||
.ToListAsync(cancel);
|
.ToListAsync(cancel);
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ Public Class EnvelopeModel
|
|||||||
|
|
||||||
oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
|
oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
|
||||||
oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
|
oEnvelope.Histories = HistoryModel.List(oEnvelope.Id)
|
||||||
oEnvelope.Type = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
|
oEnvelope.Defaults = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)
|
||||||
|
|
||||||
Return oEnvelope
|
Return oEnvelope
|
||||||
End Function
|
End Function
|
||||||
|
|||||||
@@ -154,7 +154,7 @@ namespace EnvelopeGenerator.Domain.Entities
|
|||||||
#if nullable
|
#if nullable
|
||||||
?
|
?
|
||||||
#endif
|
#endif
|
||||||
Type
|
Defaults
|
||||||
{ get; set; }
|
{ get; set; }
|
||||||
|
|
||||||
#if NETFRAMEWORK
|
#if NETFRAMEWORK
|
||||||
|
|||||||
@@ -68,14 +68,14 @@ Public Class frmEnvelopeMainData
|
|||||||
chked_2Faktor.EditValue = DEF_TF_ENABLED
|
chked_2Faktor.EditValue = DEF_TF_ENABLED
|
||||||
|
|
||||||
Else
|
Else
|
||||||
If IsNothing(Envelope.Type) Then
|
If IsNothing(Envelope.Defaults) Then
|
||||||
Envelope.Type = EnvelopeType
|
Envelope.Defaults = EnvelopeType
|
||||||
End If
|
End If
|
||||||
If Envelope.Type.ContractType = 0 Then
|
If Envelope.Defaults.ContractType = 0 Then
|
||||||
cmbEnvelopeType.EditValue = EnvelopeType
|
cmbEnvelopeType.EditValue = EnvelopeType
|
||||||
Else
|
Else
|
||||||
' This will trigger loading values from the type
|
' This will trigger loading values from the type
|
||||||
cmbEnvelopeType.EditValue = Envelope.Type
|
cmbEnvelopeType.EditValue = Envelope.Defaults
|
||||||
' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
|
' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.Type) - 1
|
||||||
' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
|
' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
|
||||||
' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
|
' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of Type).Where(Function(i) i.Id = Envelope.Type.Id).SingleOrDefault()
|
||||||
@@ -126,7 +126,7 @@ Public Class frmEnvelopeMainData
|
|||||||
oEnvelopeType = EnvelopeType
|
oEnvelopeType = EnvelopeType
|
||||||
End If
|
End If
|
||||||
Envelope.Title = txtTitle.EditValue.ToString
|
Envelope.Title = txtTitle.EditValue.ToString
|
||||||
Envelope.Type = oEnvelopeType
|
Envelope.Defaults = oEnvelopeType
|
||||||
Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
|
Envelope.EnvelopeTypeId = IIf(IsNothing(oEnvelopeType), 0, oEnvelopeType.Id)
|
||||||
Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
|
Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
|
||||||
Envelope.Language = cmbLanguage.EditValue
|
Envelope.Language = cmbLanguage.EditValue
|
||||||
|
|||||||
Reference in New Issue
Block a user