Refactor dialog components to remove Cancel event from backdrop; enhance confirmation dialog for restore functionality
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5 class="mb-3">Neues Konto</h5>
|
<h5 class="mb-3">Neues Konto</h5>
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
@inject IEntryService EntryService
|
@inject IEntryService EntryService
|
||||||
|
|
||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5>@(EditEntry != null ? "Buchung bearbeiten" : "Neue Buchung")</h5>
|
<h5>@(EditEntry != null ? "Buchung bearbeiten" : "Neue Buchung")</h5>
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
@inject IEntryService EntryService
|
@inject IEntryService EntryService
|
||||||
@inject IAccountService AccountService
|
@inject IAccountService AccountService
|
||||||
|
|
||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5 class="mb-3">@(EditEntry != null ? "Umbuchung bearbeiten" : "Neue Umbuchung")</h5>
|
<h5 class="mb-3">@(EditEntry != null ? "Umbuchung bearbeiten" : "Neue Umbuchung")</h5>
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5>@Title</h5>
|
<h5>@Title</h5>
|
||||||
<p>@Message</p>
|
<p>@Message</p>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5 class="mb-3">Übertrag bearbeiten</h5>
|
<h5 class="mb-3">Übertrag bearbeiten</h5>
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
<div class="dialog-backdrop" @onclick="Cancel">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5 class="mb-3">@DialogTitle</h5>
|
<h5 class="mb-3">@DialogTitle</h5>
|
||||||
<div class="form-container">
|
<div class="form-container">
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
@if (showAboutDialog)
|
@if (showAboutDialog)
|
||||||
{
|
{
|
||||||
<div class="dialog-backdrop" @onclick="CloseAboutDialog">
|
<div class="dialog-backdrop">
|
||||||
<div class="dialog-content" @onclick:stopPropagation="true">
|
<div class="dialog-content" @onclick:stopPropagation="true">
|
||||||
<h5>Über Dümpelkas · Version @AppVersion</h5>
|
<h5>Über Dümpelkas · Version @AppVersion</h5>
|
||||||
<p class="mb-2">Entwickler: Andre Beging</p>
|
<p class="mb-2">Entwickler: Andre Beging</p>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@
|
|||||||
@inject ISettingsService SettingsService
|
@inject ISettingsService SettingsService
|
||||||
@inject IPdfStatementService PdfStatementService
|
@inject IPdfStatementService PdfStatementService
|
||||||
@inject IFileSaveService FileSaveService
|
@inject IFileSaveService FileSaveService
|
||||||
@inject IJSRuntime JsRuntime
|
|
||||||
@inject NavigationManager NavigationManager
|
@inject NavigationManager NavigationManager
|
||||||
@using System.Globalization
|
@using System.Globalization
|
||||||
|
|
||||||
@@ -97,10 +96,23 @@
|
|||||||
OnCancel="CancelOpenSavedPdf" />
|
OnCancel="CancelOpenSavedPdf" />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@if (showRestoreConfirm)
|
||||||
|
{
|
||||||
|
<ConfirmDialog Title="Restore bestätigen"
|
||||||
|
Message="Restore überschreibt die aktuelle Datenbank. Möchten Sie fortfahren?"
|
||||||
|
ConfirmText="Ja, wiederherstellen"
|
||||||
|
CancelText="Nein, abbrechen"
|
||||||
|
ConfirmButtonClass="btn btn-warning"
|
||||||
|
ConfirmIconClass="bi bi-arrow-counterclockwise"
|
||||||
|
OnConfirm="HandleConfirmRestore"
|
||||||
|
OnCancel="CancelRestoreConfirm" />
|
||||||
|
}
|
||||||
|
|
||||||
@code {
|
@code {
|
||||||
private List<AccountSummaryDto>? accounts;
|
private List<AccountSummaryDto>? accounts;
|
||||||
private bool showAddAccount;
|
private bool showAddAccount;
|
||||||
private bool showEditClubName;
|
private bool showEditClubName;
|
||||||
|
private bool showRestoreConfirm;
|
||||||
private string clubName = string.Empty;
|
private string clubName = string.Empty;
|
||||||
private string? operationMessage;
|
private string? operationMessage;
|
||||||
private string operationMessageClass = "alert-info";
|
private string operationMessageClass = "alert-info";
|
||||||
@@ -147,13 +159,20 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task HandleRestoreAsync()
|
private Task HandleRestoreAsync()
|
||||||
{
|
{
|
||||||
var confirmed = await JsRuntime.InvokeAsync<bool>("confirm",
|
showRestoreConfirm = true;
|
||||||
"Restore überschreibt die aktuelle Datenbank. Möchten Sie fortfahren?");
|
return Task.CompletedTask;
|
||||||
|
}
|
||||||
|
|
||||||
if (!confirmed) return;
|
private void CancelRestoreConfirm()
|
||||||
|
{
|
||||||
|
showRestoreConfirm = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async Task HandleConfirmRestore()
|
||||||
|
{
|
||||||
|
showRestoreConfirm = false;
|
||||||
var message = await BackupService.RestoreBackupAsync();
|
var message = await BackupService.RestoreBackupAsync();
|
||||||
var isSuccess = message.StartsWith("Wiederherstellung erfolgreich", StringComparison.OrdinalIgnoreCase);
|
var isSuccess = message.StartsWith("Wiederherstellung erfolgreich", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
@@ -164,7 +183,6 @@
|
|||||||
} else {
|
} else {
|
||||||
SetOperationMessage(message, isSuccess);
|
SetOperationMessage(message, isSuccess);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task HandleDashboardExportAsync()
|
private async Task HandleDashboardExportAsync()
|
||||||
|
|||||||
Reference in New Issue
Block a user