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")' />
|
<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>
|
</MudTooltip>
|
||||||
</label>
|
</label>
|
||||||
<select @bind="_selectedEnvelopeType"
|
<select id="wizard-envelope-type"
|
||||||
|
name="wizard-envelope-type"
|
||||||
|
@bind="_selectedEnvelopeType"
|
||||||
@bind:after="OnEnvelopeTypeChanged"
|
@bind:after="OnEnvelopeTypeChanged"
|
||||||
class="sender-create-wizard__select">
|
class="sender-create-wizard__select">
|
||||||
@foreach (var type in EnvelopeTypes)
|
@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")' />
|
<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>
|
</MudTooltip>
|
||||||
</label>
|
</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="de-DE">Deutsch (de-DE)</option>
|
||||||
<option value="en-US">English (en-US)</option>
|
<option value="en-US">English (en-US)</option>
|
||||||
<option value="de">Deutsch (de)</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")' />
|
<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>
|
</MudTooltip>
|
||||||
</label>
|
</label>
|
||||||
<select @bind="_finalEmailToCreator" class="sender-create-wizard__select">
|
<select id="wizard-final-email-to-creator"
|
||||||
<option value="0">@L("No", "Nein")</option>
|
name="wizard-final-email-to-creator"
|
||||||
<option value="1">@L("Yes", "Ja")</option>
|
@bind="_finalEmailToCreator"
|
||||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
@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>
|
</select>
|
||||||
</div>
|
</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")' />
|
<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>
|
</MudTooltip>
|
||||||
</label>
|
</label>
|
||||||
<select @bind="_finalEmailToReceivers" class="sender-create-wizard__select">
|
<select id="wizard-final-email-to-receivers"
|
||||||
<option value="0">@L("No", "Nein")</option>
|
name="wizard-final-email-to-receivers"
|
||||||
<option value="1">@L("Yes", "Ja")</option>
|
@bind="_finalEmailToReceivers"
|
||||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
@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>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -441,6 +454,8 @@
|
|||||||
private bool _tfaEnabled;
|
private bool _tfaEnabled;
|
||||||
private FinalEmailType _finalEmailToCreator = FinalEmailType.No;
|
private FinalEmailType _finalEmailToCreator = FinalEmailType.No;
|
||||||
private FinalEmailType _finalEmailToReceivers = FinalEmailType.No;
|
private FinalEmailType _finalEmailToReceivers = FinalEmailType.No;
|
||||||
|
private bool _finalEmailToCreatorUserOverridden;
|
||||||
|
private bool _finalEmailToReceiversUserOverridden;
|
||||||
private bool _sendReminderEmails;
|
private bool _sendReminderEmails;
|
||||||
private int _firstReminderDays;
|
private int _firstReminderDays;
|
||||||
private int _reminderIntervalDays;
|
private int _reminderIntervalDays;
|
||||||
@@ -552,6 +567,20 @@
|
|||||||
return Task.CompletedTask;
|
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()
|
private Task AddReceiver()
|
||||||
{
|
{
|
||||||
if (IsActionLocked)
|
if (IsActionLocked)
|
||||||
@@ -1005,12 +1034,14 @@
|
|||||||
if (_tfaEnabled)
|
if (_tfaEnabled)
|
||||||
_useAccessCode = true;
|
_useAccessCode = true;
|
||||||
|
|
||||||
if (envelopeType.FinalEmailToCreator.HasValue)
|
if (envelopeType.FinalEmailToCreator.HasValue && !_finalEmailToCreatorUserOverridden)
|
||||||
_finalEmailToCreator = envelopeType.FinalEmailToCreator.Value;
|
_finalEmailToCreator = envelopeType.FinalEmailToCreator.Value;
|
||||||
|
|
||||||
if (envelopeType.FinalEmailToReceivers.HasValue)
|
if (envelopeType.FinalEmailToReceivers.HasValue && !_finalEmailToReceiversUserOverridden)
|
||||||
_finalEmailToReceivers = envelopeType.FinalEmailToReceivers.Value;
|
_finalEmailToReceivers = envelopeType.FinalEmailToReceivers.Value;
|
||||||
|
|
||||||
|
ApplyEnvelopeTypeFinalEmailDefaults(envelopeType.Id);
|
||||||
|
|
||||||
if (envelopeType.SendReminderEmails.HasValue)
|
if (envelopeType.SendReminderEmails.HasValue)
|
||||||
_sendReminderEmails = envelopeType.SendReminderEmails.Value;
|
_sendReminderEmails = envelopeType.SendReminderEmails.Value;
|
||||||
|
|
||||||
@@ -1029,6 +1060,26 @@
|
|||||||
NormalizeSettings();
|
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()
|
private void NormalizeSettings()
|
||||||
{
|
{
|
||||||
_language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim();
|
_language = string.IsNullOrWhiteSpace(_language) ? "de-DE" : _language.Trim();
|
||||||
@@ -1099,6 +1150,8 @@
|
|||||||
_tfaEnabled = false;
|
_tfaEnabled = false;
|
||||||
_finalEmailToCreator = FinalEmailType.No;
|
_finalEmailToCreator = FinalEmailType.No;
|
||||||
_finalEmailToReceivers = FinalEmailType.No;
|
_finalEmailToReceivers = FinalEmailType.No;
|
||||||
|
_finalEmailToCreatorUserOverridden = false;
|
||||||
|
_finalEmailToReceiversUserOverridden = false;
|
||||||
_sendReminderEmails = false;
|
_sendReminderEmails = false;
|
||||||
_firstReminderDays = 0;
|
_firstReminderDays = 0;
|
||||||
_reminderIntervalDays = 0;
|
_reminderIntervalDays = 0;
|
||||||
|
|||||||
@@ -134,19 +134,25 @@
|
|||||||
|
|
||||||
<div class="sender-settings-field">
|
<div class="sender-settings-field">
|
||||||
<label class="sender-settings-label">@L("FinalEmailToCreator", "Finale E-Mail an Ersteller")</label>
|
<label class="sender-settings-label">@L("FinalEmailToCreator", "Finale E-Mail an Ersteller")</label>
|
||||||
<select @bind="_finalEmailToCreator" class="sender-settings-select">
|
<select id="sender-editor-final-email-to-creator"
|
||||||
<option value="0">@L("No", "Nein")</option>
|
name="sender-editor-final-email-to-creator"
|
||||||
<option value="1">@L("Yes", "Ja")</option>
|
@bind="_finalEmailToCreator"
|
||||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
class="sender-settings-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>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="sender-settings-field">
|
<div class="sender-settings-field">
|
||||||
<label class="sender-settings-label">@L("FinalEmailToReceivers", "Finale E-Mail an Empfänger")</label>
|
<label class="sender-settings-label">@L("FinalEmailToReceivers", "Finale E-Mail an Empfänger")</label>
|
||||||
<select @bind="_finalEmailToReceivers" class="sender-settings-select">
|
<select id="sender-editor-final-email-to-receivers"
|
||||||
<option value="0">@L("No", "Nein")</option>
|
name="sender-editor-final-email-to-receivers"
|
||||||
<option value="1">@L("Yes", "Ja")</option>
|
@bind="_finalEmailToReceivers"
|
||||||
<option value="2">@L("YesWithAttachment", "Ja, mit Anhang")</option>
|
class="sender-settings-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>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user