diff --git a/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor b/Wonky.Client/Components/ReportActivityLedgerComponent.razor similarity index 83% rename from Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor rename to Wonky.Client/Components/ReportActivityLedgerComponent.razor index b90c0f25..e1a7d0a1 100644 --- a/Wonky.Client/Components/AdvisorReportActivityLedgerComponent.razor +++ b/Wonky.Client/Components/ReportActivityLedgerComponent.razor @@ -18,7 +18,7 @@ - + @@ -26,16 +26,16 @@ - + - - - - - - - - + + + + + + + + @@ -83,7 +83,11 @@
Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount) Dagens Resultat
BesøgDemoSalgBeløbBesøgDemoSalgBeløbBesøgDemoSalgBeløbBesøgDemoSalgBeløb
N
- +
+
+ @(ReportData.TotalTurnoverMonth + ReportData.SasTurnoverMonth) +
+
@code{ [Parameter] diff --git a/Wonky.Client/Components/ReportViewActivityLedgerComponent.razor b/Wonky.Client/Components/ReportViewActivityLedgerComponent.razor index 980a2ff3..33e39802 100644 --- a/Wonky.Client/Components/ReportViewActivityLedgerComponent.razor +++ b/Wonky.Client/Components/ReportViewActivityLedgerComponent.razor @@ -19,7 +19,7 @@
- + @@ -27,16 +27,16 @@ - + - - - - - - - - + + + + + + + + @@ -84,7 +84,11 @@
Dagens Demo @(ReportData.NewDemoCount + ReportData.RecallDemoCount) Dagens Resultat
BesøgDemoSalgBeløbBesøgDemoSalgBeløbBesøgDemoSalgBeløbBesøgDemoSalgBeløb
N
- +
+
+ @(ReportData.TotalTurnoverMonth + ReportData.SasTurnoverMonth) +
+
@code{ diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 34fd7a1f..d6fdb49b 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -119,7 +119,7 @@ public partial class AdvisorActivityCreatePage : IDisposable if (_company.HasFolded == 1) { // _company has shut down - _activity.OrderMessage = "BEMÆRK: CVR nummer er ophørt."; + _activity.OrderMessage = "BEMÆRK: CVR nummer er ikke normal. Check for ophør eller fusion"; } _activity.ActivityStatusEnum = "noSale"; // decide if new or recall @@ -176,6 +176,7 @@ public partial class AdvisorActivityCreatePage : IDisposable await PreferenceService.SetWorkDate(SelectedDate); } // raise flag if report is closed + // the flag cause a message instead of order entry ReportClosed = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); // Lines may already have been added from the company inventory page if (DraftProvider.Draft.DraftType == "order") @@ -188,7 +189,7 @@ public partial class AdvisorActivityCreatePage : IDisposable _activity.ActivityStatusEnum = "order"; _formInvalid = false; } - if (_salesRep.CountryCode.ToLower() == "se") + if (_salesRep.CountryCode.Equals("se", StringComparison.CurrentCultureIgnoreCase)) { await TestOrgNumber(); } diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor index 94877d1c..af9d2046 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor @@ -78,11 +78,11 @@ Report.Figures.KmMorning = _kmMorning; + @bind-Value="_checkIn" @bind-Value:event="oninput" @onchange="@OnTimeChanged"/> + @bind-Value="_checkOut" @bind-Value:event="oninput" @onchange="@OnTimeChanged"/> } @@ -191,7 +191,7 @@ }
@* ledger summaries calculated *@ - +
diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 3edaecad..4890c8fb 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -147,7 +147,7 @@ public partial class AdvisorReportCreatePage : IDisposable _currKmMonth = data.ReportData.DistanceMonth; _currKmPrivate = data.ReportData.DistancePrivate; - if (Report.DayTypeEnum.ToLower().Contains("leave")) + if (Report.DayTypeEnum.Contains("leave", StringComparison.CurrentCultureIgnoreCase)) { // ensure no distances in calculation Report.Figures.KmMorning = 0; @@ -253,7 +253,7 @@ public partial class AdvisorReportCreatePage : IDisposable DateTime checkOut; // create a date time object using workDate and workHour input - if (Report.DayTypeEnum.ToLower().Contains("leave")) + if (Report.DayTypeEnum.Contains("leave", StringComparison.CurrentCultureIgnoreCase)) { checkIn = new DateTime(_beginLeave.Year, _beginLeave.Month, _beginLeave.Day, 0, 0, 0); checkOut = new DateTime(_endLeave.Year, _endLeave.Month, _endLeave.Day, 0, 0, 0); @@ -269,8 +269,9 @@ public partial class AdvisorReportCreatePage : IDisposable // format report date time input Report.FromDateTime = checkIn.ToString("yyyy-MM-dd'T'HH:mm:ss", CultureInfo.InvariantCulture); - Report.ToDateTime = checkOut.ToString("yyyy-MM-dd'T'HH:mm:ss", CultureInfo.InvariantCulture); - + Report.ToDateTime = checkOut.ToString("yyyy-MM-dd'T'HH:mm:ss", CultureInfo.InvariantCulture); + Logger.LogDebug("Report.FromDateTime => {}", Report.FromDateTime ); + Logger.LogDebug("Report.ToDateTime => {}", Report.ToDateTime ); Logger.LogDebug("_workDate => {workDate}", $"{_thisWorkDate:yyyy-MM-dd}"); Logger.LogDebug("Report => {report}", JsonSerializer.Serialize(Report)); diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 21d54b48..d8adf0bd 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "249.0", + "version": "255.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png", diff --git a/Wonky.Client/wwwroot/css/print.css b/Wonky.Client/wwwroot/css/print.css index 82f06565..1f518b43 100644 --- a/Wonky.Client/wwwroot/css/print.css +++ b/Wonky.Client/wwwroot/css/print.css @@ -15,9 +15,9 @@ } .report-main { font-size: 10px; - page-break-before: always; - page-break-after: always; - break-before: page; + /*page-break-before: always;*/ + /*page-break-after: always;*/ + /*break-before: page;*/ break-after: page; break-inside: avoid; /*min-height: 280mm;*/ @@ -30,10 +30,10 @@ color-adjust: exact; } .report-visit { - page-break-before: always; - page-break-after: always; + /*page-break-before: always;*/ + /*page-break-after: always;*/ break-after: page; - break-before: page; + /*break-before: page;*/ break-inside: avoid-page; height: initial; border: initial; @@ -47,9 +47,11 @@ } .distance-ledger {} .report-ledger { - page-break-before: avoid; - page-break-inside: avoid; - page-break-after: always; + /*page-break-before: avoid;*/ + /*page-break-inside: avoid;*/ + /*page-break-after: always;*/ + break-before: avoid; + break-inside: avoid; break-after: recto; min-height: 300px; } diff --git a/alfa-build.sh b/alfa-build.sh index 0488f1df..d54557a0 100755 --- a/alfa-build.sh +++ b/alfa-build.sh @@ -21,7 +21,7 @@ sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}" dotnet clean dotnet publish -c release -cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/* "/a/projects/inno/version-sync/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/* "/a/projects/inno/version-sync/${FOLDER}" sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://dev.innotec.dk\",|g' "${FILE}" sed -i 's|\"rc\".*|\"rc\": true,|g' "${FILE}" diff --git a/edu-build.sh b/edu-build.sh index 2e40fabc..1fc1e3a6 100755 --- a/edu-build.sh +++ b/edu-build.sh @@ -21,7 +21,7 @@ sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://eta.innotec.dk\",|g' "${FILE}" dotnet clean dotnet publish -c release -cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" # RESET TO DEVELOPMENT sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" diff --git a/next-build.sh b/next-build.sh index ede7eb96..207341d0 100755 --- a/next-build.sh +++ b/next-build.sh @@ -21,7 +21,7 @@ sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}" dotnet clean dotnet publish -c release -cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" # RESET TO DEVELOPMENT sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}" diff --git a/prod-build.sh b/prod-build.sh index c7d55155..b6099e3c 100755 --- a/prod-build.sh +++ b/prod-build.sh @@ -21,7 +21,7 @@ sed -i 's|\"baseUrl\".*|\"baseUrl\": \"https://zeta.innotec.dk\",|g' "${FILE}" dotnet clean dotnet publish -c release -cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net7.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" +cp --recursive /a/projects/inno/a/Wonky.Client/Wonky.Client/bin/Release/net8.0/publish/ "/a/projects/inno/version-sync/client/${FOLDER}" # RESET TO DEVELOPMENT sed -i 's|\"sandBox\".*|\"sandBox\": true,|g' "${FILE}"