From 02fb20ca8a4e61e4b5ccad1a4c12f6386f0e5358 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Tue, 14 Mar 2023 16:40:23 +0100 Subject: [PATCH] WIP: user maintenance --- ...ponent.razor => PagerPagesComponent.razor} | 0 ....razor.cs => PagerPagesComponent.razor.cs} | 4 +- .../Components/PagerSimpleComponent.razor | 28 +++++++ .../Components/PagerSimpleComponent.razor.cs | 53 ++++++++++++ ...verlay.razor => CatalogPagedOverlay.razor} | 12 ++- ....razor.cs => CatalogPagedOverlay.razor.cs} | 10 +-- .../Pages/AdvisorActivityCreatePage.razor | 2 +- .../Pages/AdvisorActivityCreatePage.razor.cs | 2 +- ...zor => AdvisorCustomerPagedListPage.razor} | 12 ++- ... => AdvisorCustomerPagedListPage.razor.cs} | 8 +- .../Pages/AdvisorReportCreatePage.razor | 2 +- ...azor => CatalogCountryPagedListPage.razor} | 10 ++- ...s => CatalogCountryPagedListPage.razor.cs} | 38 ++++----- .../OfficeCustomerAdvisorPagedListPage.razor | 81 +++++++++++++++++++ ...ficeCustomerAdvisorPagedListPage.razor.cs} | 18 +++-- ... OfficeCustomerCountryPagedListPage.razor} | 23 ++++-- ...ficeCustomerCountryPagedListPage.razor.cs} | 14 ++-- .../Pages/OfficeOrderCreatePage.razor | 2 +- .../Pages/OfficeOrderCreatePage.razor.cs | 2 +- .../OfficeUserAdvisorCustomerListPage.razor | 62 -------------- .../Pages/OfficeUserAdvisorListPage.razor | 6 +- .../OfficeUserAdvisorReportListPage.razor | 4 +- .../Pages/OfficeUserAdvisorViewEditPage.razor | 4 +- .../Pages/SystemKrvProductsAdminPage.razor | 13 ++- .../Pages/SystemKrvProtectionsAdminPage.razor | 10 ++- .../Pages/SystemKrvTextsAdminPage.razor | 10 ++- .../Pages/SystemSupervisorListPage.razor | 12 ++- Wonky.Client/Pages/SystemUserCreatePage.razor | 8 +- Wonky.Client/Pages/SystemUserListPage.razor | 4 +- .../Pages/SystemUserViewEditPage.razor | 5 +- 30 files changed, 320 insertions(+), 139 deletions(-) rename Wonky.Client/Components/{PaginationComponent.razor => PagerPagesComponent.razor} (100%) rename Wonky.Client/Components/{PaginationComponent.razor.cs => PagerPagesComponent.razor.cs} (96%) create mode 100644 Wonky.Client/Components/PagerSimpleComponent.razor create mode 100644 Wonky.Client/Components/PagerSimpleComponent.razor.cs rename Wonky.Client/OverlayOrderCreate/{PriceCatalogOverlay.razor => CatalogPagedOverlay.razor} (90%) rename Wonky.Client/OverlayOrderCreate/{PriceCatalogOverlay.razor.cs => CatalogPagedOverlay.razor.cs} (93%) rename Wonky.Client/Pages/{AdvisorCustomerListPage.razor => AdvisorCustomerPagedListPage.razor} (86%) rename Wonky.Client/Pages/{AdvisorCustomerListPage.razor.cs => AdvisorCustomerPagedListPage.razor.cs} (95%) rename Wonky.Client/Pages/{CatalogCountryPage.razor => CatalogCountryPagedListPage.razor} (87%) rename Wonky.Client/Pages/{CatalogCountryPage.razor.cs => CatalogCountryPagedListPage.razor.cs} (82%) create mode 100644 Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor rename Wonky.Client/Pages/{OfficeUserAdvisorCustomerListPage.razor.cs => OfficeCustomerAdvisorPagedListPage.razor.cs} (88%) rename Wonky.Client/Pages/{OfficeCountryCustomerListPage.razor => OfficeCustomerCountryPagedListPage.razor} (78%) rename Wonky.Client/Pages/{OfficeCountryCustomerListPage.razor.cs => OfficeCustomerCountryPagedListPage.razor.cs} (93%) delete mode 100644 Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor diff --git a/Wonky.Client/Components/PaginationComponent.razor b/Wonky.Client/Components/PagerPagesComponent.razor similarity index 100% rename from Wonky.Client/Components/PaginationComponent.razor rename to Wonky.Client/Components/PagerPagesComponent.razor diff --git a/Wonky.Client/Components/PaginationComponent.razor.cs b/Wonky.Client/Components/PagerPagesComponent.razor.cs similarity index 96% rename from Wonky.Client/Components/PaginationComponent.razor.cs rename to Wonky.Client/Components/PagerPagesComponent.razor.cs index 06688027..2d02e629 100644 --- a/Wonky.Client/Components/PaginationComponent.razor.cs +++ b/Wonky.Client/Components/PagerPagesComponent.razor.cs @@ -21,7 +21,7 @@ using Wonky.Entity.Requests; namespace Wonky.Client.Components; -public partial class PaginationComponent +public partial class PagerPagesComponent { [Parameter] public MetaData MetaData { get; set; } = new(); [Parameter] public int Spread { get; set; } @@ -48,7 +48,7 @@ public partial class PaginationComponent } } - Links.Add(new PagingLink(MetaData.CurrentPage + 1, MetaData.HasNext, "Næste")); + Links.Add(new PagingLink(MetaData.CurrentPage + 1, MetaData.HasNext, "Næste")); } private async Task OnSelectedPage(PagingLink link) diff --git a/Wonky.Client/Components/PagerSimpleComponent.razor b/Wonky.Client/Components/PagerSimpleComponent.razor new file mode 100644 index 00000000..fedcf101 --- /dev/null +++ b/Wonky.Client/Components/PagerSimpleComponent.razor @@ -0,0 +1,28 @@ +@* 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] +*@ + + +
+ +
\ No newline at end of file diff --git a/Wonky.Client/Components/PagerSimpleComponent.razor.cs b/Wonky.Client/Components/PagerSimpleComponent.razor.cs new file mode 100644 index 00000000..6173d07b --- /dev/null +++ b/Wonky.Client/Components/PagerSimpleComponent.razor.cs @@ -0,0 +1,53 @@ + +// 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 Microsoft.AspNetCore.Components; +using Wonky.Client.Features; +using Wonky.Entity.Requests; + +namespace Wonky.Client.Components; + +public partial class PagerSimpleComponent +{ + [Parameter] public MetaData MetaData { get; set; } = new(); + [Parameter] public int Spread { get; set; } + [Parameter] public EventCallback SelectedPage { get; set; } + private List Links { get; set; } = new(); + + protected override void OnParametersSet() + { + CreatePaginationLinks(); + } + + private void CreatePaginationLinks() + { + Links = new List + { + new(MetaData.CurrentPage - 1, MetaData.HasPrevious, "Forrige"), + new (MetaData.CurrentPage + 1, MetaData.HasNext, "Næste") + }; + + } + + private async Task OnSelectedPage(PagingLink link) + { + if (link.Page == MetaData.CurrentPage || !link.Enabled) + return; + MetaData.CurrentPage = link.Page; + await SelectedPage.InvokeAsync(link.Page); + } +} \ No newline at end of file diff --git a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor similarity index 90% rename from Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor rename to Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor index e1168ccf..20daa65f 100644 --- a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor +++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor @@ -39,8 +39,8 @@
-
- +
+
@@ -92,6 +92,14 @@ } + @if (_pager.PageSize > 10) + { +
+
+ +
+
+ } } else { diff --git a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs similarity index 93% rename from Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs rename to Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs index 3f2699f7..fd7f90f4 100644 --- a/Wonky.Client/OverlayOrderCreate/PriceCatalogOverlay.razor.cs +++ b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs @@ -27,13 +27,13 @@ using Wonky.Entity.Views; namespace Wonky.Client.OverlayOrderCreate; -public partial class PriceCatalogOverlay : IDisposable +public partial class CatalogPagedOverlay : IDisposable { // injections [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserProfileService ProfileService { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } // parameters [Parameter] public string CountryCode { get; set; } = ""; @@ -43,7 +43,7 @@ public partial class PriceCatalogOverlay : IDisposable private string _modalDisplay = ""; private bool _showBackdrop; private List Items { get; set; } = new(); - private MetaData? MetaInfo { get; set; } = new(); + private MetaData? PageData { get; set; } = new(); private CatalogPager _pager = new(); private UserProfile _userProfile = new(); @@ -68,7 +68,7 @@ public partial class PriceCatalogOverlay : IDisposable if (pagingResponse == null) Task.Delay(250); Items = pagingResponse.Items!; - MetaInfo = pagingResponse.MetaData; + PageData = pagingResponse.MetaData; Logger.LogDebug("PriceCatalogOverlay => Items <= {}", JsonSerializer.Serialize(Items)); } @@ -78,7 +78,7 @@ public partial class PriceCatalogOverlay : IDisposable Hide(); } - private async Task SelectedPage(int page) + private async Task SetSelectedPage(int page) { Items = new List(); _pager.PageNumber = page; diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor index 5ac20116..32581e0d 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor @@ -372,7 +372,7 @@ else - + diff --git a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs index 94093020..f838fdf3 100644 --- a/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs +++ b/Wonky.Client/Pages/AdvisorActivityCreatePage.razor.cs @@ -88,7 +88,7 @@ public partial class AdvisorActivityCreatePage : IDisposable // ************************************************************* // Overlays - private PriceCatalogOverlay CatalogOverlay { get; set; } = new(); + private CatalogPagedOverlay CatalogOverlay { get; set; } = new(); private ProductHistoryOverlay ProductOverlay { get; set; } = new(); private ProductPriceHistoryOverlay PriceOverlay { get; set; } = new(); private ConfirmWorkDateModal ConfirmWorkDate { get; set; } = new(); diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor similarity index 86% rename from Wonky.Client/Pages/AdvisorCustomerListPage.razor rename to Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor index bfd8e388..f7f559bc 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor @@ -39,14 +39,14 @@ @ToggleFoldedText
-
+
- +
@* placeholder *@
@@ -57,6 +57,14 @@ +@if (Paging.PageSize > 10) +{ +
+
+ +
+
+} @if (Working) { diff --git a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs similarity index 95% rename from Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs rename to Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs index 81881b03..15075899 100644 --- a/Wonky.Client/Pages/AdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/AdvisorCustomerPagedListPage.razor.cs @@ -26,7 +26,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class AdvisorCustomerListPage : IDisposable +public partial class AdvisorCustomerPagedListPage : IDisposable { [Inject] public ILocalStorageService Storage { get; set; } [Inject] public UserProfileService ProfileService { get; set; } @@ -42,9 +42,9 @@ public partial class AdvisorCustomerListPage : IDisposable 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"; + private string ToggleFoldedText { get; set; } = "Lukkede"; private bool ShowFolded { get; set; } - private string ToggleHiddenText { get; set; } = "Inkl. Skjulte"; + private string ToggleHiddenText { get; set; } = "Inaktive"; private bool ShowHidden { get; set; } protected override void OnParametersSet() @@ -95,7 +95,7 @@ public partial class AdvisorCustomerListPage : IDisposable await FetchCustomers(); } - private async Task SelectedPage(int page) + private async Task SetSelectedPage(int page) { CompanyList = new List(); Paging.PageNumber = page; diff --git a/Wonky.Client/Pages/AdvisorReportCreatePage.razor b/Wonky.Client/Pages/AdvisorReportCreatePage.razor index 195406b2..78e7b596 100644 --- a/Wonky.Client/Pages/AdvisorReportCreatePage.razor +++ b/Wonky.Client/Pages/AdvisorReportCreatePage.razor @@ -145,7 +145,7 @@ + disabled="@(NoFigures)" readonly/>
- +
Udskriv @@ -51,6 +51,14 @@ +@if (Paging.PageSize > 10) +{ +
+
+ +
+
+} @if (Working) { diff --git a/Wonky.Client/Pages/CatalogCountryPage.razor.cs b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs similarity index 82% rename from Wonky.Client/Pages/CatalogCountryPage.razor.cs rename to Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs index bb517ab0..2940a218 100644 --- a/Wonky.Client/Pages/CatalogCountryPage.razor.cs +++ b/Wonky.Client/Pages/CatalogCountryPagedListPage.razor.cs @@ -28,21 +28,21 @@ using Wonky.Entity.DTO; namespace Wonky.Client.Pages; -public partial class CatalogCountryPage : IDisposable +public partial class CatalogCountryPagedListPage : IDisposable { [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 ILogger Logger { get; set; } [Inject] public NavigationManager Navigator { get; set; } [Inject] public IUserInfoService UserInfoService { get; set; } [Parameter] public string CountryCode { get; set; } = ""; private List Items { get; set; } = new(); - private MetaData MetaInfo { get; set; } = new(); - private CatalogPager Pager { get; set; } = new(); + private MetaData PageData { get; set; } = new(); + private CatalogPager Paging { get; set; } = new(); private UserProfile Profiles { get; set; } = new(); private UserManagerEditView XUserInfo { get; set; } = new(); private bool Working { get; set; } @@ -53,10 +53,10 @@ public partial class CatalogCountryPage : IDisposable Profiles = await ProfileService.GetProfile(); XUserInfo = await UserInfoService.GetUserInfo(); - Pager.OrderBy = Profiles.ItemSort; + Paging.OrderBy = Profiles.ItemSort; - Pager.SearchColumn = Profiles.ItemSearch; - Pager.PageSize = Convert.ToInt32(Profiles.PageSize); + Paging.SearchColumn = Profiles.ItemSearch; + Paging.PageSize = Convert.ToInt32(Profiles.PageSize); Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); @@ -77,46 +77,46 @@ public partial class CatalogCountryPage : IDisposable private async Task SetSearchPhrase(string searchTerm) { Items = new List(); - Pager.PageNumber = 1; - Pager.SearchTerm = searchTerm; + Paging.PageNumber = 1; + Paging.SearchTerm = searchTerm; await GetCatalogPaged(); } private async Task SetPageSize(string pageSize) { Items = new List(); - Pager.PageSize = Convert.ToInt32(pageSize); - Pager.PageNumber = 1; + Paging.PageSize = Convert.ToInt32(pageSize); + Paging.PageNumber = 1; await GetCatalogPaged(); } private async Task SetSearchCol(string columnName) { Items = new List(); - Pager.PageNumber = 1; - Pager.SearchColumn = columnName; + Paging.PageNumber = 1; + Paging.SearchColumn = columnName; await GetCatalogPaged(); } private async Task SetSortCol(string orderBy) { Items = new List(); - Pager.OrderBy = orderBy; + Paging.OrderBy = orderBy; await GetCatalogPaged(); } private async Task SetSelectedPage(int page) { Items = new List(); - Pager.PageNumber = page; + Paging.PageNumber = page; await GetCatalogPaged(); } private async Task SetGroupCol(string groupFilter) { Items = new List(); - Pager.PageNumber = 1; - Pager.SelectGroup = groupFilter; + Paging.PageNumber = 1; + Paging.SelectGroup = groupFilter; await GetCatalogPaged(); } @@ -127,9 +127,9 @@ public partial class CatalogCountryPage : IDisposable if (Working) return; Working = true; - var page = await Catalog.GetSalesItemsPaged(CountryCode, Pager); + var page = await Catalog.GetSalesItemsPaged(CountryCode, Paging); Items = page.Items!; - MetaInfo = page.MetaData!; + PageData = page.MetaData!; Working = false; } diff --git a/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor new file mode 100644 index 00000000..cb9bfddd --- /dev/null +++ b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor @@ -0,0 +1,81 @@ +@* 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 Wonky.Client.Components +@using Microsoft.AspNetCore.Authorization +@attribute [Authorize(Roles = "Admin,Office")] +@page "/office/users/advisors/{CountryCode}/{UserId}/customers" + +Kundeliste for @SalesRep.FirstName @SalesRep.LastName + +
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
@*placeholder*@
+
+ +
+
@*placeholder*@
+
+
+ +
+
+
+
+ Kundeliste for @SalesRep.FirstName @SalesRep.LastName +
+
+
+
+
+
+ +
+
+ +@if (Paging.PageSize > 10) +{ +
+
+ +
+
+} + +@if (Working) +{ + +} \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs similarity index 88% rename from Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs rename to Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs index 02ab7fb1..f8b6c539 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor.cs +++ b/Wonky.Client/Pages/OfficeCustomerAdvisorPagedListPage.razor.cs @@ -25,7 +25,7 @@ using Wonky.Entity.Views; namespace Wonky.Client.Pages; -public partial class OfficeUserAdvisorCustomerListPage : IDisposable +public partial class OfficeCustomerAdvisorPagedListPage : IDisposable { [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } @@ -36,11 +36,13 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable [Parameter] public string CountryCode { get; set; } = "dk"; private List CompanyList { get; set; } = new(); - private MetaData ResponseMeta { get; set; } = new(); + private MetaData PageData { get; set; } = new(); private CustomerPaging Paging { get; set; } = new(); private UserProfile UserProfile { get; set; } = new(); private string SavedSearch { get; set; } = ""; private bool IncludeFolded { get; set; } + private bool ShowFolded { get; set; } + private string ToggleFoldedText { get; set; } = "Vis Lukkede"; private bool Working { get; set; } = true; private UserManagerEditView SalesRep { get; set; } = new(); @@ -66,16 +68,18 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable Working = false; } - private async Task OnFoldedClick() + private async Task ToggleFolded() { - IncludeFolded = !IncludeFolded; + Working = true; + ShowFolded = !ShowFolded; + ToggleFoldedText = ShowFolded ? "Normal Visning" : "Vis Lukkede"; CompanyList = new List(); Paging.PageNumber = 1; - Paging.HasFolded = IncludeFolded ? 1 : 0; + Paging.HasFolded = ShowFolded ? 1 : 0; await FetchCompanies(); } - private async Task SelectedPage(int page) + private async Task SetSelectedPage(int page) { CompanyList = new List(); Paging.PageNumber = page; @@ -125,7 +129,7 @@ public partial class OfficeUserAdvisorCustomerListPage : IDisposable Working = true; var pagingResponse = await CustomerRepo.GetCompaniesPaged(CountryCode, UserId, Paging); CompanyList = pagingResponse.Items; - ResponseMeta = pagingResponse.MetaData; + PageData = pagingResponse.MetaData; Working = false; } diff --git a/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor similarity index 78% rename from Wonky.Client/Pages/OfficeCountryCustomerListPage.razor rename to Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor index 83e19632..6540b8e5 100644 --- a/Wonky.Client/Pages/OfficeCountryCustomerListPage.razor +++ b/Wonky.Client/Pages/OfficeCustomerCountryPagedListPage.razor @@ -34,15 +34,17 @@
-
-
-
- +
@*placeholder*@
+
+
+
@*placeholder*@
- + \ No newline at end of file diff --git a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs index c8e32823..38fed9ed 100644 --- a/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs +++ b/Wonky.Client/Pages/OfficeOrderCreatePage.razor.cs @@ -77,7 +77,7 @@ public partial class OfficeOrderCreatePage : IDisposable // -------------------------------------------------------------------- // overlays - private PriceCatalogOverlay CatalogOverlay { get; set; } = new(); + private CatalogPagedOverlay CatalogOverlay { get; set; } = new(); private OfficeCustomerInvoiceListOverlay InvoiceListOverlay { get; set; } = new(); private OfficeCustomerActivityListOverlay ActivityListOverlay { get; set; } = new(); private OfficeOrderInventoryListOverlay InventoryListOverlay { get; set; } = new(); diff --git a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor deleted file mode 100644 index b29e73e1..00000000 --- a/Wonky.Client/Pages/OfficeUserAdvisorCustomerListPage.razor +++ /dev/null @@ -1,62 +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 Wonky.Client.Components -@using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Admin,Office")] -@page "/office/users/advisors/{CountryCode}/{UserId}/customers" - -Kundeliste for @SalesRep.FirstName @SalesRep.LastName - -
-
-
-
- -
-
- -
-
- -
-
- -
-
-
-
-
- - -
-
-
- -
-
- @* Opret kunde *@ -
-
-
-
- - - -@if (Working) -{ - -} diff --git a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor index 13d699e1..7c740407 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorListPage.razor @@ -16,14 +16,16 @@ @using Wonky.Client.Components @using Microsoft.AspNetCore.Authorization -@attribute [Authorize(Roles = "Admin,Office")] +@attribute [Authorize(Roles = "Admin,Office,Management")] @page "/office/users/advisors/{CountryCode}" Sælger Oversigt @CountryName
-

Sælgere

+
+ Sælger Oversigt @CountryName +
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor index e3d32736..7f8b5f4a 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorReportListPage.razor @@ -22,7 +22,9 @@ Rapport Arkiv @UserInfo.FirstName @UserInfo.LastName
-

Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName

+
+ Rapport Arkiv - @UserInfo.FirstName @UserInfo.LastName +
diff --git a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor index 7a2dbfd7..b184b609 100644 --- a/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor +++ b/Wonky.Client/Pages/OfficeUserAdvisorViewEditPage.razor @@ -21,7 +21,9 @@
-

Bruger info

+
+ Sælger Vedligeholdelse +
@if (!string.IsNullOrWhiteSpace(UserInfo.UserId)) diff --git a/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor index 68e22bc2..680954f0 100644 --- a/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor +++ b/Wonky.Client/Pages/SystemKrvProductsAdminPage.razor @@ -15,8 +15,17 @@ @page "/system/krv/products" -

SystemKrvProductsAdminPage

+ +
+
+
+ KRV Produkt Vedligeholdelse +
+
+
+
+
@code { - + } \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor index ef4c73f6..4d5befa4 100644 --- a/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor +++ b/Wonky.Client/Pages/SystemKrvProtectionsAdminPage.razor @@ -15,7 +15,15 @@ @page "/system/krv/protections" -

SystemKrvProtectionsAdminPage

+
+
+
+ KRV Værnemiddel Vedligeholdelse +
+
+
+
+
@code { diff --git a/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor index 51b42288..b374b49a 100644 --- a/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor +++ b/Wonky.Client/Pages/SystemKrvTextsAdminPage.razor @@ -15,7 +15,15 @@ @page "/system/krv/texts" -

SystemKrvTextsAdminPage

+
+
+
+ KRV Risiko Tekst Vedligeholdelse +
+
+
+
+
@code { diff --git a/Wonky.Client/Pages/SystemSupervisorListPage.razor b/Wonky.Client/Pages/SystemSupervisorListPage.razor index 6df501bf..dac7e481 100644 --- a/Wonky.Client/Pages/SystemSupervisorListPage.razor +++ b/Wonky.Client/Pages/SystemSupervisorListPage.razor @@ -18,9 +18,17 @@ @attribute [Authorize(Roles = "Admin")] @page "/system/supervisors" -SupervisorUserListPage +Supervisor Oversigt -

Supervisor User List Page

+
+
+
+ Supervisor Oversigt +
+
+
+
+
@code { diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor b/Wonky.Client/Pages/SystemUserCreatePage.razor index a7c59297..c9e8d0c4 100644 --- a/Wonky.Client/Pages/SystemUserCreatePage.razor +++ b/Wonky.Client/Pages/SystemUserCreatePage.razor @@ -21,8 +21,8 @@
-
-

Bruger oprettelse

+
+ System Bruger Oprettelse
@@ -64,7 +64,7 @@
- + @*
@@ -72,7 +72,7 @@
*@ - +
diff --git a/Wonky.Client/Pages/SystemUserListPage.razor b/Wonky.Client/Pages/SystemUserListPage.razor index 209965f5..35ba7996 100644 --- a/Wonky.Client/Pages/SystemUserListPage.razor +++ b/Wonky.Client/Pages/SystemUserListPage.razor @@ -18,10 +18,10 @@ @attribute [Authorize(Roles = "Admin")] @page "/system/users" -Administrativ - Bruger liste +System Bruger Oversigt
-

Administrativ - Bruger liste

+

System Bruger Oversigt

diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor b/Wonky.Client/Pages/SystemUserViewEditPage.razor index 313adf52..13eb0ef6 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor @@ -19,9 +19,12 @@ @attribute [Authorize(Roles = "Admin")] @page "/system/users/{UserId}" +
-

Bruger info

+
+ System Bruger Vedligeholdelse +
@if (!string.IsNullOrWhiteSpace(UserInfo.UserId))