From c7165892aa7f7282817d342a195fc75a28bb1523 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 28 Sep 2022 14:23:57 +0200 Subject: [PATCH] icons --- .../AdvisorActivityTableComponent.razor | 14 +-- Wonky.Client/Components/ColorCoding.razor | 61 ---------- .../Components/ColorCodingComponent.razor | 104 ++++++++++++++++++ ...zor.css => ColorCodingComponent.razor.css} | 0 .../DisplayStateComponent.razor.css | 26 +++++ .../OfficeActivityTableComponent.razor.cs | 8 +- .../Components/ProcessStateComponent.razor | 8 +- .../Components/WarehouseListComponent.razor | 4 +- .../Pages/{HelpPage.razor => InfoPage.razor} | 2 +- ...{HelpPage.razor.css => InfoPage.razor.css} | 0 .../css/{app-v0.20.0.css => app-v0.22.0.css} | 34 +----- Wonky.Client/wwwroot/index.html | 2 +- 12 files changed, 153 insertions(+), 110 deletions(-) delete mode 100644 Wonky.Client/Components/ColorCoding.razor create mode 100644 Wonky.Client/Components/ColorCodingComponent.razor rename Wonky.Client/Components/{ColorCoding.razor.css => ColorCodingComponent.razor.css} (100%) create mode 100644 Wonky.Client/Components/DisplayStateComponent.razor.css rename Wonky.Client/Pages/{HelpPage.razor => InfoPage.razor} (98%) rename Wonky.Client/Pages/{HelpPage.razor.css => InfoPage.razor.css} (100%) rename Wonky.Client/wwwroot/css/{app-v0.20.0.css => app-v0.22.0.css} (88%) diff --git a/Wonky.Client/Components/AdvisorActivityTableComponent.razor b/Wonky.Client/Components/AdvisorActivityTableComponent.razor index 2d99bf17..8c17ab4b 100644 --- a/Wonky.Client/Components/AdvisorActivityTableComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityTableComponent.razor @@ -27,10 +27,10 @@ Note sas Beløb - - - - + + + + @@ -46,15 +46,15 @@ @(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}") @if (activity.OurRef.Contains("T:")) - {} + {} @if (activity.Express) - {} + {} @if (activity.StatusTypeEnum == "Quote") - {} + {} @if (activity.Lines.Any()) diff --git a/Wonky.Client/Components/ColorCoding.razor b/Wonky.Client/Components/ColorCoding.razor deleted file mode 100644 index 25b39ffa..00000000 --- a/Wonky.Client/Components/ColorCoding.razor +++ /dev/null @@ -1,61 +0,0 @@ -@* -// 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] -// -*@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Besøg statusPakning/Forsendelse
stateEr nylig besøgtstateUbehandlet
statePlanlagtstateVarer er plukket
stateInterval OverskredetstateOrdre er pakket
stateAjourfør besøgsdato/intervalstatePakken er afsendt
stateVirksomhed ophørt
stateCVR/ORG nummer ugyldig
diff --git a/Wonky.Client/Components/ColorCodingComponent.razor b/Wonky.Client/Components/ColorCodingComponent.razor new file mode 100644 index 00000000..c05bd7c7 --- /dev/null +++ b/Wonky.Client/Components/ColorCodingComponent.razor @@ -0,0 +1,104 @@ +@* +// 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.Client.Components + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Kunde / Besøg StatusPakning / Forsendelse
+
+ +
+ 		Er nylig besøgt +
+ +
+ 		Ubehandlet
+
+ +
+ 		Planlæg +
+ +
+ 		Varer er plukket
+
+ +
+ 		Interval Overskredet +
+ +
+ 		Varer er pakket
+
+ +
+ 		Ajourfør besøgsdato/interval +
+ +
+ 		Varer er afsendt
+
+ +
+ 		Virksomhed ophørt
+
+ +
+ 		CVR/ORG nummer ugyldig
\ No newline at end of file diff --git a/Wonky.Client/Components/ColorCoding.razor.css b/Wonky.Client/Components/ColorCodingComponent.razor.css similarity index 100% rename from Wonky.Client/Components/ColorCoding.razor.css rename to Wonky.Client/Components/ColorCodingComponent.razor.css diff --git a/Wonky.Client/Components/DisplayStateComponent.razor.css b/Wonky.Client/Components/DisplayStateComponent.razor.css new file mode 100644 index 00000000..6e9f9df7 --- /dev/null +++ b/Wonky.Client/Components/DisplayStateComponent.razor.css @@ -0,0 +1,26 @@ +/* begin state elements */ +.state { + width: 16px; + height: 16px; + min-width: 16px; + min-height: 16px; +} +.the-good { + background-color: green; +} +.the-bad { + background-color: orange; +} +.the-ugly { + background-color: #ff0000; +} +.the-draw { + background-color: #9b02fc; +} +.no-vat { + background-color: red; +} +.the-dead { + background-color: #0dcaf0; +} +/* end state elements */ diff --git a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs b/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs index 07a266d5..f768f61d 100644 --- a/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs +++ b/Wonky.Client/Components/OfficeActivityTableComponent.razor.cs @@ -27,11 +27,11 @@ public partial class OfficeActivityTableComponent { return processStatus.ToLower() switch { - "none" => "the-ugly-fg", + "none" => "the-good-fg", "picked" => "the-bad-fg", - "packed" => "the-good-fg", - "shipped" => "the-draw-fg", - _ => "the-dead" + "packed" => "the-ugly-fg", + "shipped" => "the-dead-fg", + _ => "the-draw" }; } diff --git a/Wonky.Client/Components/ProcessStateComponent.razor b/Wonky.Client/Components/ProcessStateComponent.razor index c217eff8..2b68e373 100644 --- a/Wonky.Client/Components/ProcessStateComponent.razor +++ b/Wonky.Client/Components/ProcessStateComponent.razor @@ -15,7 +15,7 @@ // *@ - + @code{ [Parameter] public string StateClass { get; set; } = ""; @@ -25,10 +25,10 @@ { _icon = StateClass switch { - "the-ugly-fg" => "file-earmark", + "the-good-fg" => "file-earmark", "the-bad-fg" => "file-earmark-check", - "the-good-fg" => "box2-fill", - "the-draw-fg" => "truck", + "the-ugly-fg" => "box2-fill", + "the-dead-fg" => "truck", _ => "question-square" }; } diff --git a/Wonky.Client/Components/WarehouseListComponent.razor b/Wonky.Client/Components/WarehouseListComponent.razor index 682d0437..c0481601 100644 --- a/Wonky.Client/Components/WarehouseListComponent.razor +++ b/Wonky.Client/Components/WarehouseListComponent.razor @@ -19,13 +19,13 @@
- + - + diff --git a/Wonky.Client/Pages/HelpPage.razor b/Wonky.Client/Pages/InfoPage.razor similarity index 98% rename from Wonky.Client/Pages/HelpPage.razor rename to Wonky.Client/Pages/InfoPage.razor index 4891eab7..8fb1b5fa 100644 --- a/Wonky.Client/Pages/HelpPage.razor +++ b/Wonky.Client/Pages/InfoPage.razor @@ -33,7 +33,7 @@

Piktogrammer

- +
diff --git a/Wonky.Client/Pages/HelpPage.razor.css b/Wonky.Client/Pages/InfoPage.razor.css similarity index 100% rename from Wonky.Client/Pages/HelpPage.razor.css rename to Wonky.Client/Pages/InfoPage.razor.css diff --git a/Wonky.Client/wwwroot/css/app-v0.20.0.css b/Wonky.Client/wwwroot/css/app-v0.22.0.css similarity index 88% rename from Wonky.Client/wwwroot/css/app-v0.20.0.css rename to Wonky.Client/wwwroot/css/app-v0.22.0.css index 2186d44f..c91a7e71 100644 --- a/Wonky.Client/wwwroot/css/app-v0.20.0.css +++ b/Wonky.Client/wwwroot/css/app-v0.22.0.css @@ -12,36 +12,6 @@ body { .workDate { font-variant: small-caps; } -/* begin state elements */ -.state { - width: 16px; - height: 16px; - min-width: 16px; - min-height: 16px; -} -.text-inno { - color: #ffaa00; -} -.the-good { - background-color: green; -} -.the-bad { - background-color: orange; -} -.the-ugly { - background-color: #ff0000; -} -.the-draw { - background-color: #9b02fc; -} -.no-vat { - background-color: yellow; -} -.the-dead { - background-color: black; -} - -/* end state elements */ .btn.btn-edit { color: #030303; @@ -66,6 +36,10 @@ a, .btn-link { border-color: #1861ac; } +.text-inno { + color: #ffaa00; +} + .content { padding-top: 1.1rem; } diff --git a/Wonky.Client/wwwroot/index.html b/Wonky.Client/wwwroot/index.html index e8ba2952..94c5dd1f 100644 --- a/Wonky.Client/wwwroot/index.html +++ b/Wonky.Client/wwwroot/index.html @@ -18,7 +18,7 @@ - +