From 9ff13d9914bd71efb20591a3d01c6aaf67f3a126 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sun, 2 Oct 2022 17:35:19 +0200 Subject: [PATCH] touch-ups and adjustments --- .../AdvisorActivityTableComponent.razor | 9 ++-- .../AdvisorActivityTableComponent.razor.cs | 24 ++++----- .../OfficeActivityTableComponent.razor | 2 +- .../Components/ReportItemComponent.razor | 22 +++----- Wonky.Client/Helpers/Utils.cs | 13 +++++ .../Pages/OfficeViewActivityPage.razor | 53 ++++++++++--------- Wonky.Client/Pages/OfficeViewReportPage.razor | 2 +- Wonky.Client/wwwroot/appsettings.json | 2 +- 8 files changed, 68 insertions(+), 59 deletions(-) diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor b/Wonky.Client/Components/AdvisorActivityTableComponent.razor index 8c17ab4b..98f2c27d 100644 --- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityTableComponent.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 @@ -57,18 +58,18 @@ {} - @if (activity.Lines.Any()) + @if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { - + } } - + Total @Activities.Where(x => x.StatusTypeEnum == "Order").Sum(x => x.OrderAmount) - + diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs b/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs index 3b9e5141..3ac7be57 100644 --- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorActivityTableComponent.razor.cs @@ -23,18 +23,18 @@ public partial class AdvisorActivityTableComponent [Parameter] public List Activities { get; set; } [Inject] public NavigationManager _navigator { get; set; } - private static string GetProcessStatus(string processStatus) - { - return processStatus.ToLower() switch - { - "express" => "the-fast", - "none" => "the-ugly", - "picked" => "the-bad", - "packed" => "the-good", - "shipped" => "the-draw", - _ => "the-dead" - }; - } + // 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", + // _ => "" + // }; + // } private void ShowOrder(string companyId, string orderId) { diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor b/Wonky.Client/Components/OfficeActivityTableComponent.razor index 2896d8f6..36ce9bbf 100644 --- a/Wonky.Client/Components/OfficeActivityTableComponent.razor +++ b/Wonky.Client/Components/OfficeActivityTableComponent.razor @@ -57,7 +57,7 @@ {} - @if (activity.Lines.Any()) + @if (activity.Lines.Any() && activity.StatusTypeEnum == "Order") { } diff --git a/Wonky.Client/Components/ReportItemComponent.razor b/Wonky.Client/Components/ReportItemComponent.razor index c9ad723f..29ada42e 100644 --- a/Wonky.Client/Components/ReportItemComponent.razor +++ b/Wonky.Client/Components/ReportItemComponent.razor @@ -24,18 +24,18 @@

@ReportItem.Company.Name

- @if (ReportItem.StatusTypeEnum.ToLower() is "quote") - { -

TILBUD

- } @if (ReportItem.Express) {

HASTER

} - @if (ReportItem.VisitTypeEnum.ToLower() == "phone" || ReportItem.OurRef.Contains("T:")) + @if (ReportItem.VisitTypeEnum == "Phone" || ReportItem.OurRef.Contains("T:")) {
TELEFONORDRE
} + @if (ReportItem.StatusTypeEnum is "Quote") + { +
TILBUD
+ }
@@ -118,9 +118,9 @@ @if (ReportItem.Express) { - + -
HASTER
+
HASTER
} @@ -136,14 +136,6 @@ } -@if (ReportItem.Express && ReportItem.ProcessStatusEnum == "Express") -{ -
- -
-} - - @code{ [Parameter] diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs index 57bc7bbd..d117c657 100644 --- a/Wonky.Client/Helpers/Utils.cs +++ b/Wonky.Client/Helpers/Utils.cs @@ -39,4 +39,17 @@ public static class Utils return dtNow > dtNext.AddDays(-14) ? "the-bad" : "the-good"; } + + public static string GetProcessStatus(string processStatus) + { + return processStatus.ToLower() switch + { + "express" => "the-fast", + "none" => "the-good", + "picked" => "the-bad", + "packed" => "the-ugly", + "shipped" => "the-dead", + _ => "question-square" + }; + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeViewActivityPage.razor b/Wonky.Client/Pages/OfficeViewActivityPage.razor index 3d1104df..7ec03ae9 100644 --- a/Wonky.Client/Pages/OfficeViewActivityPage.razor +++ b/Wonky.Client/Pages/OfficeViewActivityPage.razor @@ -7,40 +7,41 @@ -
-

@_reportItem.Company.Name

- @if (_reportItem.StatusTypeEnum.ToLower() is "quote") - { -

TILBUD

- } @if (_reportItem.Express) - { -

HASTER

- } - @if (_reportItem.Express && _reportItem.ProcessStatusEnum == "None") {
- - -
-
-
- -
-
- + @if (_reportItem.ProcessStatusEnum == "None") + { + + +
+
+
+ + +
-
- - + + + } + } +
+

@_reportItem.Company.Name

+ @if (_reportItem.Express) + { +

HASTER

} @if (_reportItem.VisitTypeEnum.ToLower() == "phone" || _reportItem.OurRef.Contains("T:")) {
TELEFONORDRE
} + @if (_reportItem.StatusTypeEnum is "Quote") + { +
TILBUD
+ }
@@ -120,8 +121,10 @@ @if (_reportItem.Express) { - -
HASTER
+ + +
HASTER
+ } @@ -130,4 +133,4 @@

@_reportItem.OfficeNote

-} +} \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeViewReportPage.razor b/Wonky.Client/Pages/OfficeViewReportPage.razor index d38c4885..cbcaaa01 100644 --- a/Wonky.Client/Pages/OfficeViewReportPage.razor +++ b/Wonky.Client/Pages/OfficeViewReportPage.razor @@ -61,7 +61,7 @@ @if (_items.Any()) { - @foreach (var item in _items.Where(item => item.StatusTypeEnum != "Offer" && item.ProcessStatusEnum == "None")) + @foreach (var item in _items.Where(item => item.StatusTypeEnum.ToLower() == "order" && item.ProcessStatusEnum.ToLower() == "none")) { } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 0adb53fe..28728bc5 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.25.1", + "version": "0.25.4", "rc": true, "sandBox": false, "image": "grumpy-coder.png"