diff --git a/Wonky.Client/Components/OfficeReportListComponent.razor b/Wonky.Client/Components/OfficeReportListComponent.razor index 6ada16cd..6fa4fda3 100644 --- a/Wonky.Client/Components/OfficeReportListComponent.razor +++ b/Wonky.Client/Components/OfficeReportListComponent.razor @@ -40,7 +40,7 @@ { @foreach (var report in ReportList) { - + } } else diff --git a/Wonky.Client/Components/OfficeReportListComponent.razor.cs b/Wonky.Client/Components/OfficeReportListComponent.razor.cs index 6a600719..2ab77aa6 100644 --- a/Wonky.Client/Components/OfficeReportListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportListComponent.razor.cs @@ -34,7 +34,7 @@ public partial class OfficeReportListComponent } - private void ShowThisReport(string reportDate) + private void ShowReport(string reportDate) { OnShowReport.InvokeAsync(reportDate); } diff --git a/Wonky.Client/Components/ReportListComponent.razor b/Wonky.Client/Components/ReportListComponent.razor index ff5c069c..ef186c35 100644 --- a/Wonky.Client/Components/ReportListComponent.razor +++ b/Wonky.Client/Components/ReportListComponent.razor @@ -38,7 +38,7 @@ { @foreach (var report in ReportList) { - + } } else diff --git a/Wonky.Client/Components/ReportListComponent.razor.cs b/Wonky.Client/Components/ReportListComponent.razor.cs index 49b7882c..be2a8883 100644 --- a/Wonky.Client/Components/ReportListComponent.razor.cs +++ b/Wonky.Client/Components/ReportListComponent.razor.cs @@ -24,20 +24,26 @@ public partial class ReportListComponent // ########################################################################### [Parameter] public List ReportList { get; set; } = new(); [Parameter] public EventCallback OnShowReport { get; set; } - - + [Parameter] public EventCallback OnShowDocument { get; set; } + + // ########################################################################### private List Reports { get; set; } = new(); - protected override void OnParametersSet() { Reports = ReportList.OrderByDescending(x => x.ReportDate).ToList(); } - private void ShowThisReport(string reportDate) + private void ShowDocument(string documentId) + { + OnShowDocument.InvokeAsync(documentId); + } + + + private void ShowReport(string reportDate) { OnShowReport.InvokeAsync(reportDate); } diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor index 910b3beb..85043608 100644 --- a/Wonky.Client/Components/ReportListItemComponent.razor +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -15,8 +15,7 @@ @using Wonky.Entity.Views - @activity.Company.City @activity.Demo @activity.Sales diff --git a/Wonky.Client/Components/ReportActivityListComponent.razor.cs b/Wonky.Client/Components/ReportViewActivityListComponent.razor.cs similarity index 95% rename from Wonky.Client/Components/ReportActivityListComponent.razor.cs rename to Wonky.Client/Components/ReportViewActivityListComponent.razor.cs index 0fd0c9b1..8b567507 100644 --- a/Wonky.Client/Components/ReportActivityListComponent.razor.cs +++ b/Wonky.Client/Components/ReportViewActivityListComponent.razor.cs @@ -19,7 +19,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class ReportActivityListComponent +public partial class ReportViewActivityListComponent { // ############################################################################## [Parameter] public List ActivityList { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor b/Wonky.Client/Components/ReportViewDistanceLedgerComponent.razor similarity index 100% rename from Wonky.Client/Components/ReportDistanceLedgerComponent.razor rename to Wonky.Client/Components/ReportViewDistanceLedgerComponent.razor diff --git a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs b/Wonky.Client/Components/ReportViewDistanceLedgerComponent.razor.cs similarity index 94% rename from Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs rename to Wonky.Client/Components/ReportViewDistanceLedgerComponent.razor.cs index c442fb0c..8335aad5 100644 --- a/Wonky.Client/Components/ReportDistanceLedgerComponent.razor.cs +++ b/Wonky.Client/Components/ReportViewDistanceLedgerComponent.razor.cs @@ -18,7 +18,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Components; -public partial class ReportDistanceLedgerComponent +public partial class ReportViewDistanceLedgerComponent { [Parameter] public ReportData ReportData { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor b/Wonky.Client/Components/ReportViewSummaryComponent.razor similarity index 100% rename from Wonky.Client/Components/ReportSummaryComponent.razor rename to Wonky.Client/Components/ReportViewSummaryComponent.razor diff --git a/Wonky.Client/Components/ReportSummaryComponent.razor.cs b/Wonky.Client/Components/ReportViewSummaryComponent.razor.cs similarity index 95% rename from Wonky.Client/Components/ReportSummaryComponent.razor.cs rename to Wonky.Client/Components/ReportViewSummaryComponent.razor.cs index 7393374a..57c0fc94 100644 --- a/Wonky.Client/Components/ReportSummaryComponent.razor.cs +++ b/Wonky.Client/Components/ReportViewSummaryComponent.razor.cs @@ -19,7 +19,7 @@ using Microsoft.AspNetCore.Components; namespace Wonky.Client.Components; -public partial class ReportSummaryComponent +public partial class ReportViewSummaryComponent { [Parameter] public ReportData ReportData { get; set; } = new(); diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportVisitComponent.razor similarity index 99% rename from Wonky.Client/Components/ReportItemComponent.razor rename to Wonky.Client/Components/ReportVisitComponent.razor index a0f01e18..ff359a68 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportVisitComponent.razor @@ -127,7 +127,7 @@ @if (ReportItem.Express) { - +
HASTER
diff --git a/Wonky.Client/Components/ReportItemComponent.razor.cs b/Wonky.Client/Components/ReportVisitComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/ReportItemComponent.razor.cs rename to Wonky.Client/Components/ReportVisitComponent.razor.cs index 8c757c7b..457096cb 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor.cs +++ b/Wonky.Client/Components/ReportVisitComponent.razor.cs @@ -18,12 +18,11 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; -public partial class ReportItemComponent +public partial class ReportVisitComponent { // ############################################################################## [Parameter] public ReportItemView ReportItem { get; set; } = new(); - protected override void OnParametersSet() { var lines = ReportItem.Lines.OrderBy(x => x.Location).ToList(); diff --git a/Wonky.Client/Components/ReportItemComponent.razor.css b/Wonky.Client/Components/ReportVisitComponent.razor.css similarity index 100% rename from Wonky.Client/Components/ReportItemComponent.razor.css rename to Wonky.Client/Components/ReportVisitComponent.razor.css diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index f9311dfa..ce759bd9 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -44,14 +44,14 @@
- +
- +
- + } else { @@ -65,6 +65,6 @@ { @foreach (var item in Activities) { - + } } diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor index a91baa23..90ba4dcf 100644 --- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor @@ -38,7 +38,7 @@ { foreach (var item in Items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) { - + } } else diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor index 4aaeef5f..2d8848b5 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor @@ -39,12 +39,12 @@
- +
- +
- + \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 2c800c51..ff24535c 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -45,14 +45,14 @@
- +
- +
- + } else { @@ -66,6 +66,6 @@ { foreach (var item in Activities.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) { - + } } diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor index e9e97500..80af3fd7 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor @@ -29,14 +29,14 @@
- +
- +
- - + + } else { diff --git a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs index 8389b37d..5e6121eb 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorReportViewPage.razor.cs @@ -39,11 +39,11 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable [Inject] public ILogger Logger { get; set; } [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } - [Inject] public IJSRuntime JsRuntime { get; set; } [Inject] public IToastService Toaster { get; set; } [Inject] public IOrderProcessRepository ProcessRepo { get; set; } + // [Inject] public EventCallback OnShowDocument { get; set; } + - // ############################################################# [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; @@ -71,57 +71,18 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable await FetchUserReport(ReportDate); } - - protected override async Task OnAfterRenderAsync(bool firstRender) + /// + /// Event handler to show the document by Id + /// + /// + private void ShowDocument(string documentId) { - if (firstRender) - { - JsModule = await JsRuntime - .InvokeAsync("import", "/scripts/print-invoke.js"); - } - } + // shoe order/activity document + // the supervisor version + Navigator.NavigateTo($"/supervisor/advisors/{UserId}/reports/{ReportDate}/activities/{documentId}"); + } - // private void Print(PrintTarget target) - // { - // _returnUrl = new Uri(Navigator.Uri).AbsolutePath; - // switch (target) - // { - // case PrintTarget.OrderPage: - // Navigator.NavigateTo($"/report/print/orders/{CountryCode}/{UserId}/{ReportDate}?returnUrl={_returnUrl}"); - // break; - // case PrintTarget.FrontPage: - // Navigator.NavigateTo($"/report/print/summary/{CountryCode}/{UserId}/{ReportDate}?returnUrl={_returnUrl}"); - // break; - // case PrintTarget.None: - // break; - // case PrintTarget.All: - // break; - // default: - // throw new ArgumentOutOfRangeException(nameof(target), target, null); - // } - // } - // - // - // private async Task Print() - // { - // var current = 0; - // var orders = Report.ReportItems - // .Where(x => x is { StatusTypeEnum: "Order", ProcessStatusEnum: "None" } ); - // var count = orders.Count(); - // foreach (var item in orders) - // { - // Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); - // await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState - // { - // OrderId = item.ActivityId, - // ProcessStatusEnum = Utils.EnumToString(ProcessStatus.Printed) - // }); - // } - // Toaster.ClearAll(); - // await JsModule.InvokeVoidAsync("printInvoke"); - // } - /// /// Work date component event handler /// @@ -170,6 +131,7 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable Working = false; } + private void ProfileServiceOnOnChange(UserPreference userPreference) { Logger.LogDebug("OfficeReportViewPage => ProfileServiceOnOnChange"); @@ -180,6 +142,7 @@ public partial class SupervisorAdvisorReportViewPage : IDisposable StateHasChanged(); } + public void Dispose() { Interceptor.DisposeEvent(); diff --git a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor b/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor index cfba7bd7..a754ccfd 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor +++ b/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor @@ -25,7 +25,7 @@ Rapport Arkiv - @AdvisorInfo.FirstName @AdvisorInfo.LastName - + @if (Working) diff --git a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs b/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs index 975b69a2..49f06f20 100644 --- a/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorAdvisorViewPage.razor.cs @@ -16,9 +16,11 @@ public partial class SupervisorAdvisorViewPage : IDisposable [Inject] public NavigationManager Navigator { get; set; } [Inject] public ILogger Logger { get; set; } + // ############################################################# [Parameter] public string UserId { get; set; } = ""; + // ############################################################# private UserAdvisorInfoView AdvisorInfo { get; set; } = new(); private List ActivityReports { get; set; } = new(); @@ -42,17 +44,19 @@ public partial class SupervisorAdvisorViewPage : IDisposable ActivityReports = reports.OrderByDescending(x => x.ReportDate).ToList(); } + protected override void OnInitialized() { Working = false; } - - private void ShowThisReport(string reportDate) + + + private void ShowReport(string reportDate) { var uri = new Uri(Navigator.Uri); var url = uri.AbsoluteUri; - Logger.LogDebug("ShowThisReport\n => {}\n =>{}", reportDate, url); - Logger.LogDebug("ShowThisReport => NavigateTo => {}",$"{url}/report/{reportDate}"); + Logger.LogDebug("ShowReport\n => {}\n =>{}", reportDate, url); + Logger.LogDebug("ShowReport => NavigateTo => {}",$"{url}/reports/{reportDate}"); Navigator.NavigateTo($"{url}/reports/{reportDate}"); } diff --git a/Wonky.Client/Pages/SupervisorVisitViewPage.razor b/Wonky.Client/Pages/SupervisorVisitViewPage.razor index ee812696..89abc739 100644 --- a/Wonky.Client/Pages/SupervisorVisitViewPage.razor +++ b/Wonky.Client/Pages/SupervisorVisitViewPage.razor @@ -16,8 +16,8 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components -@attribute [Authorize(Roles = "Admin,Office,Warehouse")] -@page "/supervisor/advisors/{UserId}/reports/{ReportDate}/{ActivityId}" +@attribute [Authorize(Roles = "Supervisor")] +@page "/supervisor/advisors/{UserId}/reports/{ReportDate}/activities/{DocumentId}" @ReportItem.ESalesNumber - @ReportItem.Company.Name @@ -136,13 +136,13 @@
-
+
Kontor
@ReportItem.OfficeNote
-
+
Kundekort
@ReportItem.CrmNote diff --git a/Wonky.Client/Pages/SupervisorVisitViewPage.razor.cs b/Wonky.Client/Pages/SupervisorVisitViewPage.razor.cs index 45fc4a4c..d350ff1a 100644 --- a/Wonky.Client/Pages/SupervisorVisitViewPage.razor.cs +++ b/Wonky.Client/Pages/SupervisorVisitViewPage.razor.cs @@ -40,10 +40,13 @@ public partial class SupervisorVisitViewPage : IDisposable [Inject] public IToastService Toast { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } + // ############################################################# - [Parameter] public string CompanyId { get; set; } = ""; - [Parameter] public string OrderId { get; set; } = ""; + [Parameter] public string UserId { get; set; } = ""; + [Parameter] public string DocumentId { get; set; } = ""; + [Parameter] public string ReportDate { get; set; } = ""; + // ############################################################# private ReportItemView ReportItem { get; set; } = new(); private bool IsNotified { get; set; } @@ -59,7 +62,7 @@ public partial class SupervisorVisitViewPage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // fetch order from backend - ReportItem = await AdvisorActivityRepo.GetReportItem(OrderId); + ReportItem = await AdvisorActivityRepo.GetReportItem(DocumentId); Logger.LogDebug("ReportItem => \n {}", JsonSerializer.Serialize(ReportItem, _options)); Working = false; } diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 04da225b..2ffaef9f 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -120,7 +120,7 @@ diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index bb5ced61..bedb6786 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,15 +1,15 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.126.0", + "version": "0.126.2", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "Logging": { "LogLevel": { - "Default": "Debug", - "System": "Debug", + "Default": "Information", + "System": "Information", "Microsoft": "Information" }, "Debug": { @@ -19,7 +19,7 @@ } }, "apiConfig": { - "baseUrl": "https://dev.innotec.dk", + "baseUrl": "https://zeta.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory",