From 9b5724ff2422671ecfe20ec172a3f7637c0cd575 Mon Sep 17 00:00:00 2001 From: FH Date: Tue, 4 Oct 2022 13:23:03 +0200 Subject: [PATCH] Confirm work date when creating first activity --- Wonky.Client/Pages/CrmNewActivityPage.razor | 5 +++-- Wonky.Client/Pages/CrmNewActivityPage.razor.cs | 13 ++++++++++--- Wonky.Client/Shared/ConfirmationModal.razor | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Wonky.Client/Pages/CrmNewActivityPage.razor b/Wonky.Client/Pages/CrmNewActivityPage.razor index 60fbc19b..17014abe 100644 --- a/Wonky.Client/Pages/CrmNewActivityPage.razor +++ b/Wonky.Client/Pages/CrmNewActivityPage.razor @@ -23,7 +23,6 @@ -
@@ -320,4 +319,6 @@ else
-} \ No newline at end of file +} + + \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmNewActivityPage.razor.cs b/Wonky.Client/Pages/CrmNewActivityPage.razor.cs index 2d39a68c..517282f4 100644 --- a/Wonky.Client/Pages/CrmNewActivityPage.razor.cs +++ b/Wonky.Client/Pages/CrmNewActivityPage.razor.cs @@ -74,7 +74,7 @@ public partial class CrmNewActivityPage : IDisposable private PriceListModal PriceListModal { get; set; } private ProductHistoryModal HistoryModal { get; set; } private ProductPriceHistoryModal PriceHistoryModal { get; set; } - private ConfirmationModal ConfirmationModal { get; set; } + private ConfirmationModal ConfirmWorkDate { get; set; } = new(); protected override async Task OnParametersSetAsync() { @@ -150,9 +150,14 @@ public partial class CrmNewActivityPage : IDisposable PriceListModal.Show(); } - private void CallConfirmWorkDate() + private void VerifyWorkDateConfirmed() { - ConfirmationModal.Show(); + Logger.LogDebug("Preferences.DateConfimed => {}", _prefs.DateConfirmed); + + if (_prefs.DateConfirmed) return; + + _confirmDatePrompt = $"Dato {_activity.ActivityDate}?"; + ConfirmWorkDate.Show(); } private async Task WorkDateConfirmed() @@ -365,6 +370,8 @@ public partial class CrmNewActivityPage : IDisposable _editContext = new EditContext(_activity); _editContext.OnFieldChanged += HandleFieldChanged; _editContext.OnValidationStateChanged += ValidationChanged; + + VerifyWorkDateConfirmed(); } public void Dispose() diff --git a/Wonky.Client/Shared/ConfirmationModal.razor b/Wonky.Client/Shared/ConfirmationModal.razor index 50dcfaf6..554fa28f 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor +++ b/Wonky.Client/Shared/ConfirmationModal.razor @@ -23,7 +23,7 @@