From 379552533a08aca80c6bbd2ee5c329ef45e2d421 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 20 Dec 2022 05:34:55 +0100 Subject: [PATCH] quote list cosmetics - better date parser in component --- .../Components/QuoteListComponent.razor | 46 +++++++++++-------- .../Components/WorkDateComponent.razor.cs | 9 ++-- Wonky.Client/Pages/CrmQuotesListPage.razor.cs | 9 ++-- Wonky.Client/Shared/NavMenu.razor | 2 +- Wonky.Client/Wonky.Client.csproj | 8 ++-- Wonky.Client/wwwroot/appsettings.json | 4 +- 6 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Wonky.Client/Components/QuoteListComponent.razor b/Wonky.Client/Components/QuoteListComponent.razor index ae26ba59..c4c75cf4 100644 --- a/Wonky.Client/Components/QuoteListComponent.razor +++ b/Wonky.Client/Components/QuoteListComponent.razor @@ -4,19 +4,21 @@
-
- Reference -
Kunde
Dato
-
+
+ Skift status +
+
Status
-
+
+ Reference +
@if (Quotes.Any()) @@ -25,27 +27,26 @@ {
-
- @quote.ESalesNumber -
@quote.Company.Name
@quote.OrderDate -
+
+ + + + +
+
@switch (quote.QuoteStatusEnum) { case "None": break; - case "Win": - Ordre - break; case "Lose": - + break; case "Note": @@ -58,19 +59,24 @@ break; }
-
- - - - +
+ @quote.ESalesNumber
@if (!string.IsNullOrWhiteSpace(quote.OfficeNote)) { -
+
Note
@quote.OfficeNote
} + @if (!string.IsNullOrWhiteSpace(quote.CrmNote)) + { +
CRM note
+
+ @quote.CrmNote +
+ }
} diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index 29dc12f9..d52a70c3 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -70,9 +70,12 @@ public partial class WorkDateComponent : IDisposable /// private async Task OnDateChanged(ChangeEventArgs e) { - var val = DateTime.Parse(e.Value.ToString()); - await Prefs.SetWorkDate(val); - await OnChangedCallback.InvokeAsync($"{val:yyyy-MM-dd}"); + var x = DateTime.TryParse(e.Value.ToString(), out var val); + if (x) + { + await Prefs.SetWorkDate(val); + await OnChangedCallback.InvokeAsync($"{val:yyyy-MM-dd}"); + } } /// diff --git a/Wonky.Client/Pages/CrmQuotesListPage.razor.cs b/Wonky.Client/Pages/CrmQuotesListPage.razor.cs index 01d3535f..808ac9d2 100644 --- a/Wonky.Client/Pages/CrmQuotesListPage.razor.cs +++ b/Wonky.Client/Pages/CrmQuotesListPage.razor.cs @@ -23,16 +23,16 @@ public partial class CrmQuotesListPage : IDisposable private List Quotes { get; set; } = new(); private List _quotes { get; set; } = new(); private bool Working { get; set; } = true; - private QStatus QFilter { get; set; } = QStatus.None; + private QStatus QFilter { get; set; } = QStatus.All; protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); Quotes = await ActivityRepo.GetQuotes(); - await Storage.SetItemAsync("quotes", Quotes); + await Storage.SetItemAsync("quotes", Quotes.OrderBy(x => x.Company.Name)); if (Quotes.Any()) - _quotes = Quotes.Where(x => x.QuoteStatusEnum is "Note" or "None").ToList(); + await FilterQuotes(QFilter); Working = false; } @@ -43,7 +43,6 @@ public partial class CrmQuotesListPage : IDisposable _quotes = QFilter switch { QStatus.None => Quotes.Where(x => x.QuoteStatusEnum is "None").ToList(), - QStatus.Win => Quotes.Where(x => x.QuoteStatusEnum is "Win").ToList(), QStatus.Lose => Quotes.Where(x => x.QuoteStatusEnum is "Lose").ToList(), QStatus.Archive => Quotes.Where(x => x.QuoteStatusEnum is "Archive").ToList(), QStatus.Note => Quotes.Where(x => x.QuoteStatusEnum is "Note").ToList(), @@ -66,7 +65,7 @@ public partial class CrmQuotesListPage : IDisposable while (!Quotes.Any()) await Task.Delay(1000); - await Storage.SetItemAsync("quotes", Quotes); + await Storage.SetItemAsync("quotes", Quotes.OrderBy(x => x.Company.Name)); await FilterQuotes(QFilter); diff --git a/Wonky.Client/Shared/NavMenu.razor b/Wonky.Client/Shared/NavMenu.razor index 28c92e87..a7461b5f 100644 --- a/Wonky.Client/Shared/NavMenu.razor +++ b/Wonky.Client/Shared/NavMenu.razor @@ -97,7 +97,7 @@
- Åbne Tilbud + Aftaler/Tilbud
diff --git a/Wonky.Client/Wonky.Client.csproj b/Wonky.Client/Wonky.Client.csproj index 6153c1a6..8cc7d5f2 100644 --- a/Wonky.Client/Wonky.Client.csproj +++ b/Wonky.Client/Wonky.Client.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index be7a4d33..d6d0f6f3 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,13 +1,13 @@ { "appInfo": { "name": "Wonky Client", - "version": "0.85.7", + "version": "0.86.0", "rc": true, "sandBox": false, "image": "grumpy-coder.png" }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory",