diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs b/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs index 51dc4aa3..86ab9e50 100644 --- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.Components; public partial class AdvisorActivityTableComponent { - [Parameter] public List ActivityList { get; set; } + [Parameter] public List ActivityList { get; set; } = new(); [Inject] public NavigationManager Navigator { get; set; } // private void ShowOrder(string companyId, string orderId) diff --git a/Wonky.Client/Components/LandingComponentAdmin.razor b/Wonky.Client/Components/LandingComponentAdmin.razor index 28f012a6..62f24364 100644 --- a/Wonky.Client/Components/LandingComponentAdmin.razor +++ b/Wonky.Client/Components/LandingComponentAdmin.razor @@ -18,7 +18,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components -Inno Web CRM +Innotec Admin @*
diff --git a/Wonky.Client/Components/LandingComponentAdvisor.razor b/Wonky.Client/Components/LandingComponentAdvisor.razor index 22d16060..5ddd8c37 100644 --- a/Wonky.Client/Components/LandingComponentAdvisor.razor +++ b/Wonky.Client/Components/LandingComponentAdvisor.razor @@ -18,7 +18,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components -Inno Web CRM +Innotec Rådgiver
diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs b/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs index 567469b7..e9ea64e3 100644 --- a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.Components; public partial class OfficeActivityTableComponent { - [Parameter] public List ActivityList { get; set; } + [Parameter] public List ActivityList { get; set; } = new(); [Inject] public NavigationManager Navigator { get; set; } private static string GetProcessStatus(string processStatus) diff --git a/Wonky.Client/Components/OfficeAdvisorTableComponent.razor.cs b/Wonky.Client/Components/OfficeAdvisorTableComponent.razor.cs index 4d6d221f..5d15be7d 100644 --- a/Wonky.Client/Components/OfficeAdvisorTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeAdvisorTableComponent.razor.cs @@ -21,5 +21,5 @@ namespace Wonky.Client.Components; public partial class OfficeAdvisorTableComponent { - [Parameter] public List UserList { get; set; } + [Parameter] public List UserList { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs index 4125ef21..9e0f86e9 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs @@ -20,7 +20,7 @@ namespace Wonky.Client.Components; public partial class OfficeReportTableComponent { - [Parameter] public List ReportList { get; set; } + [Parameter] public List ReportList { get; set; } = new(); [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; } \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeUserTableComponent.razor.cs b/Wonky.Client/Components/OfficeUserTableComponent.razor.cs index 33470562..8c3ff7ec 100644 --- a/Wonky.Client/Components/OfficeUserTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeUserTableComponent.razor.cs @@ -21,5 +21,5 @@ namespace Wonky.Client.Components; public partial class OfficeUserTableComponent { - [Parameter] public List UserList { get; set; } + [Parameter] public List UserList { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ProductInventoryTableComponent.razor.cs b/Wonky.Client/Components/ProductInventoryTableComponent.razor.cs index e1ce28f3..0039fd88 100644 --- a/Wonky.Client/Components/ProductInventoryTableComponent.razor.cs +++ b/Wonky.Client/Components/ProductInventoryTableComponent.razor.cs @@ -25,9 +25,10 @@ namespace Wonky.Client.Components; public partial class ProductInventoryTableComponent { - [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; } + [CascadingParameter] public DraftStateProvider DraftStateProvider { get; set; } = new(); [Parameter] public List ProductList { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; + [Inject] public ICatalogHttpRepository Catalog { get; set; } // private variables private SalesItemView SalesItem { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportActivityLedgerComponent.razor.cs b/Wonky.Client/Components/ReportActivityLedgerComponent.razor.cs index ebd81602..870de4ef 100644 --- a/Wonky.Client/Components/ReportActivityLedgerComponent.razor.cs +++ b/Wonky.Client/Components/ReportActivityLedgerComponent.razor.cs @@ -20,5 +20,5 @@ namespace Wonky.Client.Components; public partial class ReportActivityLedgerComponent { - [Parameter] public ReportData ReportData { get; set; } + [Parameter] public ReportData ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs index 1c68af4e..c442fb0c 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs +++ b/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs @@ -20,7 +20,6 @@ namespace Wonky.Client.Components; public partial class ReportDistanceLedgerComponent { - [Parameter] - public ReportData ReportData { get; set; } + [Parameter] public ReportData ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor.cs b/Wonky.Client/Components/ReportSummaryComponent.razor.cs index 2af159bc..7393374a 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor.cs +++ b/Wonky.Client/Components/ReportSummaryComponent.razor.cs @@ -21,7 +21,6 @@ namespace Wonky.Client.Components; public partial class ReportSummaryComponent { - [Parameter] - public ReportData ReportData { get; set; } + [Parameter] public ReportData ReportData { get; set; } = new(); } \ No newline at end of file diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor.cs b/Wonky.Client/Components/TaskItemTableComponent.razor.cs index 47cee9e9..2ee6e492 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor.cs +++ b/Wonky.Client/Components/TaskItemTableComponent.razor.cs @@ -25,7 +25,7 @@ namespace Wonky.Client.Components { public partial class TaskItemTableComponent { - [Parameter] public List? TaskItemList { get; set; } = new(); + [Parameter] public List TaskItemList { get; set; } = new(); [Parameter] public EventCallback OnDeleteTask { get; set; } [Parameter] public EventCallback OnCompleteTask { get; set; } [Parameter] public EventCallback OnTaskCompleted { get; set; } diff --git a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs index f6f8500f..d54f6692 100644 --- a/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs +++ b/Wonky.Client/HttpInterceptors/HttpInterceptorService.cs @@ -105,13 +105,13 @@ namespace Wonky.Client.HttpInterceptors _authenticationService.Logout(); _navigation.NavigateTo($"/login/{currDoc}"); message = "Venligst login ..."; - _toast.ShowWarning(message); + _toast.ShowInfo(message); break; case HttpStatusCode.Conflict: break; case HttpStatusCode.InternalServerError: - message = "Der er interne problemer på serveren ..."; - _toast.ShowError(message); + // message = "Der er interne problemer på serveren ..."; + // _toast.ShowError(message); break; default: _toast.ShowError(message); diff --git a/Wonky.Client/HttpRepository/CrmReportHttpRepository.cs b/Wonky.Client/HttpRepository/CrmReportHttpRepository.cs index d302349a..84d5c462 100644 --- a/Wonky.Client/HttpRepository/CrmReportHttpRepository.cs +++ b/Wonky.Client/HttpRepository/CrmReportHttpRepository.cs @@ -53,9 +53,8 @@ public class CrmReportHttpRepository :ICrmReportHttpRepository } public async Task ReportExist(string workDate) { - var result = - await _client - .GetFromJsonAsync($"{_apiConfig.CrmReports}/exist/{workDate}"); + var result = await _client.GetFromJsonAsync( + $"{_apiConfig.CrmReports}/exist/{workDate}"); return result.ReportClosed; } diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/CrmReportNewPage.razor index 1eebf5d7..28706842 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor +++ b/Wonky.Client/Pages/CrmReportNewPage.razor @@ -26,7 +26,7 @@
- +
@@ -297,7 +297,7 @@
- + @if (Working) { diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs index 99a1272d..261e7a81 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs @@ -44,7 +44,7 @@ public partial class CrmReportNewPage : IDisposable private bool FormInvalid { get; set; } = true; private bool NoFigures { get; set; } = true; private bool Working { get; set; } = true; - private DateTime _workDate { get; set; } = DateTime.Now; + private DateTime _workDate { get; set; } private TimeOnly _checkIn { get; set; } = new(12, 0); private TimeOnly _checkOut { get; set; } = new(12, 0); private DateTime BeginLeave { get; set; } = DateTime.Now; @@ -65,11 +65,12 @@ public partial class CrmReportNewPage : IDisposable ReportContext.OnValidationStateChanged += ValidationChanged; Prefs = await PrefService.GetPreferences(); + _workDate = DateTime.Now; if (!string.IsNullOrWhiteSpace(Prefs.WorkDate)) _workDate = DateTime.Parse(Prefs.WorkDate); - - if(await CrmReportRepo.ReportExist(Prefs.WorkDate)) - Navigator.NavigateTo($"/sales-reports/view/{Prefs.WorkDate}"); + + // if(await CrmReportRepo.ReportExist(Prefs.WorkDate)) + // Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); BeginLeave = _workDate; EndLeave = _workDate; @@ -81,7 +82,10 @@ public partial class CrmReportNewPage : IDisposable Report.Figures.KmEvening = 0; Report.Figures.Distance = 0; Report.Figures.DistancePrivateMonth = 0; + Working = false; + Logger.LogDebug("OnInitializedAsync => GetKeyFigures"); + await GetKeyFigures(); } /// @@ -91,8 +95,13 @@ public partial class CrmReportNewPage : IDisposable /// private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - Console.WriteLine($"e FieldName => {e.FieldIdentifier.FieldName}"); + // Console.WriteLine($"e FieldName => {e.FieldIdentifier.FieldName}"); FormInvalid = !ReportContext.Validate(); + if (Report.Figures.KmEvening - Report.Figures.KmMorning > 1000) + { + Toaster.ShowError($"KM tal '{Report.Figures.KmEvening - Report.Figures.KmMorning}'. Er du sikker på at det er rigtigt?", "KM tal"); + } + StateHasChanged(); } @@ -114,7 +123,7 @@ public partial class CrmReportNewPage : IDisposable /// /// Save report confirmed callback /// - private async Task ConfirmSaveCallback() + private async Task ConfirmReportCallback() { // attempt to eliminate doubled click on submit button if (Working) @@ -122,12 +131,7 @@ public partial class CrmReportNewPage : IDisposable Working = true; var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", Report); - // if (!result.IsSuccess) - // { - // Working = false; - // Toaster.ShowError($"{result.Message}", $"HTTP Status {result.Code}"); - // return; - // } + Toaster.ShowInfo($"{result.Message}", $"HTTP Status"); // reset km and date confirmation await PrefService.SetKmMorning(0); @@ -194,7 +198,9 @@ public partial class CrmReportNewPage : IDisposable // pop confirmation // create a prompt for popup confirmation - Prompt = Report.Figures.Distance > 1000 ? $"'{Report.Figures.Distance}'KM tal er meget højt. Er du sikker på at det er rigtigt? Gem rapport for {_workDate.ToLongDateString()}?" : $"Gem Rapport for {_workDate.ToLongDateString()}?"; + var warning = Report.Figures.KmEvening - Report.Figures.KmMorning > 1000 ? + $"KM tal '{Report.Figures.KmEvening - Report.Figures.KmMorning}'. Er du sikker på at det er rigtigt?

" : ""; + Prompt = $"{warning}Gem rapport for {_workDate.ToLongDateString()}?"; ConfirmReportModal.Show(); } @@ -236,6 +242,8 @@ public partial class CrmReportNewPage : IDisposable /// private async Task GetKeyFigures() { + if (Working) + return; Working = true; Report.Figures = new ReportFiguresDto(); diff --git a/Wonky.Client/Shared/ConfirmationModal.razor b/Wonky.Client/Shared/ConfirmationModal.razor index 6bdb2985..36f8e538 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor +++ b/Wonky.Client/Shared/ConfirmationModal.razor @@ -19,11 +19,11 @@
-
Bekræft Venligst
+

Bekræft Venligst

-

@BodyMessage

+ @((MarkupString) BodyMessage)
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 4be88fd7..0134b27c 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.81.1", + "version": "0.83.2", "rc": true, "sandBox": false, "image": "grumpy-coder.png"