From 50a41ebd59ded21207e8cd3b8466b53113199c52 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 13 Nov 2023 08:43:13 +0100 Subject: [PATCH] added new property to ReportInitDto - rebuilt production --- Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs | 8 +++++--- Wonky.Client/wwwroot/appsettings.json | 4 ++-- Wonky.Entity/DTO/ReportInitDto.cs | 1 + 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index c1b2266f..2e46b981 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -116,7 +116,6 @@ public partial class AdvisorReportCreatePage : IDisposable Report.Figures.Distance = 0; Report.Figures.DistancePrivate = 0; Report.Figures.DistancePrivateMonth = 0; - await GetKeyFigures(); Logger.LogDebug("OnInitializedAsync => GetKeyFigures <= {}", JsonSerializer.Serialize(Report)); @@ -244,7 +243,8 @@ public partial class AdvisorReportCreatePage : IDisposable } // distance day check - only if not leave - if (Report.Figures.KmMorning > Report.Figures.KmEvening && !Report.DayTypeEnum.ToLower().Contains("leave")) + if (Report.Figures.KmMorning > Report.Figures.KmEvening && + !Report.DayTypeEnum.Contains("leave", StringComparison.CurrentCultureIgnoreCase)) { Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal"); return; @@ -255,8 +255,10 @@ public partial class AdvisorReportCreatePage : IDisposable DateTime checkOut; // create a list of activity ids for the report - Report.ActivityIdList = _reportData.ReportItems.Select(x => x.ActivityId).ToList(); + // Report.ActivityIdList = _reportData.ReportItems.Select(x => x.ActivityId).ToList(); + Report.ActivityIdList = _reportData.ActivityIdList; 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/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index e8e0af3b..c6a845e7 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,8 +1,8 @@ { "appInfo": { "name": "Wonky Online", - "version": "301.0", - "rc": false, + "version": "302.0", + "rc": true, "sandBox": true, "image": "grumpy-coder.png", "sdk": "dotnet 8.0" diff --git a/Wonky.Entity/DTO/ReportInitDto.cs b/Wonky.Entity/DTO/ReportInitDto.cs index d63b31ae..46846274 100644 --- a/Wonky.Entity/DTO/ReportInitDto.cs +++ b/Wonky.Entity/DTO/ReportInitDto.cs @@ -24,4 +24,5 @@ public class ReportInitDto public bool ReportClosed { get; set; } public ReportFiguresView ReportData { get; set; } = new(); public List ReportItems { get; set; } = new(); + public List ActivityIdList { get; set; } = new(); } \ No newline at end of file