From 94afd3e8c378cdc3e6981b31f69d44f859d36f0d Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 10 Jan 2023 14:58:14 +0100 Subject: [PATCH] added info page on quote pictograms --- Wonky.Client.sln.DotSettings | 4 +++ ...t.razor => InfoColorCodingComponent.razor} | 0 ...css => InfoColorCodingComponent.razor.css} | 0 .../InfoQuoteToolbarComponent.razor | 33 +++++++++++++++++++ .../Components/QuoteListComponent.razor | 10 +++--- .../HttpRepository/AdvisorReportRepository.cs | 17 ++++++++++ .../Pages/AdvisorCreateActivityPage.razor | 2 +- .../Pages/AdvisorCreateActivityPage.razor.cs | 13 ++++++-- Wonky.Client/Pages/AdvisorQuoteListPage.razor | 22 ++++++------- .../Pages/AdvisorReportCreatePage.razor.cs | 6 ++-- Wonky.Client/Pages/InfoPage.razor | 9 +++-- 11 files changed, 90 insertions(+), 26 deletions(-) rename Wonky.Client/Components/{ColorCodingComponent.razor => InfoColorCodingComponent.razor} (100%) rename Wonky.Client/Components/{ColorCodingComponent.razor.css => InfoColorCodingComponent.razor.css} (100%) create mode 100644 Wonky.Client/Components/InfoQuoteToolbarComponent.razor diff --git a/Wonky.Client.sln.DotSettings b/Wonky.Client.sln.DotSettings index 9438812a..22a99637 100644 --- a/Wonky.Client.sln.DotSettings +++ b/Wonky.Client.sln.DotSettings @@ -1,6 +1,10 @@  True True + True + True True + True + True True True \ No newline at end of file diff --git a/Wonky.Client/Components/ColorCodingComponent.razor b/Wonky.Client/Components/InfoColorCodingComponent.razor similarity index 100% rename from Wonky.Client/Components/ColorCodingComponent.razor rename to Wonky.Client/Components/InfoColorCodingComponent.razor diff --git a/Wonky.Client/Components/ColorCodingComponent.razor.css b/Wonky.Client/Components/InfoColorCodingComponent.razor.css similarity index 100% rename from Wonky.Client/Components/ColorCodingComponent.razor.css rename to Wonky.Client/Components/InfoColorCodingComponent.razor.css diff --git a/Wonky.Client/Components/InfoQuoteToolbarComponent.razor b/Wonky.Client/Components/InfoQuoteToolbarComponent.razor new file mode 100644 index 00000000..2803fdf4 --- /dev/null +++ b/Wonky.Client/Components/InfoQuoteToolbarComponent.razor @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
SymbolBetydning
Alle tilbud
Tabte tilbud
Ingen svar
Åbne tilbud
Aktive aftaler
Åbne tilbud / Aktive aftaler
diff --git a/Wonky.Client/Components/QuoteListComponent.razor b/Wonky.Client/Components/QuoteListComponent.razor index ef741305..c07e912e 100644 --- a/Wonky.Client/Components/QuoteListComponent.razor +++ b/Wonky.Client/Components/QuoteListComponent.razor @@ -46,19 +46,19 @@ @switch (quote.QuoteStatusEnum) { case "None": - + break; case "Lose": - + break; case "Note": - + break; case "Archive": - + break; default: - + break; } diff --git a/Wonky.Client/HttpRepository/AdvisorReportRepository.cs b/Wonky.Client/HttpRepository/AdvisorReportRepository.cs index c242ef1b..4f09c0b2 100644 --- a/Wonky.Client/HttpRepository/AdvisorReportRepository.cs +++ b/Wonky.Client/HttpRepository/AdvisorReportRepository.cs @@ -104,8 +104,25 @@ public class AdvisorReportRepository : IAdvisorReportRepository { var response = await _client .PostAsJsonAsync($"{_apiConfig.CrmReports}/{workDate}", reportDto, _options); + if (!response.IsSuccessStatusCode) + return new ApiResponseView + { + Code = (int) response.StatusCode, + Id = "", + Message = "Der er opstået en fejl.", + IsSuccess = false + }; var jsonDate = await response.Content.ReadAsStringAsync(); + if(string.IsNullOrWhiteSpace(jsonDate)) + return new ApiResponseView + { + Code = (int) response.StatusCode, + Id = "", + Message = "Response er tom", + IsSuccess = response.IsSuccessStatusCode + }; + var result = JsonSerializer.Deserialize(jsonDate); return new ApiResponseView { diff --git a/Wonky.Client/Pages/AdvisorCreateActivityPage.razor b/Wonky.Client/Pages/AdvisorCreateActivityPage.razor index 5836a8a3..1aa03ab5 100644 --- a/Wonky.Client/Pages/AdvisorCreateActivityPage.razor +++ b/Wonky.Client/Pages/AdvisorCreateActivityPage.razor @@ -317,7 +317,7 @@ else Kundekort
- +
} diff --git a/Wonky.Client/Pages/AdvisorCreateActivityPage.razor.cs b/Wonky.Client/Pages/AdvisorCreateActivityPage.razor.cs index 55a4eca3..cbeb463e 100644 --- a/Wonky.Client/Pages/AdvisorCreateActivityPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCreateActivityPage.razor.cs @@ -77,6 +77,7 @@ public partial class AdvisorCreateActivityPage : IDisposable private ConfirmWorkDateModal ConfirmWorkDateModal { get; set; } = new(); private ConfirmProductCheckModal ConfirmProductCheckModal { get; set; } = new(); private List CheckList { get; set; } = new(); + private string ButtonText { get; set; } = "Gem besøg"; /// @@ -444,10 +445,16 @@ public partial class AdvisorCreateActivityPage : IDisposable { Logger.LogDebug("ActivityNewPage => ActivityStatusEnum == 'noSale' <= remove items"); DraftProvider.Draft.Items = new List(); - } - - + + ButtonText = Activity.ActivityStatusEnum switch + { + "noSale" => "Gem Besøg", + "order" => "Gem Bestilling", + "quote" => "Gem Tilbud", + _ => ButtonText + }; + // InvalidCanvas = InvalidActivityType; InvalidActivity = InvalidActivityType || PoFormInvalid diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor b/Wonky.Client/Pages/AdvisorQuoteListPage.razor index 3a053261..b1d69a00 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor @@ -27,23 +27,23 @@
+ + + - + - - - - - - - - + + - + + + + - +
@* diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index f0849828..db488281 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -69,8 +69,8 @@ public partial class AdvisorReportCreatePage : IDisposable if (!string.IsNullOrWhiteSpace(Prefs.WorkDate)) _workDate = DateTime.Parse(Prefs.WorkDate); - // if(await CrmReportRepo.ReportExist(Prefs.WorkDate)) - // Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); + if(await AdvisorReportRepo.ReportExist(Prefs.WorkDate)) + Navigator.NavigateTo($"/sales-reports/view/{_workDate:yyyy-MM-dd}"); BeginLeave = _workDate; EndLeave = _workDate; @@ -131,7 +131,7 @@ public partial class AdvisorReportCreatePage : IDisposable Working = true; var result = await AdvisorReportRepo.CreateReport($"{_workDate:yyyy-MM-dd}", Report); - Toaster.ShowInfo($"{result.Message}", $"HTTP Status"); + Logger.LogDebug("CreateReport.result => {}", JsonSerializer.Serialize(result)); // reset km and date confirmation await ProfileService.SetKmMorning(0); diff --git a/Wonky.Client/Pages/InfoPage.razor b/Wonky.Client/Pages/InfoPage.razor index 5d78d83b..ba460ea3 100644 --- a/Wonky.Client/Pages/InfoPage.razor +++ b/Wonky.Client/Pages/InfoPage.razor @@ -31,9 +31,12 @@
-
-

Piktogrammer

- +

Piktogrammer

+
+ +
+
+