From 73520262b1fe4cfc68ed4941550908918f352099 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Wed, 8 Nov 2023 14:59:52 +0100 Subject: [PATCH] production v.296 added activityIdList to create report endpoint --- .../Components/ActivityLinesComponent.razor | 60 +++++++++++++++++++ .../Components/ReportVisitComponent.razor | 16 +++-- .../AdvisorCustomerActivityViewEditPage.razor | 7 +++ .../Pages/AdvisorReportCreatePage.razor.cs | 18 +++--- Wonky.Client/Pages/OfficeOrderViewPage.razor | 53 +--------------- Wonky.Client/wwwroot/appsettings.json | 2 +- Wonky.Client/wwwroot/css/app.css | 3 +- Wonky.Entity/DTO/ReportDto.cs | 1 + 8 files changed, 94 insertions(+), 66 deletions(-) create mode 100644 Wonky.Client/Components/ActivityLinesComponent.razor diff --git a/Wonky.Client/Components/ActivityLinesComponent.razor b/Wonky.Client/Components/ActivityLinesComponent.razor new file mode 100644 index 00000000..a8074164 --- /dev/null +++ b/Wonky.Client/Components/ActivityLinesComponent.razor @@ -0,0 +1,60 @@ +@using Wonky.Entity.Views + + + + + + + + + + + + + + + @foreach (var line in ReportItem.Lines) + { + + + + + + + + + + } + @if (ReportItem.Express) + { + + + } + + + + + + + + + + + + + + + + + + +
AntalVarnrBeskrivelsePrisR%BeløbSAS
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
+
HASTER
+
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.OrderAmount + ReportItem.SasAmount)
+ +@code { + + [Parameter] + public ReportItemView ReportItem { get; set; } = new(); + +} \ No newline at end of file diff --git a/Wonky.Client/Components/ReportVisitComponent.razor b/Wonky.Client/Components/ReportVisitComponent.razor index 95551ca8..6d94fa28 100644 --- a/Wonky.Client/Components/ReportVisitComponent.razor +++ b/Wonky.Client/Components/ReportVisitComponent.razor @@ -92,6 +92,12 @@ Email @ReportItem.Company.Email + + Vores Ref + @ReportItem.OurRef + Oprettet af + @ReportItem.CreatedBy + @@ -118,7 +124,9 @@ - + } @@ -147,8 +155,8 @@ } - - + +
@($"{line.Price:N2}") @($"{line.Discount:N2}") @($"{line.LineSum:N2}") + +
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) { @@ -158,4 +166,4 @@

} - + \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor index 8a7bf296..737ac3e3 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerActivityViewEditPage.razor @@ -23,6 +23,9 @@ @ReportItem.Company.Name @ReportItem.OrderDate + + +@* @@ -104,7 +107,9 @@
+*@ +@* @@ -163,6 +168,8 @@ }
+*@ + @* Office Note *@ @if (ReportItem is { ProcessStatusEnum: "None",Express: false } && AllowOfficeNoteUpdate()) { diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index 2cb9ae0e..c1b2266f 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -62,6 +62,7 @@ public partial class AdvisorReportCreatePage : IDisposable private int _currKmPrivate; private bool _isSupervisor; private int _kmMorning; + private ReportInitDto _reportData = new(); /// @@ -138,15 +139,15 @@ public partial class AdvisorReportCreatePage : IDisposable _initialValues = new ReportFiguresView(); _activities = new List(); - var data = await AdvisorSalesReportRepo.InitializeReportData(_workDate); - if(data.ReportClosed) + _reportData = await AdvisorSalesReportRepo.InitializeReportData(_workDate); + if(_reportData.ReportClosed) Navigator.NavigateTo($"/advisor/reports/view/{_thisWorkDate:yyyy-MM-dd}"); - Report.Figures = data.ReportData; - _initialValues = data.ReportData; - _activities = data.ReportItems; - _currKmMonth = data.ReportData.DistanceMonth; - _currKmPrivate = data.ReportData.DistancePrivate; + Report.Figures = _reportData.ReportData; + _initialValues = _reportData.ReportData; + _activities = _reportData.ReportItems; + _currKmMonth = _reportData.ReportData.DistanceMonth; + _currKmPrivate = _reportData.ReportData.DistancePrivate; if (Report.DayTypeEnum.Contains("leave", StringComparison.CurrentCultureIgnoreCase)) { @@ -253,6 +254,9 @@ public partial class AdvisorReportCreatePage : IDisposable DateTime checkIn; DateTime checkOut; + // create a list of activity ids for the report + Report.ActivityIdList = _reportData.ReportItems.Select(x => x.ActivityId).ToList(); + Logger.LogDebug("ActivityIdList => {}", JsonSerializer.Serialize(Report.ActivityIdList)); // create a date time object using workDate and workHour input if (Report.DayTypeEnum.Contains("leave", StringComparison.CurrentCultureIgnoreCase)) { diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OfficeOrderViewPage.razor index 89d83448..c875509c 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor @@ -41,58 +41,8 @@ + - - - - - - - - - - - - - - @foreach (var line in ReportItem.Lines) - { - - - - - - - - - - } - @if (ReportItem.Express) - { - - - } - - - - - - - - - - - - - - - - - - -
AntalVarnrBeskrivelsePrisR%BeløbSAS
@line.Quantity@line.Sku@line.Description@($"{line.Price:N2}")@($"{line.Discount:N2}")@($"{line.LineSum:N2}")
-
HASTER
-
SAS@ReportItem.SasAmount
NORMAL@ReportItem.OrderAmount
TOTAL@(ReportItem.OrderAmount + ReportItem.SasAmount)
@if (!string.IsNullOrWhiteSpace(ReportItem.OfficeNote)) {
@@ -100,7 +50,6 @@
} - @if (Working) { diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index fdd45629..15021995 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "294.0", + "version": "296.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png", diff --git a/Wonky.Client/wwwroot/css/app.css b/Wonky.Client/wwwroot/css/app.css index 19353776..7cd3fce1 100644 --- a/Wonky.Client/wwwroot/css/app.css +++ b/Wonky.Client/wwwroot/css/app.css @@ -23,10 +23,9 @@ } .i-larger { - font-size: 1.3rem; + /*font-size: 1.3rem;*/ } .sas-check { - font-size: 2rem; } .btn.btn-edit { diff --git a/Wonky.Entity/DTO/ReportDto.cs b/Wonky.Entity/DTO/ReportDto.cs index 316e5346..5c69b0ea 100644 --- a/Wonky.Entity/DTO/ReportDto.cs +++ b/Wonky.Entity/DTO/ReportDto.cs @@ -35,4 +35,5 @@ public class ReportDto public string FromDateTime { get; set; } = ""; public string ToDateTime { get; set; } = ""; public ReportFiguresView Figures { get; set; } = new(); + public List ActivityIdList { get; set; } = new(); } \ No newline at end of file