From 096aa9201eb3b53236913c2d92f59260d4a883da Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 22 Nov 2022 13:44:08 +0100 Subject: [PATCH] fix small cosmetics v.0.50.2 --- .../AdvisorActivityKmStartComponent.razor | 3 +- .../Components/ReportTableComponent.razor | 46 ++--- .../Components/ReportTableComponent.razor.cs | 5 + .../Pages/CrmActivityNewPage.razor.cs | 1 + Wonky.Client/Pages/CrmActivityTodayPage.razor | 2 +- .../Pages/CrmActivityTodayPage.razor.cs | 30 ++-- ...ListPage.razor => CrmReportListPage.razor} | 15 +- ...ge.razor.cs => CrmReportListPage.razor.cs} | 2 +- Wonky.Client/Pages/CrmReportNewPage.razor | 105 ++++++------ Wonky.Client/Pages/CrmReportNewPage.razor.cs | 158 +++++++++--------- Wonky.Client/Services/RefreshTokenService.cs | 3 +- Wonky.Client/wwwroot/appsettings.json | 6 +- 12 files changed, 193 insertions(+), 183 deletions(-) rename Wonky.Client/Pages/{CrmActivityReportListPage.razor => CrmReportListPage.razor} (73%) rename Wonky.Client/Pages/{CrmActivityReportListPage.razor.cs => CrmReportListPage.razor.cs} (96%) diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index c383a9a9..d14ea3cd 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -2,7 +2,8 @@
- +
@code { diff --git a/Wonky.Client/Components/ReportTableComponent.razor b/Wonky.Client/Components/ReportTableComponent.razor index addae76a..b5cf84f7 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor +++ b/Wonky.Client/Components/ReportTableComponent.razor @@ -15,28 +15,28 @@ // *@ -@if (ReportList.Any()) -{ -
-
-
-
- Dato -
-
- Dag -
-
- Start -
-
- Slut -
-
- Resultat -
+
+
+
+
+ Dato +
+
+ Dag +
+
+ Start +
+
+ Slut +
+
+ Resultat
+
+ @if (_reports.Any()) + { @foreach (var report in ReportList) { @@ -81,9 +81,9 @@
} -
-} + } +
else { - + } \ No newline at end of file diff --git a/Wonky.Client/Components/ReportTableComponent.razor.cs b/Wonky.Client/Components/ReportTableComponent.razor.cs index 0f847ad3..4da8d7c1 100644 --- a/Wonky.Client/Components/ReportTableComponent.razor.cs +++ b/Wonky.Client/Components/ReportTableComponent.razor.cs @@ -22,4 +22,9 @@ namespace Wonky.Client.Components; public partial class ReportTableComponent { [Parameter] public List ReportList { get; set; } = new(); + private List _reports { get; set; } = new(); + protected override void OnParametersSet() + { + _reports = ReportList; + } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs index 40656e64..330bfa1e 100644 --- a/Wonky.Client/Pages/CrmActivityNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmActivityNewPage.razor.cs @@ -288,6 +288,7 @@ public partial class CrmActivityNewPage : IDisposable DraftStateProvider.Draft.Items.Count == 0 ? "Besøg er oprettet" : "Bestilling er oprettet"); await DeleteDraft(); Navigator.NavigateTo($"/companies"); + return; } PoFormInvalid = false; diff --git a/Wonky.Client/Pages/CrmActivityTodayPage.razor b/Wonky.Client/Pages/CrmActivityTodayPage.razor index d6a71750..675d4cbc 100644 --- a/Wonky.Client/Pages/CrmActivityTodayPage.razor +++ b/Wonky.Client/Pages/CrmActivityTodayPage.razor @@ -28,7 +28,7 @@
- @if (_reportExist) + @if (ReportExist) { RAPPORT } diff --git a/Wonky.Client/Pages/CrmActivityTodayPage.razor.cs b/Wonky.Client/Pages/CrmActivityTodayPage.razor.cs index 41c18b6a..07d0dc38 100644 --- a/Wonky.Client/Pages/CrmActivityTodayPage.razor.cs +++ b/Wonky.Client/Pages/CrmActivityTodayPage.razor.cs @@ -27,45 +27,47 @@ namespace Wonky.Client.Pages; public partial class CrmActivityTodayPage : IDisposable { - [Inject] public PreferenceService _preferenceService { get; set; } - [Inject] public ILogger _logger { get; set; } - [Inject] public HttpInterceptorService _interceptor { get; set; } - [Inject] public NavigationManager _navigator { get; set; } + [Inject] public PreferenceService PreferenceService { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public IToastService Toaster { get; set; } private ReportStatusView? ReportStatusView { get; set; } = new(); - private Preferences _prefs { get; set; } = new(); + private Preferences Preferences { get; set; } = new(); private DateTime SelectedDate { get; set; } - private bool _reportExist = false; + private bool ReportExist { get; set; } private bool Loading { get; set; } = true; protected override async Task OnInitializedAsync() { - _prefs = await _preferenceService.GetPreferences(); - SelectedDate = string.IsNullOrWhiteSpace(_prefs.WorkDate) ? DateTime.Now : DateTime.Parse(_prefs.WorkDate); + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + Preferences = await PreferenceService.GetPreferences(); - _interceptor.RegisterEvent(); - _interceptor.RegisterBeforeSendEvent(); + SelectedDate = string.IsNullOrWhiteSpace(Preferences.WorkDate) ? DateTime.Now : DateTime.Parse(Preferences.WorkDate); + + ReportExist = await CrmReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); - _reportExist = await CrmReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); await GetActivities($"{SelectedDate:yyyy-MM-dd}"); } private async Task GetActivities(string workDate) { - Toaster.ShowInfo("Vent nogle sekunder for data"); + Toaster.ShowInfo("Vent nogle sekunder for data", "HENTER DATA"); SelectedDate = DateTime.Parse(workDate); ReportStatusView = new ReportStatusView(); ReportStatusView = await CrmActivityRepo.GetActivities($"{SelectedDate:yyyy-MM-dd}"); - _logger.LogDebug("Activities => {}", JsonSerializer.Serialize(ReportStatusView)); + Logger.LogDebug("Activities => {}", JsonSerializer.Serialize(ReportStatusView)); Loading = false; Toaster.ClearAll(); } public void Dispose() { - _interceptor.DisposeEvent(); + Interceptor.DisposeEvent(); } } \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmActivityReportListPage.razor b/Wonky.Client/Pages/CrmReportListPage.razor similarity index 73% rename from Wonky.Client/Pages/CrmActivityReportListPage.razor rename to Wonky.Client/Pages/CrmReportListPage.razor index 7d3de719..54c6e138 100644 --- a/Wonky.Client/Pages/CrmActivityReportListPage.razor +++ b/Wonky.Client/Pages/CrmReportListPage.razor @@ -17,15 +17,10 @@ @using Wonky.Client.Components @page "/sales-reports" -
-
-
-
-

Rapport Arkiv

-
+ +
+
+

Rapport Arkiv

-
- -
-
+ diff --git a/Wonky.Client/Pages/CrmActivityReportListPage.razor.cs b/Wonky.Client/Pages/CrmReportListPage.razor.cs similarity index 96% rename from Wonky.Client/Pages/CrmActivityReportListPage.razor.cs rename to Wonky.Client/Pages/CrmReportListPage.razor.cs index 232b4364..64aa4122 100644 --- a/Wonky.Client/Pages/CrmActivityReportListPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportListPage.razor.cs @@ -22,7 +22,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class CrmActivityReportListPage : IDisposable +public partial class CrmReportListPage : IDisposable { [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } [Inject] public HttpInterceptorService _interceptor { get; set; } diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor b/Wonky.Client/Pages/CrmReportNewPage.razor index b797b9bc..8ce8d00e 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor +++ b/Wonky.Client/Pages/CrmReportNewPage.razor @@ -24,15 +24,18 @@
+
+ +
- @if (_working) + @if (Working) { }
- +
@@ -48,7 +51,7 @@ - @if (_report.DayTypeEnum.ToLower().Contains("leave")) + @if (Report.DayTypeEnum.ToLower().Contains("leave")) {
- + @@ -81,14 +84,14 @@ } @*
*@ @*
*@ @@ -96,7 +99,7 @@
- @if (!_report.DayTypeEnum.ToLower().Contains("leave")) + @if (!Report.DayTypeEnum.ToLower().Contains("leave")) { @@ -108,12 +111,12 @@ @@ -131,16 +134,16 @@ @@ -150,7 +153,7 @@ - + @@ -169,52 +172,52 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + + - - + + - - - - - - - - + + + + + + + +
- - + + - - + +
- + - + - +
Dagens Demo @(_report.Figures.NewDemoCount + _report.Figures.RecallDemoCount)Dagens Demo @(Report.Figures.NewDemoCount + Report.Figures.RecallDemoCount) Dagens Resultat Måneds Resultat
N@_report.Figures.NewVisitCount@_report.Figures.NewDemoCount@_report.Figures.NewSaleCount@_report.Figures.NewTurnover@_report.Figures.NewVisitCountMonth@_report.Figures.NewDemoCountMonth@_report.Figures.NewSaleCountMonth@_report.Figures.NewTurnoverMonth@Report.Figures.NewVisitCount@Report.Figures.NewDemoCount@Report.Figures.NewSaleCount@Report.Figures.NewTurnover@Report.Figures.NewVisitCountMonth@Report.Figures.NewDemoCountMonth@Report.Figures.NewSaleCountMonth@Report.Figures.NewTurnoverMonth
R@_report.Figures.RecallVisitCount@_report.Figures.RecallDemoCount@_report.Figures.RecallSaleCount@_report.Figures.RecallTurnover@_report.Figures.RecallVisitCountMonth@_report.Figures.RecallDemoCountMonth@_report.Figures.RecallSaleCountMonth@_report.Figures.RecallTurnoverMonth@Report.Figures.RecallVisitCount@Report.Figures.RecallDemoCount@Report.Figures.RecallSaleCount@Report.Figures.RecallTurnover@Report.Figures.RecallVisitCountMonth@Report.Figures.RecallDemoCountMonth@Report.Figures.RecallSaleCountMonth@Report.Figures.RecallTurnoverMonth
SAS @_report.Figures.SasCount@_report.Figures.SasTurnover@Report.Figures.SasCount@Report.Figures.SasTurnover @_report.Figures.SasCountMonth@_report.Figures.SasTurnoverMonth@Report.Figures.SasCountMonth@Report.Figures.SasTurnoverMonth
TOTAL@_report.Figures.TotalVisitCount@_report.Figures.TotalDemoCount@_report.Figures.TotalSaleCount@_report.Figures.TotalTurnover@_report.Figures.TotalVisitCountMonth@_report.Figures.TotalDemoCountMonth@_report.Figures.TotalSaleCountMonth@_report.Figures.TotalTurnoverMonth@Report.Figures.TotalVisitCount@Report.Figures.TotalDemoCount@Report.Figures.TotalSaleCount@Report.Figures.TotalTurnover@Report.Figures.TotalVisitCountMonth@Report.Figures.TotalDemoCountMonth@Report.Figures.TotalSaleCountMonth@Report.Figures.TotalTurnoverMonth
- @if (_activities != null) + @if (Activities != null) { @@ -238,7 +241,7 @@ - @foreach (var activity in _activities) + @foreach (var activity in Activities) { @@ -271,7 +274,7 @@ - + @@ -280,4 +283,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Pages/CrmReportNewPage.razor.cs b/Wonky.Client/Pages/CrmReportNewPage.razor.cs index ad9c376e..c7a95710 100644 --- a/Wonky.Client/Pages/CrmReportNewPage.razor.cs +++ b/Wonky.Client/Pages/CrmReportNewPage.razor.cs @@ -15,6 +15,7 @@ using System.Globalization; using System.Runtime.Intrinsics; +using System.Text.Encodings.Web; using System.Text.Json; using Blazored.Toast.Services; using Microsoft.AspNetCore.Authentication; @@ -34,103 +35,104 @@ namespace Wonky.Client.Pages; public partial class CrmReportNewPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public PreferenceService PrefsService { get; set; } + [Inject] public PreferenceService PreferenceService { get; set; } [Inject] public ICrmActivityHttpRepository CrmActivityRepo { get; set; } [Inject] public ICrmReportHttpRepository CrmReportRepo { get; set; } - [Inject] public NavigationManager _navigator { get; set; } - [Inject] public ILogger _logger { get; set; } - [Inject] public IToastService _toast { get; set; } - private EditContext _editContext { get; set; } - private ReportDto _report { get; set; } = new(); - private List _activities { get; set; } = new(); - private ReportFiguresDto _init { get; set; } - private Preferences _prefs { get; set; } = new(); - private bool _formInvalid = true; - private bool _noFigures = true; - private bool _working; + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toaster { get; set; } + private EditContext ReportContext { get; set; } + private ReportDto Report { get; set; } = new(); + private List Activities { get; set; } = new(); + private ReportFiguresDto InitialValues { get; set; } + private Preferences Preferences { get; set; } = new(); + private bool FormInvalid = true; + private bool NoFigures = true; + private bool Working; private DateTime _workDate { get; set; } = DateTime.Now; private TimeOnly _checkIn { get; set; } = new(12, 0); private TimeOnly _checkOut { get; set; } = new(12, 0); private DateTime _leaveBegin { get; set; } = DateTime.Now; private DateTime _leaveEnd { get; set; } = DateTime.Now; - private ConfirmationModal _confirmReport { get; set; } - private string _prompt { get; set; } = ""; + private ConfirmationModal ConfirmReportModal { get; set; } + private string Prompt { get; set; } = ""; protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - _editContext = new EditContext(_report); - _editContext.OnFieldChanged += HandleFieldChanged; - _editContext.OnValidationStateChanged += ValidationChanged; + ReportContext = new EditContext(Report); + ReportContext.OnFieldChanged += HandleFieldChanged; + ReportContext.OnValidationStateChanged += ValidationChanged; - _prefs = await PrefsService.GetPreferences(); - if (!string.IsNullOrWhiteSpace(_prefs.WorkDate)) - _workDate = DateTime.Parse(_prefs.WorkDate); + Preferences = await PreferenceService.GetPreferences(); + if (!string.IsNullOrWhiteSpace(Preferences.WorkDate)) + _workDate = DateTime.Parse(Preferences.WorkDate); - if(await CrmReportRepo.ReportExist(_prefs.WorkDate)) - _navigator.NavigateTo($"/sales-reports/view/{_prefs.WorkDate}"); + if(await CrmReportRepo.ReportExist(Preferences.WorkDate)) + Navigator.NavigateTo($"/sales-reports/view/{Preferences.WorkDate}"); _leaveBegin = _workDate; _leaveEnd = _workDate; - _report.FromDateTime = $"{_workDate:yyyy-MM-dd'T'12:00:00}"; - _report.ToDateTime = $"{_workDate:yyyy-MM-dd'T'12:00:00}"; + Report.FromDateTime = $"{_workDate:yyyy-MM-dd'T'12:00:00}"; + Report.ToDateTime = $"{_workDate:yyyy-MM-dd'T'12:00:00}"; - _report.Figures.Distance = 0; - _report.Figures.DistancePrivateMonth = 0; + Report.Figures.Distance = 0; + Report.Figures.DistancePrivateMonth = 0; } private void HandleFieldChanged(object sender, FieldChangedEventArgs e) { - _formInvalid = !_editContext.Validate(); + FormInvalid = !ReportContext.Validate(); StateHasChanged(); } private void ValidationChanged(object sender, ValidationStateChangedEventArgs e) { - _formInvalid = false; - _editContext.OnFieldChanged -= HandleFieldChanged; - _editContext = new EditContext(_report); - _editContext.OnFieldChanged += HandleFieldChanged; - _editContext.OnValidationStateChanged += ValidationChanged; + FormInvalid = false; + ReportContext.OnFieldChanged -= HandleFieldChanged; + ReportContext = new EditContext(Report); + ReportContext.OnFieldChanged += HandleFieldChanged; + ReportContext.OnValidationStateChanged += ValidationChanged; } private async Task ReportSaveConfirmed() { // attempt to eliminate doubled click on submit button - if (_working) + if (Working) return; - _working = true; + Working = true; - var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", _report); + var result = await CrmReportRepo.PostReport($"{_workDate:yyyy-MM-dd}", Report); // reset km and date confirmation - await PrefsService.SetKmMorning(0); - await PrefsService.SetDateConfirmed(false); - _navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); + // await PreferenceService.SetKmMorning(0); + // reset date confirmed + await PreferenceService.SetDateConfirmed(false); + Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); } private void SubmitReport() { // attempt to eliminate doubled click on submit button - if (_working) + if (Working) return; - if (string.IsNullOrWhiteSpace(_report.DayTypeEnum)) + if (string.IsNullOrWhiteSpace(Report.DayTypeEnum)) { - _toast.ShowError("Dagtype skal vælges"); + Toaster.ShowError("Dagtype skal vælges"); return; } - if (_report.Figures.KmMorning > _report.Figures.KmEvening) + if (Report.Figures.KmMorning > Report.Figures.KmEvening) { - _toast.ShowError("Km udregning er negativ - kontroller venligst km tal"); + Toaster.ShowError("Km udregning er negativ - kontroller venligst km tal"); return; } DateTime checkIn; DateTime checkOut; - if (_report.DayTypeEnum.ToLower().Contains("leave")) + if (Report.DayTypeEnum.ToLower().Contains("leave")) { checkIn = new DateTime(_leaveBegin.Year, _leaveBegin.Month, _leaveBegin.Day, 0, 0, 0); checkOut = new DateTime(_leaveEnd.Year, _leaveEnd.Month, _leaveEnd.Day, 0, 0, 0); @@ -141,66 +143,66 @@ public partial class CrmReportNewPage : IDisposable checkOut = new DateTime(_workDate.Year, _workDate.Month, _workDate.Day, _checkOut.Hour, _checkOut.Minute, 0); } - _report.SalesDayNumber = _report.DayTypeEnum == "sales" ? _report.Figures.SalesDayCount + 1 : 0; - _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.SalesDayNumber = Report.DayTypeEnum == "sales" ? Report.Figures.SalesDayCount + 1 : 0; + 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.Figures.Distance = _report.Figures.KmEvening - _report.Figures.KmMorning; - _report.Figures.DistanceMonth += _report.Figures.Distance; - _report.Figures.DistancePrivateMonth += _report.Figures.DistancePrivate; + Report.Figures.Distance = Report.Figures.KmEvening - Report.Figures.KmMorning; + Report.Figures.DistanceMonth += Report.Figures.Distance; + Report.Figures.DistancePrivateMonth += Report.Figures.DistancePrivate; - _logger.LogDebug("_workDate => {workDate}", $"{_workDate:yyyy-MM-dd}"); - _logger.LogDebug("_report => {report}", JsonSerializer.Serialize(_report)); + Logger.LogDebug("_workDate => {workDate}", $"{_workDate:yyyy-MM-dd}"); + Logger.LogDebug("_report => {report}", JsonSerializer.Serialize(Report)); - _prompt = $"Rapport for {_workDate.ToLongDateString()}?"; + Prompt = Report.Figures.Distance > 1000 ? $"'{Report.Figures.Distance}'km er meget højt. Er du sikker på at det er rigtigt? Gem rapport for {_workDate.ToLongDateString()}?" : $"Rapport for {_workDate.ToLongDateString()}?"; - _confirmReport.Show(); + ConfirmReportModal.Show(); } private void OnTimeChanged() { var f = new DateTime(_workDate.Year, _workDate.Month, _workDate.Day, _checkIn.Hour, _checkIn.Minute,0); - _report.FromDateTime = $"{f:yyyy-MM-dd'T'HH:mm}"; + Report.FromDateTime = $"{f:yyyy-MM-dd'T'HH:mm}"; var t = new DateTime(_workDate.Year, _workDate.Month, _workDate.Day, _checkOut.Hour, _checkOut.Minute,0); - _report.ToDateTime = $"{t:yyyy-MM-dd'T'HH:mm}"; + Report.ToDateTime = $"{t:yyyy-MM-dd'T'HH:mm}"; } private void SetWorkDate(string workDate) { _workDate = DateTime.Parse(workDate); - _noFigures = true; - _report.Figures = new ReportFiguresDto(); - _init = new ReportFiguresDto(); - _activities = new List(); - _report.Figures.KmEvening = 0; - _report.Figures.KmMorning = 0; - _report.Figures.Distance = 0; - _report.Figures.DistanceMonth = 0; - _report.Figures.DistancePrivate = 0; - _report.Figures.DistancePrivateMonth = 0; - _report.FromDateTime = $"{_workDate:yyyy-MM-dd'T'12:00}"; - _report.ToDateTime = $"{_workDate:yyyy-MM-dd'T'12:00}"; + NoFigures = true; + Report.Figures = new ReportFiguresDto(); + InitialValues = new ReportFiguresDto(); + Activities = new List(); + Report.Figures.KmEvening = 0; + Report.Figures.KmMorning = 0; + Report.Figures.Distance = 0; + Report.Figures.DistanceMonth = 0; + Report.Figures.DistancePrivate = 0; + Report.Figures.DistancePrivateMonth = 0; + Report.FromDateTime = $"{_workDate:yyyy-MM-dd'T'12:00}"; + Report.ToDateTime = $"{_workDate:yyyy-MM-dd'T'12:00}"; } private async Task GetKeyFigures() { - _working = true; + Working = true; var data = await CrmReportRepo.InitializeReportData($"{_workDate:yyyy-MM-dd}"); if(data.ReportClosed) - _navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); - _report.Figures = data.ReportData; - _init = data.ReportData; - _activities = data.ReportItems; - _report.Figures.KmMorning = _prefs.KmMorning; - _noFigures = false; - _working = false; + Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); + Report.Figures = data.ReportData; + InitialValues = data.ReportData; + Activities = data.ReportItems; + Report.Figures.KmMorning = Preferences.KmMorning; + NoFigures = false; + Working = false; } public void Dispose() { Interceptor.DisposeEvent(); - _editContext.OnFieldChanged -= HandleFieldChanged; - _editContext.OnValidationStateChanged -= ValidationChanged; + ReportContext.OnFieldChanged -= HandleFieldChanged; + ReportContext.OnValidationStateChanged -= ValidationChanged; } } \ No newline at end of file diff --git a/Wonky.Client/Services/RefreshTokenService.cs b/Wonky.Client/Services/RefreshTokenService.cs index b0201c1d..aa5e797e 100644 --- a/Wonky.Client/Services/RefreshTokenService.cs +++ b/Wonky.Client/Services/RefreshTokenService.cs @@ -42,11 +42,12 @@ public class RefreshTokenService var expClaim = user.FindFirst(c => c.Type.Contains("exp"))?.Value; + //var expTime = DateTimeOffset.FromUnixTimeSeconds(Convert.ToInt64(expClaim)); var expTime = DateTimeOffset.FromUnixTimeSeconds(Convert.ToInt64(expClaim)); var diff = expTime - DateTime.UtcNow; return diff.TotalMinutes <= 2 - ? await _authService.RefreshToken().ConfigureAwait(true) + ? await _authService.RefreshToken() //.ConfigureAwait(true) : string.Empty; } diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 4fd52ca6..e4354059 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.48.1", - "rc": true, + "version": "0.50.2", + "rc": false, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "innoBaseUrl": "https://zeta.innotec.dk", + "innoBaseUrl": "https://dev.innotec.dk", "glsTrackUrl": "https://www.gls-group.eu/276-I-PORTAL-WEB/content/GLS/DK01/DA/5004.htm?txtAction=71000&txtRefNo=", "glsId": "", "serviceVirk": "api/v2/services/virk",
@activity.Company.Name
Total@_activities.Where(x => x.StatusTypeEnum != "Quote").Sum(x => x.OrderAmount)@Activities.Where(x => x.StatusTypeEnum != "Quote").Sum(x => x.OrderAmount)