From fce275f19d54ea04fb1e42508a0a09bee61bb847 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 17 Jan 2023 06:17:35 +0100 Subject: [PATCH] v.0.99.1 cosmetic - order counter --- .../OfficeReportActivityListComponent.razor | 4 +++- .../OfficeReportActivityListComponent.razor.cs | 15 +-------------- .../Components/ProcessStateComponent.razor | 1 + Wonky.Client/Helpers/Utils.cs | 3 ++- .../Pages/OfficeUserAdvisorReportViewPage.razor | 4 ++-- .../OfficeUserAdvisorReportViewPage.razor.cs | 12 +++++++----- Wonky.Client/Pages/ReportPrintOrderPage.razor | 2 +- Wonky.Client/Pages/ReportPrintOrderPage.razor.cs | 10 ++++++---- Wonky.Client/wwwroot/appsettings.json | 4 ++-- 9 files changed, 25 insertions(+), 30 deletions(-) diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor b/Wonky.Client/Components/OfficeReportActivityListComponent.razor index 14c12e52..cee0fd5a 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor @@ -1,3 +1,4 @@ +@using Wonky.Client.Helpers @* // Copyright (C) 2022 FCS Frede's Computer Services. // This program is free software: you can redistribute it and/or modify @@ -15,6 +16,7 @@ // *@ +@using Wonky.Client.Helpers @if (ActivityList.Any()) { @@ -59,7 +61,7 @@ diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs index 4b7dee0c..ba5e64e5 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs @@ -22,20 +22,7 @@ public partial class OfficeReportActivityListComponent { [Parameter] public List ActivityList { get; set; } = new(); [Inject] private NavigationManager Navigator { get; set; } - - private static string GetProcessStatus(string processStatus) - { - return processStatus.ToLower() switch - { - "express" => "the-fast", - "none" => "the-good", - "picked" => "the-bad", - "packed" => "the-ugly", - "shipped" => "the-dead", - _ => "the-draw" - }; - } - + private void ShowOrder(string companyId, string orderId) { Navigator.NavigateTo($"/office/customers/{companyId}/orders/{orderId}"); diff --git a/Wonky.Client/Components/ProcessStateComponent.razor b/Wonky.Client/Components/ProcessStateComponent.razor index c28e80ea..11b9d7eb 100644 --- a/Wonky.Client/Components/ProcessStateComponent.razor +++ b/Wonky.Client/Components/ProcessStateComponent.razor @@ -30,6 +30,7 @@ "the-bad" => "file-earmark-check", "the-ugly" => "box2-fill", "the-dead" => "truck", + "accepted" => "hand-thumbs-up", _ => "question-square" }; } diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index 0c2792b5..58d333b2 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -146,7 +146,8 @@ public static class Utils "picked" => "the-bad", "packed" => "the-ugly", "shipped" => "the-dead", - _ => "question-square" + "accepted" => "accepted", + _ => "question" }; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor index 97255209..8cc2a237 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor @@ -32,7 +32,7 @@
- +
@@ -72,4 +72,4 @@ } } - + diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs index d5bf79d5..51ead1c3 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportViewPage.razor.cs @@ -100,17 +100,19 @@ public partial class OfficeUserAdvisorReportViewPage : IDisposable private async Task OnOkCallBack() { var current = 0; - var all = Report.ReportItems.Count; - foreach (var item in Report.ReportItems) + 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 {all} ordrer. Vent venligst"); + Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) }); - } - Toaster.ShowInfo("Ordrer er klar til udskrift."); + } + Toaster.ClearAll(); await Print(); } diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor b/Wonky.Client/Pages/ReportPrintOrderPage.razor index 55c8c314..98cbbb2a 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor @@ -51,4 +51,4 @@ else } - \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs index 24cddc88..7d538ed8 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs @@ -71,17 +71,19 @@ public partial class ReportPrintOrderPage private async Task OnOkCallBack() { var current = 0; - var all = Items.Count; - foreach (var item in Items) + 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 {all} ordrer. Vent venligst"); + Toaster.ShowInfo($"Behandler {current++} af {count} ordrer. Vent venligst"); await ProcessRepo.UpdateWarehouseOrderStatus(new OrderProcessState { OrderId = item.ActivityId, ProcessStatusEnum = Utils.EnumToString(PStatus.Accepted) }); } - Toaster.ShowInfo("Ordrer er klar til udskrift."); + Toaster.ClearAll(); await Print(); } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 7165effe..acaeefe5 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.98.xx", + "version": "0.99.1", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -36,7 +36,7 @@ }, "Logging": { "LogLevel": { - "Default": "Debug", + "Default": "Information", "System": "Information", "Microsoft": "Information" },
@if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { - + }