From a03d23192a861bc32f223c10019315b85e899bc7 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Sat, 2 Dec 2023 14:58:33 +0100 Subject: [PATCH] rework display - rebuild all - added script for building all --- .../Components/ActivityLinesComponent.razor | 4 ++-- .../ReportActivityListComponent.razor | 10 +++++----- .../ReportLedgerSummaryComponent.razor | 19 +++++++------------ Wonky.Client/wwwroot/appsettings.json | 4 ++-- build-all.sh | 11 +++++++++++ 5 files changed, 27 insertions(+), 21 deletions(-) create mode 100755 build-all.sh diff --git a/Wonky.Client/Components/ActivityLinesComponent.razor b/Wonky.Client/Components/ActivityLinesComponent.razor index 6da21bab..198b41fe 100644 --- a/Wonky.Client/Components/ActivityLinesComponent.razor +++ b/Wonky.Client/Components/ActivityLinesComponent.razor @@ -41,7 +41,7 @@ SAS - @ReportItem.SasAmount + @ReportItem.SasAmount @@ -51,7 +51,7 @@ TOTAL - @(ReportItem.OrderAmount + ReportItem.SasAmount) + @(ReportItem.OrderAmount + ReportItem.SasAmount) diff --git a/Wonky.Client/Components/ReportActivityListComponent.razor b/Wonky.Client/Components/ReportActivityListComponent.razor index d034c6d5..8a941da6 100644 --- a/Wonky.Client/Components/ReportActivityListComponent.razor +++ b/Wonky.Client/Components/ReportActivityListComponent.razor @@ -25,7 +25,7 @@ Salg Note SAS - NORMAL + Salg @@ -73,14 +73,14 @@ - - @(Activities.Sum(x => x.SasAmount)) - @(Activities.Sum(x => x.OrderAmount)) + + @(Activities.Sum(x => x.SasAmount)) + @(Activities.Sum(x => x.OrderAmount)) TOTAL - @(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount)) + @(Activities.Sum(x => x.SasAmount) + Activities.Sum(x => x.OrderAmount)) diff --git a/Wonky.Client/Components/ReportLedgerSummaryComponent.razor b/Wonky.Client/Components/ReportLedgerSummaryComponent.razor index baa81814..c49ade6c 100644 --- a/Wonky.Client/Components/ReportLedgerSummaryComponent.razor +++ b/Wonky.Client/Components/ReportLedgerSummaryComponent.razor @@ -23,7 +23,7 @@ Demo: @(ReportData.NewDemoCount + ReportData.RecallDemoCount) - Resultat + Dagens Resultat Måneds Resultat @@ -65,7 +65,7 @@ @* PHONE row *@ - TLF + Tlf @ReportData.PhoneCount @@ -77,7 +77,7 @@ @* WEB row *@ - WEB + Web @ReportData.WebCount @@ -89,7 +89,7 @@ @* SUMMARY row *@ - SALG + Salg u/SAS @ReportData.TotalVisitCount @ReportData.TotalDemoCount @ReportData.TotalSaleCount @@ -112,15 +112,10 @@ @ReportData.SasTurnoverMonth @* TOTAL summarry row *@ - - SUM - - - + + Dagens oms. @ReportData.TotalTurnover - - - + Måneds oms. @ReportData.TotalTurnoverMonth diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 615bc445..59cc4ba1 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,8 +1,8 @@ { "appInfo": { "name": "Wonky Online", - "version": "314.0", - "rc": true, + "version": "315.0", + "rc": false, "sandBox": true, "image": "grumpy-coder.png", "sdk": "dotnet 8.0" diff --git a/build-all.sh b/build-all.sh new file mode 100755 index 00000000..81f0b4f3 --- /dev/null +++ b/build-all.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +if [[ -z $1 ]]; then + echo "no version" + exit 1 +fi + +./alfa-build.sh $1 +./edu-build.sh $1 +./next-build.sh $1 +./prod-build.sh $1 \ No newline at end of file