From 81f0ca900d53f344a51ef64258de61d2dfb33bdb Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 24 Jul 2023 10:57:39 +0200 Subject: [PATCH] rename function --- .../AdvisorLandingComponent.razor.cs | 2 +- .../OfficeLandingComponent.razor.cs | 2 +- .../Components/PageSizeComponent.razor.cs | 2 +- .../SearchCatalogColumnComponent.razor.cs | 2 +- .../SearchCatalogSortColumnComponent.razor.cs | 2 +- .../SearchCustomerColumnComponent.razor.cs | 2 +- .../SearchCustomerPhraseComponent.razor.cs | 2 +- ...SearchCustomerSortColumnComponent.razor.cs | 2 +- .../Components/WorkDateComponent.razor.cs | 2 +- .../CountryCatalogRepository.cs | 4 +- .../Local.Services/UserPreferenceService.cs | 18 +-- .../CatalogPagedOverlay.razor.cs | 2 +- .../CustomerSearchOverlay.razor.cs | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 2 +- .../AdvisorActivityTodayListPage.razor.cs | 2 +- .../AdvisorCustomerPagedListPage.razor.cs | 26 ++-- .../Pages/AdvisorReportCreatePage.razor.cs | 2 +- .../Pages/AdvisorTaskItemListCrmPage.razor.cs | 2 +- .../Pages/CatalogCountryPagedListPage.razor | 11 +- .../CatalogCountryPagedListPage.razor.cs | 54 ++++--- .../Pages/CatalogCountryProductPage.razor | 15 ++ .../Pages/CatalogCountryProductPage.razor.cs | 33 ++++ ...fficeAdvisorCustomerPagedListPage.razor.cs | 2 +- ...fficeCustomerCountryPagedListPage.razor.cs | 145 +++++++++--------- Wonky.Client/wwwroot/appsettings.json | 2 +- 25 files changed, 194 insertions(+), 146 deletions(-) create mode 100644 Wonky.Client/Pages/CatalogCountryProductPage.razor create mode 100644 Wonky.Client/Pages/CatalogCountryProductPage.razor.cs diff --git a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs index d50ae44b..13952e31 100644 --- a/Wonky.Client/Components/AdvisorLandingComponent.razor.cs +++ b/Wonky.Client/Components/AdvisorLandingComponent.razor.cs @@ -51,7 +51,7 @@ public partial class AdvisorLandingComponent protected override async Task OnInitializedAsync() { - Profiles = await PreferenceService.GetProfile(); + Profiles = await PreferenceService.GetPreference(); // SelectedDate = string.IsNullOrWhiteSpace(Profiles.WorkDate) ? DateTime.Parse(Profiles.WorkDate) : DateTime.Today; } diff --git a/Wonky.Client/Components/OfficeLandingComponent.razor.cs b/Wonky.Client/Components/OfficeLandingComponent.razor.cs index c9c9acf7..20b7e812 100644 --- a/Wonky.Client/Components/OfficeLandingComponent.razor.cs +++ b/Wonky.Client/Components/OfficeLandingComponent.razor.cs @@ -47,7 +47,7 @@ public partial class OfficeLandingComponent protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileChanged; - Profiles = await PreferenceService.GetProfile(); + Profiles = await PreferenceService.GetPreference(); if (string.IsNullOrWhiteSpace(Profiles.WorkDate)) { await PreferenceService.SetWorkDate(DateTime.Now); diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index a74025a7..762b63c5 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -35,7 +35,7 @@ public partial class PageSizeComponent : IDisposable protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileServiceOnOnChange; - Profile = await PreferenceService.GetProfile(); + Profile = await PreferenceService.GetPreference(); PageSize = Profile.PageSize; await OnChanged.InvokeAsync(PageSize); } diff --git a/Wonky.Client/Components/SearchCatalogColumnComponent.razor.cs b/Wonky.Client/Components/SearchCatalogColumnComponent.razor.cs index f32af7a6..daadef9f 100644 --- a/Wonky.Client/Components/SearchCatalogColumnComponent.razor.cs +++ b/Wonky.Client/Components/SearchCatalogColumnComponent.razor.cs @@ -36,7 +36,7 @@ public partial class SearchCatalogColumnComponent : IDisposable protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileServiceOnOnChange; - Profiles = await PreferenceService.GetProfile(); + Profiles = await PreferenceService.GetPreference(); SearchCol = Profiles.ItemSearch; await OnChanged.InvokeAsync(SearchCol); } diff --git a/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor.cs b/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor.cs index 25b6dcf9..25ff1d6f 100644 --- a/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor.cs +++ b/Wonky.Client/Components/SearchCatalogSortColumnComponent.razor.cs @@ -36,7 +36,7 @@ public partial class SearchCatalogSortColumnComponent : IDisposable protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileServiceOnOnChange; - _profiles = await PreferenceService.GetProfile(); + _profiles = await PreferenceService.GetPreference(); SortCol = _profiles.ItemSort; } diff --git a/Wonky.Client/Components/SearchCustomerColumnComponent.razor.cs b/Wonky.Client/Components/SearchCustomerColumnComponent.razor.cs index 4d66b037..427f9a12 100644 --- a/Wonky.Client/Components/SearchCustomerColumnComponent.razor.cs +++ b/Wonky.Client/Components/SearchCustomerColumnComponent.razor.cs @@ -40,7 +40,7 @@ public partial class SearchCustomerColumnComponent : IDisposable protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileServiceOnOnChange; - Profiles = await PreferenceService.GetProfile(); + Profiles = await PreferenceService.GetPreference(); SearchCol = Profiles.CompanySearch; } diff --git a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor.cs b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor.cs index 95d13b6c..397ec0ea 100644 --- a/Wonky.Client/Components/SearchCustomerPhraseComponent.razor.cs +++ b/Wonky.Client/Components/SearchCustomerPhraseComponent.razor.cs @@ -37,7 +37,7 @@ public partial class SearchCustomerPhraseComponent protected override async Task OnInitializedAsync() { - Profiles = await PreferenceService.GetProfile(); + Profiles = await PreferenceService.GetPreference(); SearchTerm = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase.Trim(); if(!string.IsNullOrWhiteSpace(SearchTerm)) diff --git a/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor.cs b/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor.cs index 236b9191..bd99efaf 100644 --- a/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor.cs +++ b/Wonky.Client/Components/SearchCustomerSortColumnComponent.razor.cs @@ -40,7 +40,7 @@ public partial class SearchCustomerSortColumnComponent : IDisposable protected override async Task OnInitializedAsync() { PreferenceService.OnChange += ProfileServiceOnOnChange; - _profiles = await PreferenceService.GetProfile(); + _profiles = await PreferenceService.GetPreference(); SortCol = _profiles.CompanySort; } diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index 78e105a7..89b09f13 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -59,7 +59,7 @@ public partial class WorkDateComponent : IDisposable { WorkDateContext = new EditContext(SelectedDate); UserPreference.OnChange += ProfileServiceOnOnChange; - Profile = await UserPreference.GetProfile(); + Profile = await UserPreference.GetPreference(); SelectedDate = string.IsNullOrWhiteSpace(Profile.WorkDate) ? DateTime.Now : DateTime.Parse(Profile.WorkDate); diff --git a/Wonky.Client/HttpRepository/CountryCatalogRepository.cs b/Wonky.Client/HttpRepository/CountryCatalogRepository.cs index 1a51c98e..2d262bfd 100644 --- a/Wonky.Client/HttpRepository/CountryCatalogRepository.cs +++ b/Wonky.Client/HttpRepository/CountryCatalogRepository.cs @@ -134,6 +134,8 @@ public class CountryCatalogRepository : ICountryCatalogRepository /// public async Task> GetPriceList(string countryCode) { - return await _client.GetFromJsonAsync>($"{_api.Catalog}/{countryCode}", _options); + var result = await _client.GetFromJsonAsync>( + $"{_api.Catalog}/{countryCode}", _options); + return result ?? new List(); } } \ No newline at end of file diff --git a/Wonky.Client/Local.Services/UserPreferenceService.cs b/Wonky.Client/Local.Services/UserPreferenceService.cs index c945235c..30203fec 100644 --- a/Wonky.Client/Local.Services/UserPreferenceService.cs +++ b/Wonky.Client/Local.Services/UserPreferenceService.cs @@ -58,7 +58,7 @@ public class UserPreferenceService public async Task SetDateConfirmed(bool confirmed) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { @@ -71,7 +71,7 @@ public class UserPreferenceService public async Task SetCompanyFilterPhrase(string filterPhrase) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { @@ -84,7 +84,7 @@ public class UserPreferenceService public async Task SetWorkDate(DateTime workDate) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { @@ -97,7 +97,7 @@ public class UserPreferenceService public async Task SetCompanySearch(string companySearch) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { CompanySearch = companySearch }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -107,7 +107,7 @@ public class UserPreferenceService public async Task SetCompanySort(string companySort) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { CompanySort = companySort }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -117,7 +117,7 @@ public class UserPreferenceService public async Task SetItemSearch(string itemSearch) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { ItemSearch = itemSearch }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -127,7 +127,7 @@ public class UserPreferenceService public async Task SetItemSort(string itemSort) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { ItemSort = itemSort }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -137,7 +137,7 @@ public class UserPreferenceService public async Task SetPageSize(string pageSize) { - var preferences = await GetProfile(); + var preferences = await GetPreference(); var newPreferences = preferences with { PageSize = pageSize }; await _localStorageService.SetItemAsync(KeyName, newPreferences); @@ -145,7 +145,7 @@ public class UserPreferenceService } - public async Task GetProfile() + public async Task GetPreference() { return await _localStorageService.GetItemAsync(KeyName) ?? new UserPreference(); } diff --git a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs index bb45b9ea..46924e8f 100644 --- a/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs @@ -56,7 +56,7 @@ public partial class CatalogPagedOverlay : IDisposable protected override async Task OnInitializedAsync() { - _userPreference = await PreferenceService.GetProfile(); + _userPreference = await PreferenceService.GetPreference(); _pager.OrderBy = _userPreference.ItemSort; _pager.SearchColumn = _userPreference.ItemSearch; _pager.PageSize = Convert.ToInt32(_userPreference.PageSize); diff --git a/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs index a6db543c..5a8e422d 100644 --- a/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs +++ b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs @@ -57,7 +57,7 @@ public partial class CustomerSearchOverlay : IDisposable protected override async Task OnInitializedAsync() { - _userPreference = await PreferenceService.GetProfile(); + _userPreference = await PreferenceService.GetPreference(); _pager.OrderBy = _userPreference.ItemSort; _pager.SearchColumn = _userPreference.ItemSearch; _pager.PageSize = Convert.ToInt32(_userPreference.PageSize); diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 85de6b71..a4ac12b4 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -105,7 +105,7 @@ public partial class AdvisorActivityCreatePage : IDisposable Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - _userPref = await PreferenceService.GetProfile(); + _userPref = await PreferenceService.GetPreference(); _salesRep = await UserInfo.GetUserInfo(); _company = await CompanyRepo.GetCompanyById(CompanyId); diff --git a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs index 43e161ac..101d1823 100644 --- a/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityTodayListPage.razor.cs @@ -46,7 +46,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - UserPreference = await PreferenceService.GetProfile(); + UserPreference = await PreferenceService.GetPreference(); SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate) ? DateTime.Now : DateTime.Parse(UserPreference.WorkDate); diff --git a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs index 5a2f8d80..417f278d 100644 --- a/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs @@ -38,8 +38,8 @@ public partial class AdvisorCustomerPagedListPage : IDisposable // ######################################################################3 private List CompanyList { get; set; } = new(); - private UserPreference Profile { get; set; } = new(); - private UserManagerEditView UserInfo { get; set; } = new(); + private UserPreference Preference { get; set; } = new(); + private UserManagerEditView XUserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool Working { get; set; } = true; private MetaData PageData { get; set; } = new(); @@ -50,27 +50,23 @@ public partial class AdvisorCustomerPagedListPage : IDisposable private bool ShowHidden { get; set; } - protected override void OnParametersSet() + protected override async Task OnInitializedAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - } - - protected override async Task OnInitializedAsync() - { + XUserInfo = await UserInfoService.GetUserInfo(); + // set preferences - Profile = await PreferenceService.GetProfile(); - UserInfo = await UserInfoService.GetUserInfo(); - Paging.OrderBy = Profile.CompanySort; - Paging.SearchColumn = Profile.CompanySearch; - Paging.PageSize = Convert.ToInt32(Profile.PageSize); + Preference = await PreferenceService.GetPreference(); + + Paging.OrderBy = Preference.CompanySort; + Paging.SearchColumn = Preference.CompanySearch; + Paging.PageSize = Convert.ToInt32(Preference.PageSize); Paging.HasFolded = ShowFolded ? 1 : 0; - // load saved search - SavedSearch = string.IsNullOrWhiteSpace(Profile.CompanyFilterPhrase) ? "" : Profile.CompanyFilterPhrase; + SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase; await SetSearchPhrase(SavedSearch); - Working = false; } diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs index a2fe62d6..b01e3324 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor.cs @@ -81,7 +81,7 @@ public partial class AdvisorReportCreatePage : IDisposable PreferenceService.OnChange += ProfileServiceOnOnChange; - Preference = await PreferenceService.GetProfile(); + Preference = await PreferenceService.GetPreference(); KmMorning = await PreferenceService.GetKmMorning(); diff --git a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs index 89941c8e..54f2aa02 100644 --- a/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorTaskItemListCrmPage.razor.cs @@ -40,7 +40,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable protected override async Task OnInitializedAsync() { - Profile = await UserPreferenceService.GetProfile(); + Profile = await UserPreferenceService.GetPreference(); if(!string.IsNullOrWhiteSpace(Profile.WorkDate)) WorkDate = Profile.WorkDate; diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor index 6682f9b1..fbaf5a9a 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor @@ -54,14 +54,11 @@ -@if (Paging.PageSize > 10) -{ -
-
- -
+
+
+
-} +
@if (Working) { diff --git a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs index c761fc3d..92c29a17 100644 --- a/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs @@ -45,30 +45,28 @@ public partial class CatalogCountryPagedListPage : IDisposable private List Items { get; set; } = new(); private MetaData PageData { get; set; } = new(); private CatalogPager Paging { get; set; } = new(); - private UserPreference Profiles { get; set; } = new(); + private UserPreference Preference { get; set; } = new(); private UserManagerEditView XUserInfo { get; set; } = new(); private bool Working { get; set; } private string CountryName { get; set; } = ""; - - + + protected override async Task OnInitializedAsync() { - Profiles = await PreferenceService.GetProfile(); - XUserInfo = await UserInfoService.GetUserInfo(); - - Paging.OrderBy = Profiles.ItemSort; - - Paging.SearchColumn = Profiles.ItemSearch; - Paging.PageSize = Convert.ToInt32(Profiles.PageSize); - Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); + + Preference = await PreferenceService.GetPreference(); + Paging.PageSize = Convert.ToInt32(Preference.PageSize); + Paging.OrderBy = Preference.ItemSort; + Paging.SearchColumn = Preference.ItemSearch; + + XUserInfo = await UserInfoService.GetUserInfo(); + await Task.Delay(100); + if (string.IsNullOrWhiteSpace(CountryCode)) { - while (string.IsNullOrWhiteSpace(XUserInfo.CountryCode)) - await Task.Delay(500); - CountryCode = XUserInfo.CountryCode.ToLower(); Navigator.NavigateTo($"/catalog/{CountryCode}", false, true); } @@ -79,6 +77,20 @@ public partial class CatalogCountryPagedListPage : IDisposable } + private async Task GetCatalogPaged() + { + if (string.IsNullOrWhiteSpace(CountryCode)) + return; + if (Working) + return; + Working = true; + var page = await Catalog.GetSalesItemsPaged(CountryCode, Paging); + Items = page.Items!; + PageData = page.MetaData!; + Working = false; + } + + private async Task SetSearchPhrase(string searchTerm) { Items = new List(); @@ -131,20 +143,6 @@ public partial class CatalogCountryPagedListPage : IDisposable } - private async Task GetCatalogPaged() - { - if (string.IsNullOrWhiteSpace(CountryCode)) - return; - if (Working) - return; - Working = true; - var page = await Catalog.GetSalesItemsPaged(CountryCode, Paging); - Items = page.Items!; - PageData = page.MetaData!; - Working = false; - } - - public void Dispose() => Interceptor.DisposeEvent(); } \ No newline at end of file diff --git a/Wonky.Client/Pages/CatalogCountryProductPage.razor b/Wonky.Client/Pages/CatalogCountryProductPage.razor new file mode 100644 index 00000000..59d99534 --- /dev/null +++ b/Wonky.Client/Pages/CatalogCountryProductPage.razor @@ -0,0 +1,15 @@ +@using Wonky.Client.Components +@using System.Text.Json +@page "/catalog/{CountryCode}/{sku}" + +

CatalogCountryProductPage

+ +@if (!string.IsNullOrWhiteSpace(_item.Sku)) +{ + @JsonSerializer.Serialize(_item) +} + +@if (_working) +{ + +} \ No newline at end of file diff --git a/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs b/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs new file mode 100644 index 00000000..ac5b6bf3 --- /dev/null +++ b/Wonky.Client/Pages/CatalogCountryProductPage.razor.cs @@ -0,0 +1,33 @@ +using Microsoft.AspNetCore.Components; +using Toolbelt.Blazor; +using Wonky.Client.HttpInterceptors; +using Wonky.Client.HttpRepository; +using Wonky.Entity.Views; + +#pragma warning disable CS8618 + +namespace Wonky.Client.Pages; + +public partial class CatalogCountryProductPage +{ + // ############################################################## + [Inject] public HttpInterceptorService Interceptor { get; set; } + [Inject] public ICountryCatalogRepository Catalog { get; set; } + + // ############################################################## + [Parameter] public string CountryCode { get; set; } = ""; + [Parameter] public string Sku { get; set; } = ""; + + // ############################################################## + private SalesItemView _item = new(); + private bool _working = true; + + protected override async Task OnInitializedAsync() + { + Interceptor.RegisterEvent(); + Interceptor.RegisterBeforeSendEvent(); + + _item = await Catalog.GetSalesItemSku(CountryCode, Sku); + _working = false; + } +} \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs index 17cdf796..b6e0c1d3 100644 --- a/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeAdvisorCustomerPagedListPage.razor.cs @@ -57,7 +57,7 @@ public partial class OfficeAdvisorCustomerPagedListPage : IDisposable SalesRep = await UserRepo.GetUserInfo(UserId); // set preferences - UserPreference = await UserPreferenceService.GetProfile(); + UserPreference = await UserPreferenceService.GetPreference(); Paging.OrderBy = UserPreference.CompanySort; Paging.SearchColumn = UserPreference.CompanySearch; Paging.PageSize = Convert.ToInt32(UserPreference.PageSize); diff --git a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs index fdc61f66..67510b5f 100644 --- a/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor.cs @@ -41,91 +41,37 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable // ############################################################# private List Companies { get; set; } = new(); - private UserPreference Profiles { get; set; } = new(); - private UserManagerEditView UserInfo { get; set; } = new(); + private UserPreference Preference { get; set; } = new(); + private UserManagerEditView XUserInfo { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool ShowFolded { get; set; } private bool Working { get; set; } = true; private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); private string ToggleFoldedText { get; set; } = "Vis Lukkede"; - - protected override async Task OnParametersSetAsync() + + + protected override async Task OnInitializedAsync() { - Working = true; - Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); // set preferences - Profiles = await PreferenceService.GetProfile(); - UserInfo = await UserInfoService.GetUserInfo(); - Paging.OrderBy = Profiles.CompanySort; - Paging.SearchColumn = Profiles.CompanySearch; - Paging.PageSize = Convert.ToInt32(Profiles.PageSize); + Preference = await PreferenceService.GetPreference(); + XUserInfo = await UserInfoService.GetUserInfo(); + + Paging.OrderBy = Preference.CompanySort; + Paging.SearchColumn = Preference.CompanySearch; + Paging.PageSize = Convert.ToInt32(Preference.PageSize); Paging.HasFolded = ShowFolded ? 1 : 0; - + // load saved search - SavedSearch = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase; - Paging.SearchTerm = SavedSearch; - - // get companies - await FetchCustomers(); + SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase; + await SetSearchPhrase(SavedSearch); + Working = false; } - private async Task ToggleFolded() - { - Working = true; - ShowFolded = !ShowFolded; - ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; - Companies = new List(); - Paging.PageNumber = 1; - Paging.HasFolded = ShowFolded ? 1 : 0; - await FetchCustomers(); - } - private async Task SetSelectedPage(int page) - { - Working = true; - Companies = new List(); - Paging.PageNumber = page; - await FetchCustomers(); - } - - private async Task SetSearchCol(string searchColumn) - { - Working = true; - Companies = new List(); - Paging.SearchColumn = searchColumn; - Paging.PageNumber = 1; - await FetchCustomers(); - } - private async Task SetPageSize(string pageSize) - { - Working = true; - Companies = new List(); - Paging.PageSize = Convert.ToInt32(pageSize); - Paging.PageNumber = 1; - await FetchCustomers(); - } - - private async Task SetSearchPhrase(string searchTerm) - { - Working = true; - Companies = new List(); - Paging.PageNumber = 1; - Paging.SearchTerm = searchTerm; - await FetchCustomers(); - } - - private async Task SetSortCol(string orderBy) - { - Working = true; - Companies = new List(); - Paging.OrderBy = orderBy; - await FetchCustomers(); - } - private async Task FetchCustomers() { Working = true; @@ -143,5 +89,66 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable } } + + private async Task ToggleFolded() + { + Working = true; + ShowFolded = !ShowFolded; + ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; + Companies = new List(); + Paging.PageNumber = 1; + Paging.HasFolded = ShowFolded ? 1 : 0; + await FetchCustomers(); + } + + + private async Task SetSelectedPage(int page) + { + Working = true; + Companies = new List(); + Paging.PageNumber = page; + await FetchCustomers(); + } + + + private async Task SetSearchCol(string searchColumn) + { + Working = true; + Companies = new List(); + Paging.SearchColumn = searchColumn; + Paging.PageNumber = 1; + await FetchCustomers(); + } + + + private async Task SetPageSize(string pageSize) + { + Working = true; + Companies = new List(); + Paging.PageSize = Convert.ToInt32(pageSize); + Paging.PageNumber = 1; + await FetchCustomers(); + } + + + private async Task SetSearchPhrase(string searchTerm) + { + Working = true; + Companies = new List(); + Paging.PageNumber = 1; + Paging.SearchTerm = searchTerm; + await FetchCustomers(); + } + + + private async Task SetSortCol(string orderBy) + { + Working = true; + Companies = new List(); + Paging.OrderBy = orderBy; + await FetchCustomers(); + } + + public void Dispose() => Interceptor.DisposeEvent(); } \ No newline at end of file diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index 69e78afb..0a39953e 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "185.0", + "version": "188.0", "rc": true, "sandBox": true, "image": "grumpy-coder.png",