From f691f020d216db3717a13f97f595c04d825d8911 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 8 May 2023 09:26:50 +0200 Subject: [PATCH] code quality cleanup - refactor `onclick` events - added demo to kanvas visit --- .../AdvisorCustomerListComponent.razor | 2 +- .../CustomerActivityListComponent.razor | 2 +- .../CustomerInventoryListComponent.razor | 10 +-- .../CustomerInvoiceListComponent.razor | 2 +- .../CustomerProductCheckListComponent.razor | 8 +- .../OfficeCountryCustomerListComponent.razor | 6 +- .../OfficeCustomerActivityListComponent.razor | 2 +- .../OfficeInventoryListComponent.razor | 8 +- .../Components/PageSizeComponent.razor | 2 +- .../Components/PagerPagesComponent.razor | 2 +- .../Components/PagerSimpleComponent.razor | 2 +- .../Components/QuoteListComponent.razor | 8 +- .../Components/ReportListItemComponent.razor | 2 +- .../ReportViewActivityListComponent.razor | 4 +- .../SearchCatalogColumnComponent.razor | 2 +- .../SearchCatalogPhraseComponent.razor | 4 +- .../SearchCatalogSortColumnComponent.razor | 2 +- .../SearchCustomerColumnComponent.razor | 2 +- .../SearchCustomerPhraseComponent.razor | 4 +- .../SearchCustomerSortColumnComponent.razor | 2 +- .../Components/TaskItemTableComponent.razor | 6 +- .../Components/VatAddressInputComponent.razor | 2 +- .../VatCompanyNameInputComponent.razor | 2 +- .../Components/VatNumberInputComponent.razor | 2 +- .../Components/WarehouseListComponent.razor | 4 +- .../Local.Services/AuthenticationService.cs | 33 ++++++--- .../CustomerActivityListOverlay.razor | 2 +- .../CustomerActivityViewOverlay.razor | 2 +- .../CustomerInventoryListOverlay.razor | 2 +- .../CustomerInventoryReorderOverlay.razor | 18 +++-- .../CustomerInvoiceListOverlay.razor | 2 +- .../CustomerInvoiceViewOverlay.razor | 2 +- .../OfficeCustomerActivityListOverlay.razor | 2 +- .../OfficeCustomerActivityViewOverlay.razor | 2 +- ...fficeCustomerInventoryReorderOverlay.razor | 16 ++-- .../OfficeCustomerInvoiceListOverlay.razor | 2 +- .../OfficeCustomerInvoiceViewOverlay.razor | 2 +- .../OfficeCustomerProductListOverlay.razor | 8 +- .../OfficeOrderInventoryListOverlay.razor | 2 +- .../OfficeOrderInventoryReorderOverlay.razor | 18 ++--- .../CatalogPagedOverlay.razor | 4 +- .../ProductCheckConfirmationOverlay.razor | 6 +- .../ProductHistoryOverlay.razor | 2 +- .../ProductPriceHistoryOverlay.razor | 4 +- .../Pages/AdvisorActivityCreatePage.razor | 74 +++++++++++-------- .../Pages/AdvisorActivityViewEditPage.razor | 2 +- .../Pages/AdvisorCustomerCreatePage.razor | 2 +- .../Pages/AdvisorCustomerPagedListPage.razor | 8 +- .../Pages/AdvisorCustomerViewEditPage.razor | 18 ++--- Wonky.Client/Pages/AdvisorQuoteListPage.razor | 2 +- .../Pages/AdvisorReportCreatePage.razor | 6 +- .../Pages/AdvisorReportViewPage.razor | 4 +- .../Pages/CommonReportPrintOrderPage.razor | 4 +- .../Pages/CommonReportPrintSummaryPage.razor | 2 +- Wonky.Client/Pages/ErrorPage404.razor | 2 +- .../OfficeAdvisorCustomerPagedListPage.razor | 2 +- .../Pages/OfficeAdvisorReportViewPage.razor | 6 +- .../OfficeAdvisorReportViewPage.razor.cs | 3 +- .../OfficeCustomerCountryPagedListPage.razor | 2 +- .../Pages/OfficeOrderCreatePage.razor | 24 +++--- .../Pages/OfficeOrderCreatePage.razor.cs | 19 +++-- Wonky.Client/Pages/OfficeOrderViewPage.razor | 2 +- .../SupervisorDocumentViewEditPage.razor | 2 +- .../Pages/SystemShortMessagePage.razor | 2 +- .../Pages/SystemUserViewEditPage.razor | 6 +- .../Pages/WarehouseOrderViewPage.razor | 6 +- Wonky.Client/Shared/AuthStateProvider.cs | 18 ++++- .../Shared/ConfirmWorkDateModal.razor | 6 +- Wonky.Client/Shared/ConfirmationModal.razor | 6 +- Wonky.Client/Shared/ContactModal.razor | 2 +- Wonky.Client/Shared/InformationModal.razor | 6 +- Wonky.Client/Shared/NavMenu-backup.razor | 4 +- Wonky.Client/Shared/NavMenu.razor | 4 +- Wonky.Client/Shared/VatLookupDkModal.razor | 6 +- 74 files changed, 261 insertions(+), 210 deletions(-) diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor b/Wonky.Client/Components/AdvisorCustomerListComponent.razor index 734b3eff..74c64e81 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor @@ -33,7 +33,7 @@ @foreach (var company in CompanyList) { - + diff --git a/Wonky.Client/Components/CustomerActivityListComponent.razor b/Wonky.Client/Components/CustomerActivityListComponent.razor index 15fd42ae..d4286ca7 100644 --- a/Wonky.Client/Components/CustomerActivityListComponent.razor +++ b/Wonky.Client/Components/CustomerActivityListComponent.razor @@ -37,7 +37,7 @@ { @foreach (var activity in Activities) { -
+
@activity.OrderDate diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor b/Wonky.Client/Components/CustomerInventoryListComponent.razor index 142eff7d..45f740ba 100644 --- a/Wonky.Client/Components/CustomerInventoryListComponent.razor +++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor @@ -23,9 +23,9 @@
-
Navn
-
Varenr
-
Antal
+
Navn
+
Varenr
+
Antal
@@ -51,9 +51,9 @@ @product.Quantity
- Genbestil +
-
+
@if (product.Check) { diff --git a/Wonky.Client/Components/CustomerInvoiceListComponent.razor b/Wonky.Client/Components/CustomerInvoiceListComponent.razor index 3352e137..6f49eeb3 100644 --- a/Wonky.Client/Components/CustomerInvoiceListComponent.razor +++ b/Wonky.Client/Components/CustomerInvoiceListComponent.razor @@ -39,7 +39,7 @@
@foreach (var invoice in InvoiceList) { -
+
@invoice.DocumentDate
@invoice.DocumentNumber
diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor b/Wonky.Client/Components/CustomerProductCheckListComponent.razor index c811e6ae..40c7ba08 100644 --- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor +++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor @@ -22,9 +22,9 @@
-
Navn
-
Varenr
-
Antal
+
Navn
+
Varenr
+
Antal
@@ -44,7 +44,7 @@
-
+
@if (product.Check) { diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor index 459bbdaf..591d301c 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor @@ -51,13 +51,13 @@
- +
- +
- +
Bestilling diff --git a/Wonky.Client/Components/OfficeCustomerActivityListComponent.razor b/Wonky.Client/Components/OfficeCustomerActivityListComponent.razor index 3c1f1878..62e737d7 100644 --- a/Wonky.Client/Components/OfficeCustomerActivityListComponent.razor +++ b/Wonky.Client/Components/OfficeCustomerActivityListComponent.razor @@ -38,7 +38,7 @@ { @foreach (var activity in Activities) { -
+
@activity.OrderDate diff --git a/Wonky.Client/Components/OfficeInventoryListComponent.razor b/Wonky.Client/Components/OfficeInventoryListComponent.razor index 20c37187..6d0a4b50 100644 --- a/Wonky.Client/Components/OfficeInventoryListComponent.razor +++ b/Wonky.Client/Components/OfficeInventoryListComponent.razor @@ -24,9 +24,9 @@
-
Navn
-
Varenr
-
Antal
+
Navn
+
Varenr
+
Antal
@@ -52,7 +52,7 @@ @product.Quantity
- Genbestil +
diff --git a/Wonky.Client/Components/PageSizeComponent.razor b/Wonky.Client/Components/PageSizeComponent.razor index 0a4844a4..601470da 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor +++ b/Wonky.Client/Components/PageSizeComponent.razor @@ -14,7 +14,7 @@ *@ - diff --git a/Wonky.Client/Components/PagerPagesComponent.razor b/Wonky.Client/Components/PagerPagesComponent.razor index fedcf101..cd1f52db 100644 --- a/Wonky.Client/Components/PagerPagesComponent.razor +++ b/Wonky.Client/Components/PagerPagesComponent.razor @@ -18,7 +18,7 @@
    @foreach (var link in Links) { -
  • @link.Text diff --git a/Wonky.Client/Components/PagerSimpleComponent.razor b/Wonky.Client/Components/PagerSimpleComponent.razor index fedcf101..cd1f52db 100644 --- a/Wonky.Client/Components/PagerSimpleComponent.razor +++ b/Wonky.Client/Components/PagerSimpleComponent.razor @@ -18,7 +18,7 @@
      @foreach (var link in Links) { -
    • @link.Text diff --git a/Wonky.Client/Components/QuoteListComponent.razor b/Wonky.Client/Components/QuoteListComponent.razor index bbf8a94d..2a0a0ac7 100644 --- a/Wonky.Client/Components/QuoteListComponent.razor +++ b/Wonky.Client/Components/QuoteListComponent.razor @@ -52,18 +52,18 @@ @quote.OrderDate
- - - @if (quote.QuoteStatusEnum == "None") { - } diff --git a/Wonky.Client/Components/ReportListItemComponent.razor b/Wonky.Client/Components/ReportListItemComponent.razor index 85043608..0fbc23ca 100644 --- a/Wonky.Client/Components/ReportListItemComponent.razor +++ b/Wonky.Client/Components/ReportListItemComponent.razor @@ -15,7 +15,7 @@ @using Wonky.Entity.Views - + @activity.Company.City @activity.Demo @activity.Sales @activity.OfficeNote @($"{activity.SasAmount:N2}") - @(activity.StatusTypeEnum == "Quote" ? $"{0:N2}" : $"{activity.OrderAmount:N2}") + @(activity.StatusTypeEnum == "Quote" ? "{0:N2}" : $"{activity.OrderAmount:N2}") @if (activity.OurRef.Contains("T:")) {} diff --git a/Wonky.Client/Components/SearchCatalogColumnComponent.razor b/Wonky.Client/Components/SearchCatalogColumnComponent.razor index 1a1367b6..ad6e16bf 100644 --- a/Wonky.Client/Components/SearchCatalogColumnComponent.razor +++ b/Wonky.Client/Components/SearchCatalogColumnComponent.razor @@ -13,7 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ - diff --git a/Wonky.Client/Components/SearchCatalogPhraseComponent.razor b/Wonky.Client/Components/SearchCatalogPhraseComponent.razor index 2a94fb35..90c0905c 100644 --- a/Wonky.Client/Components/SearchCatalogPhraseComponent.razor +++ b/Wonky.Client/Components/SearchCatalogPhraseComponent.razor @@ -15,7 +15,7 @@
- + @bind-value="SearchTerm" @bind-value:event="oninput" onkeyup="@OnSearchChanged" /> +
diff --git a/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor b/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor index f88d5b77..d3cc4fdf 100644 --- a/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor +++ b/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor @@ -13,7 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ - diff --git a/Wonky.Client/Components/SearchCustomerColumnComponent.razor b/Wonky.Client/Components/SearchCustomerColumnComponent.razor index 4596ca25..6841172d 100644 --- a/Wonky.Client/Components/SearchCustomerColumnComponent.razor +++ b/Wonky.Client/Components/SearchCustomerColumnComponent.razor @@ -13,7 +13,7 @@ // along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] *@ - diff --git a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor index d10a5c4e..30f1a4d0 100644 --- a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor +++ b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor @@ -16,7 +16,7 @@
- + @bind-value="SearchTerm" @bind-value:event="oninput" @onkeyup="OnSearchChanged" /> +
diff --git a/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor b/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor index 64ad40f5..52d9fbcf 100644 --- a/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor +++ b/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor @@ -14,7 +14,7 @@ *@ - diff --git a/Wonky.Client/Components/TaskItemTableComponent.razor b/Wonky.Client/Components/TaskItemTableComponent.razor index 901cd264..7273b89e 100644 --- a/Wonky.Client/Components/TaskItemTableComponent.razor +++ b/Wonky.Client/Components/TaskItemTableComponent.razor @@ -50,12 +50,12 @@ - - @@ -70,7 +70,7 @@ @if (task.TaskTypeEnum is "Recall") { - } diff --git a/Wonky.Client/Components/VatAddressInputComponent.razor b/Wonky.Client/Components/VatAddressInputComponent.razor index fc3c026e..77541da9 100644 --- a/Wonky.Client/Components/VatAddressInputComponent.razor +++ b/Wonky.Client/Components/VatAddressInputComponent.razor @@ -33,7 +33,7 @@
- +
\ No newline at end of file diff --git a/Wonky.Client/Components/VatCompanyNameInputComponent.razor b/Wonky.Client/Components/VatCompanyNameInputComponent.razor index 4673e0aa..6c3206fe 100644 --- a/Wonky.Client/Components/VatCompanyNameInputComponent.razor +++ b/Wonky.Client/Components/VatCompanyNameInputComponent.razor @@ -23,7 +23,7 @@
- +
\ No newline at end of file diff --git a/Wonky.Client/Components/VatNumberInputComponent.razor b/Wonky.Client/Components/VatNumberInputComponent.razor index 066e4597..35ebad18 100644 --- a/Wonky.Client/Components/VatNumberInputComponent.razor +++ b/Wonky.Client/Components/VatNumberInputComponent.razor @@ -24,7 +24,7 @@
- +
\ No newline at end of file diff --git a/Wonky.Client/Components/WarehouseListComponent.razor b/Wonky.Client/Components/WarehouseListComponent.razor index 594043dc..1bbce393 100644 --- a/Wonky.Client/Components/WarehouseListComponent.razor +++ b/Wonky.Client/Components/WarehouseListComponent.razor @@ -42,7 +42,7 @@
@if (ReadyToShip && Orders.Any()) { - + }
@@ -84,7 +84,7 @@ @switch (order.ProcessStatusEnum.ToLower()) { case "none": - + Pluk varer break; case "picked": diff --git a/Wonky.Client/Local.Services/AuthenticationService.cs b/Wonky.Client/Local.Services/AuthenticationService.cs index 5786472c..6ae84127 100644 --- a/Wonky.Client/Local.Services/AuthenticationService.cs +++ b/Wonky.Client/Local.Services/AuthenticationService.cs @@ -72,7 +72,7 @@ public class AuthenticationService : IAuthenticationService if (!response.IsSuccessStatusCode) return new AuthResponseView { - IsSuccess = false, ErrorMessage = $"Kontroller indtastning" + IsSuccess = false, ErrorMessage = "Kontroller indtastning" }; // process response content @@ -99,20 +99,31 @@ public class AuthenticationService : IAuthenticationService public async Task RefreshToken() { var refreshToken = await _infoService.GetRefreshToken(); + await Task.Delay(250); + if (string.IsNullOrWhiteSpace(refreshToken)) + { + return string.Empty; + } + var credentials = new Dictionary { ["grant_type"] = "refresh_token", ["refresh_token"] = refreshToken }; + var response = await _client.PostAsync(_apiConfig.Value.ServicesAuth, new FormUrlEncodedContent(credentials)); - if (!response.IsSuccessStatusCode) + var content = await response.Content.ReadAsStringAsync(); + if (!response.IsSuccessStatusCode || string.IsNullOrWhiteSpace(content)) + { return string.Empty; - - var resContent = await response.Content.ReadAsStringAsync(); - var data = JsonSerializer.Deserialize(resContent, _options); - + } + + var data = JsonSerializer.Deserialize(content, _options); + if (string.IsNullOrWhiteSpace(data.AccessToken)) + { return string.Empty; + } // set default request headers using access_token _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken); @@ -124,12 +135,12 @@ public class AuthenticationService : IAuthenticationService public async Task Logout() { - var profileBackup = await _preference.GetProfile(); - Task.Delay(150); - await _localStorage.ClearAsync(); - Task.Delay(150); - await _preference.SetProfile(profileBackup); _client.DefaultRequestHeaders.Authorization = null; + var profileBackup = await _preference.GetProfile(); + await Task.Delay(150); + await _localStorage.ClearAsync(); + await Task.Delay(150); + await _preference.SetProfile(profileBackup); ((AuthStateProvider)_authStateProvider).NotifyUserLogout(); } diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor index b09c8653..ad144b06 100644 --- a/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor @@ -18,7 +18,7 @@

@CompanyName - Aktivitet oversigt

- +
diff --git a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor index e7b88e7e..2ec88f50 100644 --- a/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor @@ -17,7 +17,7 @@
- +
diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor index 03fd0a51..e7a0e5ed 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor @@ -20,7 +20,7 @@

@CompanyName - Produktoversigt

- +
diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor index f30da893..f45057d3 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor @@ -21,7 +21,7 @@

@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)

- +
@if (SalesItem.Discontinued) @@ -49,21 +49,21 @@ - +
- +
- + - + - + @@ -76,7 +76,7 @@ @foreach (var rate in SalesItem.Rates) {
- + @rate.Quantity @rate.Rate/stk
@@ -107,7 +107,9 @@ @if (!SalesItem.Discontinued) { - + } diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor index d88cbea1..cd58b07e 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor @@ -24,7 +24,7 @@ {

@Company.Name - Faktura Oversigt

} - +
diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor index b925ff06..89b02038 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor @@ -23,7 +23,7 @@ {

Faktura @Invoice.DocumentNumber

} - +
@if (!string.IsNullOrWhiteSpace(Invoice.Company.Name)) diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor index 792dd5c1..c4dbe52e 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor @@ -20,7 +20,7 @@

@Company.Name - Aktivitet oversigt

- +
@* activity list *@ diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor index 5a26b260..711c0d82 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor @@ -18,7 +18,7 @@
- +
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor index f30da893..62eac24d 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor @@ -21,7 +21,7 @@

@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)

- +
@if (SalesItem.Discontinued) @@ -49,21 +49,21 @@ - +
- +
- + - + - + @@ -76,7 +76,7 @@ @foreach (var rate in SalesItem.Rates) {
- + @rate.Quantity @rate.Rate/stk
@@ -107,7 +107,7 @@ @if (!SalesItem.Discontinued) { - + } diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor index dfe6889b..62d2256f 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor @@ -21,7 +21,7 @@

@Company.Name - Faktura oversigt

- +
@* component listing invoices*@ diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor index 77db3f48..ca7acf89 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor @@ -20,7 +20,7 @@
Faktura
- +
@if (!string.IsNullOrWhiteSpace(Invoice.Company.Name)) diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor index db64be2a..eb558ac9 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor @@ -21,7 +21,7 @@

@Company.Name - Produkt oversigt

- +
@@ -30,9 +30,9 @@
-
Navn
-
Varenr
-
Antal
+
Navn
+
Varenr
+
Antal
diff --git a/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor index e99eb612..58884b45 100644 --- a/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeOrderInventoryListOverlay.razor @@ -20,7 +20,7 @@

@Company.Name - Produktoversigt

- +
diff --git a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor index 299bb48b..55b10276 100644 --- a/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor +++ b/Wonky.Client/OverlayOffice/OfficeOrderInventoryReorderOverlay.razor @@ -21,7 +21,7 @@

@SalesItem.Name @SalesItem.Sku (@SalesItem.BoxSize stk/colli)

- +
@if (SalesItem.Discontinued) @@ -49,21 +49,21 @@ - +
- +
- + - + - + @@ -76,9 +76,9 @@ @foreach (var rate in SalesItem.Rates) {
- +
}
@@ -107,7 +107,7 @@ @if (!SalesItem.Discontinued) { - + } diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor index b7797b06..593d9c02 100644 --- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor +++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor @@ -20,7 +20,7 @@
Pris Katalog
- +
@@ -79,7 +79,7 @@
@rate.Quantity
@rate.Rate
diff --git a/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor index 2e51c519..54d80f0e 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor +++ b/Wonky.Client/OverlayOrderCreate/ProductCheckConfirmationOverlay.razor @@ -19,15 +19,15 @@

PRODUKT GENNEMGANG

- +
@((MarkupString) BodyMessage)
- - + +
diff --git a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor index bc4163f2..15e8fe96 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor +++ b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor @@ -20,7 +20,7 @@
@ProductName
- +
@if (!string.IsNullOrWhiteSpace(ProductName)) diff --git a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor index a44ee1cf..625d7b06 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor +++ b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor @@ -18,7 +18,7 @@
@ProductName
- +
@if (!string.IsNullOrWhiteSpace(ProductName)) @@ -44,7 +44,7 @@ @entry.Discount @entry.Price - + } diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index fed52a55..f7702754 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -114,7 +114,25 @@ else }
- @if (!Kanvas) + @if (Kanvas) + { + +
+ + +
+ +
+ + +
+ +
+ + +
+ } + else {
@@ -157,20 +175,18 @@ else
+ +
+ + +
+ + +
+ + +
} - - -
- - -
- - -
- - -
-
@if (!Kanvas) @@ -180,23 +196,23 @@ else @* ***************** Invoice history overlay ***************************** *@ - +
@* ***************** Visit hisotry overlay ***************************** *@ - +
@* ***************** Product Inventory overlay ***************************** *@ - +
-
+
@* Draft lines in draft -----------------------------------------------------*@
@@ -210,7 +226,7 @@ else @* ***************** Reset draft ***************************** *@ - + @@ -243,7 +259,7 @@ else @* ***************** Remove item ***************************** *@ - + } @@ -257,7 +273,7 @@ else @* ***************** Price catalog overlay button ***************************** *@ - @@ -288,31 +304,31 @@ else - +
- + @* ***************** Product Price history overlay button ********************* *@ -
- + - + @SelectedItem.Sku @* ***************** Add item button ***************************** *@ - + @@ -324,7 +340,7 @@ else
@* Delivery address *@ -
+

diff --git a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor index 8cb5a665..3f749b71 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorActivityViewEditPage.razor @@ -142,7 +142,7 @@
- +
diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor index ec32ac6c..7da11f27 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor @@ -35,7 +35,7 @@ @switch (Company.CountryCode) { case "dk": - + break; case "no": Firma søgning diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor index bfaf9ada..ccb23cbb 100644 --- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor @@ -34,14 +34,14 @@
-
-
diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor index 144a7879..ea496fd6 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor @@ -142,11 +142,11 @@ @* Enable edit/save *@
- +
@* Force enable visit *@
- +
@* Save erp data *@
@@ -165,14 +165,14 @@
@* Enable edit/save vatnumber *@
- +
@* vat lookup *@
@switch (CountryCode) { case "dk": - + break; case "no": brreg.no @@ -184,7 +184,7 @@
@* save vat number *@
- +
} @@ -239,7 +239,7 @@
@* Save CRM data button *@
- +
@* crm context - contacts *@ @@ -247,7 +247,7 @@
-
+
Stilling
Navn
@@ -261,7 +261,7 @@ { @foreach (var contact in Contacts) { -
+
@contact.JobTitle
@contact.FirstName @contact.LastName
@@ -307,7 +307,7 @@
- +
@if (AppInfo.Value.Rc) diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor b/Wonky.Client/Pages/AdvisorQuoteListPage.razor index 28f56272..1b3e39fe 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor @@ -49,7 +49,7 @@ @*
+ @bind-Value="Filtered" @bind-Value:event="onchange" onclick="@FilterQuotes" disabled="@(!Quotes.Any())"/>
*@ diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor index 48944dc6..7652d02f 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor @@ -83,18 +83,18 @@ + @bind-Value="CheckOut" @bind-Value:event="oninput" onchange="@OnTimeChanged"/> } diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor index c69db585..27286e63 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor @@ -26,10 +26,10 @@
- +
- +
diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor index 90ba4dcf..3435f72e 100644 --- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor @@ -25,10 +25,10 @@
- + - +
diff --git a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor index 2d8848b5..2d4d00f6 100644 --- a/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor +++ b/Wonky.Client/Pages/CommonReportPrintSummaryPage.razor @@ -24,7 +24,7 @@ Tilbage
- +
diff --git a/Wonky.Client/Pages/ErrorPage404.razor b/Wonky.Client/Pages/ErrorPage404.razor index 02dfe018..a73cd77d 100644 --- a/Wonky.Client/Pages/ErrorPage404.razor +++ b/Wonky.Client/Pages/ErrorPage404.razor @@ -35,7 +35,7 @@
- Gå til forsiden + Gå til forsiden
diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor index 3e100471..fda2cb78 100644 --- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor @@ -38,7 +38,7 @@
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor index 53e01600..29c6afd4 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor @@ -26,13 +26,13 @@
- +
- +
- +
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs index d9dfe0b0..76e4d298 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs @@ -91,13 +91,14 @@ public partial class OfficeAdvisorReportViewPage : IDisposable case PrintTarget.None: break; case PrintTarget.All: + InvokeAsync(PrintAll); break; default: throw new ArgumentOutOfRangeException(nameof(target), target, null); } } - private async Task Print() + private async Task PrintAll() { var current = 0; var orders = Report.ReportItems diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor index 72689b9d..b6a95cd7 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor @@ -36,7 +36,7 @@
diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor b/Wonky.Client/Pages/OfficeOrderCreatePage.razor index 1c9189de..d4a8adcc 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor @@ -98,21 +98,21 @@ @* ***************** Invoice history overlay ***************************** *@ - +
@* ***************** Visit history overlay ***************************** *@ - +
@* ***************** Product Inventory overlay ***************************** *@ - +
@@ -130,7 +130,7 @@ @* ***************** Reset draft ***************************** *@ - + @@ -159,7 +159,7 @@ @* ***************** Remove draft line ***************************** *@ - + } @@ -172,7 +172,7 @@ @* ***************** Product Catalog overlay ***************************** *@ - @@ -202,27 +202,27 @@ - +
- + @* - *@
- + @SelectedItem.Sku @* ***************** Add line to draft ***************************** *@ - + @@ -238,7 +238,7 @@ @* ***************** Submit order to erp system ***************************** *@ - +
diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index 02e82197..47400160 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -130,6 +130,7 @@ public partial class OfficeOrderCreatePage : IDisposable // set activity salesRep and countryCode Activity.SalesRep = SalesRep.SalesRep; Activity.CountryCode = SalesRep.CountryCode; + Activity.SalesRepId = Company.SalesRepId; // add customer info into activity properties Activity.Account = Company.Account; @@ -149,25 +150,25 @@ public partial class OfficeOrderCreatePage : IDisposable Activity.DlvCity = Company.City; Activity.BcId = Company.BcId; Activity.CompanyId = Company.CompanyId; - Activity.SalesRepId = Company.SalesRepId; // setting up activity properties - Activity.ActivityStatusEnum = "noSale"; - Activity.ActivityVisitEnum = "recall"; + Activity.ActivityVisitEnum = "none"; Activity.ActivityTypeEnum = "phone"; Activity.ActivityStatusEnum = "order"; - Activity.OurRef = $"T:{UserInfo.FirstName}"; + Activity.OurRef = $"INNOTEC:{UserInfo.FirstName}"; // Initialize date variable SelectedDate = DateTime.Now; Working = false; } + private async Task DeleteDraft() { await DraftProvider.DeleteDraftAsync(); } + private async Task RemoveItem(DraftItem item) { // remove item @@ -176,6 +177,7 @@ public partial class OfficeOrderCreatePage : IDisposable await DraftProvider.SaveChangesAsync(); } + private async Task AddItem(SalesItemView salesItem) { ShowItem = false; @@ -199,6 +201,7 @@ public partial class OfficeOrderCreatePage : IDisposable await DraftProvider.SaveChangesAsync(); } + private async Task PriceListCallback(SelectedSku sku) { // get selected item @@ -211,24 +214,31 @@ public partial class OfficeOrderCreatePage : IDisposable StateHasChanged(); } + private void ShowCatalogOverlay() { CatalogOverlay.Show(); } + private void ShowInvoiceOverlay() { InvoiceListOverlay.Show(); } + + private void ShowVisitOverlay() { ActivityListOverlay.Show(); } + + private void ShowInventoryOverlay() { InventoryListOverlay.Show(); } + private async Task CreateActivity() { // avoid duplication @@ -327,7 +337,6 @@ public partial class OfficeOrderCreatePage : IDisposable Working = false; // show error message Toaster.ShowError(result.Message); - } private void InventoryCallback(DraftItem item) diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor b/Wonky.Client/Pages/OfficeOrderViewPage.razor index 08153fc2..8ad1583a 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor @@ -35,7 +35,7 @@
- +
diff --git a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor index a77a5a2d..9ab5205b 100644 --- a/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor +++ b/Wonky.Client/Pages/SupervisorDocumentViewEditPage.razor @@ -70,7 +70,7 @@
- +
diff --git a/Wonky.Client/Pages/SystemShortMessagePage.razor b/Wonky.Client/Pages/SystemShortMessagePage.razor index 448944ec..e9536b0a 100644 --- a/Wonky.Client/Pages/SystemShortMessagePage.razor +++ b/Wonky.Client/Pages/SystemShortMessagePage.razor @@ -50,7 +50,7 @@
- +
diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor b/Wonky.Client/Pages/SystemUserViewEditPage.razor index 4074dec2..81cd633a 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor @@ -149,10 +149,10 @@
- +
- +
@@ -185,7 +185,7 @@
- +
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor index 460835f7..9ba61c7b 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor @@ -108,15 +108,15 @@
@if (Order.ProcessStatusEnum.ToLower() is "none" or "printed") { - + } @if (Order.ProcessStatusEnum.ToLower() == "picked") { - + } @if (Order.ProcessStatusEnum.ToLower() == "packed") { - + }
diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs index 64902f2a..746b2eeb 100644 --- a/Wonky.Client/Shared/AuthStateProvider.cs +++ b/Wonky.Client/Shared/AuthStateProvider.cs @@ -30,6 +30,7 @@ public class AuthStateProvider : AuthenticationStateProvider private readonly AuthenticationState _anonymous; private readonly IUserInfoService _infoService; + public AuthStateProvider(HttpClient client, IUserInfoService infoService) { _client = client; @@ -37,15 +38,20 @@ public class AuthStateProvider : AuthenticationStateProvider _anonymous = new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity())); } + public override async Task GetAuthenticationStateAsync() { var token = await _infoService.GetAccessToken(); if (string.IsNullOrEmpty(token)) + { return _anonymous; + } var userInfo = await _infoService.GetUserInfo(); - if (userInfo == null) + if (string.IsNullOrWhiteSpace(userInfo.UserId)) + { return _anonymous; + } _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token); var exp = await _infoService.GetExpiration(); @@ -59,18 +65,22 @@ public class AuthStateProvider : AuthenticationStateProvider }; claims.AddRange( from role in userInfo.AssignedRoles - where role.Assigned select new Claim(ClaimTypes.Role, role.Name)); + where role.Assigned select new Claim(ClaimTypes.Role, role.Name) + ); // return the authState for the user return new AuthenticationState( new ClaimsPrincipal( new ClaimsIdentity(claims, "token"))); } - + + public async void NotifyUserAuthenticationAsync(string token) { if (string.IsNullOrEmpty(token)) + { return; + } _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token); @@ -96,6 +106,8 @@ public class AuthStateProvider : AuthenticationStateProvider NotifyAuthenticationStateChanged(authState); } + + public void NotifyUserLogout() { var authState = Task.FromResult(_anonymous); diff --git a/Wonky.Client/Shared/ConfirmWorkDateModal.razor b/Wonky.Client/Shared/ConfirmWorkDateModal.razor index 2a2a0cc5..bb7e6b64 100644 --- a/Wonky.Client/Shared/ConfirmWorkDateModal.razor +++ b/Wonky.Client/Shared/ConfirmWorkDateModal.razor @@ -19,14 +19,14 @@

Bekræft Venligst

- +

@BodyMessage

- - + +
diff --git a/Wonky.Client/Shared/ConfirmationModal.razor b/Wonky.Client/Shared/ConfirmationModal.razor index 16eeb3f3..cc685bbb 100644 --- a/Wonky.Client/Shared/ConfirmationModal.razor +++ b/Wonky.Client/Shared/ConfirmationModal.razor @@ -19,14 +19,14 @@

Bekræft Venligst

- +
@((MarkupString) BodyMessage)
- - + +
diff --git a/Wonky.Client/Shared/ContactModal.razor b/Wonky.Client/Shared/ContactModal.razor index 2fde475f..8d78e3e8 100644 --- a/Wonky.Client/Shared/ContactModal.razor +++ b/Wonky.Client/Shared/ContactModal.razor @@ -21,7 +21,7 @@
@CompanyName
- +
diff --git a/Wonky.Client/Shared/InformationModal.razor b/Wonky.Client/Shared/InformationModal.razor index 293b4d9b..6efee00e 100644 --- a/Wonky.Client/Shared/InformationModal.razor +++ b/Wonky.Client/Shared/InformationModal.razor @@ -19,7 +19,7 @@
Info
- +
@@ -27,8 +27,8 @@
- - @* *@ + + @* *@
diff --git a/Wonky.Client/Shared/NavMenu-backup.razor b/Wonky.Client/Shared/NavMenu-backup.razor index 4770cef0..6227644c 100644 --- a/Wonky.Client/Shared/NavMenu-backup.razor +++ b/Wonky.Client/Shared/NavMenu-backup.razor @@ -22,13 +22,13 @@
-
-
+