From a419b3fe66f775f5d8ba08a62928e2ac0cdcc2a4 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 21 Feb 2023 13:11:53 +0100 Subject: [PATCH] WIP: user management --- .../AdvisorActivityKmStartComponent.razor | 4 +- .../AdvisorActivityListComponent.razor.cs | 2 +- .../AdvisorCustomerListComponent.razor.cs | 4 +- .../AdvisorLandingComponent.razor.cs | 4 +- .../Components/CatalogGroupComponent.razor.cs | 4 +- .../CatalogSearchComponent.razor.cs | 4 +- .../Components/CatalogSortComponent.razor.cs | 4 +- .../CustomerInventoryListComponent.razor.cs | 2 +- ...CustomerProductCheckListComponent.razor.cs | 2 +- .../CustomerSearchColumnComponent.razor.cs | 6 +-- .../CustomerSearchPhraseComponent.razor.cs | 4 +- .../Components/CustomerSortComponent.razor.cs | 6 +-- .../InfoProcessStateComponent.razor | 4 +- ...fficeCountryCustomerListComponent.razor.cs | 4 +- .../OfficeLandingComponent.razor.cs | 4 +- ...OfficeReportActivityListComponent.razor.cs | 2 +- .../Components/PageSizeComponent.razor.cs | 6 +-- .../ProductPriceListComponent.razor.cs | 2 +- .../Components/WorkDateComponent.razor.cs | 10 ++-- .../CustomerInventoryListOverlay.razor.cs | 6 +-- .../CustomerInventoryReorderOverlay.razor.cs | 2 +- .../CustomerInvoiceListOverlay.razor.cs | 2 +- .../CustomerInvoiceViewOverlay.razor.cs | 4 +- ...ceCustomerInventoryReorderOverlay.razor.cs | 2 +- .../OfficeCustomerInvoiceListOverlay.razor.cs | 2 +- .../OfficeCustomerInvoiceViewOverlay.razor.cs | 4 +- .../OfficeCustomerProductListOverlay.razor.cs | 6 +-- .../PriceCatalogOverlay.razor.cs | 10 ++-- .../ProductHistoryOverlay.razor.cs | 2 +- .../ProductPriceHistoryOverlay.razor.cs | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 4 +- .../AdvisorActivityTodayListPage.razor.cs | 16 +++--- .../Pages/AdvisorActivityViewPage.razor.cs | 10 ++-- .../AdvisorCustomerActivityListPage.razor.cs | 6 +-- .../Pages/AdvisorCustomerCreatePage.razor.cs | 16 +++--- .../AdvisorCustomerInventoryListPage.razor.cs | 14 ++--- .../AdvisorCustomerInvoiceListPage.razor.cs | 12 ++--- .../Pages/AdvisorCustomerListPage.razor.cs | 14 ++--- .../Pages/AdvisorCustomerViewPage.razor.cs | 20 +++---- .../Pages/AdvisorQuoteListPage.razor.cs | 10 ++-- .../Pages/AdvisorReportCreatePage.razor.cs | 16 +++--- .../Pages/AdvisorReportListPage.razor.cs | 8 +-- .../Pages/AdvisorReportViewPage.razor.cs | 14 ++--- .../Pages/AdvisorTaskItemListCrmPage.razor.cs | 14 ++--- .../Pages/AdvisorTaskItemViewCrmPage.razor.cs | 4 +- .../AdvisorWorkplaceDocumentListPage.razor.cs | 4 +- .../Pages/AdvisorWorkplaceListPage.razor.cs | 6 +-- .../Pages/AdvisorWorkplaceViewPage.razor.cs | 8 +-- .../Pages/CatalogCountryPage.razor.cs | 16 +++--- .../Pages/CatalogCountryPrintPage.razor.cs | 6 +-- Wonky.Client/Pages/ErrorPage404.razor.cs | 2 +- Wonky.Client/Pages/Login.razor.cs | 6 +-- Wonky.Client/Pages/Logout.razor.cs | 4 +- .../OfficeAdvisorReportViewPage.razor.cs | 18 +++---- .../OfficeCountryCustomerListPage.razor.cs | 14 ++--- .../Pages/OfficeOrderCreatePage.razor.cs | 14 ++--- .../Pages/OfficeOrderViewPage.razor.cs | 16 +++--- ...OfficeUserAdvisorCustomerListPage.razor.cs | 10 ++-- .../Pages/OfficeUserAdvisorListPage.razor.cs | 4 +- .../OfficeUserAdvisorReportListPage.razor.cs | 8 +-- .../Pages/ReportPrintOrderPage.razor.cs | 12 ++--- .../Pages/ReportPrintSummaryPage.razor.cs | 8 +-- .../Pages/SystemUserViewEditPage.razor.cs | 10 ++-- .../Pages/WarehouseOrderListPage.razor.cs | 6 +-- .../Pages/WarehouseOrderViewPage.razor.cs | 10 ++-- Wonky.Client/Program.cs | 6 +-- .../Services/AuthenticationService.cs | 53 +++++++++---------- Wonky.Client/Services/IUserInfoService.cs | 15 ++++++ Wonky.Client/Services/UserInfoService.cs | 52 +++++++++++++++++- Wonky.Client/Services/UserProfileService.cs | 26 +++++---- Wonky.Client/Shared/AuthStateProvider.cs | 22 ++++---- .../Shared/DraftStateProvider.razor.cs | 2 +- Wonky.Client/Shared/VatLookupDkModal.razor.cs | 6 +-- Wonky.Entity/Views/X_WebUserInfoView.cs | 35 ------------ 74 files changed, 365 insertions(+), 332 deletions(-) create mode 100644 Wonky.Client/Services/IUserInfoService.cs delete mode 100644 Wonky.Entity/Views/X_WebUserInfoView.cs diff --git a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor index 3e6784cc..1a4c4103 100644 --- a/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor +++ b/Wonky.Client/Components/AdvisorActivityKmStartComponent.razor @@ -25,13 +25,13 @@ @code { - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private int KmMorning { get; set; } private UserProfile Profiles { get; set; } = new(); protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); KmMorning = Profiles.KmMorning; } diff --git a/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs b/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs index 047c15d9..a5617ebd 100644 --- a/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorActivityListComponent.razor.cs @@ -21,6 +21,6 @@ namespace Wonky.Client.Components; public partial class AdvisorActivityListComponent { [Parameter] public List ActivityList { get; set; } = new(); - // [Inject] private NavigationManager Navigator { get; set; } + // [Inject] public NavigationManager Navigator { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs index b2463918..9f1514ec 100644 --- a/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorCustomerListComponent.razor.cs @@ -33,8 +33,8 @@ namespace Wonky.Client.Components [Parameter] public List CompanyList { get; set; } = new(); [Parameter] public EventCallback OnDelete { get; set; } [Parameter] public EventCallback OnSelect { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IJSRuntime JsRuntime { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IJSRuntime JsRuntime { get; set; } private Lazy BsTooltip { get; set; } = new(); diff --git a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs index 36de18ce..bca37365 100644 --- a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs @@ -32,7 +32,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class AdvisorLandingComponent { - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private readonly JsonSerializerOptions JsonOptions = new JsonSerializerOptions { @@ -45,7 +45,7 @@ public partial class AdvisorLandingComponent protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); SelectedDate = string.IsNullOrWhiteSpace(Profiles.WorkDate) ? DateTime.Now : DateTime.Parse(Profiles.WorkDate); } diff --git a/Wonky.Client/Components/CatalogGroupComponent.razor.cs b/Wonky.Client/Components/CatalogGroupComponent.razor.cs index 92c50900..7b47a3b8 100644 --- a/Wonky.Client/Components/CatalogGroupComponent.razor.cs +++ b/Wonky.Client/Components/CatalogGroupComponent.razor.cs @@ -22,8 +22,8 @@ namespace Wonky.Client.Components; public partial class CatalogGroupComponent { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserProfile _profiles = new(); diff --git a/Wonky.Client/Components/CatalogSearchComponent.razor.cs b/Wonky.Client/Components/CatalogSearchComponent.razor.cs index 98dfe834..9fa1f22e 100644 --- a/Wonky.Client/Components/CatalogSearchComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSearchComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSearchComponent : IDisposable /// /// User preference service /// - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged event callback @@ -47,7 +47,7 @@ public partial class CatalogSearchComponent : IDisposable protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); SearchCol = Profiles.ItemSearch; await OnChanged.InvokeAsync(SearchCol); } diff --git a/Wonky.Client/Components/CatalogSortComponent.razor.cs b/Wonky.Client/Components/CatalogSortComponent.razor.cs index e402a7ea..9a309bd7 100644 --- a/Wonky.Client/Components/CatalogSortComponent.razor.cs +++ b/Wonky.Client/Components/CatalogSortComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CatalogSortComponent : IDisposable /// /// User preference service /// - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } /// /// OnChanged callback function @@ -47,7 +47,7 @@ public partial class CatalogSortComponent : IDisposable protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; - _profiles = await ProfileService.GetPreferences(); + _profiles = await ProfileService.GetProfile(); SortCol = _profiles.ItemSort; } diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs index aa8c03f0..3c06916f 100644 --- a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs +++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs @@ -23,7 +23,7 @@ namespace Wonky.Client.Components; public partial class CustomerInventoryListComponent { - [Inject] private ILocalStorageService Storage { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } // Parameters [Parameter] public List Inventory { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs index 5bf37b9c..ae936fc7 100644 --- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs +++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs @@ -24,7 +24,7 @@ public partial class CustomerProductCheckListComponent { [Parameter] public List ProductList { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; - [Inject] private ILocalStorageService Storage { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } // private variables private bool Descending { get; set; } diff --git a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs index 54249ce8..6799751f 100644 --- a/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchColumnComponent.razor.cs @@ -24,8 +24,8 @@ namespace Wonky.Client.Components; public partial class CustomerSearchColumnComponent : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); @@ -33,7 +33,7 @@ public partial class CustomerSearchColumnComponent : IDisposable protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); SearchCol = Profiles.CompanySearch; } private async Task OnSelectionChanged(ChangeEventArgs e) diff --git a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs index e43a01e0..c2485896 100644 --- a/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSearchPhraseComponent.razor.cs @@ -26,12 +26,12 @@ namespace Wonky.Client.Components private Timer InputTimer { get; set; } = new(); private string SearchTerm { get; set; } = ""; private UserProfile Profiles { get; set; } = new (); - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); SearchTerm = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase.Trim(); if(!string.IsNullOrWhiteSpace(SearchTerm)) diff --git a/Wonky.Client/Components/CustomerSortComponent.razor.cs b/Wonky.Client/Components/CustomerSortComponent.razor.cs index 3655e334..b0545301 100644 --- a/Wonky.Client/Components/CustomerSortComponent.razor.cs +++ b/Wonky.Client/Components/CustomerSortComponent.razor.cs @@ -24,8 +24,8 @@ namespace Wonky.Client.Components { public partial class CustomerSortComponent : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserProfile _profiles = new(); @@ -33,7 +33,7 @@ namespace Wonky.Client.Components protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; - _profiles = await ProfileService.GetPreferences(); + _profiles = await ProfileService.GetProfile(); SortCol = _profiles.CompanySort; } private async Task OnSelectionChanged(ChangeEventArgs e) diff --git a/Wonky.Client/Components/InfoProcessStateComponent.razor b/Wonky.Client/Components/InfoProcessStateComponent.razor index 2b51a77d..06ed1877 100644 --- a/Wonky.Client/Components/InfoProcessStateComponent.razor +++ b/Wonky.Client/Components/InfoProcessStateComponent.razor @@ -34,8 +34,8 @@ Ubehandlet - - Accepteret + + Udskrevet diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs index 122c2dcf..20719524 100644 --- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs @@ -40,8 +40,8 @@ namespace Wonky.Client.Components // ****************************************************** // injects - [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] public ICountryActivityRepository ActivityRepo { get; set; } + [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public ICountryActivityRepository ActivityRepo { get; set; } // ****************************************************** // overlays diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor.cs b/Wonky.Client/Components/OfficeLandingComponent.razor.cs index 3999ed25..b3beb159 100644 --- a/Wonky.Client/Components/OfficeLandingComponent.razor.cs +++ b/Wonky.Client/Components/OfficeLandingComponent.razor.cs @@ -33,7 +33,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Components; public partial class OfficeLandingComponent { - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } private readonly JsonSerializerOptions _options = new JsonSerializerOptions { @@ -48,7 +48,7 @@ public partial class OfficeLandingComponent protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileChanged; - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); if (string.IsNullOrWhiteSpace(Profiles.WorkDate)) { await ProfileService.SetWorkDate(DateTime.Now); diff --git a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs index dacc0d81..2aadc4a2 100644 --- a/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs +++ b/Wonky.Client/Components/OfficeReportActivityListComponent.razor.cs @@ -22,7 +22,7 @@ namespace Wonky.Client.Components; public partial class OfficeReportActivityListComponent { [Parameter] public List ActivityList { get; set; } = new(); - [Inject] private NavigationManager Navigator { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private void ShowOrder(string companyId, string orderId) { diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index f25763d5..de41f4c2 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -24,8 +24,8 @@ namespace Wonky.Client.Components { public partial class PageSizeComponent : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } [Parameter] public EventCallback OnChanged { get; set; } private Dictionary Items { get; set; } = new(); private UserProfile _profiles = new(); @@ -34,7 +34,7 @@ namespace Wonky.Client.Components protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; - _profiles = await ProfileService.GetPreferences(); + _profiles = await ProfileService.GetProfile(); PageSize = _profiles.PageSize; } diff --git a/Wonky.Client/Components/ProductPriceListComponent.razor.cs b/Wonky.Client/Components/ProductPriceListComponent.razor.cs index 677f3fa2..d680037b 100644 --- a/Wonky.Client/Components/ProductPriceListComponent.razor.cs +++ b/Wonky.Client/Components/ProductPriceListComponent.razor.cs @@ -23,5 +23,5 @@ namespace Wonky.Client.Components; public partial class ProductPriceListComponent { [Parameter] public List ItemList { get; set; } = new(); - [Inject] private IToastService ToastService { get; set; } + [Inject] public IToastService ToastService { get; set; } } \ No newline at end of file diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index c198b0e1..d952c838 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -28,7 +28,7 @@ public partial class WorkDateComponent : IDisposable /// /// User preference service /// - [Inject] public UserProfileService Profiles { get; set; } + [Inject] public UserProfileService UserProfile { get; set; } /// /// OnChanged callback function @@ -56,8 +56,8 @@ public partial class WorkDateComponent : IDisposable protected override async Task OnInitializedAsync() { WorkDateContext = new EditContext(SelectedDate); - Profiles.OnChange += ProfileServiceOnOnChange; - Profile = await Profiles.GetPreferences(); + UserProfile.OnChange += ProfileServiceOnOnChange; + Profile = await UserProfile.GetProfile(); SelectedDate = string.IsNullOrWhiteSpace(Profile.WorkDate) ? DateTime.Now : DateTime.Parse(Profile.WorkDate); @@ -72,7 +72,7 @@ public partial class WorkDateComponent : IDisposable var x = DateTime.TryParse(e.Value.ToString(), out var setDate); if (x) { - await Profiles.SetWorkDate(setDate); + await UserProfile.SetWorkDate(setDate); await OnChangedCallback.InvokeAsync($"{setDate:yyyy-MM-dd}"); } } @@ -92,6 +92,6 @@ public partial class WorkDateComponent : IDisposable /// public void Dispose() { - Profiles.OnChange -= ProfileServiceOnOnChange; + UserProfile.OnChange -= ProfileServiceOnOnChange; } } \ No newline at end of file diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs index 076b00f6..9918f49b 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs @@ -26,9 +26,9 @@ namespace Wonky.Client.OverlayCustomer; public partial class CustomerInventoryListOverlay : IDisposable { - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryCatalogRepository CatalogRepo { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] public ILogger Logger { get; set; } [Parameter] public string CompanyName { get; set; } = ""; [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs index 09b49a1b..c1edbb28 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs @@ -27,7 +27,7 @@ public partial class CustomerInventoryReorderOverlay { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public SalesItemView SalesItem { get; set; } = new(); - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } [Parameter] public EventCallback OnSelected { get; set; } private List? History { get; set; } = new(); private DraftItem SelectedItem { get; set; } = new(); diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs index 15449850..6fbece83 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs @@ -25,7 +25,7 @@ public partial class CustomerInvoiceListOverlay { [Parameter] public InvoiceListView CustomerInvoices { get; set; } = new(); - [Inject] private ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private CustomerInvoiceViewOverlay CustomerInvoiceView { get; set; } = new(); private string InvoiceId { get; set; } = ""; private string _modalDisplay = ""; diff --git a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs index 0939f561..0a3cd81a 100644 --- a/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs @@ -26,8 +26,8 @@ public partial class CustomerInvoiceViewOverlay : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string InvoiceId { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; private InvoiceView Invoice { get; set; } = new(); diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs index 8f943d21..faa7b074 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryReorderOverlay.razor.cs @@ -28,7 +28,7 @@ public partial class OfficeCustomerInventoryReorderOverlay { [Parameter] public CompanyDto Company { get; set; } [Parameter] public SalesItemView SalesItem { get; set; } = new(); - [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } [Parameter] public EventCallback OrderItemCallback { get; set; } private List History { get; set; } = new(); private DraftItem SelectedItem { get; set; } = new(); diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs index 30040d02..570221e0 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs @@ -27,7 +27,7 @@ public partial class OfficeCustomerInvoiceListOverlay [Parameter] public InvoiceListView InvoiceList { get; set; } = new(); [Parameter] public CompanyDto Company { get; set; } = new(); // dependency injection - [Inject] private ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } private string InvoiceId { get; set; } = ""; private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs index b44e9bc1..738a9ee1 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs @@ -27,8 +27,8 @@ public partial class OfficeCustomerInvoiceViewOverlay : IDisposable [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string InvoiceId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCustomerHistoryRepository HistoryRepo { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs index d96a3c37..1206fe02 100644 --- a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs +++ b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs @@ -26,9 +26,9 @@ namespace Wonky.Client.OverlayOffice; public partial class OfficeCustomerProductListOverlay : IDisposable { - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryCatalogRepository CatalogRepo { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] public ILogger Logger { get; set; } private string _modalDisplay = ""; private bool _showBackdrop; diff --git a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs index f38ae9b1..fa75ae48 100644 --- a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs @@ -29,10 +29,10 @@ namespace Wonky.Client.OverlayOrderCreate; public partial class PriceCatalogOverlay : IDisposable { // injections - [Inject] private ICountryCatalogRepository CatalogRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public ILogger Logger { get; set; } // parameters [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public EventCallback OnSelected { get; set; } @@ -53,7 +53,7 @@ public partial class PriceCatalogOverlay : IDisposable protected override async Task OnInitializedAsync() { - _userProfile = await ProfileService.GetPreferences(); + _userProfile = await ProfileService.GetProfile(); _pager.OrderBy = _userProfile.ItemSort; _pager.SearchColumn = _userProfile.ItemSearch; _pager.PageSize = Convert.ToInt32(_userProfile.PageSize); diff --git a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs index b3b52725..2711b16a 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs @@ -27,7 +27,7 @@ public partial class ProductHistoryOverlay // [Parameter] public EventCallback OnSelected { get; set; } [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string ItemSku { get; set; } = ""; - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private List? History { get; set; } private string ProductName { get; set; } = ""; private string _modalDisplay = ""; diff --git a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs index 1da80fc4..6571d7bb 100644 --- a/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs @@ -27,7 +27,7 @@ public partial class ProductPriceHistoryOverlay [Parameter] public EventCallback OnSelected { get; set; } [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string Sku { get; set; } = ""; - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } private List? History { get; set; } private string ProductName { get; set; } = ""; private string _modalDisplay = ""; diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index b6a8ea59..a2b552bd 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -48,7 +48,7 @@ public partial class AdvisorActivityCreatePage : IDisposable [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } [Inject] public IAdvisorReportRepository ReportRepo { get; set; } [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } [CascadingParameter] private DraftStateProvider DraftProvider { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; @@ -106,7 +106,7 @@ public partial class AdvisorActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // User Preferences - UserProfile = await ProfileService.GetPreferences(); + UserProfile = await ProfileService.GetProfile(); // User Info SalesRep = await UserInfoService.GetUserInfo(); // Fetch Customer from http diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index c1474d38..bdf055e3 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -27,13 +27,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorActivityTodayListPage : IDisposable { - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IAdvisorActivityRepository ActivityRepo { get; set; } - [Inject] private IAdvisorReportRepository ReportRepo { get; set; } - [Inject] private IToastService Toaster { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IAdvisorActivityRepository ActivityRepo { get; set; } + [Inject] public IAdvisorReportRepository ReportRepo { get; set; } + [Inject] public IToastService Toaster { get; set; } private ReportStatusView ReportStatusView { get; set; } = new(); private UserProfile UserProfile { get; set; } = new(); private DateTime SelectedDate { get; set; } @@ -44,7 +44,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserProfile = await ProfileService.GetPreferences(); + UserProfile = await ProfileService.GetProfile(); SelectedDate = string.IsNullOrWhiteSpace(UserProfile.WorkDate) ? DateTime.Now : DateTime.Parse(UserProfile.WorkDate); ReportExist = await ReportRepo.ReportExist($"{SelectedDate:yyyy-MM-dd}"); await GetActivities($"{SelectedDate:yyyy-MM-dd}"); diff --git a/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs index 27742d17..6621519e 100644 --- a/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityViewPage.razor.cs @@ -30,11 +30,11 @@ public partial class AdvisorActivityViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private NavigationManager Navigator { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private ReportItemView ReportItem { get; set; } = new(); private ActivityOfficeNote Note { get; set; } = new(); private EditContext NoteContext { get; set; } diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs index db04f973..fea9f243 100644 --- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs @@ -27,9 +27,9 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerActivityListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } private List ActivityList { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs index cff61ae0..4b3eff3b 100644 --- a/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerCreatePage.razor.cs @@ -34,14 +34,14 @@ namespace Wonky.Client.Pages { public partial class AdvisorCustomerCreatePage : IDisposable { - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private VatInfoLookupService VatService { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public VatInfoLookupService VatService { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private EditContext CompanyContext { get; set; } private CompanyDto Company { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs index 4ef7eb15..10497d7e 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs @@ -31,13 +31,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInventoryListPage : IDisposable { - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] private IAdvisorCustomerRepository CustomerREpo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerREpo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } [CascadingParameter] public DraftStateProvider DraftStateProvider { get; set; } = new(); [Parameter] public string CompanyId { get; set; } = ""; diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index d323f441..510422c0 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -30,12 +30,12 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInvoiceListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ILogger Logger { get; set; } private InvoiceListView CompanyInvoices { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private CustomerInvoiceViewOverlay CustomerInvoiceView { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs index cf499d6a..5d0081da 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs @@ -28,12 +28,12 @@ namespace Wonky.Client.Pages { public partial class AdvisorCustomerListPage : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private List CompanyList { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); @@ -55,7 +55,7 @@ namespace Wonky.Client.Pages protected override async Task OnInitializedAsync() { // set preferences - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); XUserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profiles.CompanySort; Paging.SearchColumn = Profiles.CompanySearch; diff --git a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs index 79f89e9d..b1ca2c46 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerViewPage.razor.cs @@ -36,16 +36,16 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IAdvisorCustomerRepository CompanyRepo { get; set; } - [Inject] private IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } - [Inject] private IAdvisorContactRepository AdvisorContactRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private VatInfoLookupService VatService { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; } + [Inject] public IAdvisorCustomerHistoryRepository HistoryRepo { get; set; } + [Inject] public IAdvisorContactRepository AdvisorContactRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public VatInfoLookupService VatService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private readonly JsonSerializerOptions _options = new () { PropertyNameCaseInsensitive = true }; private CompanyDto Company { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs index 3570b6af..0b40831c 100644 --- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs @@ -28,11 +28,11 @@ namespace Wonky.Client.Pages; public partial class AdvisorQuoteListPage : IDisposable { - [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } private List QuoteList { get; set; } = new(); private List FilteredQuotes { get; set; } = new(); private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index fecb1373..1fa83df2 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -31,13 +31,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportCreatePage : IDisposable { - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private IToastService Toaster { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } + [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(); @@ -70,7 +70,7 @@ public partial class AdvisorReportCreatePage : IDisposable ReportContext.OnValidationStateChanged += ValidationChanged; ProfileService.OnChange += ProfileServiceOnOnChange; - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); Logger.LogDebug("{}", JsonSerializer.Serialize(Profiles)); WorkDate = Profiles.WorkDate; diff --git a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs index 43f50737..68214ed2 100644 --- a/Wonky.Client/Pages/AdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportListPage.razor.cs @@ -24,10 +24,10 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportListPage : IDisposable { - [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ILogger Logger { get; set; } private List ReportList { get; set; } = new(); private bool Working { get; set; } diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs index caa3668d..4d21fc1d 100644 --- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs @@ -29,13 +29,13 @@ namespace Wonky.Client.Pages; public partial class AdvisorReportViewPage : IDisposable { [Parameter] public string ReportDate { get; set; } - [Inject] private IAdvisorReportRepository AdvisorReportRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public IAdvisorReportRepository AdvisorReportRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private UserProfile Profiles { get; set; } = new(); private ReportView Report { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index c69d8eaa..97ace2ad 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -26,12 +26,12 @@ namespace Wonky.Client.Pages; public partial class AdvisorTaskItemListCrmPage : IDisposable { - [Inject] private UserProfileService UserProfileService { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IAdvisorTaskItemRepository TaskRepo { get; set; } - [Inject] private IToastService Toaster { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } + [Inject] public IToastService Toaster { get; set; } private UserProfile Profile { get; set; } = new(); private string WorkDate { get; set; } = $"{DateTime.Now:yyyy-MM-dd}"; @@ -40,7 +40,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable protected override async Task OnInitializedAsync() { - Profile = await UserProfileService.GetPreferences(); + Profile = await UserProfileService.GetProfile(); if(!string.IsNullOrWhiteSpace(Profile.WorkDate)) WorkDate = Profile.WorkDate; diff --git a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs index 3ed6852d..c9b0df12 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemViewCrmPage.razor.cs @@ -27,8 +27,8 @@ namespace Wonky.Client.Pages; public partial class AdvisorTaskItemViewCrmPage : IDisposable { [Parameter] public string TaskItemId { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorTaskItemRepository TaskRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorTaskItemRepository TaskRepo { get; set; } private TaskItemDto TaskItem { get; set; } = new (); private EditContext TaskContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs index 2a85677c..f1855cc9 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceDocumentListPage.razor.cs @@ -26,8 +26,8 @@ public partial class AdvisorWorkplaceDocumentListPage [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string WorkplaceId { get; set; } = ""; - [Inject] private HttpInterceptorService _interceptor { get; set; } - [Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] public HttpInterceptorService _interceptor { get; set; } + [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } private bool Working { get; set; } = true; } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs index 7e0bee82..1102da7e 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceListPage.razor.cs @@ -26,9 +26,9 @@ namespace Wonky.Client.Pages; public partial class AdvisorWorkplaceListPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; - [Inject] private IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } - [Inject] private IAdvisorCustomerRepository CustomerRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorWorkplaceRepository WorkplaceRepo { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } private List WorkplaceList { get; set; } = new(); private CompanyDto Company { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs index 942c1f4e..eacf0780 100644 --- a/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorWorkplaceViewPage.razor.cs @@ -27,10 +27,10 @@ public partial class AdvisorWorkplaceViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string WorkplaceId { get; set; } = ""; - [Inject] private IAdvisorWorkplaceRepository Workplaces { get; set; } - [Inject] private IAdvisorCustomerRepository CustomerRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } + [Inject] public IAdvisorWorkplaceRepository Workplaces { get; set; } + [Inject] public IAdvisorCustomerRepository CustomerRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private WorkplaceDto Workplace { get; set; } = new(); private EditContext WorkplaceContext { get; set; } private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/CatalogCountryPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPage.razor.cs index 86bef3cd..cf130335 100644 --- a/Wonky.Client/Pages/CatalogCountryPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPage.razor.cs @@ -31,13 +31,13 @@ namespace Wonky.Client.Pages; public partial class CatalogCountryPage : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ICountryCatalogRepository Catalog { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ICountryCatalogRepository Catalog { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } [Parameter] public string CountryCode { get; set; } = ""; @@ -51,7 +51,7 @@ public partial class CatalogCountryPage : IDisposable protected override async Task OnInitializedAsync() { - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); XUserInfo = await UserInfoService.GetUserInfo(); Pager.OrderBy = Profiles.ItemSort; diff --git a/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs index d98b3d4f..3bb30b64 100644 --- a/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPrintPage.razor.cs @@ -26,9 +26,9 @@ namespace Wonky.Client.Pages; public partial class CatalogCountryPrintPage : IDisposable { - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ICountryCatalogRepository Catalog { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ICountryCatalogRepository Catalog { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } [Parameter] public string CountryCode { get; set; } = ""; private List Items { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/ErrorPage404.razor.cs b/Wonky.Client/Pages/ErrorPage404.razor.cs index 63bd6d41..873111fc 100644 --- a/Wonky.Client/Pages/ErrorPage404.razor.cs +++ b/Wonky.Client/Pages/ErrorPage404.razor.cs @@ -21,7 +21,7 @@ namespace Wonky.Client.Pages; public partial class ErrorPage404 { - [Inject] private NavigationManager NavigationManager { get; set; } + [Inject] public NavigationManager NavigationManager { get; set; } private void NavigateToHome() { diff --git a/Wonky.Client/Pages/Login.razor.cs b/Wonky.Client/Pages/Login.razor.cs index 4ea141bf..71bfca03 100644 --- a/Wonky.Client/Pages/Login.razor.cs +++ b/Wonky.Client/Pages/Login.razor.cs @@ -23,9 +23,9 @@ namespace Wonky.Client.Pages; public partial class Login { - [Inject] private NavigationManager NavigationManager { get; set; } - [Inject] private IAuthenticationService AuthenticationService { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public NavigationManager NavigationManager { get; set; } + [Inject] public IAuthenticationService AuthenticationService { get; set; } + [Inject] public ILogger Logger { get; set; } [Parameter] public string ReturnUrl { get; set; } = ""; private CredentialDto CredentialDto { get; set; } = new (); private bool ShowAuthError { get; set; } diff --git a/Wonky.Client/Pages/Logout.razor.cs b/Wonky.Client/Pages/Logout.razor.cs index a419c8e5..ead71c05 100644 --- a/Wonky.Client/Pages/Logout.razor.cs +++ b/Wonky.Client/Pages/Logout.razor.cs @@ -23,8 +23,8 @@ namespace Wonky.Client.Pages; public partial class Logout { - [Inject] private IAuthenticationService AuthenticationService { get; set; } - [Inject] private NavigationManager NavigationManager { get; set; } + [Inject] public IAuthenticationService AuthenticationService { get; set; } + [Inject] public NavigationManager NavigationManager { get; set; } [Inject] private ILocalStorageService LocalStorage { get; set; } protected override async Task OnInitializedAsync() diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs index 675e8883..f7a093e0 100644 --- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs @@ -34,15 +34,15 @@ public partial class OfficeAdvisorReportViewPage : IDisposable [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryReportRepository ReportRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private IJSRuntime JsRuntime { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private IOrderProcessRepository ProcessRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryReportRepository ReportRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public IJSRuntime JsRuntime { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public IOrderProcessRepository ProcessRepo { get; set; } private IJSObjectReference JsModule { get; set; } private ReportView Report { get; set; } = new(); private List Activities { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor.cs index ccf98c3f..4e6e08a9 100644 --- a/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor.cs @@ -29,12 +29,12 @@ namespace Wonky.Client.Pages public partial class OfficeCountryCustomerListPage : IDisposable { [Parameter] public string CountryCode { get; set; } = ""; - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private UserProfileService ProfileService { get; set; } - [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public UserProfileService ProfileService { get; set; } + [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private List Companies { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); @@ -54,7 +54,7 @@ namespace Wonky.Client.Pages Interceptor.RegisterBeforeSendEvent(); // set preferences - Profiles = await ProfileService.GetPreferences(); + Profiles = await ProfileService.GetProfile(); XUserInfo = await UserInfoService.GetUserInfo(); Paging.OrderBy = Profiles.CompanySort; Paging.SearchColumn = Profiles.CompanySearch; diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index 04607bfb..a7ac8253 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -31,13 +31,13 @@ namespace Wonky.Client.Pages; public partial class OfficeOrderCreatePage : IDisposable { - [Inject] private ILogger Logger { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] private ICountryCustomerHistoryRepository InventoryRepo { get; set; } - [Inject] private ICountryReportRepository ReportRepo { get; set; } - [Inject] private ISystemUserRepository UserRepo { get; set; } - [Inject] private ICountryCatalogRepository Catalog { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } + [Inject] public ICountryCustomerHistoryRepository InventoryRepo { get; set; } + [Inject] public ICountryReportRepository ReportRepo { get; set; } + [Inject] public ISystemUserRepository UserRepo { get; set; } + [Inject] public ICountryCatalogRepository Catalog { get; set; } // parameters [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; diff --git a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs index 0e739d4a..0ed2f5ca 100644 --- a/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderViewPage.razor.cs @@ -32,14 +32,14 @@ public partial class OfficeOrderViewPage : IDisposable { [Parameter] public string CompanyId { get; set; } = ""; [Parameter] public string OrderId { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IAdvisorActivityRepository AdvisorActivityRepo { get; set; } - [Inject] private ISystemSendMailService MailService { get; set; } - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private ISystemUserRepository SystemUserRepo { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private IToastService Toast { get; set; } - [Inject] private UserInfoService UserInfoService { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; } + [Inject] public ISystemSendMailService MailService { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toast { get; set; } + [Inject] public IUserInfoService UserInfoService { get; set; } private ReportItemView ReportItem { get; set; } = new(); private bool IsNotified { get; set; } diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs index 7d8d7097..37b635bf 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs @@ -27,10 +27,10 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorCustomerListPage : IDisposable { - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ICountryCustomerRepository CustomerRepo { get; set; } - [Inject] private UserProfileService UserProfileService { get; set; } - [Inject] private ISystemUserRepository UserRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } + [Inject] public UserProfileService UserProfileService { get; set; } + [Inject] public ISystemUserRepository UserRepo { get; set; } [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = "dk"; @@ -52,7 +52,7 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable SalesRep = await UserRepo.GetUserInfo(UserId); // set preferences - UserProfile = await UserProfileService.GetPreferences(); + UserProfile = await UserProfileService.GetProfile(); Paging.OrderBy = UserProfile.CompanySort; Paging.SearchColumn = UserProfile.CompanySearch; Paging.PageSize = Convert.ToInt32(UserProfile.PageSize); diff --git a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs index 07ce4e0c..fe96d1b9 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor.cs @@ -25,8 +25,8 @@ namespace Wonky.Client.Pages; public partial class OfficeUserAdvisorListPage :IDisposable { - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ISystemUserRepository SystemUserRepo { get; set; } [Parameter] public string CountryCode { get; set; } = ""; private List SalesReps { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs index c0d9fcdd..c0455960 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor.cs @@ -27,10 +27,10 @@ public partial class OfficeUserAdvisorReportListPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] private ICountryReportRepository ReportRepo { get; set; } - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private ISystemUserRepository SystemUserRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } + [Inject] public ICountryReportRepository ReportRepo { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ISystemUserRepository SystemUserRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private List ActivityReports { get; set; } = new(); private bool Working { get; set; } = true; private UserManagerEditView UserInfo { get; set; } = new(); diff --git a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs index 71e5c0c8..76747933 100644 --- a/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintOrderPage.razor.cs @@ -32,12 +32,12 @@ public partial class ReportPrintOrderPage [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IOrderProcessRepository ProcessRepo { get; set; } - [Inject] private IJSRuntime JsRuntime { get; set; } - [Inject] private ILogger Logger { get; set; } - [Inject] private IToastService Toaster { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IOrderProcessRepository ProcessRepo { get; set; } + [Inject] public IJSRuntime JsRuntime { get; set; } + [Inject] public ILogger Logger { get; set; } + [Inject] public IToastService Toaster { get; set; } private ReportView Report { get; set; } = new(); private List Items { get; set; } = new(); private IJSObjectReference JsModule { get; set; } diff --git a/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs b/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs index 76edd265..78ac4046 100644 --- a/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs +++ b/Wonky.Client/Pages/ReportPrintSummaryPage.razor.cs @@ -28,10 +28,10 @@ public partial class ReportPrintSummaryPage [Parameter] public string CountryCode { get; set; } = ""; [Parameter] public string UserId { get; set; } = ""; [Parameter] public string ReportDate { get; set; } = ""; - [Inject] private ILocalStorageService Storage { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IJSRuntime JsRuntime { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public ILocalStorageService Storage { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IJSRuntime JsRuntime { get; set; } + [Inject] public ILogger Logger { get; set; } private ReportView Report { get; set; } = new(); private IJSObjectReference JsModule { get; set; } private string ReturnUrl { get; set; } = ""; diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs index bb9a28da..2b0a9515 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor.cs @@ -31,11 +31,11 @@ public partial class SystemUserViewEditPage : IDisposable { [Parameter] public string UserId { get; set; } = ""; [Parameter] public string CountryCode { get; set; } = ""; - [Inject] public HttpInterceptorService Interceptor { get; set; } - [Inject] public ISystemUserRepository UserRepo { get; set; } - // [Inject] public ILogger Logger { get; set; } - // [Inject] public NavigationManager Navigator { get; set; } - [Inject] private IToastService Toaster { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ISystemUserRepository UserRepo { get; set; } + // [Inject] public ILogger Logger { get; set; } + // [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IToastService Toaster { get; set; } private UserManagerEditView UserInfo { get; set; } = new(); private EditContext UserEditContext { get; set; } private ResetPasswordDto Passwords { get; set; } = new(); diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs index 4a197889..64ab7fb9 100644 --- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs @@ -29,9 +29,9 @@ public partial class WarehouseOrderListPage : IDisposable { [Parameter] public string Status { get; set; } = "none"; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IOrderProcessRepository OrderProcessRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } private List OrderList { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs index e2c80931..9c87befc 100644 --- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs +++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor.cs @@ -28,11 +28,11 @@ namespace Wonky.Client.Pages; public partial class WarehouseOrderViewPage : IDisposable { [Parameter] public string OrderId { get; set; } = ""; - [Inject] private HttpInterceptorService Interceptor { get; set; } - [Inject] private IOrderProcessRepository OrderProcessRepo { get; set; } - [Inject] private NavigationManager Navigator { get; set; } - [Inject] private IToastService Toast { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public IOrderProcessRepository OrderProcessRepo { get; set; } + [Inject] public NavigationManager Navigator { get; set; } + [Inject] public IToastService Toast { get; set; } + [Inject] public ILogger Logger { get; set; } private WarehouseOrderView Order { get; set; } = new(); private bool Working { get; set; } = true; diff --git a/Wonky.Client/Program.cs b/Wonky.Client/Program.cs index 024ad1c4..aae655b6 100644 --- a/Wonky.Client/Program.cs +++ b/Wonky.Client/Program.cs @@ -54,6 +54,9 @@ builder.Services.AddHttpClientInterceptor(); builder.Services.Configure(builder.Configuration.GetSection("ApiConfig")); // app info object builder.Services.Configure(builder.Configuration.GetSection("AppInfo")); +// user +builder.Services.AddScoped(); +builder.Services.AddScoped(); // crm repositories builder.Services.AddScoped(); builder.Services.AddScoped(); @@ -75,7 +78,6 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); // interceptor builder.Services.AddScoped(); -builder.Services.AddScoped(); // storage builder.Services.AddBlazoredLocalStorage(); // authorization @@ -88,8 +90,6 @@ builder.Services.AddScoped(); builder.Services.AddScoped(); // vat registry service builder.Services.AddScoped(); -// preference service -builder.Services.AddScoped(); // activity draft service builder.Services.AddScoped(); diff --git a/Wonky.Client/Services/AuthenticationService.cs b/Wonky.Client/Services/AuthenticationService.cs index 68d6c102..5b63cdf3 100644 --- a/Wonky.Client/Services/AuthenticationService.cs +++ b/Wonky.Client/Services/AuthenticationService.cs @@ -31,23 +31,29 @@ namespace Wonky.Client.Services private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; private readonly HttpClient _client; private readonly AuthenticationStateProvider _authStateProvider; - private readonly ILocalStorageService _localStorage; private readonly IOptions _apiConfig; private readonly ILogger _logger; + private readonly IUserInfoService _infoService; + private readonly UserProfileService _profile; + private readonly ILocalStorageService _localStorage; public AuthenticationService( HttpClient client, AuthenticationStateProvider authStateProvider, - ILocalStorageService localStorage, IOptions apiConfig, - ILogger logger + ILogger logger, + IUserInfoService infoService, + UserProfileService profile, + ILocalStorageService localStorage ) { _client = client; _authStateProvider = authStateProvider; - _localStorage = localStorage; _apiConfig = apiConfig; _logger = logger; + _infoService = infoService; + _profile = profile; + _localStorage = localStorage; } public async Task Login(CredentialDto credentials) @@ -70,19 +76,18 @@ namespace Wonky.Client.Services IsSuccess = false, ErrorMessage = $"Kontroller indtastning" }; - _logger.LogDebug("response {}", resContent); - // process response content var data = JsonSerializer.Deserialize(resContent, _options); - await _localStorage.SetItemAsync("_xa", data.AccessToken); - await _localStorage.SetItemAsync("_xr", data.RefreshToken); - await _localStorage.SetItemAsync("_xe", (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); + + await _infoService.SetAccessToken(data.AccessToken); + await _infoService.SetRefreshToken(data.RefreshToken); + await _infoService.SetExpiration((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken); - + var userInfo = await UserInfo(); - await _localStorage.SetItemAsync("_xu", userInfo); + await _infoService.SetUserInfo(userInfo); // notify system on state change ((AuthStateProvider)_authStateProvider).NotifyUserAuthenticationAsync(data.AccessToken); @@ -92,7 +97,7 @@ namespace Wonky.Client.Services public async Task RefreshToken() { - var refreshToken = await _localStorage.GetItemAsync("_xr"); + var refreshToken = await _infoService.GetRefreshToken(); var credentials = new Dictionary { ["grant_type"] = "refresh_token", @@ -110,38 +115,30 @@ namespace Wonky.Client.Services // set default request headers using access_token _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", data.AccessToken); - await _localStorage.SetItemAsync("_xa", data.AccessToken); - await _localStorage.SetItemAsync("_xr", data.RefreshToken); - await _localStorage.SetItemAsync("_xe", (int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); + await _infoService.SetAccessToken(data.AccessToken); + await _infoService.SetRefreshToken(data.RefreshToken); + await _infoService.SetExpiration((int)DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds + data.ExpiresIn - 60); return data.AccessToken; } public async Task Logout() { - // create a backup copy of user profile - var profileBackup = await _localStorage.GetItemAsync("preferences"); - // clear storage + var profileBackup = await _profile.GetProfile(); + Task.Delay(150); await _localStorage.ClearAsync(); - // write profile back - await _localStorage.SetItemAsync("preferences", profileBackup); - // remove authentication headers + Task.Delay(150); + await _profile.SetProfile(profileBackup); _client.DefaultRequestHeaders.Authorization = null; - // notify logout ((AuthStateProvider)_authStateProvider).NotifyUserLogout(); } public async Task UserInfo(bool write = false) { - _logger.LogDebug("sending userinfo request"); var response = await _client.GetAsync(_apiConfig.Value.UserInfo).ConfigureAwait(true); - var content = await response.Content.ReadAsStringAsync(); - - _logger.LogDebug("UserInfo <= {}", content); - var userInfo = JsonSerializer.Deserialize(content, _options); if(write) - await _localStorage.SetItemAsync("_xui", userInfo); + await _infoService.SetUserInfo(userInfo); return userInfo ?? new UserManagerEditView(); } } diff --git a/Wonky.Client/Services/IUserInfoService.cs b/Wonky.Client/Services/IUserInfoService.cs new file mode 100644 index 00000000..99961894 --- /dev/null +++ b/Wonky.Client/Services/IUserInfoService.cs @@ -0,0 +1,15 @@ +using Wonky.Entity.DTO; + +namespace Wonky.Client.Services; + +public interface IUserInfoService +{ + Task GetUserInfo(); + Task SetUserInfo(UserManagerEditView userInfo); + Task GetRefreshToken(); + Task SetRefreshToken(string token); + Task GetAccessToken(); + Task SetAccessToken(string token); + Task GetExpiration(); + Task SetExpiration(long expiration); +} \ No newline at end of file diff --git a/Wonky.Client/Services/UserInfoService.cs b/Wonky.Client/Services/UserInfoService.cs index e7fc4be9..a2897099 100644 --- a/Wonky.Client/Services/UserInfoService.cs +++ b/Wonky.Client/Services/UserInfoService.cs @@ -1,14 +1,62 @@ +using System.Security.Cryptography.Xml; +using System.Text.Json; using Blazored.LocalStorage; using Wonky.Entity.DTO; namespace Wonky.Client.Services; -public class UserInfoService +public class UserInfoService : IUserInfoService { + private const string _infoKey = "_xui"; + private const string _refreshKey = "_xr"; + private const string _accessKey = "_xa"; + private const string _expiryKey = "_xe"; + private readonly ILocalStorageService _localStorageService; + private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; + public UserInfoService(ILocalStorageService localStorageService) + { + _localStorageService = localStorageService; + } + public async Task GetUserInfo() { - return await _localStorageService.GetItemAsync("_xui"); + return await _localStorageService.GetItemAsync(_infoKey); + } + + public async Task SetUserInfo(UserManagerEditView userInfo) + { + await _localStorageService.SetItemAsync(_infoKey, userInfo); + } + + public async Task GetRefreshToken() + { + return await _localStorageService.GetItemAsStringAsync(_refreshKey); + } + + public async Task SetRefreshToken(string token) + { + await _localStorageService.SetItemAsStringAsync(_refreshKey, token); + } + + public async Task GetAccessToken() + { + return await _localStorageService.GetItemAsStringAsync(_accessKey); + } + + public async Task SetAccessToken(string token) + { + await _localStorageService.SetItemAsStringAsync(_accessKey, token); + } + + public async Task GetExpiration() + { + return await _localStorageService.GetItemAsync(_expiryKey); + } + + public async Task SetExpiration(long expiration) + { + await _localStorageService.SetItemAsync(_expiryKey, expiration); } } \ No newline at end of file diff --git a/Wonky.Client/Services/UserProfileService.cs b/Wonky.Client/Services/UserProfileService.cs index 982a8fe4..d0d49aff 100644 --- a/Wonky.Client/Services/UserProfileService.cs +++ b/Wonky.Client/Services/UserProfileService.cs @@ -35,6 +35,7 @@ public class UserProfileService private readonly ILocalStorageService _localStorageService; private const string KeyName = "preferences"; public event Action? OnChange; + public UserProfileService(ILocalStorageService localStorageService) { _localStorageService = localStorageService; @@ -42,7 +43,7 @@ public class UserProfileService public async Task SetDateConfirmed(bool confirmed) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { @@ -54,7 +55,7 @@ public class UserProfileService public async Task SetKmMorning(int kmMorning) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { @@ -66,7 +67,7 @@ public class UserProfileService public async Task SetCompanyFilterPhrase(string filterPhrase) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { @@ -78,7 +79,7 @@ public class UserProfileService public async Task SetWorkDate(DateTime workDate) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { @@ -90,7 +91,7 @@ public class UserProfileService public async Task SetCompanySearch(string companySearch) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { CompanySearch = companySearch }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -99,7 +100,7 @@ public class UserProfileService public async Task SetCompanySort(string companySort) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { CompanySort = companySort }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -108,7 +109,7 @@ public class UserProfileService public async Task SetItemSearch(string itemSearch) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { ItemSearch = itemSearch }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -117,7 +118,7 @@ public class UserProfileService public async Task SetItemSort(string itemSort) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { ItemSort = itemSort }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -126,15 +127,20 @@ public class UserProfileService public async Task SetPageSize(string pageSize) { - var preferences = await GetPreferences(); + var preferences = await GetProfile(); var newPreferences = preferences with { PageSize = pageSize }; await _localStorageService.SetItemAsync(KeyName, newPreferences); OnChange?.Invoke(newPreferences); } - public async Task GetPreferences() + public async Task GetProfile() { return await _localStorageService.GetItemAsync(KeyName) ?? new UserProfile(); } + + public async Task SetProfile(UserProfile profile) + { + await _localStorageService.SetItemAsync(KeyName, profile); + } } \ No newline at end of file diff --git a/Wonky.Client/Shared/AuthStateProvider.cs b/Wonky.Client/Shared/AuthStateProvider.cs index d06e01ef..e661a696 100644 --- a/Wonky.Client/Shared/AuthStateProvider.cs +++ b/Wonky.Client/Shared/AuthStateProvider.cs @@ -18,6 +18,7 @@ using System.Net.Http.Headers; using System.Security.Claims; using Blazored.LocalStorage; using Microsoft.AspNetCore.Components.Authorization; +using Wonky.Client.Services; using Wonky.Entity.DTO; using Wonky.Entity.Views; @@ -26,35 +27,36 @@ namespace Wonky.Client.Shared public class AuthStateProvider : AuthenticationStateProvider { private readonly HttpClient _client; - private readonly ILocalStorageService _storage; + // private readonly ILocalStorageService _storage; private readonly AuthenticationState _anonymous; + private readonly IUserInfoService _infoService; - public AuthStateProvider(HttpClient client, ILocalStorageService storage) + public AuthStateProvider(HttpClient client, IUserInfoService infoService) { _client = client; - _storage = storage; + _infoService = infoService; _anonymous = new AuthenticationState(new ClaimsPrincipal(new ClaimsIdentity())); } public override async Task GetAuthenticationStateAsync() { - var token = await _storage.GetItemAsync("_xa"); + var token = await _infoService.GetAccessToken(); if (string.IsNullOrEmpty(token)) return _anonymous; - var userInfo = await _storage.GetItemAsync("_xu"); + var userInfo = await _infoService.GetUserInfo(); if (userInfo == null) return _anonymous; _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token); - var exp = await _storage.GetItemAsync("_xe"); + var exp = await _infoService.GetExpiration(); var claims = new List { new(ClaimTypes.Name, $"{userInfo.FirstName} {userInfo.LastName}"), new(ClaimTypes.Email, userInfo.Email), new(ClaimTypes.Country, userInfo.CountryCode), new(ClaimTypes.MobilePhone, userInfo.PhoneNumber), - new(ClaimTypes.Expiration, exp) + new(ClaimTypes.Expiration, exp.ToString()) }; claims.AddRange( from role in userInfo.AssignedRoles @@ -73,8 +75,8 @@ namespace Wonky.Client.Shared _client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("bearer", token); - var userInfo = await _storage.GetItemAsync("_xu"); - var exp = await _storage.GetItemAsync("_xe"); + var userInfo = await _infoService.GetUserInfo(); + var exp = await _infoService.GetExpiration(); var claims = new List { @@ -82,7 +84,7 @@ namespace Wonky.Client.Shared new(ClaimTypes.Email, userInfo.Email), new(ClaimTypes.Country, userInfo.CountryCode), new(ClaimTypes.MobilePhone, userInfo.PhoneNumber), - new(ClaimTypes.Expiration, exp) + new(ClaimTypes.Expiration, exp.ToString()) }; claims.AddRange( from role in userInfo.AssignedRoles diff --git a/Wonky.Client/Shared/DraftStateProvider.razor.cs b/Wonky.Client/Shared/DraftStateProvider.razor.cs index 776224ce..a848adf0 100644 --- a/Wonky.Client/Shared/DraftStateProvider.razor.cs +++ b/Wonky.Client/Shared/DraftStateProvider.razor.cs @@ -25,7 +25,7 @@ public partial class DraftStateProvider { [Parameter] public RenderFragment ChildContent { get; set; } [Parameter] public string DraftId { get; set; } = ""; - [Inject] private ILocalStorageService LocalStorageService { get; set; } + [Inject] public ILocalStorageService LocalStorageService { get; set; } public Draft Draft { get; set; } = new(); private bool _hasLoaded; diff --git a/Wonky.Client/Shared/VatLookupDkModal.razor.cs b/Wonky.Client/Shared/VatLookupDkModal.razor.cs index 8e26eff9..649ec5ef 100644 --- a/Wonky.Client/Shared/VatLookupDkModal.razor.cs +++ b/Wonky.Client/Shared/VatLookupDkModal.razor.cs @@ -36,9 +36,9 @@ public partial class VatLookupDkModal [Parameter] public string EntityName { get; set; } = ""; [Parameter] public string VatNumber { get; set; } = ""; [Parameter] public EventCallback OnSelectedCompany { get; set; } - [Inject] private VatInfoLookupService VatService { get; set; } - [Inject] private IToastService Toaster { get; set; } - [Inject] private ILogger Logger { get; set; } + [Inject] public VatInfoLookupService VatService { get; set; } + [Inject] public IToastService Toaster { get; set; } + [Inject] public ILogger Logger { get; set; } private VirkRegInfo CompanyRegInfo { get; set; } = new(); private List VatInfos { get; set; } = new(); private VatAddress ThisVatAddress { get; set; } = new(); diff --git a/Wonky.Entity/Views/X_WebUserInfoView.cs b/Wonky.Entity/Views/X_WebUserInfoView.cs deleted file mode 100644 index 8e97d7f1..00000000 --- a/Wonky.Entity/Views/X_WebUserInfoView.cs +++ /dev/null @@ -1,35 +0,0 @@ - -// Copyright (C) 2022 FCS Frede's Computer Services. -// This program is free software: you can redistribute it and/or modify -// it under the terms of the GNU Affero General Public License as -// published by the Free Software Foundation, either version 3 of the -// License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Affero General Public License for more details. -// -// You should have received a copy of the GNU Affero General Public License -// along with this program. If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html] -// - -using System.Text.Json.Serialization; - -namespace Wonky.Entity.Views; - -public class X_WebUserInfoView -{ - [JsonPropertyName("userId")] public string UserId { get; set; } = ""; - [JsonPropertyName("salesRep")] public string Advisor { get; set; } = ""; - [JsonPropertyName("countryCode")] public string CountryCode { get; set; } = ""; - [JsonPropertyName("countryName")] public string CountryName { get; set; } = ""; - [JsonPropertyName("email")] public string Email { get; set; } = ""; - [JsonPropertyName("firstName")] public string FirstName { get; set; } = ""; - [JsonPropertyName("lastName")]public string LastName { get; set; } = ""; - [JsonPropertyName("phoneNumber")]public string PhoneNumber { get; set; } = ""; - [JsonPropertyName("lockoutEnabled")] public bool LockoutEnabled { get; set; } - [JsonPropertyName("emailConfirmed")] public bool EmailConfirmed { get; set; } - [JsonPropertyName("isAdmin")] public bool IsAdmin { get; set; } - [JsonPropertyName("isAdvisor")] public bool IsAdvisor { get; set; } -} \ No newline at end of file