From e782e7cac2917bcc36fead68bf612ad0400cdfe0 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com> Date: Thu, 7 Jul 2022 08:08:18 +0200 Subject: [PATCH] publish v.0.8.122 to production --- Wonky.Client/Components/AppVersion.razor | 24 ++- .../ReportActivityLedgerComponent.razor | 137 +++++++------- .../ReportDistanceLedgerComponent.razor | 73 +++---- .../Components/ReportItemComponent.razor | 178 +++++++++--------- .../Components/ReportSummaryComponent.razor | 6 +- .../Pages/AdminSalesReportViewPage.razor | 82 ++++---- .../Pages/AdminSalesReportViewPage.razor.cs | 6 +- .../Pages/{Info.razor => HelpPage.razor} | 9 +- .../{Info.razor.css => HelpPage.razor.css} | 0 Wonky.Client/Pages/SalesReportViewPage.razor | 8 +- Wonky.Client/Shared/NavMenu.razor | 10 +- Wonky.Client/wwwroot/appsettings.json | 5 +- Wonky.Client/wwwroot/css/app.css | 39 ++++ Wonky.Client/wwwroot/css/report-print-21.css | 103 ---------- Wonky.Client/wwwroot/index.html | 10 +- Wonky.Entity/Configuration/AppInfo.cs | 5 + 16 files changed, 329 insertions(+), 366 deletions(-) rename Wonky.Client/Pages/{Info.razor => HelpPage.razor} (87%) rename Wonky.Client/Pages/{Info.razor.css => HelpPage.razor.css} (100%) delete mode 100644 Wonky.Client/wwwroot/css/report-print-21.css diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor index 99b378cc..3887769c 100644 --- a/Wonky.Client/Components/AppVersion.razor +++ b/Wonky.Client/Components/AppVersion.razor @@ -18,13 +18,35 @@ @using Wonky.Entity.Configuration @using Microsoft.Extensions.Options -@_app?.Version@if(_app!.IsBeta){-beta} +@if (_production) +{ +
- | Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount) | -Dagens Resultat | -Måneds Resultat | -|||||
---|---|---|---|---|---|---|---|---|
- | Besøg | -Demo | -Salg | -Beløb | -Besøg | -Demo | -Salg | -Beløb | -
N | -@ReportData.NewVisitCount | -@ReportData.NewDemoCount | -@ReportData.NewSaleCount | -@ReportData.NewTurnover | -@ReportData.NewVisitCountMonth | -@ReportData.NewDemoCountMonth | -@ReportData.NewSaleCountMonth | -@ReportData.NewTurnoverMonth | -
R | -@ReportData.RecallVisitCount | -@ReportData.RecallDemoCount | -@ReportData.RecallSaleCount | -@ReportData.RecallTurnover | -@ReportData.RecallVisitCountMonth | -@ReportData.RecallDemoCountMonth | -@ReportData.RecallSaleCountMonth | -@ReportData.RecallTurnoverMonth | -
SAS | -- | - | @ReportData.SasCount | -@ReportData.SasTurnover | -- | - | @ReportData.SasCountMonth | -@ReportData.SasTurnoverMonth | -
TOTAL | -@ReportData.TotalVisitCount | -@ReportData.TotalDemoCount | -@ReportData.TotalSaleCount | -@ReportData.TotalTurnover | -@ReportData.TotalVisitCountMonth | -@ReportData.TotalDemoCountMonth | -@ReportData.TotalSaleCountMonth | -@ReportData.TotalTurnoverMonth | -
+ | Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount) | +Dagens Resultat | +Måneds Resultat | +|||||
---|---|---|---|---|---|---|---|---|
+ | Besøg | +Demo | +Salg | +Beløb | +Besøg | +Demo | +Salg | +Beløb | +
N | +@ReportData.NewVisitCount | +@ReportData.NewDemoCount | +@ReportData.NewSaleCount | +@ReportData.NewTurnover | +@ReportData.NewVisitCountMonth | +@ReportData.NewDemoCountMonth | +@ReportData.NewSaleCountMonth | +@ReportData.NewTurnoverMonth | +
R | +@ReportData.RecallVisitCount | +@ReportData.RecallDemoCount | +@ReportData.RecallSaleCount | +@ReportData.RecallTurnover | +@ReportData.RecallVisitCountMonth | +@ReportData.RecallDemoCountMonth | +@ReportData.RecallSaleCountMonth | +@ReportData.RecallTurnoverMonth | +
SAS | ++ | + | @ReportData.SasCount | +@ReportData.SasTurnover | ++ | + | @ReportData.SasCountMonth | +@ReportData.SasTurnoverMonth | +
TOTAL | +@ReportData.TotalVisitCount | +@ReportData.TotalDemoCount | +@ReportData.TotalSaleCount | +@ReportData.TotalTurnover | +@ReportData.TotalVisitCountMonth | +@ReportData.TotalDemoCountMonth | +@ReportData.TotalSaleCountMonth | +@ReportData.TotalTurnoverMonth | +
- Km regnskab - | -|
---|---|
Aften | -@ReportData.KmEvening | -
Morgen | -@ReportData.KmMorning | -
Kørt Dag | -@ReportData.Distance | -
Kørt Md. | -@ReportData.DistanceMonth | -
Privat | -@ReportData.DistancePrivate | -
Privat Md. | -@ReportData.DistancePrivateMonth | -
+ Km regnskab + | +|
---|---|
Aften | +@ReportData.KmEvening | +
Morgen | +@ReportData.KmMorning | +
Kørt Dag | +@ReportData.Distance | +
Kørt Md. | +@ReportData.DistanceMonth | +
Privat | +@ReportData.DistancePrivate | +
Privat Md. | +@ReportData.DistancePrivateMonth | +
EOrdre nr. | -@ReportItem.ESalesNumber | -Konto | -@ReportItem.Company.Account | -
---|---|---|---|
Telefon | -@ReportItem.Company.Phone | -Køber | -@ReportItem.YourRef | -
CVR/VAT | -@ReportItem.Company.VatNumber | -Rekvisition | -@ReportItem.ReferenceNumber | -
Navn | -@ReportItem.Company.Name | -Lev.Navn | -@ReportItem.DlvName | -
Adresse | -@ReportItem.Company.Address1 | -Lev.Adresse | -@ReportItem.DlvAddress1 | -
Adresse | -@ReportItem.Company.Address2 | -Lev.Adresse | -@ReportItem.DlvAddress2 | -
Postnr By | -@ReportItem.Company.ZipCode @ReportItem.Company.City | -Lev.Postnr By | -@ReportItem.DlvZipCity | -
Antal | -Varnr | -Beskrivelse | -Pris | -R% | -Beløb | -||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@line.Quantity | -@line.Sku | -@line.Description | -@($"{line.Price:N2}") | -@($"{line.Discount:N2}") | -@($"{line.LineSum:N2}") | +
+ Ordre @ReportItem.ESalesNumber + | |||
---|---|---|---|
Dato | +@ReportItem.OrderDate | +Konto | +@ReportItem.Company.Account | +
Telefon | +@ReportItem.Company.Phone | +Køber | +@ReportItem.YourRef | +
CVR/VAT | +@ReportItem.Company.VatNumber | +Rekvisition | +@ReportItem.ReferenceNumber | +
Navn | +@ReportItem.Company.Name | +Lev.Navn | +@ReportItem.DlvName | +
Adresse | +@ReportItem.Company.Address1 | +Lev.Adresse | +@ReportItem.DlvAddress1 | +
Adresse | +@ReportItem.Company.Address2 | +Lev.Adresse | +@ReportItem.DlvAddress2 | +
Postnr By | +@ReportItem.Company.ZipCode @ReportItem.Company.City | +Lev.Postnr By | +@ReportItem.DlvZipCity | +
Antal | +Varnr | +Beskrivelse | +Pris | +R% | +Beløb | +
---|---|---|---|---|---|
@line.Quantity | +@line.Sku | +@line.Description | +@($"{line.Price:N2}") | +@($"{line.Discount:N2}") | +@($"{line.LineSum:N2}") | +
+ | Ordresum | +@ReportItem.OrderAmount | +
@@ -33,7 +33,7 @@ | @ReportData.SupervisedBy | |||
---|---|---|---|---|
Indhold | +Dækkende | @{ switch (ReportData.DayTypeEnum) @@ -61,7 +61,7 @@ | ||
Fra/Til | +Periode |
@{
switch (ReportData.DayTypeEnum)
diff --git a/Wonky.Client/Pages/AdminSalesReportViewPage.razor b/Wonky.Client/Pages/AdminSalesReportViewPage.razor
index 68cc74bb..ec2c8d67 100644
--- a/Wonky.Client/Pages/AdminSalesReportViewPage.razor
+++ b/Wonky.Client/Pages/AdminSalesReportViewPage.razor
@@ -22,53 +22,49 @@
@if (Report != null)
{
-
-
-
- @* *@
-
- @if (_items.Any())
- {
-
- @foreach (var item in _items)
- {
-
-
-
- @if (!string.IsNullOrWhiteSpace(ReportDate))
- {
-
- @DateTime.Parse(ReportDate).ToLongDateString()- } -
-
-
-
-
-
-
- @Report.ReportData.Name-
-
-
-
-
-
-
-
-
+
}
else
{
+
+
+
- }
- }
+
+ @if (!string.IsNullOrWhiteSpace(ReportDate))
+ {
+
+ @DateTime.Parse(ReportDate).ToLongDateString()+ } +
+
+
+
+
+
+
@Report.ReportData.Name
+
+
+
+
+
+ Browservalg- De nyeste udgaver af Firefox, Edge, Safari, Vivaldi, Chrome eller Chromium. + Den nyeste udgave af Google Chrome, Chromium, Microsoft Edge, Apple Safari eller Vivaldi.
@@ -38,10 +38,7 @@
-
- App version
-
+ |