Improve dropdown handling and accessibility
Added `id` and `name` attributes to `<select>` elements in `CreateEnvelopeWizardPopup.razor` and `SenderEditorPage.razor` for better accessibility. Replaced hardcoded dropdown values with `FinalEmailType` enum for maintainability. Introduced `@bind:after` event handlers to track user overrides for `FinalEmailToCreator` and `FinalEmailToReceivers`. Added flags `_finalEmailToCreatorUserOverridden` and `_finalEmailToReceiversUserOverridden` to ensure user changes are respected. Refactored default value logic into `ApplyEnvelopeTypeFinalEmailDefaults` and updated `NormalizeSettings` to reset override flags. Improved code readability by replacing magic numbers with named constants.
This commit is contained in:
@@ -81,7 +81,9 @@
|
||||
<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 @bind="_selectedEnvelopeType"
|
||||
<select id="wizard-envelope-type"
|
||||
name="wizard-envelope-type"
|
||||
@bind="_selectedEnvelopeType"
|
||||
@bind:after="OnEnvelopeTypeChanged"
|
||||
class="sender-create-wizard__select">
|
||||
@foreach (var type in EnvelopeTypes)
|
||||
@@ -117,7 +119,10 @@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Info" Color="Color.Tertiary" Size="Size.Small" Class="sender-create-wizard__help-icon" aria-label='@L("SenderWizard_HelpAria_Language", "Hilfe zum Feld Sprache")' />
|
||||
</MudTooltip>
|
||||
</label>
|
||||
<select @bind="_language" class="sender-create-wizard__select">
|
||||
<select id="wizard-language"
|
||||
name="wizard-language"
|
||||
@bind="_language"
|
||||
class="sender-create-wizard__select">
|
||||
<option value="de-DE">Deutsch (de-DE)</option>
|
||||
<option value="en-US">English (en-US)</option>
|
||||
<option value="de">Deutsch (de)</option>
|
||||
@@ -148,10 +153,14 @@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Info" Color="Color.Tertiary" Size="Size.Small" Class="sender-create-wizard__help-icon" aria-label='@L("SenderWizard_HelpAria_FinalEmailToCreator", "Hilfe zum Feld Abgeschlossenes Dokument an Ersteller")' />
|
||||
</MudTooltip>
|
||||
</label>
|
||||
<select @bind="_finalEmailToCreator" class="sender-create-wizard__select">
|
||||
<option value="0">@L("No", "Nein")</option>
|
||||
<option value="1">@L("Yes", "Ja")</option>
|
||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
<select id="wizard-final-email-to-creator"
|
||||
name="wizard-final-email-to-creator"
|
||||
@bind="_finalEmailToCreator"
|
||||
@bind:after="OnFinalEmailToCreatorChanged"
|
||||
class="sender-create-wizard__select">
|
||||
<option value="@FinalEmailType.No">@L("No", "Nein")</option>
|
||||
<option value="@FinalEmailType.Yes">@L("Yes", "Ja")</option>
|
||||
<option value="@FinalEmailType.YesWithAttachment">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -162,10 +171,14 @@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Info" Color="Color.Tertiary" Size="Size.Small" Class="sender-create-wizard__help-icon" aria-label='@L("SenderWizard_HelpAria_FinalEmailToReceivers", "Hilfe zum Feld Abgeschlossenes Dokument an Empfaenger")' />
|
||||
</MudTooltip>
|
||||
</label>
|
||||
<select @bind="_finalEmailToReceivers" class="sender-create-wizard__select">
|
||||
<option value="0">@L("No", "Nein")</option>
|
||||
<option value="1">@L("Yes", "Ja")</option>
|
||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
<select id="wizard-final-email-to-receivers"
|
||||
name="wizard-final-email-to-receivers"
|
||||
@bind="_finalEmailToReceivers"
|
||||
@bind:after="OnFinalEmailToReceiversChanged"
|
||||
class="sender-create-wizard__select">
|
||||
<option value="@FinalEmailType.No">@L("No", "Nein")</option>
|
||||
<option value="@FinalEmailType.Yes">@L("Yes", "Ja")</option>
|
||||
<option value="@FinalEmailType.YesWithAttachment">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -441,6 +454,8 @@
|
||||
private bool _tfaEnabled;
|
||||
private FinalEmailType _finalEmailToCreator = FinalEmailType.No;
|
||||
private FinalEmailType _finalEmailToReceivers = FinalEmailType.No;
|
||||
private bool _finalEmailToCreatorUserOverridden;
|
||||
private bool _finalEmailToReceiversUserOverridden;
|
||||
private bool _sendReminderEmails;
|
||||
private int _firstReminderDays;
|
||||
private int _reminderIntervalDays;
|
||||
@@ -552,6 +567,20 @@
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnFinalEmailToCreatorChanged()
|
||||
{
|
||||
_validationMessage = null;
|
||||
_finalEmailToCreatorUserOverridden = true;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task OnFinalEmailToReceiversChanged()
|
||||
{
|
||||
_validationMessage = null;
|
||||
_finalEmailToReceiversUserOverridden = true;
|
||||
return Task.CompletedTask;
|
||||
}
|
||||
|
||||
private Task AddReceiver()
|
||||
{
|
||||
if (IsActionLocked)
|
||||
@@ -1005,12 +1034,14 @@
|
||||
if (_tfaEnabled)
|
||||
_useAccessCode = true;
|
||||
|
||||
if (envelopeType.FinalEmailToCreator.HasValue)
|
||||
if (envelopeType.FinalEmailToCreator.HasValue && !_finalEmailToCreatorUserOverridden)
|
||||
_finalEmailToCreator = envelopeType.FinalEmailToCreator.Value;
|
||||
|
||||
if (envelopeType.FinalEmailToReceivers.HasValue)
|
||||
if (envelopeType.FinalEmailToReceivers.HasValue && !_finalEmailToReceiversUserOverridden)
|
||||
_finalEmailToReceivers = envelopeType.FinalEmailToReceivers.Value;
|
||||
|
||||
ApplyEnvelopeTypeFinalEmailDefaults(envelopeType.Id);
|
||||
|
||||
if (envelopeType.SendReminderEmails.HasValue)
|
||||
_sendReminderEmails = envelopeType.SendReminderEmails.Value;
|
||||
|
||||
@@ -1029,6 +1060,26 @@
|
||||
NormalizeSettings();
|
||||
}
|
||||
|
||||
private void ApplyEnvelopeTypeFinalEmailDefaults(EnvelopeType envelopeType)
|
||||
{
|
||||
if ((envelopeType == EnvelopeType.SimpleSignature || envelopeType == EnvelopeType.AdvancedSignature)
|
||||
&& !_finalEmailToCreatorUserOverridden)
|
||||
{
|
||||
_finalEmailToCreator = FinalEmailType.YesWithAttachment;
|
||||
}
|
||||
|
||||
if (envelopeType == EnvelopeType.ReadAndConfirm && !_finalEmailToCreatorUserOverridden)
|
||||
_finalEmailToCreator = FinalEmailType.Yes;
|
||||
|
||||
if ((envelopeType == EnvelopeType.SimpleSignature
|
||||
|| envelopeType == EnvelopeType.AdvancedSignature
|
||||
|| envelopeType == EnvelopeType.ReadAndConfirm)
|
||||
&& !_finalEmailToReceiversUserOverridden)
|
||||
{
|
||||
_finalEmailToReceivers = FinalEmailType.YesWithAttachment;
|
||||
}
|
||||
}
|
||||
|
||||
private void NormalizeSettings()
|
||||
{
|
||||
_language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim();
|
||||
@@ -1099,6 +1150,8 @@
|
||||
_tfaEnabled = false;
|
||||
_finalEmailToCreator = FinalEmailType.No;
|
||||
_finalEmailToReceivers = FinalEmailType.No;
|
||||
_finalEmailToCreatorUserOverridden = false;
|
||||
_finalEmailToReceiversUserOverridden = false;
|
||||
_sendReminderEmails = false;
|
||||
_firstReminderDays = 0;
|
||||
_reminderIntervalDays = 0;
|
||||
|
||||
Reference in New Issue
Block a user