From a1b67a8b6e6f132c53345c93edb59044550f3485 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 28 Feb 2023 10:59:28 +0100 Subject: [PATCH] page size fix when navigating from customer card to list --- .../Components/PageSizeComponent.razor.cs | 9 ++++++--- .../Components/WorkDateComponent.razor.cs | 2 +- .../PriceCatalogOverlay.razor.cs | 19 +++++++++++-------- .../AdvisorCustomerInvoiceListPage.razor.cs | 4 +++- .../Pages/AdvisorCustomerViewEditPage.razor | 16 +++++++++------- Wonky.Client/wwwroot/appsettings.json | 4 ++-- 6 files changed, 32 insertions(+), 22 deletions(-) diff --git a/Wonky.Client/Components/PageSizeComponent.razor.cs b/Wonky.Client/Components/PageSizeComponent.razor.cs index 81f12c24..b4816344 100644 --- a/Wonky.Client/Components/PageSizeComponent.razor.cs +++ b/Wonky.Client/Components/PageSizeComponent.razor.cs @@ -24,20 +24,22 @@ namespace Wonky.Client.Components; public partial class PageSizeComponent : IDisposable { - [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 Profile { get; set; } = new(); private string PageSize { get; set; } - + protected override async Task OnInitializedAsync() { ProfileService.OnChange += ProfileServiceOnOnChange; Profile = await ProfileService.GetProfile(); PageSize = Profile.PageSize; + await OnChanged.InvokeAsync(PageSize); } - + private async Task OnSelectChanged(ChangeEventArgs e) { var val = e.Value?.ToString(); @@ -51,6 +53,7 @@ public partial class PageSizeComponent : IDisposable private void ProfileServiceOnOnChange(UserProfile newUserProfile) { Profile = newUserProfile; + PageSize = Profile.PageSize; StateHasChanged(); } diff --git a/Wonky.Client/Components/WorkDateComponent.razor.cs b/Wonky.Client/Components/WorkDateComponent.razor.cs index 3f62e909..caaddf09 100644 --- a/Wonky.Client/Components/WorkDateComponent.razor.cs +++ b/Wonky.Client/Components/WorkDateComponent.razor.cs @@ -70,7 +70,7 @@ public partial class WorkDateComponent : IDisposable /// private async Task OnDateChanged(ChangeEventArgs e) { - if (string.IsNullOrWhiteSpace(e.Value.ToString())) return; + if (DateTime.TryParse(e.Value.ToString(), out var setDate)) { await UserProfile.SetWorkDate(setDate); diff --git a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs index 7a25b5c1..50c82202 100644 --- a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs @@ -33,9 +33,11 @@ public partial class PriceCatalogOverlay : IDisposable [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; } + // variables private string _modalDisplay = ""; private bool _showBackdrop; @@ -50,7 +52,7 @@ public partial class PriceCatalogOverlay : IDisposable Interceptor.RegisterBeforeSendEvent(); await GetSalesItems(); } - + protected override async Task OnInitializedAsync() { _userProfile = await ProfileService.GetProfile(); @@ -58,7 +60,7 @@ public partial class PriceCatalogOverlay : IDisposable _pager.SearchColumn = _userProfile.ItemSearch; _pager.PageSize = Convert.ToInt32(_userProfile.PageSize); } - + private async Task GetSalesItems() { var pagingResponse = await CatalogRepo.GetSalesItemsPaged(CountryCode, _pager); @@ -68,7 +70,7 @@ public partial class PriceCatalogOverlay : IDisposable MetaInfo = pagingResponse.MetaData; Logger.LogDebug("PriceCatalogOverlay => Items <= {}", JsonSerializer.Serialize(Items)); } - + private void SelectItem(string itemId, string quantity, string rate) { OnSelected.InvokeAsync(new SelectedSku { Quantity = quantity, Rate = rate, ItemId = itemId }); @@ -80,7 +82,8 @@ public partial class PriceCatalogOverlay : IDisposable Items = new List(); _pager.PageNumber = page; await GetSalesItems(); - } + } + private async Task SetSearchPhrase(string searchTerm) { Items = new List(); @@ -88,7 +91,7 @@ public partial class PriceCatalogOverlay : IDisposable _pager.SearchTerm = searchTerm; await GetSalesItems(); } - + private async Task SetPageSize(string pageSize) { Items = new List(); @@ -111,20 +114,20 @@ public partial class PriceCatalogOverlay : IDisposable _pager.OrderBy = orderBy; await GetSalesItems(); } - + public void Show() { _modalDisplay = "block;"; _showBackdrop = true; StateHasChanged(); } - + private void Hide() { _modalDisplay = "none;"; _showBackdrop = false; StateHasChanged(); } - + public void Dispose() => Interceptor.DisposeEvent(); } \ No newline at end of file diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs index 1ed96038..32e559b7 100644 --- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor.cs @@ -29,13 +29,15 @@ namespace Wonky.Client.Pages; public partial class AdvisorCustomerInvoiceListPage : IDisposable { - [Parameter] public string CompanyId { 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; } + + [Parameter] public string CompanyId { 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/AdvisorCustomerViewEditPage.razor b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor index cef46b6d..9d250945 100644 --- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor @@ -92,12 +92,14 @@
@* ---- placeholder --- *@
-
- -
+ @* Force enable visit *@
+ @* Enable edit/save *@ +
+ +
@@ -112,10 +114,6 @@ -
- -
- @* vat lookup *@
@switch (CountryCode) @@ -131,6 +129,10 @@ break; }
+ @* Enable edit/save *@ +
+ +
@* save vat number *@
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json index b871b78b..e46d792a 100644 --- a/Wonky.Client/wwwroot/appsettings.json +++ b/Wonky.Client/wwwroot/appsettings.json @@ -1,7 +1,7 @@ { "appInfo": { "name": "Wonky Online", - "version": "0.118.0", + "version": "0.118.4", "rc": true, "sandBox": false, "image": "grumpy-coder.png" @@ -19,7 +19,7 @@ } }, "apiConfig": { - "baseUrl": "https://zeta.innotec.dk", + "baseUrl": "https://dev.innotec.dk", "catalog": "api/v2/catalog/country", "crmCustomers": "api/v2/crm/companies", "crmInventoryExt": "history/inventory",