rename function
This commit is contained in:
parent
2c6665ecf1
commit
81f0ca900d
25 changed files with 194 additions and 146 deletions
|
@ -51,7 +51,7 @@ public partial class AdvisorLandingComponent
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Profiles = await PreferenceService.GetPreference();
|
||||||
// SelectedDate = string.IsNullOrWhiteSpace(Profiles.WorkDate) ? DateTime.Parse(Profiles.WorkDate) : DateTime.Today;
|
// SelectedDate = string.IsNullOrWhiteSpace(Profiles.WorkDate) ? DateTime.Parse(Profiles.WorkDate) : DateTime.Today;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -47,7 +47,7 @@ public partial class OfficeLandingComponent
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileChanged;
|
PreferenceService.OnChange += ProfileChanged;
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Profiles = await PreferenceService.GetPreference();
|
||||||
if (string.IsNullOrWhiteSpace(Profiles.WorkDate))
|
if (string.IsNullOrWhiteSpace(Profiles.WorkDate))
|
||||||
{
|
{
|
||||||
await PreferenceService.SetWorkDate(DateTime.Now);
|
await PreferenceService.SetWorkDate(DateTime.Now);
|
||||||
|
|
|
@ -35,7 +35,7 @@ public partial class PageSizeComponent : IDisposable
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
Profile = await PreferenceService.GetProfile();
|
Profile = await PreferenceService.GetPreference();
|
||||||
PageSize = Profile.PageSize;
|
PageSize = Profile.PageSize;
|
||||||
await OnChanged.InvokeAsync(PageSize);
|
await OnChanged.InvokeAsync(PageSize);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ public partial class SearchCatalogColumnComponent : IDisposable
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Profiles = await PreferenceService.GetPreference();
|
||||||
SearchCol = Profiles.ItemSearch;
|
SearchCol = Profiles.ItemSearch;
|
||||||
await OnChanged.InvokeAsync(SearchCol);
|
await OnChanged.InvokeAsync(SearchCol);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,7 +36,7 @@ public partial class SearchCatalogSortColumnComponent : IDisposable
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
_profiles = await PreferenceService.GetProfile();
|
_profiles = await PreferenceService.GetPreference();
|
||||||
SortCol = _profiles.ItemSort;
|
SortCol = _profiles.ItemSort;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ public partial class SearchCustomerColumnComponent : IDisposable
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Profiles = await PreferenceService.GetPreference();
|
||||||
SearchCol = Profiles.CompanySearch;
|
SearchCol = Profiles.CompanySearch;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,7 @@ public partial class SearchCustomerPhraseComponent
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Profiles = await PreferenceService.GetPreference();
|
||||||
SearchTerm = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase.Trim();
|
SearchTerm = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase.Trim();
|
||||||
|
|
||||||
if(!string.IsNullOrWhiteSpace(SearchTerm))
|
if(!string.IsNullOrWhiteSpace(SearchTerm))
|
||||||
|
|
|
@ -40,7 +40,7 @@ public partial class SearchCustomerSortColumnComponent : IDisposable
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
_profiles = await PreferenceService.GetProfile();
|
_profiles = await PreferenceService.GetPreference();
|
||||||
SortCol = _profiles.CompanySort;
|
SortCol = _profiles.CompanySort;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@ public partial class WorkDateComponent : IDisposable
|
||||||
{
|
{
|
||||||
WorkDateContext = new EditContext(SelectedDate);
|
WorkDateContext = new EditContext(SelectedDate);
|
||||||
UserPreference.OnChange += ProfileServiceOnOnChange;
|
UserPreference.OnChange += ProfileServiceOnOnChange;
|
||||||
Profile = await UserPreference.GetProfile();
|
Profile = await UserPreference.GetPreference();
|
||||||
SelectedDate = string.IsNullOrWhiteSpace(Profile.WorkDate)
|
SelectedDate = string.IsNullOrWhiteSpace(Profile.WorkDate)
|
||||||
? DateTime.Now
|
? DateTime.Now
|
||||||
: DateTime.Parse(Profile.WorkDate);
|
: DateTime.Parse(Profile.WorkDate);
|
||||||
|
|
|
@ -134,6 +134,8 @@ public class CountryCatalogRepository : ICountryCatalogRepository
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public async Task<List<SalesItemView>> GetPriceList(string countryCode)
|
public async Task<List<SalesItemView>> GetPriceList(string countryCode)
|
||||||
{
|
{
|
||||||
return await _client.GetFromJsonAsync<List<SalesItemView>>($"{_api.Catalog}/{countryCode}", _options);
|
var result = await _client.GetFromJsonAsync<List<SalesItemView>>(
|
||||||
|
$"{_api.Catalog}/{countryCode}", _options);
|
||||||
|
return result ?? new List<SalesItemView>();
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -58,7 +58,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetDateConfirmed(bool confirmed)
|
public async Task SetDateConfirmed(bool confirmed)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with
|
with
|
||||||
{
|
{
|
||||||
|
@ -71,7 +71,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetCompanyFilterPhrase(string filterPhrase)
|
public async Task SetCompanyFilterPhrase(string filterPhrase)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with
|
with
|
||||||
{
|
{
|
||||||
|
@ -84,7 +84,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetWorkDate(DateTime workDate)
|
public async Task SetWorkDate(DateTime workDate)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with
|
with
|
||||||
{
|
{
|
||||||
|
@ -97,7 +97,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetCompanySearch(string companySearch)
|
public async Task SetCompanySearch(string companySearch)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with { CompanySearch = companySearch };
|
with { CompanySearch = companySearch };
|
||||||
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
||||||
|
@ -107,7 +107,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetCompanySort(string companySort)
|
public async Task SetCompanySort(string companySort)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with { CompanySort = companySort };
|
with { CompanySort = companySort };
|
||||||
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
||||||
|
@ -117,7 +117,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetItemSearch(string itemSearch)
|
public async Task SetItemSearch(string itemSearch)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with { ItemSearch = itemSearch };
|
with { ItemSearch = itemSearch };
|
||||||
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
||||||
|
@ -127,7 +127,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetItemSort(string itemSort)
|
public async Task SetItemSort(string itemSort)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with { ItemSort = itemSort };
|
with { ItemSort = itemSort };
|
||||||
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
||||||
|
@ -137,7 +137,7 @@ public class UserPreferenceService
|
||||||
|
|
||||||
public async Task SetPageSize(string pageSize)
|
public async Task SetPageSize(string pageSize)
|
||||||
{
|
{
|
||||||
var preferences = await GetProfile();
|
var preferences = await GetPreference();
|
||||||
var newPreferences = preferences
|
var newPreferences = preferences
|
||||||
with { PageSize = pageSize };
|
with { PageSize = pageSize };
|
||||||
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
await _localStorageService.SetItemAsync(KeyName, newPreferences);
|
||||||
|
@ -145,7 +145,7 @@ public class UserPreferenceService
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public async Task<UserPreference> GetProfile()
|
public async Task<UserPreference> GetPreference()
|
||||||
{
|
{
|
||||||
return await _localStorageService.GetItemAsync<UserPreference>(KeyName) ?? new UserPreference();
|
return await _localStorageService.GetItemAsync<UserPreference>(KeyName) ?? new UserPreference();
|
||||||
}
|
}
|
||||||
|
|
|
@ -56,7 +56,7 @@ public partial class CatalogPagedOverlay : IDisposable
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
_userPreference = await PreferenceService.GetProfile();
|
_userPreference = await PreferenceService.GetPreference();
|
||||||
_pager.OrderBy = _userPreference.ItemSort;
|
_pager.OrderBy = _userPreference.ItemSort;
|
||||||
_pager.SearchColumn = _userPreference.ItemSearch;
|
_pager.SearchColumn = _userPreference.ItemSearch;
|
||||||
_pager.PageSize = Convert.ToInt32(_userPreference.PageSize);
|
_pager.PageSize = Convert.ToInt32(_userPreference.PageSize);
|
||||||
|
|
|
@ -57,7 +57,7 @@ public partial class CustomerSearchOverlay : IDisposable
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
_userPreference = await PreferenceService.GetProfile();
|
_userPreference = await PreferenceService.GetPreference();
|
||||||
_pager.OrderBy = _userPreference.ItemSort;
|
_pager.OrderBy = _userPreference.ItemSort;
|
||||||
_pager.SearchColumn = _userPreference.ItemSearch;
|
_pager.SearchColumn = _userPreference.ItemSearch;
|
||||||
_pager.PageSize = Convert.ToInt32(_userPreference.PageSize);
|
_pager.PageSize = Convert.ToInt32(_userPreference.PageSize);
|
||||||
|
|
|
@ -105,7 +105,7 @@ public partial class AdvisorActivityCreatePage : IDisposable
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
|
|
||||||
_userPref = await PreferenceService.GetProfile();
|
_userPref = await PreferenceService.GetPreference();
|
||||||
_salesRep = await UserInfo.GetUserInfo();
|
_salesRep = await UserInfo.GetUserInfo();
|
||||||
|
|
||||||
_company = await CompanyRepo.GetCompanyById(CompanyId);
|
_company = await CompanyRepo.GetCompanyById(CompanyId);
|
||||||
|
|
|
@ -46,7 +46,7 @@ public partial class AdvisorActivityTodayListPage : IDisposable
|
||||||
{
|
{
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
UserPreference = await PreferenceService.GetProfile();
|
UserPreference = await PreferenceService.GetPreference();
|
||||||
SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate)
|
SelectedDate = string.IsNullOrWhiteSpace(UserPreference.WorkDate)
|
||||||
? DateTime.Now
|
? DateTime.Now
|
||||||
: DateTime.Parse(UserPreference.WorkDate);
|
: DateTime.Parse(UserPreference.WorkDate);
|
||||||
|
|
|
@ -38,8 +38,8 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
||||||
|
|
||||||
// ######################################################################3
|
// ######################################################################3
|
||||||
private List<CompanyDto> CompanyList { get; set; } = new();
|
private List<CompanyDto> CompanyList { get; set; } = new();
|
||||||
private UserPreference Profile { get; set; } = new();
|
private UserPreference Preference { get; set; } = new();
|
||||||
private UserManagerEditView UserInfo { get; set; } = new();
|
private UserManagerEditView XUserInfo { get; set; } = new();
|
||||||
private string SavedSearch { get; set; } = "";
|
private string SavedSearch { get; set; } = "";
|
||||||
private bool Working { get; set; } = true;
|
private bool Working { get; set; } = true;
|
||||||
private MetaData PageData { get; set; } = new();
|
private MetaData PageData { get; set; } = new();
|
||||||
|
@ -50,27 +50,23 @@ public partial class AdvisorCustomerPagedListPage : IDisposable
|
||||||
private bool ShowHidden { get; set; }
|
private bool ShowHidden { get; set; }
|
||||||
|
|
||||||
|
|
||||||
protected override void OnParametersSet()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
}
|
|
||||||
|
|
||||||
|
XUserInfo = await UserInfoService.GetUserInfo();
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
|
||||||
{
|
|
||||||
// set preferences
|
// set preferences
|
||||||
Profile = await PreferenceService.GetProfile();
|
Preference = await PreferenceService.GetPreference();
|
||||||
UserInfo = await UserInfoService.GetUserInfo();
|
|
||||||
Paging.OrderBy = Profile.CompanySort;
|
Paging.OrderBy = Preference.CompanySort;
|
||||||
Paging.SearchColumn = Profile.CompanySearch;
|
Paging.SearchColumn = Preference.CompanySearch;
|
||||||
Paging.PageSize = Convert.ToInt32(Profile.PageSize);
|
Paging.PageSize = Convert.ToInt32(Preference.PageSize);
|
||||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||||
|
|
||||||
// load saved search
|
// load saved search
|
||||||
SavedSearch = string.IsNullOrWhiteSpace(Profile.CompanyFilterPhrase) ? "" : Profile.CompanyFilterPhrase;
|
SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase;
|
||||||
await SetSearchPhrase(SavedSearch);
|
await SetSearchPhrase(SavedSearch);
|
||||||
|
|
||||||
Working = false;
|
Working = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ public partial class AdvisorReportCreatePage : IDisposable
|
||||||
|
|
||||||
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
PreferenceService.OnChange += ProfileServiceOnOnChange;
|
||||||
|
|
||||||
Preference = await PreferenceService.GetProfile();
|
Preference = await PreferenceService.GetPreference();
|
||||||
|
|
||||||
KmMorning = await PreferenceService.GetKmMorning();
|
KmMorning = await PreferenceService.GetKmMorning();
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ public partial class AdvisorTaskItemListCrmPage : IDisposable
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
Profile = await UserPreferenceService.GetProfile();
|
Profile = await UserPreferenceService.GetPreference();
|
||||||
if(!string.IsNullOrWhiteSpace(Profile.WorkDate))
|
if(!string.IsNullOrWhiteSpace(Profile.WorkDate))
|
||||||
WorkDate = Profile.WorkDate;
|
WorkDate = Profile.WorkDate;
|
||||||
|
|
||||||
|
|
|
@ -54,14 +54,11 @@
|
||||||
|
|
||||||
<ProductPriceListComponent ItemList="Items"/>
|
<ProductPriceListComponent ItemList="Items"/>
|
||||||
|
|
||||||
@if (Paging.PageSize > 10)
|
<div class="row mt-5 pb-5">
|
||||||
{
|
<div class="col-sm-12 text-center">
|
||||||
<div class="row mt-5 pb-5">
|
<PagerSimpleComponent MetaData="PageData" Spread="2" SelectedPage="SetSelectedPage"/>
|
||||||
<div class="col-sm-12 text-center">
|
|
||||||
<PagerSimpleComponent MetaData="PageData" Spread="2" SelectedPage="SetSelectedPage"/>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
}
|
</div>
|
||||||
@if (Working)
|
@if (Working)
|
||||||
{
|
{
|
||||||
<WorkingThreeDots />
|
<WorkingThreeDots />
|
||||||
|
|
|
@ -45,7 +45,7 @@ public partial class CatalogCountryPagedListPage : IDisposable
|
||||||
private List<SalesItemView> Items { get; set; } = new();
|
private List<SalesItemView> Items { get; set; } = new();
|
||||||
private MetaData PageData { get; set; } = new();
|
private MetaData PageData { get; set; } = new();
|
||||||
private CatalogPager Paging { 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 UserManagerEditView XUserInfo { get; set; } = new();
|
||||||
private bool Working { get; set; }
|
private bool Working { get; set; }
|
||||||
private string CountryName { get; set; } = "";
|
private string CountryName { get; set; } = "";
|
||||||
|
@ -53,22 +53,20 @@ public partial class CatalogCountryPagedListPage : IDisposable
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
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.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
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))
|
if (string.IsNullOrWhiteSpace(CountryCode))
|
||||||
{
|
{
|
||||||
while (string.IsNullOrWhiteSpace(XUserInfo.CountryCode))
|
|
||||||
await Task.Delay(500);
|
|
||||||
|
|
||||||
CountryCode = XUserInfo.CountryCode.ToLower();
|
CountryCode = XUserInfo.CountryCode.ToLower();
|
||||||
Navigator.NavigateTo($"/catalog/{CountryCode}", false, true);
|
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)
|
private async Task SetSearchPhrase(string searchTerm)
|
||||||
{
|
{
|
||||||
Items = new List<SalesItemView>();
|
Items = new List<SalesItemView>();
|
||||||
|
@ -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();
|
public void Dispose() => Interceptor.DisposeEvent();
|
||||||
|
|
||||||
}
|
}
|
15
Wonky.Client/Pages/CatalogCountryProductPage.razor
Normal file
15
Wonky.Client/Pages/CatalogCountryProductPage.razor
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
@using Wonky.Client.Components
|
||||||
|
@using System.Text.Json
|
||||||
|
@page "/catalog/{CountryCode}/{sku}"
|
||||||
|
|
||||||
|
<h3>CatalogCountryProductPage</h3>
|
||||||
|
|
||||||
|
@if (!string.IsNullOrWhiteSpace(_item.Sku))
|
||||||
|
{
|
||||||
|
@JsonSerializer.Serialize(_item)
|
||||||
|
}
|
||||||
|
|
||||||
|
@if (_working)
|
||||||
|
{
|
||||||
|
<WorkingThreeDots />
|
||||||
|
}
|
33
Wonky.Client/Pages/CatalogCountryProductPage.razor.cs
Normal file
33
Wonky.Client/Pages/CatalogCountryProductPage.razor.cs
Normal file
|
@ -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;
|
||||||
|
}
|
||||||
|
}
|
|
@ -57,7 +57,7 @@ public partial class OfficeAdvisorCustomerPagedListPage : IDisposable
|
||||||
SalesRep = await UserRepo.GetUserInfo(UserId);
|
SalesRep = await UserRepo.GetUserInfo(UserId);
|
||||||
|
|
||||||
// set preferences
|
// set preferences
|
||||||
UserPreference = await UserPreferenceService.GetProfile();
|
UserPreference = await UserPreferenceService.GetPreference();
|
||||||
Paging.OrderBy = UserPreference.CompanySort;
|
Paging.OrderBy = UserPreference.CompanySort;
|
||||||
Paging.SearchColumn = UserPreference.CompanySearch;
|
Paging.SearchColumn = UserPreference.CompanySearch;
|
||||||
Paging.PageSize = Convert.ToInt32(UserPreference.PageSize);
|
Paging.PageSize = Convert.ToInt32(UserPreference.PageSize);
|
||||||
|
|
|
@ -41,8 +41,8 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
||||||
|
|
||||||
// #############################################################
|
// #############################################################
|
||||||
private List<CompanyDto> Companies { get; set; } = new();
|
private List<CompanyDto> Companies { get; set; } = new();
|
||||||
private UserPreference Profiles { get; set; } = new();
|
private UserPreference Preference { get; set; } = new();
|
||||||
private UserManagerEditView UserInfo { get; set; } = new();
|
private UserManagerEditView XUserInfo { get; set; } = new();
|
||||||
private string SavedSearch { get; set; } = "";
|
private string SavedSearch { get; set; } = "";
|
||||||
private bool ShowFolded { get; set; }
|
private bool ShowFolded { get; set; }
|
||||||
private bool Working { get; set; } = true;
|
private bool Working { get; set; } = true;
|
||||||
|
@ -50,81 +50,27 @@ public partial class OfficeCustomerCountryPagedListPage : IDisposable
|
||||||
private CustomerPaging Paging { get; set; } = new();
|
private CustomerPaging Paging { get; set; } = new();
|
||||||
private string ToggleFoldedText { get; set; } = "Vis Lukkede";
|
private string ToggleFoldedText { get; set; } = "Vis Lukkede";
|
||||||
|
|
||||||
protected override async Task OnParametersSetAsync()
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
|
|
||||||
|
protected override async Task OnInitializedAsync()
|
||||||
|
{
|
||||||
Interceptor.RegisterEvent();
|
Interceptor.RegisterEvent();
|
||||||
Interceptor.RegisterBeforeSendEvent();
|
Interceptor.RegisterBeforeSendEvent();
|
||||||
|
|
||||||
// set preferences
|
// set preferences
|
||||||
Profiles = await PreferenceService.GetProfile();
|
Preference = await PreferenceService.GetPreference();
|
||||||
UserInfo = await UserInfoService.GetUserInfo();
|
XUserInfo = await UserInfoService.GetUserInfo();
|
||||||
Paging.OrderBy = Profiles.CompanySort;
|
|
||||||
Paging.SearchColumn = Profiles.CompanySearch;
|
Paging.OrderBy = Preference.CompanySort;
|
||||||
Paging.PageSize = Convert.ToInt32(Profiles.PageSize);
|
Paging.SearchColumn = Preference.CompanySearch;
|
||||||
|
Paging.PageSize = Convert.ToInt32(Preference.PageSize);
|
||||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||||
|
|
||||||
// load saved search
|
// load saved search
|
||||||
SavedSearch = string.IsNullOrWhiteSpace(Profiles.CompanyFilterPhrase) ? "" : Profiles.CompanyFilterPhrase;
|
SavedSearch = string.IsNullOrWhiteSpace(Preference.CompanyFilterPhrase) ? "" : Preference.CompanyFilterPhrase;
|
||||||
Paging.SearchTerm = SavedSearch;
|
await SetSearchPhrase(SavedSearch);
|
||||||
|
Working = false;
|
||||||
// get companies
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ToggleFolded()
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
ShowFolded = !ShowFolded;
|
|
||||||
ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede";
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.PageNumber = 1;
|
|
||||||
Paging.HasFolded = ShowFolded ? 1 : 0;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SetSelectedPage(int page)
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.PageNumber = page;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SetSearchCol(string searchColumn)
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.SearchColumn = searchColumn;
|
|
||||||
Paging.PageNumber = 1;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
private async Task SetPageSize(string pageSize)
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.PageSize = Convert.ToInt32(pageSize);
|
|
||||||
Paging.PageNumber = 1;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SetSearchPhrase(string searchTerm)
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.PageNumber = 1;
|
|
||||||
Paging.SearchTerm = searchTerm;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task SetSortCol(string orderBy)
|
|
||||||
{
|
|
||||||
Working = true;
|
|
||||||
Companies = new List<CompanyDto>();
|
|
||||||
Paging.OrderBy = orderBy;
|
|
||||||
await FetchCustomers();
|
|
||||||
}
|
|
||||||
|
|
||||||
private async Task FetchCustomers()
|
private async Task FetchCustomers()
|
||||||
{
|
{
|
||||||
|
@ -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<CompanyDto>();
|
||||||
|
Paging.PageNumber = 1;
|
||||||
|
Paging.HasFolded = ShowFolded ? 1 : 0;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task SetSelectedPage(int page)
|
||||||
|
{
|
||||||
|
Working = true;
|
||||||
|
Companies = new List<CompanyDto>();
|
||||||
|
Paging.PageNumber = page;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task SetSearchCol(string searchColumn)
|
||||||
|
{
|
||||||
|
Working = true;
|
||||||
|
Companies = new List<CompanyDto>();
|
||||||
|
Paging.SearchColumn = searchColumn;
|
||||||
|
Paging.PageNumber = 1;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task SetPageSize(string pageSize)
|
||||||
|
{
|
||||||
|
Working = true;
|
||||||
|
Companies = new List<CompanyDto>();
|
||||||
|
Paging.PageSize = Convert.ToInt32(pageSize);
|
||||||
|
Paging.PageNumber = 1;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task SetSearchPhrase(string searchTerm)
|
||||||
|
{
|
||||||
|
Working = true;
|
||||||
|
Companies = new List<CompanyDto>();
|
||||||
|
Paging.PageNumber = 1;
|
||||||
|
Paging.SearchTerm = searchTerm;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private async Task SetSortCol(string orderBy)
|
||||||
|
{
|
||||||
|
Working = true;
|
||||||
|
Companies = new List<CompanyDto>();
|
||||||
|
Paging.OrderBy = orderBy;
|
||||||
|
await FetchCustomers();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public void Dispose() => Interceptor.DisposeEvent();
|
public void Dispose() => Interceptor.DisposeEvent();
|
||||||
}
|
}
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"appInfo": {
|
"appInfo": {
|
||||||
"name": "Wonky Online",
|
"name": "Wonky Online",
|
||||||
"version": "185.0",
|
"version": "188.0",
|
||||||
"rc": true,
|
"rc": true,
|
||||||
"sandBox": true,
|
"sandBox": true,
|
||||||
"image": "grumpy-coder.png",
|
"image": "grumpy-coder.png",
|
||||||
|
|
Loading…
Reference in a new issue