From e85f1c909e80ece81194c16c73d60e4ec662b651 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Thu, 22 Dec 2022 16:36:59 +0100 Subject: [PATCH 1/8] rework returnUrl - created parser - invalid if contain protocol ref --- Wonky.Client/Helpers/Utils.cs | 13 ++++++++ Wonky.Client/Pages/CrmReportViewPage.razor.cs | 31 ++++++++++++------- .../Pages/OfficeReportViewPage.razor.cs | 8 ++--- Wonky.Client/Pages/PrintOrdersPage.razor.cs | 12 ++++--- Wonky.Client/Pages/PrintReportPage.razor.cs | 15 ++++++--- Wonky.Client/wwwroot/appsettings.json | 2 +- 6 files changed, 56 insertions(+), 25 deletions(-) diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index ebce0ac1..c2996cb9 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -21,6 +21,19 @@ namespace Wonky.Client.Helpers; public static class Utils { + public static Dictionary ParseQueryString(string query) + { + if (string.IsNullOrWhiteSpace(query) || query.Contains("://")) + return new Dictionary(); + + var elements = query.Split("&"); + + return elements.Select( + data + => data.Split("=")) + .ToDictionary(element => element[0], element => element[1]); + } + public static bool IsValidEmail(string email) { var trimmedEmail = email.Trim(); diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index 44d46280..c2b01f32 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -16,9 +16,7 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterfaces; -using Wonky.Client.HttpRepository; using Wonky.Client.Models; -using Wonky.Entity.DTO; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -31,28 +29,38 @@ public partial class CrmReportViewPage [Inject] public ILocalStorageService Storage { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new (); - private bool Working { get; set; } = true; - + private UserInfoView UserInfo { get; set; } = new(); + private string ReturnUrl { get; set; } = ""; protected override async Task OnInitializedAsync() { + UserInfo = await Storage.GetItemAsync("_xu"); if (!string.IsNullOrWhiteSpace(ReportDate)) { await GetReport(ReportDate); } - Working = false; } - private async Task Print(PTarget target) + private void Print(PTarget target) { - var ux = await Storage.GetItemAsync("_ux"); - if (target == PTarget.Order) + var returnUrl = new Uri(Navigator.Uri).AbsolutePath; + switch (target) { - Navigator.NavigateTo($"/print/orders/{ux.CountryCode}/{ux.Id}/{ReportDate}"); - return; + case PTarget.Order: + Navigator.NavigateTo($"/print/orders/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={returnUrl}"); + break; + case PTarget.Report: + Navigator.NavigateTo($"/print/report/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={returnUrl}"); + break; + case PTarget.None: + break; + case PTarget.All: + break; + default: + throw new ArgumentOutOfRangeException(nameof(target), target, null); } - Navigator.NavigateTo($"/print/report/{ux.CountryCode}/{ux.Id}/{ReportDate}"); + } private async Task GetReport(string workDate) { @@ -65,6 +73,7 @@ public partial class CrmReportViewPage Report = await ReportRepo.GetReport(workDate); Items = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); + await Storage.SetItemAsync($"{UserInfo.Id}-{Report.ReportData.ReportDate}", Report); Working = false; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index 2e15f94b..a8d4843f 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -85,11 +85,10 @@ public partial class OfficeReportViewPage : IDisposable { if (target == PTarget.Order) { - Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}"); + Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={Navigator.Uri}"); return; } - Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}"); - + Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={Navigator.Uri}"); } /// @@ -98,9 +97,10 @@ public partial class OfficeReportViewPage : IDisposable /// private async Task FetchReport(string workDate) { + var returnUrl = new Uri(Navigator.Uri).AbsolutePath; if (workDate != ReportDate) { - Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}"); + Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}?returnUrl={returnUrl}"); return; } diff --git a/Wonky.Client/Pages/PrintOrdersPage.razor.cs b/Wonky.Client/Pages/PrintOrdersPage.razor.cs index d7e46dd1..691b0fdc 100644 --- a/Wonky.Client/Pages/PrintOrdersPage.razor.cs +++ b/Wonky.Client/Pages/PrintOrdersPage.razor.cs @@ -16,6 +16,7 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using Wonky.Client.Helpers; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -32,8 +33,7 @@ public partial class PrintOrdersPage private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } - - + private string ReturnUrl { get; set; } = ""; protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -45,6 +45,10 @@ public partial class PrintOrdersPage protected override async Task OnInitializedAsync() { + var uri = new Uri(Navigator.Uri); + var query = Utils.ParseQueryString(uri.Query[1..]); + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); Items = Report.ReportItems; } @@ -52,8 +56,8 @@ public partial class PrintOrdersPage private async Task Print() { await JsModule.InvokeVoidAsync("printInvoke"); - - Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"); + + Navigator.NavigateTo(ReturnUrl); } /* diff --git a/Wonky.Client/Pages/PrintReportPage.razor.cs b/Wonky.Client/Pages/PrintReportPage.razor.cs index 6f504d86..0b62eb54 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportPage.razor.cs @@ -13,9 +13,11 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Runtime.CompilerServices; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; +using Wonky.Client.Helpers; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -31,10 +33,14 @@ public partial class PrintReportPage [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private IJSObjectReference JsModule { get; set; } - private bool Printed { get; set; } + private string ReturnUrl { get; set; } = ""; protected override async Task OnInitializedAsync() { + var uri = new Uri(Navigator.Uri); + var query = Utils.ParseQueryString(uri.Query[1..]); + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); } @@ -46,13 +52,12 @@ public partial class PrintReportPage .InvokeAsync("import", "/scripts/print-invoke.js"); } } - + private async Task Print() { - if(!Printed) - Printed = true; await JsModule.InvokeVoidAsync("printInvoke"); - Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"); + + Navigator.NavigateTo(ReturnUrl); } /* diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index a0421445..f9e55a2a 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.87.1", + "version": "0.87.3", "rc": true, "sandBox": false, "image": "grumpy-coder.png" From 72e5fd5b4214bb35a3320bfd73ac2ed7367a8243 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Thu, 22 Dec 2022 17:58:00 +0100 Subject: [PATCH 2/8] fixed weird issue with changing report date - minor cosmetics --- .../Components/WorkDateComponent.razor.cs | 6 +- Wonky.Client/Pages/CrmReportViewPage.razor | 39 ++++----- Wonky.Client/Pages/CrmReportViewPage.razor.cs | 34 ++++---- .../Pages/OfficeReportListPage.razor.cs | 1 + Wonky.Client/Pages/OfficeReportViewPage.razor | 79 ++++++++----------- .../Pages/OfficeReportViewPage.razor.cs | 54 ++++++------- Wonky.Client/Pages/PrintOrdersPage.razor | 7 +- Wonky.Client/Pages/PrintReportPage.razor | 7 +- Wonky.Client/wwwroot/appsettings.json | 4 +- 9 files changed, 111 insertions(+), 120 deletions(-) diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index d52a70c3..58e79de7 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -70,11 +70,11 @@ public partial class WorkDateComponent : IDisposable /// private async Task OnDateChanged(ChangeEventArgs e) { - var x = DateTime.TryParse(e.Value.ToString(), out var val); + var x = DateTime.TryParse(e.Value.ToString(), out var setDate); if (x) { - await Prefs.SetWorkDate(val); - await OnChangedCallback.InvokeAsync($"{val:yyyy-MM-dd}"); + await Prefs.SetWorkDate(setDate); + await OnChangedCallback.InvokeAsync($"{setDate:yyyy-MM-dd}"); } } diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor b/Wonky.Client/Pages/CrmReportViewPage.razor index fa04ef17..c3e058cc 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor +++ b/Wonky.Client/Pages/CrmReportViewPage.razor @@ -21,23 +21,22 @@ @page "/sales-reports/view/{ReportDate}" @attribute [Authorize(Roles = "Advisor,Admin,Supervisor")] -
- -
-
- -
-
- -
-
- -
-
- -
+
+
+
+
+ +
+
+ +
+
+ +
+
+
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { @Report.ReportData.Name @@ -63,16 +62,10 @@ }
-@if (Items.Any()) +@if (Activities.Any()) { - @foreach (var item in Items) + @foreach (var item in Activities) { } } - - -@if (Working) -{ - -} \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index c2b01f32..1dd7c486 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -15,31 +15,31 @@ using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; +using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.Models; using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmReportViewPage +public partial class CrmReportViewPage : IDisposable { [Parameter] public string ReportDate { get; set; } [Inject] public ICrmReportHttpRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } private ReportView Report { get; set; } = new(); - private List Items { get; set; } = new (); + private List Activities { get; set; } = new (); private bool Working { get; set; } = true; private UserInfoView UserInfo { get; set; } = new(); private string ReturnUrl { get; set; } = ""; - protected override async Task OnInitializedAsync() + protected override async Task OnParametersSetAsync() { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); UserInfo = await Storage.GetItemAsync("_xu"); - if (!string.IsNullOrWhiteSpace(ReportDate)) - { - await GetReport(ReportDate); - } - Working = false; + await FetchReport(ReportDate); } private void Print(PTarget target) @@ -62,18 +62,22 @@ public partial class CrmReportViewPage } } - private async Task GetReport(string workDate) + private async Task FetchReport(string workDate) { - Working = true; - Report = new ReportView(); - Items = new List(); - if(workDate != ReportDate) Navigator.NavigateTo($"/sales-reports/view/{workDate}"); - Report = await ReportRepo.GetReport(workDate); - Items = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); + Working = true; + Report = new ReportView(); + Activities = new List(); + Report = await ReportRepo.GetReport(workDate); + Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); await Storage.SetItemAsync($"{UserInfo.Id}-{Report.ReportData.ReportDate}", Report); Working = false; } + + public void Dispose() + { + Interceptor.DisposeEvent(); + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/OfficeReportListPage.razor.cs index b859771d..a9ee59cb 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportListPage.razor.cs @@ -46,6 +46,7 @@ public partial class OfficeReportListPage : IDisposable var reports = await ReportRepo.GetReports(UserId); if (reports.Any()) ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); + Working = false; } /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/OfficeReportViewPage.razor index 55494943..5e10ef73 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor @@ -21,9 +21,9 @@ @page "/office/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}" @attribute [Authorize(Roles = "Admin")] -
+
- +
@@ -36,49 +36,38 @@
-@if (ThisTarget is PTarget.Report or PTarget.All) -{ -
- @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) - { - @Report.ReportData.Name -
-
-

@Report.ReportData.Name

-
-
-
-
- -
-
- -
-
- - - } - else - { -
-
Ingen data
-
- } -
-} - -@if (ThisTarget is PTarget.Order or PTarget.All) -{ - if (Activities.Any()) +
+ @if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { - foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) - { - - } + @Report.ReportData.Name +
+
+

@Report.ReportData.Name

+
+
+
+
+ +
+
+ +
+
+ + + } + else + { +
+
Ingen rapport data
+
+ } +
+ +@if (Activities.Any()) +{ + foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) + { + } } - -@if (Working) -{ - -} diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index a8d4843f..6cb19e4d 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -76,58 +76,56 @@ public partial class OfficeReportViewPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await Task.Delay(100); - await FetchReport(ReportDate); - Working = false; + + await FetchUserReport(ReportDate); } - + private void Print(PTarget target) { - if (target == PTarget.Order) + var returnUrl = new Uri(Navigator.Uri).AbsolutePath; + switch (target) { - Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={Navigator.Uri}"); - return; + case PTarget.Order: + Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + break; + case PTarget.Report: + Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + break; + case PTarget.None: + break; + case PTarget.All: + break; + default: + throw new ArgumentOutOfRangeException(nameof(target), target, null); } - Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={Navigator.Uri}"); } /// /// Work date component event handler /// /// - private async Task FetchReport(string workDate) + private async Task FetchUserReport(string workDate) { - var returnUrl = new Uri(Navigator.Uri).AbsolutePath; if (workDate != ReportDate) { - Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}?returnUrl={returnUrl}"); + Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}"); + Working = false; return; } Working = true; Report = new ReportView(); Activities = new List(); - - Report = await FetchUserReport(UserId, workDate); + // fetch + Report = await ReportRepo.GetReport(UserId, workDate); + // assign activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); + // write to storage await Storage.SetItemAsync($"{UserId}-{ReportDate}", Report); + // hide indicator Working = false; } - - /// - /// Get report for user with entity Id for work date - /// - /// - /// - /// - private async Task FetchUserReport(string userId, string workDate) - { - Working = true; - var x = Report = await ReportRepo.GetReport(userId, workDate); - Working = false; - return x; - } - + public void Dispose() { Interceptor.DisposeEvent(); diff --git a/Wonky.Client/Pages/PrintOrdersPage.razor b/Wonky.Client/Pages/PrintOrdersPage.razor index 2ea578f5..29806c69 100644 --- a/Wonky.Client/Pages/PrintOrdersPage.razor +++ b/Wonky.Client/Pages/PrintOrdersPage.razor @@ -21,8 +21,11 @@ @attribute [Authorize(Roles = "Admin,Advisor")]
-
- +
+ Tilbage +
+
+
diff --git a/Wonky.Client/Pages/PrintReportPage.razor b/Wonky.Client/Pages/PrintReportPage.razor index e50aca41..2da2978a 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor +++ b/Wonky.Client/Pages/PrintReportPage.razor @@ -21,8 +21,11 @@ @attribute [Authorize(Roles = "Admin,Advisor")]
-
- +
+ Tilbage +
+
+
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index f9e55a2a..a69fba36 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.87.3", + "version": "0.87.4", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -34,7 +34,7 @@ }, "Logging": { "LogLevel": { - "Default": "Debug", + "Default": "Information", "System": "Information", "Microsoft": "Information" }, From 54815591affa1b77ba4c1d299e2cc11d0e153959 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 23 Dec 2022 17:57:56 +0100 Subject: [PATCH 3/8] wip --- .../Components/CatalogSortComponent.razor | 4 +- .../Components/CompanySortComponent.razor | 4 +- .../OfficeReportTableComponent.razor | 56 ++++++++------- .../Components/PageSizeComponent.razor | 12 ++-- .../Components/ReportListItemComponent.razor | 68 +++++++++++++++++++ .../Components/ReportTableComponent.razor | 6 +- .../Components/ReportTableComponent.razor.cs | 4 +- Wonky.Client/Helpers/Utils.cs | 2 +- ...tpRepository.cs => IUserHttpRepository.cs} | 2 +- ...ttpRepository.cs => UserHttpRepository.cs} | 6 +- Wonky.Client/Pages/CrmReportListPage.razor | 1 + Wonky.Client/Pages/CrmReportListPage.razor.cs | 6 +- Wonky.Client/Pages/CrmReportViewPage.razor | 8 +-- Wonky.Client/Pages/CrmReportViewPage.razor.cs | 35 +++++++--- .../Pages/OfficeOrderNewPage.razor.cs | 4 +- .../Pages/OfficeOrderViewPage.razor.cs | 2 +- Wonky.Client/Pages/OfficeReportListPage.razor | 2 +- .../Pages/OfficeReportListPage.razor.cs | 7 +- Wonky.Client/Pages/OfficeReportViewPage.razor | 6 +- .../Pages/OfficeReportViewPage.razor.cs | 37 ++++++---- .../Pages/OfficeUserListPage.razor.cs | 4 +- .../Pages/OfficeUserViewPage.razor.cs | 8 +-- ...tOrdersPage.razor => PrintOrderPage.razor} | 0 ...sPage.razor.cs => PrintOrderPage.razor.cs} | 6 +- Wonky.Client/Pages/PrintReportPage.razor.cs | 2 +- Wonky.Client/Program.cs | 2 +- Wonky.Client/wwwroot/appsettings.json | 4 +- 27 files changed, 203 insertions(+), 95 deletions(-) create mode 100644 Wonky.Client/Components/ReportListItemComponent.razor rename Wonky.Client/HttpInterfaces/{IOfficeUserHttpRepository.cs => IUserHttpRepository.cs} (96%) rename Wonky.Client/HttpRepository/{OfficeUserHttpRepository.cs => UserHttpRepository.cs} (93%) rename Wonky.Client/Pages/{PrintOrdersPage.razor => PrintOrderPage.razor} (100%) rename Wonky.Client/Pages/{PrintOrdersPage.razor.cs => PrintOrderPage.razor.cs} (93%) diff --git a/Wonky.Client/Components/CatalogSortComponent.razor b/Wonky.Client/Components/CatalogSortComponent.razor index dfc2d245..09dedc9b 100644 --- a/Wonky.Client/Components/CatalogSortComponent.razor +++ b/Wonky.Client/Components/CatalogSortComponent.razor @@ -17,6 +17,6 @@ \ No newline at end of file diff --git a/Wonky.Client/Components/CompanySortComponent.razor b/Wonky.Client/Components/CompanySortComponent.razor index d707cc07..4540f25c 100644 --- a/Wonky.Client/Components/CompanySortComponent.razor +++ b/Wonky.Client/Components/CompanySortComponent.razor @@ -17,6 +17,6 @@ \ No newline at end of file diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor b/Wonky.Client/Components/OfficeReportTableComponent.razor index 792126a3..161542fe 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor @@ -17,30 +17,33 @@ @using System.Globalization -@if (ReportList.Any()) -{ -
-
-
-
- Dato -
-
- Dag -
-
- Start -
-
- Slut -
-
- Resultat -
+
+
+
+
+ Dato +
+
+ Dag +
+
+ Start +
+
+ Slut +
+
+ Resultat
+
+ @if (ReportList.Any()) + { @foreach (var report in ReportList) { + + + @*
@@ -82,10 +85,11 @@
+ *@ } -
-} -else -{ -
Ingen data
-} \ No newline at end of file + } + else + { +
Ingen data
+ } +
\ No newline at end of file diff --git a/Wonky.Client/Components/PageSizeComponent.razor b/Wonky.Client/Components/PageSizeComponent.razor index 8ec20608..107d9d51 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor +++ b/Wonky.Client/Components/PageSizeComponent.razor @@ -16,12 +16,12 @@ *@ \ No newline at end of file diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor new file mode 100644 index 00000000..36a25c31 --- /dev/null +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -0,0 +1,68 @@ +@* +// Copyright (C) 2022 FCS Frede's Computer Services. +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as +// published by the Free Software Foundation, either version 3 of the +// License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] +// +*@ + +@using Wonky.Entity.Views + + +
+
+ @Report.ReportDate +
+
+ @{ + switch (Report.DayTypeEnum) + { + case "Sales": + Salgsdag + break; + case "SickLeave": + Sygdom + break; + case "Office": + Kontordag + break; + case "Meeting": + Salgsmøde + break; + case "Leave": + Ferie + break; + case "Supervisor": + Medkørende Supervisor + break; + } + } +
+
+ @(Report.DayTypeEnum == "Sales" ? Report.FromDateTime.Split(" ")[1] : Report.FromDateTime.Split(" ")[0]) +
+
+ @(Report.DayTypeEnum == "Sales" ? Report.ToDateTime.Split(" ")[1] : Report.ToDateTime.Split(" ")[0]) +
+
+ @Report.Turnover +
+
+ + +@code { + [Parameter] + public SalesReportListView Report { get; set; } = new(); + + [Parameter] + public string ViewUrl { get; set; } = ""; +} \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 94b71be2..3c4822e8 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -35,10 +35,13 @@
- @if (_reports.Any()) + @if (Reports.Any()) { @foreach (var report in ReportList) { + + + @*
@@ -80,6 +83,7 @@
+ *@ } } else diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index f7646d44..3f1aa0ac 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -22,9 +22,9 @@ namespace Wonky.Client.Components; public partial class ReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); - private List _reports { get; set; } = new(); + private List Reports { get; set; } = new(); protected override void OnParametersSet() { - _reports = ReportList; + Reports = ReportList; } } \ No newline at end of file diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index c2996cb9..75c75119 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.Helpers; public static class Utils { - public static Dictionary ParseQueryString(string query) + public static Dictionary ParseQuery(string query) { if (string.IsNullOrWhiteSpace(query) || query.Contains("://")) return new Dictionary(); diff --git a/Wonky.Client/HttpInterfaces/IOfficeUserHttpRepository.cs b/Wonky.Client/HttpInterfaces/IUserHttpRepository.cs similarity index 96% rename from Wonky.Client/HttpInterfaces/IOfficeUserHttpRepository.cs rename to Wonky.Client/HttpInterfaces/IUserHttpRepository.cs index d2844d5d..08f17f94 100644 --- a/Wonky.Client/HttpInterfaces/IOfficeUserHttpRepository.cs +++ b/Wonky.Client/HttpInterfaces/IUserHttpRepository.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpInterfaces; -public interface IOfficeUserHttpRepository +public interface IUserHttpRepository { Task> GetAdvisors(); Task GetAdvisorInfo(string userId); diff --git a/Wonky.Client/HttpRepository/OfficeUserHttpRepository.cs b/Wonky.Client/HttpRepository/UserHttpRepository.cs similarity index 93% rename from Wonky.Client/HttpRepository/OfficeUserHttpRepository.cs rename to Wonky.Client/HttpRepository/UserHttpRepository.cs index 697feecd..ab00e9dc 100644 --- a/Wonky.Client/HttpRepository/OfficeUserHttpRepository.cs +++ b/Wonky.Client/HttpRepository/UserHttpRepository.cs @@ -25,7 +25,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.HttpRepository; -public class OfficeUserHttpRepository : IOfficeUserHttpRepository +public class UserHttpRepository : IUserHttpRepository { private readonly JsonSerializerOptions? _options = new JsonSerializerOptions { @@ -33,11 +33,11 @@ public class OfficeUserHttpRepository : IOfficeUserHttpRepository }; private readonly NavigationManager _navigation; - private ILogger _logger; + private ILogger _logger; private readonly HttpClient _client; private readonly ApiConfig _api; - public OfficeUserHttpRepository(HttpClient client, ILogger logger, + public UserHttpRepository(HttpClient client, ILogger logger, NavigationManager navigation, IOptions configuration) { _client = client; diff --git a/Wonky.Client/Pages/CrmReportListPage.razor b/Wonky.Client/Pages/CrmReportListPage.razor index 14e316dd..21a967a9 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor +++ b/Wonky.Client/Pages/CrmReportListPage.razor @@ -23,6 +23,7 @@

Rapport Arkiv

+ diff --git a/Wonky.Client/Pages/CrmReportListPage.razor.cs b/Wonky.Client/Pages/CrmReportListPage.razor.cs index 73926284..bd9e739b 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportListPage.razor.cs @@ -24,7 +24,7 @@ namespace Wonky.Client.Pages; public partial class CrmReportListPage : IDisposable { - [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } + [Inject] public ICrmReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } private List ReportList { get; set; } = new(); @@ -34,8 +34,8 @@ public partial class CrmReportListPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - - ReportList = await CrmReportRepo.GetReports(); + await Task.Delay(1000); + ReportList = await ReportRepo.GetReports(); Working = false; } diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor b/Wonky.Client/Pages/CrmReportViewPage.razor index c3e058cc..a21e1d6a 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor +++ b/Wonky.Client/Pages/CrmReportViewPage.razor @@ -26,17 +26,17 @@
- +
- +
-
+
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { @Report.ReportData.Name @@ -57,7 +57,7 @@ else {
-
Ingen data
+
Ingen Rapport data
}
diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index 1dd7c486..0514ef0f 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -29,17 +29,19 @@ public partial class CrmReportViewPage : IDisposable [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new (); - private bool Working { get; set; } = true; + private bool Working { get; set; } private UserInfoView UserInfo { get; set; } = new(); - private string ReturnUrl { get; set; } = ""; - protected override async Task OnParametersSetAsync() + + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); UserInfo = await Storage.GetItemAsync("_xu"); - await FetchReport(ReportDate); + if(!string.IsNullOrWhiteSpace(ReportDate)) + await FetchReport(ReportDate); } private void Print(PTarget target) @@ -64,15 +66,32 @@ public partial class CrmReportViewPage : IDisposable } private async Task FetchReport(string workDate) { - if(workDate != ReportDate) - Navigator.NavigateTo($"/sales-reports/view/{workDate}"); + + // remove busy signal if report is empty + if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + Working = false; + // return if we are already at it + if (Working) + { + return; + } - Working = true; + // reset variables Report = new ReportView(); Activities = new List(); + // set busy signal + Working = true; + + // fetch report Report = await ReportRepo.GetReport(workDate); + // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); - await Storage.SetItemAsync($"{UserInfo.Id}-{Report.ReportData.ReportDate}", Report); + // store the report locally + if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + { + await Storage.SetItemAsync($"{UserInfo.Id}-{Report.ReportData.ReportDate}", Report); + } + // remove busy signal Working = false; } diff --git a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs index aed4abc8..18f458a9 100644 --- a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs @@ -34,7 +34,7 @@ public partial class OfficeOrderNewPage : IDisposable [Parameter] public string CompanyId { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository OfficeCustomerRepo { get; set; } - [Inject] public IOfficeUserHttpRepository OfficeUserRepo { get; set; } + [Inject] public IUserHttpRepository UserRepo { get; set; } [Inject] public ICatalogHttpRepository CatalogRepo { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ILogger Logger { get; set; } @@ -69,7 +69,7 @@ public partial class OfficeOrderNewPage : IDisposable _editContext.OnFieldChanged += HandleFieldChanged; _editContext.OnValidationStateChanged += ValidationChanged; - _userInfo = await OfficeUserRepo.GetAdvisorInfo(_company.SalesRepId); + _userInfo = await UserRepo.GetAdvisorInfo(_company.SalesRepId); _activity.ActivityDate = $"{DateTime.Now:yyyy-MM-dd}" ; diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index bd9029b7..833f3b8c 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -38,7 +38,7 @@ public partial class OfficeOrderViewPage : IDisposable [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; } [Inject] public ISendMailService MailService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public IOfficeUserHttpRepository UserRepo { get; set; } + [Inject] public IUserHttpRepository UserRepo { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toast { get; set; } private ReportItemView _reportItem { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor b/Wonky.Client/Pages/OfficeReportListPage.razor index e9fddd8c..021c5888 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor +++ b/Wonky.Client/Pages/OfficeReportListPage.razor @@ -24,7 +24,7 @@
-

Rapport Arkiv

+

Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName

diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/OfficeReportListPage.razor.cs index a9ee59cb..eced59ff 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportListPage.razor.cs @@ -13,6 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Runtime.CompilerServices; using Microsoft.AspNetCore.Components; using Toolbelt.Blazor; using Wonky.Client.HttpInterceptors; @@ -28,21 +29,25 @@ public partial class OfficeReportListPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; [Inject] public IOfficeReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IUserHttpRepository UserRepo { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; + private WebUserInfoView UserInfo { get; set; } = new(); protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - + await Task.Delay(1000); + UserInfo = await UserRepo.GetAdvisorInfo(UserId); await FetchReports(); Working = false; } private async Task FetchReports() { + await Task.Delay(1000); var reports = await ReportRepo.GetReports(UserId); if (reports.Any()) ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/OfficeReportViewPage.razor index 5e10ef73..6aeb9632 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor @@ -26,17 +26,17 @@
- +
- +
-
+
@if (!string.IsNullOrWhiteSpace(Report.ReportData.DayTypeEnum)) { @Report.ReportData.Name diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index 6cb19e4d..919e6650 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -59,16 +59,16 @@ public partial class OfficeReportViewPage : IDisposable ///
[Inject] public NavigationManager Navigator { get; set; } - + /// + /// Logger service + /// [Inject] public ILogger Logger { get; set; } + /// + /// Storage service + /// [Inject] public ILocalStorageService Storage { get; set; } - /// - /// Report to render - /// private ReportView Report { get; set; } = new(); - - private PTarget ThisTarget { get; set; } = PTarget.All; private List Activities { get; set; } = new(); private bool Working { get; set; } = true; @@ -106,23 +106,30 @@ public partial class OfficeReportViewPage : IDisposable /// private async Task FetchUserReport(string workDate) { - if (workDate != ReportDate) - { - Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}"); + // remove busy signal if report is empty + if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) Working = false; + // return if we are already at it + if (Working) + { return; } - - Working = true; + + // reset variables Report = new ReportView(); Activities = new List(); + // set busy signal + Working = true; // fetch Report = await ReportRepo.GetReport(UserId, workDate); - // assign activities + // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); - // write to storage - await Storage.SetItemAsync($"{UserId}-{ReportDate}", Report); - // hide indicator + // store locally + if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + { + await Storage.SetItemAsync($"{UserId}-{Report.ReportData.ReportDate}", Report); + } + // remove busy signal Working = false; } diff --git a/Wonky.Client/Pages/OfficeUserListPage.razor.cs b/Wonky.Client/Pages/OfficeUserListPage.razor.cs index 9e466473..69c76f30 100644 --- a/Wonky.Client/Pages/OfficeUserListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserListPage.razor.cs @@ -26,7 +26,7 @@ public partial class OfficeUserListPage : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IOfficeUserHttpRepository OfficeUserRepo { get; set; } + [Inject] public IUserHttpRepository UserRepo { get; set; } private List _salesReps { get; set; } = new(); private bool Working { get; set; } = true; @@ -35,7 +35,7 @@ public partial class OfficeUserListPage : IDisposable { _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - var AdvisorList = await OfficeUserRepo.GetAdvisors(); + var AdvisorList = await UserRepo.GetAdvisors(); _salesReps = AdvisorList .Where(x => x.CountryCode.ToLower() == CountryCode && Convert.ToInt32(x.SalesRep) < 100) .ToList(); diff --git a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserViewPage.razor.cs index b64d57e8..18ca1e1b 100644 --- a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserViewPage.razor.cs @@ -31,7 +31,7 @@ public partial class OfficeUserViewPage : IDisposable [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public IOfficeUserHttpRepository OfficeUserRepo { get; set; } + [Inject] public IUserHttpRepository UserRepo { get; set; } [Inject] public ILogger _logger { get; set; } [Inject] public NavigationManager _navigator { get; set; } [Inject] public IToastService _toast { get; set; } @@ -56,7 +56,7 @@ public partial class OfficeUserViewPage : IDisposable _interceptor.RegisterEvent(); _interceptor.RegisterBeforeSendEvent(); - _userInfo = await OfficeUserRepo.GetAdvisorInfo(UserId); + _userInfo = await UserRepo.GetAdvisorInfo(UserId); _updateInfo.Email = _userInfo.Email; _updateInfo.CountryCode = _userInfo.CountryCode; @@ -75,7 +75,7 @@ public partial class OfficeUserViewPage : IDisposable { Working = true; _toast.ShowInfo("Sender data til server ..."); - await OfficeUserRepo.UpdateAdvisor(UserId, _updateInfo); + await UserRepo.UpdateAdvisor(UserId, _updateInfo); Working = false; } @@ -103,7 +103,7 @@ public partial class OfficeUserViewPage : IDisposable if (Working) return; Working = true; - await OfficeUserRepo.ResetUserPassword(UserId, _passwords.NewPassword, _passwords.ConfirmPassword); + await UserRepo.ResetUserPassword(UserId, _passwords.NewPassword, _passwords.ConfirmPassword); _toast.ShowInfo("Password er nulstillet."); _passwords.NewPassword = ""; _passwords.ConfirmPassword = ""; diff --git a/Wonky.Client/Pages/PrintOrdersPage.razor b/Wonky.Client/Pages/PrintOrderPage.razor similarity index 100% rename from Wonky.Client/Pages/PrintOrdersPage.razor rename to Wonky.Client/Pages/PrintOrderPage.razor diff --git a/Wonky.Client/Pages/PrintOrdersPage.razor.cs b/Wonky.Client/Pages/PrintOrderPage.razor.cs similarity index 93% rename from Wonky.Client/Pages/PrintOrdersPage.razor.cs rename to Wonky.Client/Pages/PrintOrderPage.razor.cs index 691b0fdc..16c4b127 100644 --- a/Wonky.Client/Pages/PrintOrdersPage.razor.cs +++ b/Wonky.Client/Pages/PrintOrderPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class PrintOrdersPage +public partial class PrintOrderPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -29,7 +29,7 @@ public partial class PrintOrdersPage [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } @@ -46,7 +46,7 @@ public partial class PrintOrdersPage protected override async Task OnInitializedAsync() { var uri = new Uri(Navigator.Uri); - var query = Utils.ParseQueryString(uri.Query[1..]); + var query = Utils.ParseQuery(uri.Query[1..]); ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); diff --git a/Wonky.Client/Pages/PrintReportPage.razor.cs b/Wonky.Client/Pages/PrintReportPage.razor.cs index 0b62eb54..23896727 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportPage.razor.cs @@ -38,7 +38,7 @@ public partial class PrintReportPage protected override async Task OnInitializedAsync() { var uri = new Uri(Navigator.Uri); - var query = Utils.ParseQueryString(uri.Query[1..]); + var query = Utils.ParseQuery(uri.Query[1..]); ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index bfd0f7c3..9f7b4002 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -62,7 +62,7 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); // administrative repositories -builder.Services.AddScoped(); +builder.Services.AddScoped(); builder.Services.AddScoped(); builder.Services.AddScoped(); // warehouse repository diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index a69fba36..c24088be 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.87.4", + "version": "0.87.7", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -34,7 +34,7 @@ }, "Logging": { "LogLevel": { - "Default": "Information", + "Default": "Debug", "System": "Information", "Microsoft": "Information" }, From b88a5a37a5b19098b44f74dabd7c3b5af6c1f5a6 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 27 Dec 2022 13:06:12 +0100 Subject: [PATCH 4/8] wip --- .../AdvisorActivityKmStartComponent.razor | 6 +- .../Components/CatalogGroupComponent.razor.cs | 2 +- .../CatalogSearchComponent.razor.cs | 10 +-- .../Components/CatalogSortComponent.razor.cs | 10 +-- .../CompanySearchColumnComponent.razor.cs | 10 +-- .../CompanySearchPhraseComponent.razor.cs | 8 +-- .../Components/CompanySortComponent.razor.cs | 10 +-- .../Components/LandingComponentAdmin.razor.cs | 4 +- .../LandingComponentAdvisor.razor.cs | 6 +- .../OfficeReportTableComponent.razor | 46 +------------- .../OfficeReportTableComponent.razor.cs | 5 ++ .../Components/PageSizeComponent.razor.cs | 10 +-- .../Components/ReportListItemComponent.razor | 15 +++-- .../Components/ReportTableComponent.razor | 2 +- .../Components/ReportTableComponent.razor.cs | 7 +++ .../Components/WorkDateComponent.razor.cs | 18 +++--- .../Pages/ActivityCreatePage.razor.cs | 6 +- .../Pages/ActivityListTodayPage.razor.cs | 4 +- Wonky.Client/Pages/CatalogPage.razor.cs | 4 +- Wonky.Client/Pages/CrmReportNewPage.razor.cs | 8 +-- Wonky.Client/Pages/CrmReportViewPage.razor.cs | 1 + .../Pages/CrmTaskItemListPage.razor.cs | 4 +- Wonky.Client/Pages/CustomerListPage.razor.cs | 4 +- .../Pages/OfficeCustomerListPage.razor.cs | 6 +- .../OfficeCustomerSalesRepListPage.razor.cs | 6 +- Wonky.Client/Pages/OfficeReportListPage.razor | 2 +- .../Pages/OfficeReportListPage.razor.cs | 20 +++--- Wonky.Client/Pages/OfficeReportViewPage.razor | 2 +- .../Pages/OfficeReportViewPage.razor.cs | 61 ++++++++++++++----- ...ntOrderPage.razor => PrintFrontPage.razor} | 2 +- ...rPage.razor.cs => PrintFrontPage.razor.cs} | 6 +- Wonky.Client/Pages/PrintReportPage.razor | 2 +- Wonky.Client/Pages/PrintReportPage.razor.cs | 2 +- Wonky.Client/Program.cs | 2 +- ...erPrefService.cs => UserProfileService.cs} | 4 +- Wonky.Client/Shared/PriceListModal.razor.cs | 4 +- Wonky.Client/wwwroot/appsettings.json | 2 +- .../wwwroot/scripts/document-event-load.js | 3 + Wonky.Client/wwwroot/scripts/print-invoke.js | 4 -- 39 files changed, 165 insertions(+), 163 deletions(-) rename Wonky.Client/Pages/{PrintOrderPage.razor => PrintFrontPage.razor} (96%) rename Wonky.Client/Pages/{PrintOrderPage.razor.cs => PrintFrontPage.razor.cs} (94%) rename Wonky.Client/Services/{UserPrefService.cs => UserProfileService.cs} (97%) create mode 100644 Wonky.Client/wwwroot/scripts/document-event-load.js diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index 14309ff6..242a2670 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -8,19 +8,19 @@ @code { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private int KmMorning { get; set; } private UserPref Prefs { get; set; } = new(); protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); KmMorning = Prefs.KmMorning; } private async Task OnKmChanged() { - await PrefService.SetKmMorning(KmMorning); + await ProfileService.SetKmMorning(KmMorning); } } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index 785c5dc9..cd9a7b30 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -23,7 +23,7 @@ namespace Wonky.Client.Components; public partial class CatalogGroupComponent { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs index 6e6ba5a9..dee1c3a4 100644 --- a/Wonky.Client/Components/CatalogSearchComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSearchComponent : IDisposable /// /// User preference service /// - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged event callback @@ -46,8 +46,8 @@ public partial class CatalogSearchComponent : IDisposable /// protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SearchCol = Prefs.ItemSearch; await OnChanged.InvokeAsync(SearchCol); } @@ -61,7 +61,7 @@ public partial class CatalogSearchComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetItemSearch(val); + await ProfileService.SetItemSearch(val); } /// @@ -79,6 +79,6 @@ public partial class CatalogSearchComponent : IDisposable /// public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CatalogSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs index e48bee76..b009fb81 100644 --- a/Wonky.Client/Components/CatalogSortComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSortComponent : IDisposable /// /// User preference service /// - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged callback function @@ -46,8 +46,8 @@ public partial class CatalogSortComponent : IDisposable /// protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SortCol = Prefs.ItemSort; } @@ -60,7 +60,7 @@ public partial class CatalogSortComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetItemSort(val); + await ProfileService.SetItemSort(val); } /// @@ -78,6 +78,6 @@ public partial class CatalogSortComponent : IDisposable /// public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs b/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs index 78ebc20b..3b4777bb 100644 --- a/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs +++ b/Wonky.Client/Components/CompanySearchColumnComponent.razor.cs @@ -25,15 +25,15 @@ namespace Wonky.Client.Components; public partial class CompanySearchColumnComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs { get; set; } = new(); private string SearchCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SearchCol = Prefs.CompanySearch; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -41,7 +41,7 @@ public partial class CompanySearchColumnComponent : IDisposable var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetCompanySearch(val); + await ProfileService.SetCompanySearch(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -50,6 +50,6 @@ public partial class CompanySearchColumnComponent : IDisposable } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs index 10afcfd8..aceec932 100644 --- a/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/CompanySearchPhraseComponent.razor.cs @@ -25,12 +25,12 @@ namespace Wonky.Client.Components private Timer InputTimer { get; set; } = new(); private string SearchTerm { get; set; } = ""; private UserPref Prefs { get; set; } = new (); - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); SearchTerm = string.IsNullOrWhiteSpace(Prefs.CompanyFilterPhrase) ? "" : Prefs.CompanyFilterPhrase.Trim(); if(!string.IsNullOrWhiteSpace(SearchTerm)) @@ -41,13 +41,13 @@ namespace Wonky.Client.Components { InputTimer.Dispose(); SearchTerm = ""; - await PrefService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); await OnChanged.InvokeAsync(SearchTerm); } private async Task OnSearchChanged() { - await PrefService.SetCompanyFilterPhrase(SearchTerm.Trim()); + await ProfileService.SetCompanyFilterPhrase(SearchTerm.Trim()); InputTimer.Dispose(); InputTimer = new Timer(500); InputTimer.AutoReset = false; diff --git a/Wonky.Client/Components/CompanySortComponent.razor.cs b/Wonky.Client/Components/CompanySortComponent.razor.cs index b04beff9..045ce0d7 100644 --- a/Wonky.Client/Components/CompanySortComponent.razor.cs +++ b/Wonky.Client/Components/CompanySortComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components public partial class CompanySortComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); private string SortCol { get; set; } = "name"; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); SortCol = Prefs.CompanySort; } private async Task OnSelectionChanged(ChangeEventArgs e) @@ -40,7 +40,7 @@ namespace Wonky.Client.Components var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetCompanySort(val); + await ProfileService.SetCompanySort(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -49,7 +49,7 @@ namespace Wonky.Client.Components } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } } diff --git a/Wonky.Client/Components/LandingComponentAdmin.razor.cs b/Wonky.Client/Components/LandingComponentAdmin.razor.cs index 3fd7eaf5..a342cae0 100644 --- a/Wonky.Client/Components/LandingComponentAdmin.razor.cs +++ b/Wonky.Client/Components/LandingComponentAdmin.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentAdmin : IDisposable { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -52,7 +52,7 @@ public partial class LandingComponentAdmin : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); if(!string.IsNullOrWhiteSpace(Prefs.WorkDate)) WordDate = Prefs.WorkDate; diff --git a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs index 1c54bb5b..c471c4fd 100644 --- a/Wonky.Client/Components/LandingComponentAdvisor.razor.cs +++ b/Wonky.Client/Components/LandingComponentAdvisor.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class LandingComponentAdvisor : IDisposable { - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Inteceptor { get; set; } [Inject] public IToastService Toaster { get; set; } @@ -51,7 +51,7 @@ public partial class LandingComponentAdvisor : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); SelectedDate = string.IsNullOrWhiteSpace(Prefs.WorkDate) ? DateTime.Now : DateTime.Parse(Prefs.WorkDate); Inteceptor.RegisterEvent(); @@ -68,7 +68,7 @@ public partial class LandingComponentAdvisor : IDisposable private async Task OnCompleteTask(string taskItemId) { - await PrefService.SetWorkDate(DateTime.Now); + await ProfileService.SetWorkDate(DateTime.Now); var item = TaskItems.Find(x => x.TaskItemId == taskItemId); Navigator.NavigateTo($"/companies/{item.ReferenceId}/activities/new"); } diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor b/Wonky.Client/Components/OfficeReportTableComponent.razor index 161542fe..a27ccb29 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor @@ -41,51 +41,7 @@ { @foreach (var report in ReportList) { - - - @* - -
-
- @report.ReportDate -
-
- @{ - switch (report.DayTypeEnum) - { - case "Sales": - Salgsdag - break; - case "SickLeave": - Sygdom - break; - case "Office": - Kontordag - break; - case "Meeting": - Salgsmøde - break; - case "Leave": - Ferie - break; - case "Supervisor": - Supervisor - break; - } - } -
-
- @(report.DayTypeEnum == "Sales" ? report.FromDateTime.Split(" ")[1] : report.FromDateTime.Split(" ")[0]) -
-
- @(report.DayTypeEnum == "Sales" ? report.ToDateTime.Split(" ")[1] : report.ToDateTime.Split(" ")[0]) -
-
- @report.Turnover.ToString(CultureInfo.CurrentUICulture) -
-
- - *@ + } } else diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs index 5f21c66e..88ad540b 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportTableComponent.razor.cs @@ -23,4 +23,9 @@ public partial class OfficeReportTableComponent [Parameter] public List ReportList { get; set; } = new(); [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public EventCallback OnShowReport { get; set; } + private void ShowThisReport(string reportDate) + { + OnShowReport.InvokeAsync(reportDate); + } } \ No newline at end of file diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index e3318c70..62f3fe9d 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -24,15 +24,15 @@ namespace Wonky.Client.Components public partial class PageSizeComponent : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserPref Prefs = new(); private string PageSize { get; set; } = ""; protected override async Task OnInitializedAsync() { - PrefService.OnChange += ProfileServiceOnOnChange; - Prefs = await PrefService.GetPreferences(); + ProfileService.OnChange += ProfileServiceOnOnChange; + Prefs = await ProfileService.GetPreferences(); PageSize = Prefs.PageSize; } private async Task OnSelectChanged(ChangeEventArgs e) @@ -40,7 +40,7 @@ namespace Wonky.Client.Components var val = e.Value.ToString(); if (val == "-1") return; await OnChanged.InvokeAsync(val); - await PrefService.SetPageSize(val); + await ProfileService.SetPageSize(val); } private void ProfileServiceOnOnChange(UserPref newUserPref) { @@ -49,7 +49,7 @@ namespace Wonky.Client.Components } public void Dispose() { - PrefService.OnChange -= ProfileServiceOnOnChange; + ProfileService.OnChange -= ProfileServiceOnOnChange; } } } diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor index 36a25c31..9f85ef3d 100644 --- a/Wonky.Client/Components/ReportListItemComponent.razor +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -17,7 +17,8 @@ @using Wonky.Entity.Views - + @code { - [Parameter] - public SalesReportListView Report { get; set; } = new(); + [Parameter] public SalesReportListView Report { get; set; } = new(); + [Parameter] public EventCallback OnShowReport { get; set; } - [Parameter] - public string ViewUrl { get; set; } = ""; + private void ShowThisReport() + { + OnShowReport.InvokeAsync(Report.ReportDate); + } } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 3c4822e8..080da29f 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -39,7 +39,7 @@ { @foreach (var report in ReportList) { - + @* diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index 3f1aa0ac..5045f63b 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -22,9 +22,16 @@ namespace Wonky.Client.Components; public partial class ReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); + [Parameter] public EventCallback OnShowReport { get; set; } private List Reports { get; set; } = new(); protected override void OnParametersSet() { Reports = ReportList; } + + private void ShowThisReport(string reportDate) + { + OnShowReport.InvokeAsync(reportDate); + } + } \ No newline at end of file diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index 58e79de7..31964c32 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -28,7 +28,7 @@ public partial class WorkDateComponent : IDisposable /// User preference service /// [Inject] - public UserPrefService Prefs { get; set; } + public UserProfileService Profiles { get; set; } /// /// OnChanged callback function @@ -49,7 +49,7 @@ public partial class WorkDateComponent : IDisposable /// /// user preferences /// - private UserPref _prefs = new(); + private UserPref Prefs = new(); /// /// Component Initialization @@ -57,11 +57,11 @@ public partial class WorkDateComponent : IDisposable protected override async Task OnInitializedAsync() { WorkDateContext = new EditContext(SelectedDate); - Prefs.OnChange += ProfileServiceOnOnChange; - _prefs = await Prefs.GetPreferences(); - SelectedDate = string.IsNullOrWhiteSpace(_prefs.WorkDate) + Profiles.OnChange += ProfileServiceOnOnChange; + Prefs = await Profiles.GetPreferences(); + SelectedDate = string.IsNullOrWhiteSpace(Prefs.WorkDate) ? DateTime.Now - : DateTime.Parse(_prefs.WorkDate); + : DateTime.Parse(Prefs.WorkDate); } /// @@ -73,7 +73,7 @@ public partial class WorkDateComponent : IDisposable var x = DateTime.TryParse(e.Value.ToString(), out var setDate); if (x) { - await Prefs.SetWorkDate(setDate); + await Profiles.SetWorkDate(setDate); await OnChangedCallback.InvokeAsync($"{setDate:yyyy-MM-dd}"); } } @@ -84,7 +84,7 @@ public partial class WorkDateComponent : IDisposable /// private void ProfileServiceOnOnChange(UserPref newUserPref) { - _prefs = newUserPref; + Prefs = newUserPref; StateHasChanged(); } @@ -93,6 +93,6 @@ public partial class WorkDateComponent : IDisposable /// public void Dispose() { - Prefs.OnChange -= ProfileServiceOnOnChange; + Profiles.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor.cs b/Wonky.Client/Pages/ActivityCreatePage.razor.cs index 42bfe47e..0a901ba1 100644 --- a/Wonky.Client/Pages/ActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/ActivityCreatePage.razor.cs @@ -39,7 +39,7 @@ public partial class ActivityCreatePage : IDisposable // Services [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService Prefs { get; set; } + [Inject] public UserProfileService Profiles { get; set; } [Inject] public IToastService Toast { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } @@ -93,7 +93,7 @@ public partial class ActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // User Preferences - UserPrefs = await Prefs.GetPreferences(); + UserPrefs = await Profiles.GetPreferences(); // User Info ThisUserInfo = await Storage.GetItemAsync("_xu"); // Fetch Customer from http @@ -225,7 +225,7 @@ public partial class ActivityCreatePage : IDisposable /// private async Task WorkDateConfirmCallback() { - await Prefs.SetDateConfirmed(true); + await Profiles.SetDateConfirmed(true); ConfirmWorkDateModal.Hide(); StateHasChanged(); } diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs b/Wonky.Client/Pages/ActivityListTodayPage.razor.cs index 287372ee..ad562cb4 100644 --- a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs +++ b/Wonky.Client/Pages/ActivityListTodayPage.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Pages; public partial class ActivityListTodayPage : IDisposable { - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -44,7 +44,7 @@ public partial class ActivityListTodayPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); SelectedDate = string.IsNullOrWhiteSpace(UserPref.WorkDate) ? DateTime.Now : DateTime.Parse(UserPref.WorkDate); ReportExist = await CrmReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); await GetActivities($"{SelectedDate:yyyy-MM-dd}"); diff --git a/Wonky.Client/Pages/CatalogPage.razor.cs b/Wonky.Client/Pages/CatalogPage.razor.cs index 25823d68..da655145 100644 --- a/Wonky.Client/Pages/CatalogPage.razor.cs +++ b/Wonky.Client/Pages/CatalogPage.razor.cs @@ -34,7 +34,7 @@ public partial class CatalogPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public ICatalogHttpRepository ItemRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private List Items { get; set; } = new(); private MetaData MetaInfo { get; set; } = new(); private CatalogPagingParams PageParams = new(); @@ -44,7 +44,7 @@ public partial class CatalogPage : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); UserInfo = await Storage.GetItemAsync("_xu"); PageParams.CountryCode = UserInfo.CountryCode; diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs index 261e7a81..4304cdd4 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs @@ -30,7 +30,7 @@ namespace Wonky.Client.Pages; public partial class CrmReportNewPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -64,7 +64,7 @@ public partial class CrmReportNewPage : IDisposable ReportContext.OnFieldChanged += HandleFieldChanged; ReportContext.OnValidationStateChanged += ValidationChanged; - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); _workDate = DateTime.Now; if (!string.IsNullOrWhiteSpace(Prefs.WorkDate)) _workDate = DateTime.Parse(Prefs.WorkDate); @@ -134,9 +134,9 @@ public partial class CrmReportNewPage : IDisposable Toaster.ShowInfo($"{result.Message}", $"HTTP Status"); // reset km and date confirmation - await PrefService.SetKmMorning(0); + await ProfileService.SetKmMorning(0); // reset date confirmed - await PrefService.SetDateConfirmed(false); + await ProfileService.SetDateConfirmed(false); Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); } /// diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index 0514ef0f..d6ebc474 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -70,6 +70,7 @@ public partial class CrmReportViewPage : IDisposable // remove busy signal if report is empty if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) Working = false; + ReportDate = workDate; // return if we are already at it if (Working) { diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs index f492211b..e31a5d55 100644 --- a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs +++ b/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs @@ -27,7 +27,7 @@ namespace Wonky.Client.Pages; public partial class CrmTaskItemListPage : IDisposable { - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -41,7 +41,7 @@ public partial class CrmTaskItemListPage : IDisposable protected override async Task OnInitializedAsync() { - Prefs = await UserPrefService.GetPreferences(); + Prefs = await UserProfileService.GetPreferences(); if(!string.IsNullOrWhiteSpace(Prefs.WorkDate)) WorkDate = Prefs.WorkDate; diff --git a/Wonky.Client/Pages/CustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListPage.razor.cs index d791ec3e..e72368bb 100644 --- a/Wonky.Client/Pages/CustomerListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerListPage.razor.cs @@ -31,7 +31,7 @@ namespace Wonky.Client.Pages public partial class CustomerListPage : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public UserPrefService PrefService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } @@ -54,7 +54,7 @@ namespace Wonky.Client.Pages protected override async Task OnInitializedAsync() { // set preferences - Prefs = await PrefService.GetPreferences(); + Prefs = await ProfileService.GetPreferences(); UserInfo = await Storage.GetItemAsync("_xu"); PageParams.OrderBy = Prefs.CompanySort; PageParams.SearchColumn = Prefs.CompanySearch; diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs index ec6cf26c..d94f175f 100644 --- a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs @@ -30,7 +30,7 @@ public partial class OfficeCustomerListPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CompanyPagingParams _paging = new(); @@ -45,7 +45,7 @@ public partial class OfficeCustomerListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // set preferences - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; @@ -104,7 +104,7 @@ public partial class OfficeCustomerListPage : IDisposable if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { _savedSearch = searchTerm; - await UserPrefService.SetCompanyFilterPhrase(searchTerm.Trim()); + await UserProfileService.SetCompanyFilterPhrase(searchTerm.Trim()); } } diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs index be61ceef..e99d35d7 100644 --- a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs @@ -30,7 +30,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private List _companyList { get; set; } = new(); private MetaData _metaData { get; set; } = new(); private CompanyPagingParams _paging = new(); @@ -45,7 +45,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); // set preferences - UserPref = await UserPrefService.GetPreferences(); + UserPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; _paging.OrderBy = UserPref.CompanySort; _paging.SearchColumn = UserPref.CompanySearch; @@ -103,7 +103,7 @@ public partial class OfficeCustomerSalesRepListPage : IDisposable if (!string.IsNullOrWhiteSpace(searchTerm) && searchTerm.TrimEnd().Length > 2) { _savedSearch = searchTerm; - await UserPrefService.SetCompanyFilterPhrase(searchTerm.Trim()); + await UserProfileService.SetCompanyFilterPhrase(searchTerm.Trim()); } } diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor b/Wonky.Client/Pages/OfficeReportListPage.razor index 021c5888..246b0387 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor +++ b/Wonky.Client/Pages/OfficeReportListPage.razor @@ -29,7 +29,7 @@
- +
diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/OfficeReportListPage.razor.cs index eced59ff..9d022ae6 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportListPage.razor.cs @@ -30,30 +30,30 @@ public partial class OfficeReportListPage : IDisposable [Inject] public IOfficeReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IUserHttpRepository UserRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; private WebUserInfoView UserInfo { get; set; } = new(); - - protected override async Task OnInitializedAsync() + protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await Task.Delay(1000); - UserInfo = await UserRepo.GetAdvisorInfo(UserId); - await FetchReports(); - Working = false; - } - private async Task FetchReports() - { - await Task.Delay(1000); + UserInfo = await UserRepo.GetAdvisorInfo(UserId); var reports = await ReportRepo.GetReports(UserId); if (reports.Any()) ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); Working = false; } + private void ShowThisReport(string reportDate) + { + var uri = new Uri(Navigator.Uri); + var url = uri.AbsoluteUri; + Navigator.NavigateTo($"{url}/{reportDate}"); + } + /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources. public void Dispose() { diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/OfficeReportViewPage.razor index 6aeb9632..14eeb9c7 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor @@ -68,6 +68,6 @@ { foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) { - + } } diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index 919e6650..2857b46e 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.Models; +using Wonky.Client.Services; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -30,18 +31,17 @@ public partial class OfficeReportViewPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; - /// - /// Report date from url parameter - /// - [Parameter] - public string ReportDate { get; set; } = ""; - /// /// User entity Id from url parameter /// [Parameter] public string UserId { get; set; } = ""; + /// + /// Report Date + /// + [Parameter] + public string ReportDate { get; set; } = ""; /// /// Injected interceptor service /// @@ -59,37 +59,58 @@ public partial class OfficeReportViewPage : IDisposable /// [Inject] public NavigationManager Navigator { get; set; } + /// /// Logger service /// - [Inject] public ILogger Logger { get; set; } + [Inject] + public ILogger Logger { get; set; } + /// /// Storage service /// - [Inject] public ILocalStorageService Storage { get; set; } + [Inject] + public ILocalStorageService Storage { get; set; } + + /// + /// Preference service + /// + [Inject] + public UserProfileService ProfileService { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); private bool Working { get; set; } = true; + private UserPref Prefs = new(); + private string ReturnUrl = ""; protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); + await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); + + ProfileService.OnChange += ProfileServiceOnOnChange; + + //ReturnUrl = new Uri(Navigator.Uri).AbsolutePath.Replace($"/{ReportDate}", ""); + ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; + Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); + await FetchUserReport(ReportDate); } - + private void Print(PTarget target) { - var returnUrl = new Uri(Navigator.Uri).AbsolutePath; + + Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); switch (target) { case PTarget.Order: - Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.Report: - Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={returnUrl}"); + Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.None: break; @@ -108,13 +129,15 @@ public partial class OfficeReportViewPage : IDisposable { // remove busy signal if report is empty if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + { Working = false; + } + Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}", false, true); // return if we are already at it if (Working) { return; } - // reset variables Report = new ReportView(); Activities = new List(); @@ -127,14 +150,22 @@ public partial class OfficeReportViewPage : IDisposable // store locally if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { - await Storage.SetItemAsync($"{UserId}-{Report.ReportData.ReportDate}", Report); + await Storage.SetItemAsync($"{UserId}-{workDate}", Report); } // remove busy signal Working = false; } - + + private void ProfileServiceOnOnChange(UserPref userPref) + { + Prefs = userPref; + ReportDate = Prefs.WorkDate; + StateHasChanged(); + } + public void Dispose() { Interceptor.DisposeEvent(); + ProfileService.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/PrintOrderPage.razor b/Wonky.Client/Pages/PrintFrontPage.razor similarity index 96% rename from Wonky.Client/Pages/PrintOrderPage.razor rename to Wonky.Client/Pages/PrintFrontPage.razor index 29806c69..52f4714a 100644 --- a/Wonky.Client/Pages/PrintOrderPage.razor +++ b/Wonky.Client/Pages/PrintFrontPage.razor @@ -25,7 +25,7 @@ Tilbage
- +
diff --git a/Wonky.Client/Pages/PrintOrderPage.razor.cs b/Wonky.Client/Pages/PrintFrontPage.razor.cs similarity index 94% rename from Wonky.Client/Pages/PrintOrderPage.razor.cs rename to Wonky.Client/Pages/PrintFrontPage.razor.cs index 16c4b127..db431e88 100644 --- a/Wonky.Client/Pages/PrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/PrintFrontPage.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class PrintOrderPage +public partial class PrintFrontPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -29,7 +29,7 @@ public partial class PrintOrderPage [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } @@ -47,7 +47,7 @@ public partial class PrintOrderPage { var uri = new Uri(Navigator.Uri); var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}"; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); Items = Report.ReportItems; diff --git a/Wonky.Client/Pages/PrintReportPage.razor b/Wonky.Client/Pages/PrintReportPage.razor index 2da2978a..b675231b 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor +++ b/Wonky.Client/Pages/PrintReportPage.razor @@ -25,7 +25,7 @@ Tilbage
- +
diff --git a/Wonky.Client/Pages/PrintReportPage.razor.cs b/Wonky.Client/Pages/PrintReportPage.razor.cs index 23896727..f3c7984a 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor.cs +++ b/Wonky.Client/Pages/PrintReportPage.razor.cs @@ -39,7 +39,7 @@ public partial class PrintReportPage { var uri = new Uri(Navigator.Uri); var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : query["returnUrl"]; + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}" ; Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); } diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index 9f7b4002..013ed6af 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -86,7 +86,7 @@ builder.Services.AddScoped(); // vat registry service builder.Services.AddScoped(); // preference service -builder.Services.AddScoped(); +builder.Services.AddScoped(); // activity draft service builder.Services.AddScoped(); diff --git a/Wonky.Client/Services/UserPrefService.cs b/Wonky.Client/Services/UserProfileService.cs similarity index 97% rename from Wonky.Client/Services/UserPrefService.cs rename to Wonky.Client/Services/UserProfileService.cs index 005e24c9..58a9ee32 100644 --- a/Wonky.Client/Services/UserPrefService.cs +++ b/Wonky.Client/Services/UserProfileService.cs @@ -29,11 +29,11 @@ public record UserPref public bool DateConfirmed { get; set; } } -public class UserPrefService +public class UserProfileService { private readonly ILocalStorageService _localStorageService; public event Action? OnChange; - public UserPrefService(ILocalStorageService localStorageService) + public UserProfileService(ILocalStorageService localStorageService) { _localStorageService = localStorageService; } diff --git a/Wonky.Client/Shared/PriceListModal.razor.cs b/Wonky.Client/Shared/PriceListModal.razor.cs index cd014c55..e33958fe 100644 --- a/Wonky.Client/Shared/PriceListModal.razor.cs +++ b/Wonky.Client/Shared/PriceListModal.razor.cs @@ -30,7 +30,7 @@ public partial class PriceListModal : IDisposable [Parameter] public EventCallback OnSelected { get; set; } [Inject] public ICatalogHttpRepository ItemRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public UserPrefService UserPrefService { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; @@ -41,7 +41,7 @@ public partial class PriceListModal : IDisposable protected override async Task OnInitializedAsync() { - _userPref = await UserPrefService.GetPreferences(); + _userPref = await UserProfileService.GetPreferences(); _paging.CountryCode = CountryCode; _paging.OrderBy = _userPref.ItemSort; _paging.SearchColumn = _userPref.ItemSearch; diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index c24088be..d5f9fe28 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -7,7 +7,7 @@ "image": "grumpy-coder.png" }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", diff --git a/Wonky.Client/wwwroot/scripts/document-event-load.js b/Wonky.Client/wwwroot/scripts/document-event-load.js new file mode 100644 index 00000000..ab266c8b --- /dev/null +++ b/Wonky.Client/wwwroot/scripts/document-event-load.js @@ -0,0 +1,3 @@ +document.addEventListener("load", function() { + window.print(); +}); diff --git a/Wonky.Client/wwwroot/scripts/print-invoke.js b/Wonky.Client/wwwroot/scripts/print-invoke.js index 7623b1e3..ebc0e783 100644 --- a/Wonky.Client/wwwroot/scripts/print-invoke.js +++ b/Wonky.Client/wwwroot/scripts/print-invoke.js @@ -1,7 +1,3 @@ export function printInvoke() { window.print(); } - -document.addEventListener("load", function() { - window.print(); -}); From 76ea8d8fbaebe9e034dd96093779f51257128998 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Thu, 29 Dec 2022 16:18:26 +0100 Subject: [PATCH 5/8] wip --- .../Components/ReportListItemComponent.razor | 10 ----- .../ReportListItemComponent.razor.cs | 15 +++++++ .../Components/ReportTableComponent.razor | 44 ------------------- .../Components/ReportTableComponent.razor.cs | 3 +- Wonky.Client/Models/PTarget.cs | 4 +- Wonky.Client/Pages/CrmReportListPage.razor | 7 ++- Wonky.Client/Pages/CrmReportListPage.razor.cs | 13 +++++- Wonky.Client/Pages/CrmReportViewPage.razor | 4 +- Wonky.Client/Pages/CrmReportViewPage.razor.cs | 44 +++++++++++++++---- .../Pages/OfficeReportListPage.razor.cs | 2 + Wonky.Client/Pages/OfficeReportViewPage.razor | 4 +- .../Pages/OfficeReportViewPage.razor.cs | 31 ++++++++----- Wonky.Client/Pages/PrintFrontPage.razor | 24 +++++++--- Wonky.Client/Pages/PrintFrontPage.razor.cs | 34 +++++++------- ...tReportPage.razor => PrintOrderPage.razor} | 29 ++++++------ ...tPage.razor.cs => PrintOrderPage.razor.cs} | 36 +++++++-------- Wonky.Client/wwwroot/appsettings.json | 2 +- 17 files changed, 164 insertions(+), 142 deletions(-) create mode 100644 Wonky.Client/Components/ReportListItemComponent.razor.cs rename Wonky.Client/Pages/{PrintReportPage.razor => PrintOrderPage.razor} (66%) rename Wonky.Client/Pages/{PrintReportPage.razor.cs => PrintOrderPage.razor.cs} (88%) diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor index 9f85ef3d..09786fe7 100644 --- a/Wonky.Client/Components/ReportListItemComponent.razor +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -59,13 +59,3 @@ - -@code { - [Parameter] public SalesReportListView Report { get; set; } = new(); - [Parameter] public EventCallback OnShowReport { get; set; } - - private void ShowThisReport() - { - OnShowReport.InvokeAsync(Report.ReportDate); - } -} \ No newline at end of file diff --git a/Wonky.Client/Components/ReportListItemComponent.razor.cs b/Wonky.Client/Components/ReportListItemComponent.razor.cs new file mode 100644 index 00000000..27b53bc9 --- /dev/null +++ b/Wonky.Client/Components/ReportListItemComponent.razor.cs @@ -0,0 +1,15 @@ +using Microsoft.AspNetCore.Components; +using Wonky.Entity.Views; + +namespace Wonky.Client.Components; + +public partial class ReportListItemComponent +{ + [Parameter] public SalesReportListView Report { get; set; } = new(); + [Parameter] public EventCallback OnShowReport { get; set; } + + private void ShowThisReport() + { + OnShowReport.InvokeAsync(Report.ReportDate); + } +} \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index 080da29f..368dd090 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -40,50 +40,6 @@ @foreach (var report in ReportList) { - - @* - -
-
- @report.ReportDate -
-
- @{ - switch (report.DayTypeEnum) - { - case "Sales": - Salgsdag - break; - case "SickLeave": - Sygdom - break; - case "Office": - Kontordag - break; - case "Meeting": - Salgsmøde - break; - case "Leave": - Ferie - break; - case "Supervisor": - Medkørende Supervisor - break; - } - } -
-
- @(report.DayTypeEnum == "Sales" ? report.FromDateTime.Split(" ")[1] : report.FromDateTime.Split(" ")[0]) -
-
- @(report.DayTypeEnum == "Sales" ? report.ToDateTime.Split(" ")[1] : report.ToDateTime.Split(" ")[0]) -
-
- @report.Turnover -
-
- - *@ } } else diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index 5045f63b..b33808cc 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -23,7 +23,9 @@ public partial class ReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); [Parameter] public EventCallback OnShowReport { get; set; } + private List Reports { get; set; } = new(); + protected override void OnParametersSet() { Reports = ReportList; @@ -33,5 +35,4 @@ public partial class ReportTableComponent { OnShowReport.InvokeAsync(reportDate); } - } \ No newline at end of file diff --git a/Wonky.Client/Models/PTarget.cs b/Wonky.Client/Models/PTarget.cs index 122d24d5..92df3749 100644 --- a/Wonky.Client/Models/PTarget.cs +++ b/Wonky.Client/Models/PTarget.cs @@ -4,6 +4,6 @@ public enum PTarget { None, All, - Report, - Order + FrontPage, + OrderPage } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmReportListPage.razor b/Wonky.Client/Pages/CrmReportListPage.razor index 21a967a9..c670e9df 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor +++ b/Wonky.Client/Pages/CrmReportListPage.razor @@ -18,14 +18,13 @@ @using Wonky.Client.Components @page "/sales-reports" -
+
-

Rapport Arkiv

+

Rapport Arkiv --- crmreportlistpage

- - + @if (Working) { diff --git a/Wonky.Client/Pages/CrmReportListPage.razor.cs b/Wonky.Client/Pages/CrmReportListPage.razor.cs index bd9e739b..10478479 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportListPage.razor.cs @@ -26,6 +26,8 @@ public partial class CrmReportListPage : IDisposable { [Inject] public ICrmReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ILogger Logger { get; set; } private List ReportList { get; set; } = new(); private bool Working { get; set; } = true; @@ -34,11 +36,20 @@ public partial class CrmReportListPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await Task.Delay(1000); + ReportList = await ReportRepo.GetReports(); + if (ReportList.Any()) + ReportList = ReportList.OrderByDescending(x => x.ReportDate).ToList(); + Working = false; } + private void ShowThisReport(string reportDate) + { + Logger.LogDebug("crmreportlistpage => showthisreport <= {}", reportDate); + Navigator.NavigateTo($"/sales-reports/view/{reportDate}"); + } + public void Dispose() { Interceptor.DisposeEvent(); diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor b/Wonky.Client/Pages/CrmReportViewPage.razor index a21e1d6a..e16b9608 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor +++ b/Wonky.Client/Pages/CrmReportViewPage.razor @@ -26,10 +26,10 @@
- +
- +
diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/CrmReportViewPage.razor.cs index d6ebc474..bac882f2 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportViewPage.razor.cs @@ -18,6 +18,7 @@ using Microsoft.AspNetCore.Components; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpInterfaces; using Wonky.Client.Models; +using Wonky.Client.Services; using Wonky.Entity.Views; namespace Wonky.Client.Pages; @@ -30,30 +31,40 @@ public partial class CrmReportViewPage : IDisposable [Inject] public ILocalStorageService Storage { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ILogger Logger { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + + private UserPref Prefs { get; set; } = new(); private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new (); private bool Working { get; set; } private UserInfoView UserInfo { get; set; } = new(); - + private string ReturnUrl = ""; + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); - Interceptor.RegisterBeforeSendEvent(); + Interceptor.RegisterBeforeSendEvent(); + UserInfo = await Storage.GetItemAsync("_xu"); + + ProfileService.OnChange += ProfileServiceOnOnChange; + await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); + if(!string.IsNullOrWhiteSpace(ReportDate)) await FetchReport(ReportDate); } private void Print(PTarget target) { - var returnUrl = new Uri(Navigator.Uri).AbsolutePath; + ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; + switch (target) { - case PTarget.Order: - Navigator.NavigateTo($"/print/orders/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={returnUrl}"); + case PTarget.OrderPage: + Navigator.NavigateTo($"/print/orders/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={ReturnUrl}"); break; - case PTarget.Report: - Navigator.NavigateTo($"/print/report/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={returnUrl}"); + case PTarget.FrontPage: + Navigator.NavigateTo($"/print/report/{UserInfo.CountryCode.ToLower()}/{UserInfo.Id}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.None: break; @@ -69,8 +80,13 @@ public partial class CrmReportViewPage : IDisposable // remove busy signal if report is empty if (string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) + { Working = false; - ReportDate = workDate; + } + + // ensure the browser address bar contains the correct link + Navigator.NavigateTo($"/sales-reports/view/{workDate}", false, true); + // return if we are already at it if (Working) { @@ -80,24 +96,36 @@ public partial class CrmReportViewPage : IDisposable // reset variables Report = new ReportView(); Activities = new List(); + // set busy signal Working = true; // fetch report Report = await ReportRepo.GetReport(workDate); + // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); + // store the report locally if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { await Storage.SetItemAsync($"{UserInfo.Id}-{Report.ReportData.ReportDate}", Report); } + // remove busy signal Working = false; } + private void ProfileServiceOnOnChange(UserPref userPref) + { + Prefs = userPref; + ReportDate = Prefs.WorkDate; + StateHasChanged(); + } + public void Dispose() { + ProfileService.OnChange -= ProfileServiceOnOnChange; Interceptor.DisposeEvent(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/OfficeReportListPage.razor.cs index 9d022ae6..6fd46f65 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportListPage.razor.cs @@ -41,9 +41,11 @@ public partial class OfficeReportListPage : IDisposable Interceptor.RegisterBeforeSendEvent(); UserInfo = await UserRepo.GetAdvisorInfo(UserId); + var reports = await ReportRepo.GetReports(UserId); if (reports.Any()) ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); + Working = false; } diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/OfficeReportViewPage.razor index 14eeb9c7..b0bcb0e4 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor @@ -26,10 +26,10 @@
- +
- +
diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs index 2857b46e..e40b6a9e 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeReportViewPage.razor.cs @@ -83,33 +83,28 @@ public partial class OfficeReportViewPage : IDisposable private bool Working { get; set; } = true; private UserPref Prefs = new(); private string ReturnUrl = ""; + private string PrintUrl = ""; protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); - ProfileService.OnChange += ProfileServiceOnOnChange; - - //ReturnUrl = new Uri(Navigator.Uri).AbsolutePath.Replace($"/{ReportDate}", ""); - ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; - Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); + await ProfileService.SetWorkDate(DateTime.Parse(ReportDate)); await FetchUserReport(ReportDate); } private void Print(PTarget target) { - - Logger.LogDebug("Print() => returnUrl <= {}", ReturnUrl); + ReturnUrl = new Uri(Navigator.Uri).AbsolutePath; switch (target) { - case PTarget.Order: + case PTarget.OrderPage: Navigator.NavigateTo($"/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; - case PTarget.Report: + case PTarget.FrontPage: Navigator.NavigateTo($"/print/report/{CountryCode}/{UserId}/{ReportDate}?returnUrl={ReturnUrl}"); break; case PTarget.None: @@ -132,34 +127,48 @@ public partial class OfficeReportViewPage : IDisposable { Working = false; } + + ReportDate = workDate; + + // ensure the browser address bar contains the correct link Navigator.NavigateTo($"/office/users/advisors/{CountryCode}/{UserId}/reports/{workDate}", false, true); + // return if we are already at it if (Working) { return; } + // reset variables Report = new ReportView(); Activities = new List(); + // set busy signal Working = true; - // fetch + + // fetch report Report = await ReportRepo.GetReport(UserId, workDate); + // extract activities Activities = Report.ReportItems.Where(x => x.Lines.Any()).ToList(); + // store locally if (!string.IsNullOrWhiteSpace(Report.ReportData.ReportDate)) { await Storage.SetItemAsync($"{UserId}-{workDate}", Report); } + // remove busy signal Working = false; } private void ProfileServiceOnOnChange(UserPref userPref) { + Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange"); Prefs = userPref; + Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange => Prefs.WorkDate <= {}", Prefs.WorkDate); ReportDate = Prefs.WorkDate; + StateHasChanged(); } diff --git a/Wonky.Client/Pages/PrintFrontPage.razor b/Wonky.Client/Pages/PrintFrontPage.razor index 52f4714a..b675231b 100644 --- a/Wonky.Client/Pages/PrintFrontPage.razor +++ b/Wonky.Client/Pages/PrintFrontPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@page "/print/orders/{CountryCode}/{UserId}/{ReportDate}" +@page "/print/report/{CountryCode}/{UserId}/{ReportDate}" @attribute [Authorize(Roles = "Admin,Advisor")]
@@ -29,7 +29,21 @@
-@foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) -{ - -} +
+ @Report.ReportData.Name +
+
+

@Report.ReportData.Name

+
+
+
+
+ +
+
+ +
+
+ + +
\ No newline at end of file diff --git a/Wonky.Client/Pages/PrintFrontPage.razor.cs b/Wonky.Client/Pages/PrintFrontPage.razor.cs index db431e88..11ccbd1a 100644 --- a/Wonky.Client/Pages/PrintFrontPage.razor.cs +++ b/Wonky.Client/Pages/PrintFrontPage.razor.cs @@ -13,6 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.Runtime.CompilerServices; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -21,7 +22,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class PrintFrontPage +public partial class PrintFrontPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -31,9 +32,18 @@ public partial class PrintFrontPage [Inject] private IJSRuntime JSRuntime { get; set; } [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); - private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; + + protected override async Task OnInitializedAsync() + { + var uri = new Uri(Navigator.Uri); + var query = Utils.ParseQuery(uri.Query[1..]); + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}" ; + + Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); + } + protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -42,27 +52,17 @@ public partial class PrintFrontPage .InvokeAsync("import", "/scripts/print-invoke.js"); } } - - protected override async Task OnInitializedAsync() - { - var uri = new Uri(Navigator.Uri); - var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}"; - - Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); - Items = Report.ReportItems; - } - + private async Task Print() { await JsModule.InvokeVoidAsync("printInvoke"); - - Navigator.NavigateTo(ReturnUrl); + + Navigator.NavigateTo(ReturnUrl); } - + /* * await Task.Delay(1000); * JS.InvokeVoidAsync("invokePrint"); * InvokeAsync(() => StateHasChanged()); - */ + */ } diff --git a/Wonky.Client/Pages/PrintReportPage.razor b/Wonky.Client/Pages/PrintOrderPage.razor similarity index 66% rename from Wonky.Client/Pages/PrintReportPage.razor rename to Wonky.Client/Pages/PrintOrderPage.razor index b675231b..b8503e6b 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor +++ b/Wonky.Client/Pages/PrintOrderPage.razor @@ -17,7 +17,7 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@page "/print/report/{CountryCode}/{UserId}/{ReportDate}" +@page "/print/orders/{CountryCode}/{UserId}/{ReportDate}" @attribute [Authorize(Roles = "Admin,Advisor")]
@@ -29,21 +29,18 @@
-
- @Report.ReportData.Name +@if (Items.Any(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) +{ + foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) + { + + } +} +else +{
-
-

@Report.ReportData.Name

+
+

Der er ingen ordrer til udskrivning

-
-
- -
-
- -
-
- - -
\ No newline at end of file +} diff --git a/Wonky.Client/Pages/PrintReportPage.razor.cs b/Wonky.Client/Pages/PrintOrderPage.razor.cs similarity index 88% rename from Wonky.Client/Pages/PrintReportPage.razor.cs rename to Wonky.Client/Pages/PrintOrderPage.razor.cs index f3c7984a..f42ceb12 100644 --- a/Wonky.Client/Pages/PrintReportPage.razor.cs +++ b/Wonky.Client/Pages/PrintOrderPage.razor.cs @@ -13,7 +13,6 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // -using System.Runtime.CompilerServices; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components; using Microsoft.JSInterop; @@ -22,7 +21,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class PrintReportPage +public partial class PrintOrderPage { [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -30,20 +29,11 @@ public partial class PrintReportPage [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] private IJSRuntime JSRuntime { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); + private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; - - protected override async Task OnInitializedAsync() - { - var uri = new Uri(Navigator.Uri); - var query = Utils.ParseQuery(uri.Query[1..]); - ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}/{ReportDate}" ; - - Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); - } - protected override async Task OnAfterRenderAsync(bool firstRender) { if (firstRender) @@ -52,17 +42,27 @@ public partial class PrintReportPage .InvokeAsync("import", "/scripts/print-invoke.js"); } } - + + protected override async Task OnInitializedAsync() + { + var uri = new Uri(Navigator.Uri); + var query = Utils.ParseQuery(uri.Query[1..]); + ReturnUrl = string.IsNullOrWhiteSpace(query["returnUrl"]) ? "/" : $"{query["returnUrl"]}"; + + Report = await Storage.GetItemAsync($"{UserId}-{ReportDate}"); + Items = Report.ReportItems; + } + private async Task Print() { await JsModule.InvokeVoidAsync("printInvoke"); - - Navigator.NavigateTo(ReturnUrl); - } + Navigator.NavigateTo(ReturnUrl); + } + /* * await Task.Delay(1000); * JS.InvokeVoidAsync("invokePrint"); * InvokeAsync(() => StateHasChanged()); - */ + */ } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index d5f9fe28..78892374 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.87.7", + "version": "0.90", "rc": true, "sandBox": false, "image": "grumpy-coder.png" From 3dd4a2fc618ccfbe1358d37fade3a8f0b096ecbf Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 30 Dec 2022 06:19:08 +0100 Subject: [PATCH 6/8] refactor naming in preparation for supervisor reporting --- ...mponent.razor => ActivityTableCrmComponent.razor} | 0 ...t.razor.cs => ActivityTableCrmComponent.razor.cs} | 2 +- ...azor => ReportActivityTableOfficeComponent.razor} | 0 ...s => ReportActivityTableOfficeComponent.razor.cs} | 2 +- ...Component.razor => ReportTableCrmComponent.razor} | 0 ...ent.razor.cs => ReportTableCrmComponent.razor.cs} | 2 +- ...ponent.razor => ReportTableOfficeComponent.razor} | 0 ....razor.cs => ReportTableOfficeComponent.razor.cs} | 2 +- ...yCreatePage.razor => ActivityCreateCrmPage.razor} | 0 ...ePage.razor.cs => ActivityCreateCrmPage.razor.cs} | 4 ++-- ...ListPage.razor => ActivityListCustomerPage.razor} | 0 ...ge.razor.cs => ActivityListCustomerPage.razor.cs} | 2 +- ...odayPage.razor => ActivityListTodayCrmPage.razor} | 2 +- ...ge.razor.cs => ActivityListTodayCrmPage.razor.cs} | 4 ++-- ...ivityViewPage.razor => ActivityViewCrmPage.razor} | 0 ...iewPage.razor.cs => ActivityViewCrmPage.razor.cs} | 4 ++-- ...dCreatePage.razor => CustomerCreateCrmPage.razor} | 0 ...ePage.razor.cs => CustomerCreateCrmPage.razor.cs} | 4 ++-- ...stPage.razor => CustomerInvoiceListCrmPage.razor} | 0 ....razor.cs => CustomerInvoiceListCrmPage.razor.cs} | 4 ++-- ...tomerListPage.razor => CustomerListCrmPage.razor} | 0 ...istPage.razor.cs => CustomerListCrmPage.razor.cs} | 2 +- ...erListPage.razor => CustomerListOfficePage.razor} | 0 ...Page.razor.cs => CustomerListOfficePage.razor.cs} | 4 ++-- ...stPage.razor => CustomerProductListCrmPage.razor} | 0 ....razor.cs => CustomerProductListCrmPage.razor.cs} | 4 ++-- ...tomerCardPage.razor => CustomerViewCrmPage.razor} | 0 ...ardPage.razor.cs => CustomerViewCrmPage.razor.cs} | 4 ++-- ...ItemViewPage.razor => KrvItemViewAdminPage.razor} | 0 ...ewPage.razor.cs => KrvItemViewAdminPage.razor.cs} | 2 +- ...Page.razor.css => KrvItemViewAdminPage.razor.css} | 0 ...rderNewPage.razor => OrderCreateOfficePage.razor} | 0 ...wPage.razor.cs => OrderCreateOfficePage.razor.cs} | 4 ++-- ...erListPage.razor => OrderListWarehousePage.razor} | 0 ...OrderViewPage.razor => OrderViewOfficePage.razor} | 0 ...iewPage.razor.cs => OrderViewOfficePage.razor.cs} | 4 ++-- ...wPage.razor.css => OrderViewOfficePage.razor.css} | 0 ...erViewPage.razor => OrderViewWarehousePage.razor} | 0 ...Page.razor.cs => OrderViewWarehousePage.razor.cs} | 4 ++-- Wonky.Client/Pages/PrintFrontPage.razor | 2 +- .../{QuoteListPage.razor => QuoteListCrmPage.razor} | 0 ...teListPage.razor.cs => QuoteListCrmPage.razor.cs} | 4 ++-- ...mReportListPage.razor => ReportListCrmPage.razor} | 10 +++++----- ...tListPage.razor.cs => ReportListCrmPage.razor.cs} | 6 +++--- ...portListPage.razor => ReportListOfficePage.razor} | 12 +++--------- ...stPage.razor.cs => ReportListOfficePage.razor.cs} | 2 +- ...CrmReportNewPage.razor => ReportNewCrmPage.razor} | 0 ...ortNewPage.razor.cs => ReportNewCrmPage.razor.cs} | 4 ++-- ...mReportViewPage.razor => ReportViewCrmPage.razor} | 2 +- ...tViewPage.razor.cs => ReportViewCrmPage.razor.cs} | 4 ++-- ...portViewPage.razor => ReportViewOfficePage.razor} | 2 +- ...ewPage.razor.cs => ReportViewOfficePage.razor.cs} | 4 ++-- ...kItemListPage.razor => TaskItemListCrmPage.razor} | 0 ...istPage.razor.cs => TaskItemListCrmPage.razor.cs} | 4 ++-- ...kItemViewPage.razor => TaskItemViewCrmPage.razor} | 0 ...iewPage.razor.cs => TaskItemViewCrmPage.razor.cs} | 2 +- ...ceUserListPage.razor => UserListOfficePage.razor} | 0 ...ListPage.razor.cs => UserListOfficePage.razor.cs} | 2 +- ...sRepListPage.razor => UserListSalesRepPage.razor} | 0 ...stPage.razor.cs => UserListSalesRepPage.razor.cs} | 4 ++-- ...ceUserViewPage.razor => UserViewOfficePage.razor} | 0 ...ViewPage.razor.cs => UserViewOfficePage.razor.cs} | 4 ++-- 62 files changed, 61 insertions(+), 67 deletions(-) rename Wonky.Client/Components/{AdvisorActivityTableComponent.razor => ActivityTableCrmComponent.razor} (100%) rename Wonky.Client/Components/{AdvisorActivityTableComponent.razor.cs => ActivityTableCrmComponent.razor.cs} (95%) rename Wonky.Client/Components/{OfficeActivityTableComponent.razor => ReportActivityTableOfficeComponent.razor} (100%) rename Wonky.Client/Components/{OfficeActivityTableComponent.razor.cs => ReportActivityTableOfficeComponent.razor.cs} (96%) rename Wonky.Client/Components/{ReportTableComponent.razor => ReportTableCrmComponent.razor} (100%) rename Wonky.Client/Components/{ReportTableComponent.razor.cs => ReportTableCrmComponent.razor.cs} (96%) rename Wonky.Client/Components/{OfficeReportTableComponent.razor => ReportTableOfficeComponent.razor} (100%) rename Wonky.Client/Components/{OfficeReportTableComponent.razor.cs => ReportTableOfficeComponent.razor.cs} (96%) rename Wonky.Client/Pages/{ActivityCreatePage.razor => ActivityCreateCrmPage.razor} (100%) rename Wonky.Client/Pages/{ActivityCreatePage.razor.cs => ActivityCreateCrmPage.razor.cs} (99%) rename Wonky.Client/Pages/{CustomerActivityListPage.razor => ActivityListCustomerPage.razor} (100%) rename Wonky.Client/Pages/{CustomerActivityListPage.razor.cs => ActivityListCustomerPage.razor.cs} (97%) rename Wonky.Client/Pages/{ActivityListTodayPage.razor => ActivityListTodayCrmPage.razor} (95%) rename Wonky.Client/Pages/{ActivityListTodayPage.razor.cs => ActivityListTodayCrmPage.razor.cs} (95%) rename Wonky.Client/Pages/{ActivityViewPage.razor => ActivityViewCrmPage.razor} (100%) rename Wonky.Client/Pages/{ActivityViewPage.razor.cs => ActivityViewCrmPage.razor.cs} (96%) rename Wonky.Client/Pages/{CustomerCardCreatePage.razor => CustomerCreateCrmPage.razor} (100%) rename Wonky.Client/Pages/{CustomerCardCreatePage.razor.cs => CustomerCreateCrmPage.razor.cs} (98%) rename Wonky.Client/Pages/{CustomerInvoiceListPage.razor => CustomerInvoiceListCrmPage.razor} (100%) rename Wonky.Client/Pages/{CustomerInvoiceListPage.razor.cs => CustomerInvoiceListCrmPage.razor.cs} (95%) rename Wonky.Client/Pages/{CustomerListPage.razor => CustomerListCrmPage.razor} (100%) rename Wonky.Client/Pages/{CustomerListPage.razor.cs => CustomerListCrmPage.razor.cs} (98%) rename Wonky.Client/Pages/{OfficeCustomerListPage.razor => CustomerListOfficePage.razor} (100%) rename Wonky.Client/Pages/{OfficeCustomerListPage.razor.cs => CustomerListOfficePage.razor.cs} (97%) rename Wonky.Client/Pages/{CustomerProductListPage.razor => CustomerProductListCrmPage.razor} (100%) rename Wonky.Client/Pages/{CustomerProductListPage.razor.cs => CustomerProductListCrmPage.razor.cs} (96%) rename Wonky.Client/Pages/{CustomerCardPage.razor => CustomerViewCrmPage.razor} (100%) rename Wonky.Client/Pages/{CustomerCardPage.razor.cs => CustomerViewCrmPage.razor.cs} (99%) rename Wonky.Client/Pages/{AdminKrvItemViewPage.razor => KrvItemViewAdminPage.razor} (100%) rename Wonky.Client/Pages/{AdminKrvItemViewPage.razor.cs => KrvItemViewAdminPage.razor.cs} (96%) rename Wonky.Client/Pages/{AdminKrvItemViewPage.razor.css => KrvItemViewAdminPage.razor.css} (100%) rename Wonky.Client/Pages/{OfficeOrderNewPage.razor => OrderCreateOfficePage.razor} (100%) rename Wonky.Client/Pages/{OfficeOrderNewPage.razor.cs => OrderCreateOfficePage.razor.cs} (98%) rename Wonky.Client/Pages/{WarehouseOrderListPage.razor => OrderListWarehousePage.razor} (100%) rename Wonky.Client/Pages/{OfficeOrderViewPage.razor => OrderViewOfficePage.razor} (100%) rename Wonky.Client/Pages/{OfficeOrderViewPage.razor.cs => OrderViewOfficePage.razor.cs} (97%) rename Wonky.Client/Pages/{OfficeOrderViewPage.razor.css => OrderViewOfficePage.razor.css} (100%) rename Wonky.Client/Pages/{WarehouseOrderViewPage.razor => OrderViewWarehousePage.razor} (100%) rename Wonky.Client/Pages/{WarehouseOrderViewPage.razor.cs => OrderViewWarehousePage.razor.cs} (96%) rename Wonky.Client/Pages/{QuoteListPage.razor => QuoteListCrmPage.razor} (100%) rename Wonky.Client/Pages/{QuoteListPage.razor.cs => QuoteListCrmPage.razor.cs} (96%) rename Wonky.Client/Pages/{CrmReportListPage.razor => ReportListCrmPage.razor} (80%) rename Wonky.Client/Pages/{CrmReportListPage.razor.cs => ReportListCrmPage.razor.cs} (91%) rename Wonky.Client/Pages/{OfficeReportListPage.razor => ReportListOfficePage.razor} (71%) rename Wonky.Client/Pages/{OfficeReportListPage.razor.cs => ReportListOfficePage.razor.cs} (97%) rename Wonky.Client/Pages/{CrmReportNewPage.razor => ReportNewCrmPage.razor} (100%) rename Wonky.Client/Pages/{CrmReportNewPage.razor.cs => ReportNewCrmPage.razor.cs} (98%) rename Wonky.Client/Pages/{CrmReportViewPage.razor => ReportViewCrmPage.razor} (97%) rename Wonky.Client/Pages/{CrmReportViewPage.razor.cs => ReportViewCrmPage.razor.cs} (97%) rename Wonky.Client/Pages/{OfficeReportViewPage.razor => ReportViewOfficePage.razor} (97%) rename Wonky.Client/Pages/{OfficeReportViewPage.razor.cs => ReportViewOfficePage.razor.cs} (97%) rename Wonky.Client/Pages/{CrmTaskItemListPage.razor => TaskItemListCrmPage.razor} (100%) rename Wonky.Client/Pages/{CrmTaskItemListPage.razor.cs => TaskItemListCrmPage.razor.cs} (95%) rename Wonky.Client/Pages/{CrmTaskItemViewPage.razor => TaskItemViewCrmPage.razor} (100%) rename Wonky.Client/Pages/{CrmTaskItemViewPage.razor.cs => TaskItemViewCrmPage.razor.cs} (97%) rename Wonky.Client/Pages/{OfficeUserListPage.razor => UserListOfficePage.razor} (100%) rename Wonky.Client/Pages/{OfficeUserListPage.razor.cs => UserListOfficePage.razor.cs} (97%) rename Wonky.Client/Pages/{OfficeCustomerSalesRepListPage.razor => UserListSalesRepPage.razor} (100%) rename Wonky.Client/Pages/{OfficeCustomerSalesRepListPage.razor.cs => UserListSalesRepPage.razor.cs} (96%) rename Wonky.Client/Pages/{OfficeUserViewPage.razor => UserViewOfficePage.razor} (100%) rename Wonky.Client/Pages/{OfficeUserViewPage.razor.cs => UserViewOfficePage.razor.cs} (97%) diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor b/Wonky.Client/Components/ActivityTableCrmComponent.razor similarity index 100% rename from Wonky.Client/Components/AdvisorActivityTableComponent.razor rename to Wonky.Client/Components/ActivityTableCrmComponent.razor diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs b/Wonky.Client/Components/ActivityTableCrmComponent.razor.cs similarity index 95% rename from Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs rename to Wonky.Client/Components/ActivityTableCrmComponent.razor.cs index 86ab9e50..336fa790 100644 --- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/ActivityTableCrmComponent.razor.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class AdvisorActivityTableComponent +public partial class ActivityTableCrmComponent { [Parameter] public List ActivityList { get; set; } = new(); [Inject] public NavigationManager Navigator { get; set; } diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor similarity index 100% rename from Wonky.Client/Components/OfficeActivityTableComponent.razor rename to Wonky.Client/Components/ReportActivityTableOfficeComponent.razor diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/OfficeActivityTableComponent.razor.cs rename to Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs index e9ea64e3..2246eb19 100644 --- a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportActivityTableOfficeComponent.razor.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class OfficeActivityTableComponent +public partial class ReportActivityTableOfficeComponent { [Parameter] public List ActivityList { get; set; } = new(); [Inject] public NavigationManager Navigator { get; set; } diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableCrmComponent.razor similarity index 100% rename from Wonky.Client/Components/ReportTableComponent.razor rename to Wonky.Client/Components/ReportTableCrmComponent.razor diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableCrmComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/ReportTableComponent.razor.cs rename to Wonky.Client/Components/ReportTableCrmComponent.razor.cs index b33808cc..fef1e042 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableCrmComponent.razor.cs @@ -19,7 +19,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class ReportTableComponent +public partial class ReportTableCrmComponent { [Parameter] public List ReportList { get; set; } = new(); [Parameter] public EventCallback OnShowReport { get; set; } diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor b/Wonky.Client/Components/ReportTableOfficeComponent.razor similarity index 100% rename from Wonky.Client/Components/OfficeReportTableComponent.razor rename to Wonky.Client/Components/ReportTableOfficeComponent.razor diff --git a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableOfficeComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/OfficeReportTableComponent.razor.cs rename to Wonky.Client/Components/ReportTableOfficeComponent.razor.cs index 88ad540b..0b29645a 100644 --- a/Wonky.Client/Components/OfficeReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableOfficeComponent.razor.cs @@ -18,7 +18,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class OfficeReportTableComponent +public partial class ReportTableOfficeComponent { [Parameter] public List ReportList { get; set; } = new(); [Parameter] public string UserId { get; set; } = ""; diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor b/Wonky.Client/Pages/ActivityCreateCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/ActivityCreatePage.razor rename to Wonky.Client/Pages/ActivityCreateCrmPage.razor diff --git a/Wonky.Client/Pages/ActivityCreatePage.razor.cs b/Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs similarity index 99% rename from Wonky.Client/Pages/ActivityCreatePage.razor.cs rename to Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs index 0a901ba1..75cb6ed2 100644 --- a/Wonky.Client/Pages/ActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/ActivityCreateCrmPage.razor.cs @@ -31,13 +31,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ActivityCreatePage : IDisposable +public partial class ActivityCreateCrmPage : IDisposable { // Parameters [CascadingParameter] DraftStateProvider DraftProvider { get; set; } [Parameter] public string CompanyId { get; set; } // Services - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserProfileService Profiles { get; set; } [Inject] public IToastService Toast { get; set; } diff --git a/Wonky.Client/Pages/CustomerActivityListPage.razor b/Wonky.Client/Pages/ActivityListCustomerPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerActivityListPage.razor rename to Wonky.Client/Pages/ActivityListCustomerPage.razor diff --git a/Wonky.Client/Pages/CustomerActivityListPage.razor.cs b/Wonky.Client/Pages/ActivityListCustomerPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/CustomerActivityListPage.razor.cs rename to Wonky.Client/Pages/ActivityListCustomerPage.razor.cs index c6d9eb78..c255395a 100644 --- a/Wonky.Client/Pages/CustomerActivityListPage.razor.cs +++ b/Wonky.Client/Pages/ActivityListCustomerPage.razor.cs @@ -25,7 +25,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CustomerActivityListPage : IDisposable +public partial class ActivityListCustomerPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor similarity index 95% rename from Wonky.Client/Pages/ActivityListTodayPage.razor rename to Wonky.Client/Pages/ActivityListTodayCrmPage.razor index a2c0a44f..68ee182a 100644 --- a/Wonky.Client/Pages/ActivityListTodayPage.razor +++ b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor @@ -40,7 +40,7 @@
@if (ReportStatusView.ReportItems.Any()) { - + } @if (Working) { diff --git a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs similarity index 95% rename from Wonky.Client/Pages/ActivityListTodayPage.razor.cs rename to Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs index ad562cb4..ee65739b 100644 --- a/Wonky.Client/Pages/ActivityListTodayPage.razor.cs +++ b/Wonky.Client/Pages/ActivityListTodayCrmPage.razor.cs @@ -25,10 +25,10 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ActivityListTodayPage : IDisposable +public partial class ActivityListTodayCrmPage : IDisposable { [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } diff --git a/Wonky.Client/Pages/ActivityViewPage.razor b/Wonky.Client/Pages/ActivityViewCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/ActivityViewPage.razor rename to Wonky.Client/Pages/ActivityViewCrmPage.razor diff --git a/Wonky.Client/Pages/ActivityViewPage.razor.cs b/Wonky.Client/Pages/ActivityViewCrmPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/ActivityViewPage.razor.cs rename to Wonky.Client/Pages/ActivityViewCrmPage.razor.cs index 068a48fe..32506389 100644 --- a/Wonky.Client/Pages/ActivityViewPage.razor.cs +++ b/Wonky.Client/Pages/ActivityViewCrmPage.razor.cs @@ -29,13 +29,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ActivityViewPage : IDisposable +public partial class ActivityViewCrmPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public NavigationManager Navigator { get; set; } private ReportItemView ReportItem { get; set; } = new(); diff --git a/Wonky.Client/Pages/CustomerCardCreatePage.razor b/Wonky.Client/Pages/CustomerCreateCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerCardCreatePage.razor rename to Wonky.Client/Pages/CustomerCreateCrmPage.razor diff --git a/Wonky.Client/Pages/CustomerCardCreatePage.razor.cs b/Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/CustomerCardCreatePage.razor.cs rename to Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs index 4597141f..06aa3abb 100644 --- a/Wonky.Client/Pages/CustomerCardCreatePage.razor.cs +++ b/Wonky.Client/Pages/CustomerCreateCrmPage.razor.cs @@ -37,10 +37,10 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages { - public partial class CustomerCardCreatePage : IDisposable + public partial class CustomerCreateCrmPage : IDisposable { [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } diff --git a/Wonky.Client/Pages/CustomerInvoiceListPage.razor b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerInvoiceListPage.razor rename to Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor diff --git a/Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs similarity index 95% rename from Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs rename to Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs index b23fb487..4e8731ed 100644 --- a/Wonky.Client/Pages/CustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerInvoiceListCrmPage.razor.cs @@ -11,7 +11,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CustomerInvoiceListPage : IDisposable +public partial class CustomerInvoiceListCrmPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } @@ -19,7 +19,7 @@ public partial class CustomerInvoiceListPage : IDisposable [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public ILocalStorageService Storage { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/CustomerListPage.razor b/Wonky.Client/Pages/CustomerListCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerListPage.razor rename to Wonky.Client/Pages/CustomerListCrmPage.razor diff --git a/Wonky.Client/Pages/CustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListCrmPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/CustomerListPage.razor.cs rename to Wonky.Client/Pages/CustomerListCrmPage.razor.cs index e72368bb..f99730a0 100644 --- a/Wonky.Client/Pages/CustomerListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerListCrmPage.razor.cs @@ -28,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages { - public partial class CustomerListPage : IDisposable + public partial class CustomerListCrmPage : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserProfileService ProfileService { get; set; } diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor b/Wonky.Client/Pages/CustomerListOfficePage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeCustomerListPage.razor rename to Wonky.Client/Pages/CustomerListOfficePage.razor diff --git a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs b/Wonky.Client/Pages/CustomerListOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeCustomerListPage.razor.cs rename to Wonky.Client/Pages/CustomerListOfficePage.razor.cs index d94f175f..60f5345c 100644 --- a/Wonky.Client/Pages/OfficeCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerListOfficePage.razor.cs @@ -22,12 +22,12 @@ using Wonky.Entity.Requests; namespace Wonky.Client.Pages; -public partial class OfficeCustomerListPage : IDisposable +public partial class CustomerListOfficePage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } [Inject] public UserProfileService UserProfileService { get; set; } diff --git a/Wonky.Client/Pages/CustomerProductListPage.razor b/Wonky.Client/Pages/CustomerProductListCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerProductListPage.razor rename to Wonky.Client/Pages/CustomerProductListCrmPage.razor diff --git a/Wonky.Client/Pages/CustomerProductListPage.razor.cs b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/CustomerProductListPage.razor.cs rename to Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs index 50428004..f44b95f9 100644 --- a/Wonky.Client/Pages/CustomerProductListPage.razor.cs +++ b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs @@ -27,14 +27,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CustomerProductListPage : IDisposable +public partial class CustomerProductListCrmPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } private CompanyDto Company { get; set; } = new(); private List Inventory { get; set; } = new(); diff --git a/Wonky.Client/Pages/CustomerCardPage.razor b/Wonky.Client/Pages/CustomerViewCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CustomerCardPage.razor rename to Wonky.Client/Pages/CustomerViewCrmPage.razor diff --git a/Wonky.Client/Pages/CustomerCardPage.razor.cs b/Wonky.Client/Pages/CustomerViewCrmPage.razor.cs similarity index 99% rename from Wonky.Client/Pages/CustomerCardPage.razor.cs rename to Wonky.Client/Pages/CustomerViewCrmPage.razor.cs index 3b485028..593bf8fc 100644 --- a/Wonky.Client/Pages/CustomerCardPage.razor.cs +++ b/Wonky.Client/Pages/CustomerViewCrmPage.razor.cs @@ -31,11 +31,11 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CustomerCardPage : IDisposable +public partial class CustomerViewCrmPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Inject] public IToastService Toaster { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ICrmCompanyHttpRepository CompanyRepo { get; set; } [Inject] public ICrmHistoryHttpRepository HistoryRepo { get; set; } diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor b/Wonky.Client/Pages/KrvItemViewAdminPage.razor similarity index 100% rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs index 55c67be5..70819c02 100644 --- a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.cs +++ b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.cs @@ -24,7 +24,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdminKrvItemViewPage : IDisposable +public partial class KrvItemViewAdminPage : IDisposable { [Parameter] public string SalesItemId { get; set; } = ""; private SalesItemView _item { get; set; } = new (); diff --git a/Wonky.Client/Pages/AdminKrvItemViewPage.razor.css b/Wonky.Client/Pages/KrvItemViewAdminPage.razor.css similarity index 100% rename from Wonky.Client/Pages/AdminKrvItemViewPage.razor.css rename to Wonky.Client/Pages/KrvItemViewAdminPage.razor.css diff --git a/Wonky.Client/Pages/OfficeOrderNewPage.razor b/Wonky.Client/Pages/OrderCreateOfficePage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeOrderNewPage.razor rename to Wonky.Client/Pages/OrderCreateOfficePage.razor diff --git a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs b/Wonky.Client/Pages/OrderCreateOfficePage.razor.cs similarity index 98% rename from Wonky.Client/Pages/OfficeOrderNewPage.razor.cs rename to Wonky.Client/Pages/OrderCreateOfficePage.razor.cs index 18f458a9..cf85067e 100644 --- a/Wonky.Client/Pages/OfficeOrderNewPage.razor.cs +++ b/Wonky.Client/Pages/OrderCreateOfficePage.razor.cs @@ -28,7 +28,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeOrderNewPage : IDisposable +public partial class OrderCreateOfficePage : IDisposable { [CascadingParameter] DraftStateProvider DraftStateProvider { get; set; } [Parameter] public string CompanyId { get; set; } @@ -37,7 +37,7 @@ public partial class OfficeOrderNewPage : IDisposable [Inject] public IUserHttpRepository UserRepo { get; set; } [Inject] public ICatalogHttpRepository CatalogRepo { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private ActivityDto _activity { get; set; } = new(); private EditContext _editContext { get; set; } diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor b/Wonky.Client/Pages/OrderListWarehousePage.razor similarity index 100% rename from Wonky.Client/Pages/WarehouseOrderListPage.razor rename to Wonky.Client/Pages/OrderListWarehousePage.razor diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OrderViewOfficePage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeOrderViewPage.razor rename to Wonky.Client/Pages/OrderViewOfficePage.razor diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OrderViewOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeOrderViewPage.razor.cs rename to Wonky.Client/Pages/OrderViewOfficePage.razor.cs index 833f3b8c..d22868ed 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OrderViewOfficePage.razor.cs @@ -30,7 +30,7 @@ using Wonky.Client.Services; namespace Wonky.Client.Pages; -public partial class OfficeOrderViewPage : IDisposable +public partial class OrderViewOfficePage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; @@ -39,7 +39,7 @@ public partial class OfficeOrderViewPage : IDisposable [Inject] public ISendMailService MailService { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public IUserHttpRepository UserRepo { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toast { get; set; } private ReportItemView _reportItem { get; set; } = new(); private bool _isNotified { get; set; } diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.css b/Wonky.Client/Pages/OrderViewOfficePage.razor.css similarity index 100% rename from Wonky.Client/Pages/OfficeOrderViewPage.razor.css rename to Wonky.Client/Pages/OrderViewOfficePage.razor.css diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/OrderViewWarehousePage.razor similarity index 100% rename from Wonky.Client/Pages/WarehouseOrderViewPage.razor rename to Wonky.Client/Pages/OrderViewWarehousePage.razor diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs similarity index 96% rename from Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs rename to Wonky.Client/Pages/OrderViewWarehousePage.razor.cs index 5fc34add..09cb8875 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs @@ -25,14 +25,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class WarehouseOrderViewPage : IDisposable +public partial class OrderViewWarehousePage : IDisposable { [Parameter] public string OrderId { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } [Inject] public IWarehouseHttpRepository _warehouseRepo { get; set; } [Inject] public NavigationManager _navigator { get; set; } [Inject] public IToastService _toast { get; set; } - [Inject] public ILogger _logger { get; set; } + [Inject] public ILogger _logger { get; set; } private WarehouseOrderView _order { get; set; } = new(); private bool Loading { get; set; } diff --git a/Wonky.Client/Pages/PrintFrontPage.razor b/Wonky.Client/Pages/PrintFrontPage.razor index b675231b..49b98e5b 100644 --- a/Wonky.Client/Pages/PrintFrontPage.razor +++ b/Wonky.Client/Pages/PrintFrontPage.razor @@ -44,6 +44,6 @@ - + \ No newline at end of file diff --git a/Wonky.Client/Pages/QuoteListPage.razor b/Wonky.Client/Pages/QuoteListCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/QuoteListPage.razor rename to Wonky.Client/Pages/QuoteListCrmPage.razor diff --git a/Wonky.Client/Pages/QuoteListPage.razor.cs b/Wonky.Client/Pages/QuoteListCrmPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/QuoteListPage.razor.cs rename to Wonky.Client/Pages/QuoteListCrmPage.razor.cs index d3a39159..556ec6e2 100644 --- a/Wonky.Client/Pages/QuoteListPage.razor.cs +++ b/Wonky.Client/Pages/QuoteListCrmPage.razor.cs @@ -13,11 +13,11 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class QuoteListPage : IDisposable +public partial class QuoteListCrmPage : IDisposable { [Inject] public ICrmActivityHttpRepository ActivityRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public ILocalStorageService Storage { get; set; } private List Quotes { get; set; } = new(); diff --git a/Wonky.Client/Pages/CrmReportListPage.razor b/Wonky.Client/Pages/ReportListCrmPage.razor similarity index 80% rename from Wonky.Client/Pages/CrmReportListPage.razor rename to Wonky.Client/Pages/ReportListCrmPage.razor index c670e9df..208379c3 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor +++ b/Wonky.Client/Pages/ReportListCrmPage.razor @@ -18,13 +18,13 @@ @using Wonky.Client.Components @page "/sales-reports" -
-
-

Rapport Arkiv --- crmreportlistpage

+
+
+

Rapport Arkiv

+
- - + @if (Working) { diff --git a/Wonky.Client/Pages/CrmReportListPage.razor.cs b/Wonky.Client/Pages/ReportListCrmPage.razor.cs similarity index 91% rename from Wonky.Client/Pages/CrmReportListPage.razor.cs rename to Wonky.Client/Pages/ReportListCrmPage.razor.cs index 10478479..65c07b1e 100644 --- a/Wonky.Client/Pages/CrmReportListPage.razor.cs +++ b/Wonky.Client/Pages/ReportListCrmPage.razor.cs @@ -22,12 +22,12 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmReportListPage : IDisposable +public partial class ReportListCrmPage : IDisposable { [Inject] public ICrmReportHttpRepository ReportRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private List ReportList { get; set; } = new(); private bool Working { get; set; } = true; @@ -46,7 +46,7 @@ public partial class CrmReportListPage : IDisposable private void ShowThisReport(string reportDate) { - Logger.LogDebug("crmreportlistpage => showthisreport <= {}", reportDate); + Logger.LogDebug("CrmReportListPage => ShowThisReport <= {}", reportDate); Navigator.NavigateTo($"/sales-reports/view/{reportDate}"); } diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor b/Wonky.Client/Pages/ReportListOfficePage.razor similarity index 71% rename from Wonky.Client/Pages/OfficeReportListPage.razor rename to Wonky.Client/Pages/ReportListOfficePage.razor index 246b0387..17b8a5c5 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor +++ b/Wonky.Client/Pages/ReportListOfficePage.razor @@ -21,16 +21,10 @@ @page "/office/users/advisors/{CountryCode}/{UserId}/reports"
-
-
-
-

Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName

-
-
-
-
- +
+

Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName

+
diff --git a/Wonky.Client/Pages/OfficeReportListPage.razor.cs b/Wonky.Client/Pages/ReportListOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeReportListPage.razor.cs rename to Wonky.Client/Pages/ReportListOfficePage.razor.cs index 6fd46f65..d2e990a9 100644 --- a/Wonky.Client/Pages/OfficeReportListPage.razor.cs +++ b/Wonky.Client/Pages/ReportListOfficePage.razor.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeReportListPage : IDisposable +public partial class ReportListOfficePage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/ReportNewCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CrmReportNewPage.razor rename to Wonky.Client/Pages/ReportNewCrmPage.razor diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/ReportNewCrmPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/CrmReportNewPage.razor.cs rename to Wonky.Client/Pages/ReportNewCrmPage.razor.cs index 4304cdd4..4b9783cc 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/ReportNewCrmPage.razor.cs @@ -27,14 +27,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmReportNewPage : IDisposable +public partial class ReportNewCrmPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } private EditContext ReportContext { get; set; } private ReportDto Report { get; set; } = new(); diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor b/Wonky.Client/Pages/ReportViewCrmPage.razor similarity index 97% rename from Wonky.Client/Pages/CrmReportViewPage.razor rename to Wonky.Client/Pages/ReportViewCrmPage.razor index e16b9608..76497ca7 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor +++ b/Wonky.Client/Pages/ReportViewCrmPage.razor @@ -51,7 +51,7 @@
- + } else diff --git a/Wonky.Client/Pages/CrmReportViewPage.razor.cs b/Wonky.Client/Pages/ReportViewCrmPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/CrmReportViewPage.razor.cs rename to Wonky.Client/Pages/ReportViewCrmPage.razor.cs index bac882f2..dde5d10e 100644 --- a/Wonky.Client/Pages/CrmReportViewPage.razor.cs +++ b/Wonky.Client/Pages/ReportViewCrmPage.razor.cs @@ -23,14 +23,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmReportViewPage : IDisposable +public partial class ReportViewCrmPage : IDisposable { [Parameter] public string ReportDate { get; set; } [Inject] public ICrmReportHttpRepository ReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public UserProfileService ProfileService { get; set; } private UserPref Prefs { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor b/Wonky.Client/Pages/ReportViewOfficePage.razor similarity index 97% rename from Wonky.Client/Pages/OfficeReportViewPage.razor rename to Wonky.Client/Pages/ReportViewOfficePage.razor index b0bcb0e4..bc7311bb 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor +++ b/Wonky.Client/Pages/ReportViewOfficePage.razor @@ -53,7 +53,7 @@
- + } else diff --git a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs b/Wonky.Client/Pages/ReportViewOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeReportViewPage.razor.cs rename to Wonky.Client/Pages/ReportViewOfficePage.razor.cs index e40b6a9e..abb21d03 100644 --- a/Wonky.Client/Pages/OfficeReportViewPage.razor.cs +++ b/Wonky.Client/Pages/ReportViewOfficePage.razor.cs @@ -23,7 +23,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeReportViewPage : IDisposable +public partial class ReportViewOfficePage : IDisposable { /// /// Country code from url parameter @@ -64,7 +64,7 @@ public partial class OfficeReportViewPage : IDisposable /// Logger service /// [Inject] - public ILogger Logger { get; set; } + public ILogger Logger { get; set; } /// /// Storage service diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor b/Wonky.Client/Pages/TaskItemListCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CrmTaskItemListPage.razor rename to Wonky.Client/Pages/TaskItemListCrmPage.razor diff --git a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs b/Wonky.Client/Pages/TaskItemListCrmPage.razor.cs similarity index 95% rename from Wonky.Client/Pages/CrmTaskItemListPage.razor.cs rename to Wonky.Client/Pages/TaskItemListCrmPage.razor.cs index e31a5d55..2af94738 100644 --- a/Wonky.Client/Pages/CrmTaskItemListPage.razor.cs +++ b/Wonky.Client/Pages/TaskItemListCrmPage.razor.cs @@ -25,10 +25,10 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmTaskItemListPage : IDisposable +public partial class TaskItemListCrmPage : IDisposable { [Inject] public UserProfileService UserProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public ICrmTaskItemHttpRepository TaskItemRepo { get; set; } diff --git a/Wonky.Client/Pages/CrmTaskItemViewPage.razor b/Wonky.Client/Pages/TaskItemViewCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/CrmTaskItemViewPage.razor rename to Wonky.Client/Pages/TaskItemViewCrmPage.razor diff --git a/Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs b/Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs similarity index 97% rename from Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs rename to Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs index 3c40be45..6dd66623 100644 --- a/Wonky.Client/Pages/CrmTaskItemViewPage.razor.cs +++ b/Wonky.Client/Pages/TaskItemViewCrmPage.razor.cs @@ -24,7 +24,7 @@ using Wonky.Entity.DTO; namespace Wonky.Client.Pages; -public partial class CrmTaskItemViewPage : IDisposable +public partial class TaskItemViewCrmPage : IDisposable { [Parameter] public string TaskItemId { get; set; } [Inject] public HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/OfficeUserListPage.razor b/Wonky.Client/Pages/UserListOfficePage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeUserListPage.razor rename to Wonky.Client/Pages/UserListOfficePage.razor diff --git a/Wonky.Client/Pages/OfficeUserListPage.razor.cs b/Wonky.Client/Pages/UserListOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeUserListPage.razor.cs rename to Wonky.Client/Pages/UserListOfficePage.razor.cs index 69c76f30..bb3a0880 100644 --- a/Wonky.Client/Pages/OfficeUserListPage.razor.cs +++ b/Wonky.Client/Pages/UserListOfficePage.razor.cs @@ -22,7 +22,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeUserListPage : IDisposable +public partial class UserListOfficePage : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor b/Wonky.Client/Pages/UserListSalesRepPage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor rename to Wonky.Client/Pages/UserListSalesRepPage.razor diff --git a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs b/Wonky.Client/Pages/UserListSalesRepPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs rename to Wonky.Client/Pages/UserListSalesRepPage.razor.cs index e99d35d7..4b0fed7a 100644 --- a/Wonky.Client/Pages/OfficeCustomerSalesRepListPage.razor.cs +++ b/Wonky.Client/Pages/UserListSalesRepPage.razor.cs @@ -22,12 +22,12 @@ using Wonky.Entity.Requests; namespace Wonky.Client.Pages; -public partial class OfficeCustomerSalesRepListPage : IDisposable +public partial class UserListSalesRepPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public IOfficeCustomerHttpRepository CustomerRepo { get; set; } [Inject] public UserProfileService UserProfileService { get; set; } diff --git a/Wonky.Client/Pages/OfficeUserViewPage.razor b/Wonky.Client/Pages/UserViewOfficePage.razor similarity index 100% rename from Wonky.Client/Pages/OfficeUserViewPage.razor rename to Wonky.Client/Pages/UserViewOfficePage.razor diff --git a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs b/Wonky.Client/Pages/UserViewOfficePage.razor.cs similarity index 97% rename from Wonky.Client/Pages/OfficeUserViewPage.razor.cs rename to Wonky.Client/Pages/UserViewOfficePage.razor.cs index 18ca1e1b..98f0e509 100644 --- a/Wonky.Client/Pages/OfficeUserViewPage.razor.cs +++ b/Wonky.Client/Pages/UserViewOfficePage.razor.cs @@ -26,13 +26,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeUserViewPage : IDisposable +public partial class UserViewOfficePage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; [Inject] public HttpInterceptorService _interceptor { get; set; } [Inject] public IUserHttpRepository UserRepo { get; set; } - [Inject] public ILogger _logger { get; set; } + [Inject] public ILogger _logger { get; set; } [Inject] public NavigationManager _navigator { get; set; } [Inject] public IToastService _toast { get; set; } private WebUserInfoView _userInfo { get; set; } = new(); From b4fa8475d186c9d26c94e5ba6f8279cb6762af75 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 30 Dec 2022 06:55:19 +0100 Subject: [PATCH 7/8] revert tel:link --- Wonky.Client/Components/AdvisorCompanyTableComponent.razor | 2 +- Wonky.Client/Pages/CustomerViewCrmPage.razor | 6 ++++-- Wonky.Client/Pages/OrderViewWarehousePage.razor.cs | 1 - .../{ReportNewCrmPage.razor => ReportCreateCrmPage.razor} | 0 ...portNewCrmPage.razor.cs => ReportCreateCrmPage.razor.cs} | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) rename Wonky.Client/Pages/{ReportNewCrmPage.razor => ReportCreateCrmPage.razor} (100%) rename Wonky.Client/Pages/{ReportNewCrmPage.razor.cs => ReportCreateCrmPage.razor.cs} (98%) diff --git a/Wonky.Client/Components/AdvisorCompanyTableComponent.razor b/Wonky.Client/Components/AdvisorCompanyTableComponent.razor index 8628c875..6475f738 100644 --- a/Wonky.Client/Components/AdvisorCompanyTableComponent.razor +++ b/Wonky.Client/Components/AdvisorCompanyTableComponent.razor @@ -52,7 +52,7 @@ @company.Account - @company.Phone + @company.Phone @company.City diff --git a/Wonky.Client/Pages/CustomerViewCrmPage.razor b/Wonky.Client/Pages/CustomerViewCrmPage.razor index aaebfbba..6dc7870f 100644 --- a/Wonky.Client/Pages/CustomerViewCrmPage.razor +++ b/Wonky.Client/Pages/CustomerViewCrmPage.razor @@ -169,7 +169,7 @@
-
+
Stilling
Navn
@@ -187,7 +187,9 @@
@contact.JobTitle
@contact.FirstName @contact.LastName
-
@contact.PhoneDirect
+
+ @contact.PhoneDirect +
diff --git a/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs index 09cb8875..d30fa144 100644 --- a/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs +++ b/Wonky.Client/Pages/OrderViewWarehousePage.razor.cs @@ -35,7 +35,6 @@ public partial class OrderViewWarehousePage : IDisposable [Inject] public ILogger _logger { get; set; } private WarehouseOrderView _order { get; set; } = new(); - private bool Loading { get; set; } private bool Working { get; set; } protected override async Task OnParametersSetAsync() diff --git a/Wonky.Client/Pages/ReportNewCrmPage.razor b/Wonky.Client/Pages/ReportCreateCrmPage.razor similarity index 100% rename from Wonky.Client/Pages/ReportNewCrmPage.razor rename to Wonky.Client/Pages/ReportCreateCrmPage.razor diff --git a/Wonky.Client/Pages/ReportNewCrmPage.razor.cs b/Wonky.Client/Pages/ReportCreateCrmPage.razor.cs similarity index 98% rename from Wonky.Client/Pages/ReportNewCrmPage.razor.cs rename to Wonky.Client/Pages/ReportCreateCrmPage.razor.cs index 4b9783cc..46beacd1 100644 --- a/Wonky.Client/Pages/ReportNewCrmPage.razor.cs +++ b/Wonky.Client/Pages/ReportCreateCrmPage.razor.cs @@ -27,14 +27,14 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class ReportNewCrmPage : IDisposable +public partial class ReportCreateCrmPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserProfileService ProfileService { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public NavigationManager Navigator { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } [Inject] public IToastService Toaster { get; set; } private EditContext ReportContext { get; set; } private ReportDto Report { get; set; } = new(); From d9ca65b96b5ed5c132f38b87a31f1415d97afcce Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 30 Dec 2022 13:20:31 +0100 Subject: [PATCH 8/8] improve product display colli - history discontinued products --- .../Components/CatalogTableComponent.razor | 4 + .../CustomerProductTableComponent.razor | 2 +- .../Pages/CustomerProductListCrmPage.razor.cs | 2 + .../Shared/InventoryReorderModal.razor | 110 ++++++++++-------- .../Shared/InventoryReorderModal.razor.cs | 5 +- Wonky.Client/Shared/PriceListModal.razor | 30 +++-- Wonky.Client/wwwroot/appsettings.json | 4 +- Wonky.Entity/Views/ProductInventoryView.cs | 4 + Wonky.Entity/Views/SalesItemView.cs | 3 + 9 files changed, 100 insertions(+), 64 deletions(-) diff --git a/Wonky.Client/Components/CatalogTableComponent.razor b/Wonky.Client/Components/CatalogTableComponent.razor index a6958a5d..0c1b6de1 100644 --- a/Wonky.Client/Components/CatalogTableComponent.razor +++ b/Wonky.Client/Components/CatalogTableComponent.razor @@ -23,6 +23,7 @@ Navn Fork Varenr + Colli Stk / Pris @@ -37,6 +38,9 @@ @salesItem.Sku + + @salesItem.BoxSize +
    @foreach (var rate in salesItem.Rates) diff --git a/Wonky.Client/Components/CustomerProductTableComponent.razor b/Wonky.Client/Components/CustomerProductTableComponent.razor index 07af4cf8..ab20dff0 100644 --- a/Wonky.Client/Components/CustomerProductTableComponent.razor +++ b/Wonky.Client/Components/CustomerProductTableComponent.razor @@ -36,7 +36,7 @@
    - @product.Description + @product.Description @(product.Discontinued ? "(UDGÅET)" : "")
    @product.Sku diff --git a/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs index f44b95f9..d0b20dd4 100644 --- a/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs +++ b/Wonky.Client/Pages/CustomerProductListCrmPage.razor.cs @@ -36,6 +36,7 @@ public partial class CustomerProductListCrmPage : IDisposable [Inject] public IToastService Toaster { get; set; } [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } + private JsonSerializerOptions _options = new JsonSerializerOptions(JsonSerializerDefaults.Web); private CompanyDto Company { get; set; } = new(); private List Inventory { get; set; } = new(); private bool Working { get; set; } = true; @@ -64,6 +65,7 @@ public partial class CustomerProductListCrmPage : IDisposable } // fetch product inventory Inventory = await FetchProductInventory(); + Logger.LogDebug("CustomerProductListCrmPage => Inventory <= {}", JsonSerializer.Serialize(Inventory, _options)); Working = false; } diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor b/Wonky.Client/Shared/InventoryReorderModal.razor index f3c434e9..aa58790d 100644 --- a/Wonky.Client/Shared/InventoryReorderModal.razor +++ b/Wonky.Client/Shared/InventoryReorderModal.razor @@ -20,63 +20,70 @@
    -

    @SalesItem.Name @SalesItem.Sku

    +

    @SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)

    + @if (SalesItem.Discontinued) + { +

    Udgået produkt

    + } + else + { @* draft line ----------------------------------------------------- *@ -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    BESTILLING
    AntalPrisRabatSAS
    - - -
    - -
    -     		- - - - - -
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    BESTILLING
    AntalPrisRabatSAS
    + + +
    + +
    +     		+ + + + + +
    +
    -
    @* end draft line ------------------------------------------------- *@ @* price list item ------------------------------------------------ *@ -
    - @foreach (var rate in SalesItem.Rates) - { -
    - - @rate.Quantity @rate.Rate/stk - -
    - } -
    +
    + @foreach (var rate in SalesItem.Rates) + { +
    + + @rate.Quantity @rate.Rate/stk + +
    + } +
    @* end price list item -------------------------------------------- *@ + } @* product history ------------------------------------------------ *@ @@ -98,7 +105,10 @@ } diff --git a/Wonky.Client/Shared/InventoryReorderModal.razor.cs b/Wonky.Client/Shared/InventoryReorderModal.razor.cs index 1f1f55ce..d2cbdb1a 100644 --- a/Wonky.Client/Shared/InventoryReorderModal.razor.cs +++ b/Wonky.Client/Shared/InventoryReorderModal.razor.cs @@ -44,10 +44,13 @@ public partial class InventoryReorderModal return; History = await CrmHistoryRepo.FetchHistory(CompanyId, SalesItem.Sku); + if (!History.Any()) + await Task.Delay(1000); SelectedItem.Item = SalesItem; SelectedItem.Discount = 0; SelectedItem.Quantity = 1; - SelectedItem.Price = decimal.Parse(SalesItem.Rates[0].Rate, CultureInfo.InvariantCulture); + if(SalesItem.Rates.Any()) + SelectedItem.Price = decimal.Parse(SalesItem.Rates[0].Rate, CultureInfo.InvariantCulture); } private async Task SendToOrder(DraftItem item) diff --git a/Wonky.Client/Shared/PriceListModal.razor b/Wonky.Client/Shared/PriceListModal.razor index 2dc21fc8..a39bd430 100644 --- a/Wonky.Client/Shared/PriceListModal.razor +++ b/Wonky.Client/Shared/PriceListModal.razor @@ -25,35 +25,42 @@
    -
    -
    +
    +
    -
    +
    -
    +
    -
    +
    -
    -
    +
    +
    -
    +
    +
    +
    Vare
    +
    Varenr
    +
    Fork
    +
    Colli
    +
    Stk / Pris
    +
    @if (_items.Any()) { -
      +
        @foreach (var item in _items) {
      • -
        +
        @item.Name
        @@ -62,6 +69,9 @@
        @item.ShortName
        +
        + @item.BoxSize +
          @foreach (var rate in item.Rates) diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 78892374..7a699a65 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.90", + "version": "0.91.1", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "baseUrl": "https://dev.innotec.dk", + "baseUrl": "https://zeta.innotec.dk", "catalog": "api/v2/catalog", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory", diff --git a/Wonky.Entity/Views/ProductInventoryView.cs b/Wonky.Entity/Views/ProductInventoryView.cs index afce9ed2..3677f25d 100644 --- a/Wonky.Entity/Views/ProductInventoryView.cs +++ b/Wonky.Entity/Views/ProductInventoryView.cs @@ -30,6 +30,10 @@ public class ProductInventoryView /// public int Quantity { get; set; } /// + /// Product has been discontinued + /// + public bool Discontinued { get; set; } + /// /// Virtual checkmark /// public virtual bool Check { get; set; } diff --git a/Wonky.Entity/Views/SalesItemView.cs b/Wonky.Entity/Views/SalesItemView.cs index 61a34e9b..0d2c1451 100644 --- a/Wonky.Entity/Views/SalesItemView.cs +++ b/Wonky.Entity/Views/SalesItemView.cs @@ -13,6 +13,8 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] // +using System.ComponentModel; + namespace Wonky.Entity.Views; public class SalesItemView @@ -26,5 +28,6 @@ public class SalesItemView public string PictureLink { get; set; } = ""; public string Location { get; set; } = ""; public bool Discontinued { get; set; } + public int BoxSize { get; set; } public List Rates { get; set; } = new(); } \ No newline at end of file
    @entry.Discount @entry.Price - + @if (!SalesItem.Discontinued) + { + + }