Refactor: Remove CertificationType and ContractType
Removed `CertificationType` and `ContractType` properties and logic across the codebase as they were redundant. Updated `EnvelopeType` to include a validation extension method for improved data integrity. Refactored `CreateEnvelopeWizardPopup.razor` and other UI components to simplify handling of `EnvelopeType`. Conditionally included `CertificationType` and `ContractType` for `NETFRAMEWORK` targets using `#if NETFRAMEWORK` directives to ensure compatibility. Removed unused enums, imports, and methods. Updated `CreateEnvelopeCommandHandler` and related classes to reflect these changes.
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Info" Color="Color.Tertiary" Size="Size.Small" Class="sender-create-wizard__help-icon" aria-label='@L("SenderWizard_HelpAria_EnvelopeType", "Hilfe zum Feld Umschlagtyp")' />
|
||||
</MudTooltip>
|
||||
</label>
|
||||
<select value="@(_selectedEnvelopeTypeId?.ToString() ?? string.Empty)"
|
||||
<select value="@(_selectedEnvelopeType?.ToString() ?? string.Empty)"
|
||||
@onchange="OnEnvelopeTypeChanged"
|
||||
class="sender-create-wizard__select">
|
||||
@foreach (var type in EnvelopeTypes)
|
||||
@@ -172,7 +172,7 @@
|
||||
<div class="sender-create-wizard__field sender-create-wizard__field--full">
|
||||
<div class="sender-create-wizard__settings-toggles">
|
||||
<label class="sender-create-wizard__settings-toggle">
|
||||
<input type="checkbox" checked="@_tfaEnabled" @onchange="OnTfaChanged" disabled="@IsFesSelected" />
|
||||
<input type="checkbox" checked="@_tfaEnabled" @onchange="OnTfaChanged" disabled="@(_selectedEnvelopeType == EnvelopeType.AdvancedSignature)" />
|
||||
<span>@L("TFAEnabled", "2FA aktiviert")</span>
|
||||
<MudTooltip Text='@L("SenderWizard_Help_TfaEnabled", "Wenn aktiviert, ist die Signaturfreigabe nur mit zusaetzlicher Verifizierung moeglich.")'>
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Info" Color="Color.Tertiary" Size="Size.Small" Class="sender-create-wizard__help-icon" aria-label='@L("SenderWizard_HelpAria_TfaEnabled", "Hilfe zur Option 2FA")' />
|
||||
@@ -434,12 +434,11 @@
|
||||
private readonly HashSet<int> _completedSteps = [];
|
||||
|
||||
private string _title = string.Empty;
|
||||
private int? _selectedEnvelopeTypeId;
|
||||
private EnvelopeType? _selectedEnvelopeType;
|
||||
private string _message = string.Empty;
|
||||
private string _language = "de-DE";
|
||||
private bool _useAccessCode;
|
||||
private bool _tfaEnabled;
|
||||
private CertificationType _certificationType = CertificationType.AdvancedElectronicSignature;
|
||||
private int _finalEmailToCreator = (int)FinalEmailType.No;
|
||||
private int _finalEmailToReceivers = (int)FinalEmailType.No;
|
||||
private bool _sendReminderEmails;
|
||||
@@ -468,7 +467,6 @@
|
||||
private string? _validationMessage;
|
||||
|
||||
private bool IsActionLocked => _isDocumentUploading || _isStepActionRunning || _isFinishing;
|
||||
private bool IsFesSelected => _certificationType == CertificationType.AdvancedElectronicSignature;
|
||||
|
||||
private bool IsFirstStep => _currentStep <= 0;
|
||||
private bool IsLastStep => _currentStep >= TotalSteps - 1;
|
||||
@@ -497,7 +495,7 @@
|
||||
{
|
||||
_isVisible = Visible;
|
||||
|
||||
if (_selectedEnvelopeTypeId is null && EnvelopeTypes.Count > 0)
|
||||
if (_selectedEnvelopeType is null && EnvelopeTypes.Count > 0)
|
||||
ApplyDefaultEnvelopeType();
|
||||
|
||||
if (Visible && !_previousVisible)
|
||||
@@ -547,7 +545,7 @@
|
||||
var raw = args.Value?.ToString();
|
||||
if (int.TryParse(raw, out var id) && id > 0)
|
||||
{
|
||||
_selectedEnvelopeTypeId = id;
|
||||
_selectedEnvelopeType = id.ToEnvelopeType();
|
||||
var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == id);
|
||||
if (selectedType is not null)
|
||||
ApplyEnvelopeTypeDefaults(selectedType);
|
||||
@@ -555,7 +553,7 @@
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
_selectedEnvelopeTypeId = null;
|
||||
_selectedEnvelopeType = null;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
@@ -758,11 +756,10 @@
|
||||
var result = new CreateEnvelopeWizardResult(
|
||||
Title: _title.Trim(),
|
||||
Message: _message.Trim(),
|
||||
EnvelopeTypeId: _selectedEnvelopeTypeId,
|
||||
EnvelopeTypeId: (int?)_selectedEnvelopeType,
|
||||
Language: string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language,
|
||||
UseAccessCode: _useAccessCode,
|
||||
TFAEnabled: _tfaEnabled,
|
||||
CertificationType: _certificationType,
|
||||
FinalEmailToCreator: _finalEmailToCreator,
|
||||
FinalEmailToReceivers: _finalEmailToReceivers,
|
||||
SendReminderEmails: _sendReminderEmails,
|
||||
@@ -867,8 +864,8 @@
|
||||
{
|
||||
if (_currentStep == 0)
|
||||
{
|
||||
if (_selectedEnvelopeTypeId is null && EnvelopeTypes.Count > 0)
|
||||
_selectedEnvelopeTypeId = GetDefaultEnvelopeTypeId();
|
||||
if (_selectedEnvelopeType is null && EnvelopeTypes.Count > 0)
|
||||
_selectedEnvelopeType = EnvelopeType.SimpleSignature;
|
||||
|
||||
if (string.IsNullOrWhiteSpace(_title))
|
||||
{
|
||||
@@ -876,7 +873,7 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!_selectedEnvelopeTypeId.HasValue || _selectedEnvelopeTypeId.Value <= 0)
|
||||
if (!_selectedEnvelopeType.HasValue || _selectedEnvelopeType.Value <= 0)
|
||||
{
|
||||
_validationMessage = L("SenderWizard_Validation_EnvelopeTypeRequired", "Bitte wählen Sie einen Umschlagtyp aus.");
|
||||
return false;
|
||||
@@ -963,7 +960,7 @@
|
||||
{
|
||||
_validationMessage = null;
|
||||
|
||||
if (IsFesSelected)
|
||||
if (_selectedEnvelopeType == EnvelopeType.AdvancedSignature)
|
||||
{
|
||||
_tfaEnabled = true;
|
||||
_useAccessCode = true;
|
||||
@@ -1013,9 +1010,6 @@
|
||||
if (_tfaEnabled)
|
||||
_useAccessCode = true;
|
||||
|
||||
if (envelopeType.CertificationType.HasValue)
|
||||
_certificationType = envelopeType.CertificationType.Value;
|
||||
|
||||
if (envelopeType.FinalEmailToCreator.HasValue)
|
||||
_finalEmailToCreator = envelopeType.FinalEmailToCreator.Value;
|
||||
|
||||
@@ -1044,7 +1038,7 @@
|
||||
{
|
||||
_language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim();
|
||||
|
||||
if (IsFesSelected)
|
||||
if (_selectedEnvelopeType == EnvelopeType.AdvancedSignature)
|
||||
_tfaEnabled = true;
|
||||
|
||||
if (_tfaEnabled)
|
||||
@@ -1087,11 +1081,11 @@
|
||||
|
||||
private void ApplyDefaultEnvelopeType()
|
||||
{
|
||||
_selectedEnvelopeTypeId = GetDefaultEnvelopeTypeId();
|
||||
if (!_selectedEnvelopeTypeId.HasValue)
|
||||
_selectedEnvelopeType = EnvelopeType.SimpleSignature;
|
||||
if (!_selectedEnvelopeType.HasValue)
|
||||
return;
|
||||
|
||||
var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == _selectedEnvelopeTypeId.Value);
|
||||
var selectedType = EnvelopeTypes.FirstOrDefault(x => x.Id == (int)_selectedEnvelopeType);
|
||||
if (selectedType is not null)
|
||||
ApplyEnvelopeTypeDefaults(selectedType);
|
||||
}
|
||||
@@ -1103,12 +1097,11 @@
|
||||
_validationMessage = null;
|
||||
|
||||
_title = string.Empty;
|
||||
_selectedEnvelopeTypeId = null;
|
||||
_selectedEnvelopeType = null;
|
||||
_message = string.Empty;
|
||||
_language = "de-DE";
|
||||
_useAccessCode = false;
|
||||
_tfaEnabled = false;
|
||||
_certificationType = CertificationType.AdvancedElectronicSignature;
|
||||
_finalEmailToCreator = (int)FinalEmailType.No;
|
||||
_finalEmailToReceivers = (int)FinalEmailType.No;
|
||||
_sendReminderEmails = false;
|
||||
@@ -1133,18 +1126,6 @@
|
||||
NormalizeSettings();
|
||||
}
|
||||
|
||||
private int? GetDefaultEnvelopeTypeId()
|
||||
{
|
||||
if (EnvelopeTypes.Count == 0)
|
||||
return null;
|
||||
|
||||
var handwrittenType = EnvelopeTypes.FirstOrDefault(x =>
|
||||
!string.IsNullOrWhiteSpace(x.Title)
|
||||
&& x.Title.Contains("Handschriftliche Unterschrift", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
return handwrittenType?.Id ?? EnvelopeTypes[0].Id;
|
||||
}
|
||||
|
||||
private string L(string key, string fallback)
|
||||
{
|
||||
var modelValue = ModelLocalizer[key];
|
||||
|
||||
@@ -9,7 +9,6 @@ public sealed record CreateEnvelopeWizardResult(
|
||||
string Language,
|
||||
bool UseAccessCode,
|
||||
bool TFAEnabled,
|
||||
CertificationType CertificationType,
|
||||
int FinalEmailToCreator,
|
||||
int FinalEmailToReceivers,
|
||||
bool SendReminderEmails,
|
||||
|
||||
Reference in New Issue
Block a user