diff --git a/Wonky.Client/Helpers/Mapper.cs b/Wonky.Client/Helpers/Mapper.cs new file mode 100644 index 00000000..3e6320e4 --- /dev/null +++ b/Wonky.Client/Helpers/Mapper.cs @@ -0,0 +1,29 @@ +using System.Reflection.Metadata.Ecma335; +using Wonky.Client.Models; +using Wonky.Entity.DTO; + +namespace Wonky.Client.Helpers; + +public class Mapper +{ + public static UserManagerCreateView MapCreateUser(CreateUserInputModel model) + { + return new UserManagerCreateView + { + Description = model.Description, + Email = model.Email, + Passwd = model.NewPassword, + AssignedRoles = model.AssignedRoles, + CompanyId = model.CompanyId, + CountryCode = model.CountryCode, + EmailConfirmed = true, + EShop = model.EShop, + FirstName = model.FirstName, + LastName = model.LastName, + LockoutEnabled = false, + PhoneNumber = model.PhoneNumber, + SalesRep = model.SalesRep, + UserId = "" + }; + } +} \ No newline at end of file diff --git a/Wonky.Client/Models/CreateUserInputModel.cs b/Wonky.Client/Models/CreateUserInputModel.cs new file mode 100644 index 00000000..336d0405 --- /dev/null +++ b/Wonky.Client/Models/CreateUserInputModel.cs @@ -0,0 +1,46 @@ +using System.ComponentModel.DataAnnotations; +using Wonky.Entity.DTO; + +namespace Wonky.Client.Models; + +public class CreateUserInputModel +{ + [MaxLength(128)] public string CompanyId { get; set; } = ""; + + [Required(ErrorMessage = "Der skal vælges et land")] + public string CountryCode { get; set; } = ""; + + [MaxLength(128, ErrorMessage = "Kort beskrivelse på højst 128 tegn.")] + public string Description { get; set; } = ""; + + [Required(ErrorMessage = "Email adresse skal udfyldes")] + [MaxLength(255, ErrorMessage = "Der er afsat 255 tegn til email adressen")] + public string Email { get; set; } = ""; + + public bool EmailConfirmed { get; set; } + public bool EShop { get; set; } + + [Required(ErrorMessage = "Fornavn skal udfyldes")] + [MaxLength(50, ErrorMessage = "Der er afsat 50 tegn til fornavn")] + public string FirstName { get; set; } = ""; + + [Required(ErrorMessage = "Efternavn skal udfyldes")] + [MaxLength(50, ErrorMessage = "Der er afsat 50 tegn til efternavn")] + public string LastName { get; set; } = ""; + + public bool LockoutEnabled { get; set; } + + [Required(ErrorMessage = "AdgangsKode skal udfyldes")] + public string NewPassword { get; set; } = ""; + + [Compare(nameof(NewPassword), ErrorMessage = "Adgangskoder er ikke ens.")] + public string ConfirmPassword { get; set; } = ""; + + [MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til telefon nummber")] + public string PhoneNumber { get; set; } = ""; + + [MaxLength(20, ErrorMessage = "Der er afsat 20 tegn til Sælger Identifikation")] + public string SalesRep { get; set; } = ""; + + public List AssignedRoles { get; set; } = new(); +} \ No newline at end of file diff --git a/Wonky.Client/Overlay.Customer/CustomerActivityListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerActivityListOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor diff --git a/Wonky.Client/Overlay.Customer/CustomerActivityListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerActivityListOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerActivityListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Customer/CustomerActivityViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerActivityViewOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor diff --git a/Wonky.Client/Overlay.Customer/CustomerActivityViewOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerActivityViewOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerActivityViewOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Customer/CustomerInventoryListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor similarity index 96% rename from Wonky.Client/Overlay.Customer/CustomerInventoryListOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor index 0bdf6cfc..612be832 100644 --- a/Wonky.Client/Overlay.Customer/CustomerInventoryListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor @@ -33,4 +33,4 @@
} - \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Overlay.Customer/CustomerInventoryListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInventoryListOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerInventoryListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Customer/CustomerInventoryReorderOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInventoryReorderOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor diff --git a/Wonky.Client/Overlay.Customer/CustomerInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInventoryReorderOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerInventoryReorderOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Customer/CustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor similarity index 97% rename from Wonky.Client/Overlay.Customer/CustomerInvoiceListOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor index cc66c73a..6fcafb4d 100644 --- a/Wonky.Client/Overlay.Customer/CustomerInvoiceListOverlay.razor +++ b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor @@ -34,4 +34,4 @@
} - \ No newline at end of file + \ No newline at end of file diff --git a/Wonky.Client/Overlay.Customer/CustomerInvoiceListOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInvoiceListOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerInvoiceListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Customer/CustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInvoiceViewOverlay.razor rename to Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor diff --git a/Wonky.Client/Overlay.Customer/CustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Customer/CustomerInvoiceViewOverlay.razor.cs rename to Wonky.Client/OverlayCustomer/CustomerInvoiceViewOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Documents/ProductSelectionOverlay.razor b/Wonky.Client/OverlayDocuments/ProductSelectionOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Documents/ProductSelectionOverlay.razor rename to Wonky.Client/OverlayDocuments/ProductSelectionOverlay.razor diff --git a/Wonky.Client/Overlay.Documents/ProductSelectionOverlay.razor.cs b/Wonky.Client/OverlayDocuments/ProductSelectionOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Documents/ProductSelectionOverlay.razor.cs rename to Wonky.Client/OverlayDocuments/ProductSelectionOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerActivityListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerActivityListOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerActivityListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerActivityListOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerActivityListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerActivityViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerActivityViewOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerActivityViewOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerActivityViewOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerActivityViewOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInventoryItemReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemReorderOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInventoryItemReorderOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemReorderOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInventoryItemReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemReorderOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInventoryItemReorderOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerInventoryItemReorderOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInventoryListReorderComponent.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListReorderComponent.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInventoryListReorderComponent.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerInventoryListReorderComponent.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInventoryListReorderComponent.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInventoryListReorderComponent.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInventoryListReorderComponent.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerInventoryListReorderComponent.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInvoiceListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInvoiceListOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInvoiceListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInvoiceListOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerInvoiceListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInvoiceViewOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInvoiceViewOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerInvoiceViewOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerInvoiceViewOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerInvoiceViewOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerListInventoryOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerListInventoryOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerListInventoryOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerListInventoryOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerListInventoryOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerListInventoryOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerListInventoryOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerListInventoryOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryListOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryListOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryListOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryReorderOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryReorderOverlay.razor rename to Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor diff --git a/Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryReorderOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Office/OfficeCustomerOrderInventoryReorderOverlay.razor.cs rename to Wonky.Client/OverlayOffice/OfficeCustomerOrderInventoryReorderOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Orders/CatalogPagedOverlay.razor b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Orders/CatalogPagedOverlay.razor rename to Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor diff --git a/Wonky.Client/Overlay.Orders/CatalogPagedOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Orders/CatalogPagedOverlay.razor.cs rename to Wonky.Client/OverlayOrderCreate/CatalogPagedOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Orders/ConfirmCheckOverlay.razor b/Wonky.Client/OverlayOrderCreate/ConfirmCheckOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Orders/ConfirmCheckOverlay.razor rename to Wonky.Client/OverlayOrderCreate/ConfirmCheckOverlay.razor diff --git a/Wonky.Client/Overlay.Orders/ConfirmCheckOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ConfirmCheckOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Orders/ConfirmCheckOverlay.razor.cs rename to Wonky.Client/OverlayOrderCreate/ConfirmCheckOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Orders/ProductHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Orders/ProductHistoryOverlay.razor rename to Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor diff --git a/Wonky.Client/Overlay.Orders/ProductHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Orders/ProductHistoryOverlay.razor.cs rename to Wonky.Client/OverlayOrderCreate/ProductHistoryOverlay.razor.cs diff --git a/Wonky.Client/Overlay.Orders/ProductPriceHistoryOverlay.razor b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor similarity index 100% rename from Wonky.Client/Overlay.Orders/ProductPriceHistoryOverlay.razor rename to Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor diff --git a/Wonky.Client/Overlay.Orders/ProductPriceHistoryOverlay.razor.cs b/Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs similarity index 100% rename from Wonky.Client/Overlay.Orders/ProductPriceHistoryOverlay.razor.cs rename to Wonky.Client/OverlayOrderCreate/ProductPriceHistoryOverlay.razor.cs diff --git a/Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor similarity index 61% rename from Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor rename to Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor index bb9dfb8f..59373a46 100644 --- a/Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor +++ b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor @@ -23,72 +23,60 @@
-
+
- +
- +
- +
+
+
-
Vare
-
Varenr
-
Fork
-
Colli
-
Stk / Pris
+
Navn
+
Konto
+
Telefon
+
Post Nr.
+
Bynavn
- @if (Items.Any()) + @if (Companies.Any()) {
    - @foreach (var item in Items) + @foreach (var company in Companies) { -
  • +
  • - @item.Name + @company.Name
    - @item.Sku + @company.Account
    - @item.ShortName + @company.Phone
    - @item.BoxSize + @company.ZipCode
    -
    -
      - @foreach (var rate in item.Rates) - { -
    • -
      @rate.Quantity
      -
      @rate.Rate
      -
      - - - -
      -
      • - } -
    +
    + @company.City
    -
    • }
diff --git a/Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor.cs b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs similarity index 70% rename from Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor.cs rename to Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs index 71ec2fc1..a6db543c 100644 --- a/Wonky.Client/Overlay.System/SelectCustomerPagedOverlay.razor.cs +++ b/Wonky.Client/OverlaySystem/CustomerSearchOverlay.razor.cs @@ -20,38 +20,39 @@ using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Client.Local.Services; using Wonky.Client.Models; +using Wonky.Entity.DTO; using Wonky.Entity.Requests; using Wonky.Entity.Views; #pragma warning disable CS8618 -namespace Wonky.Client.Overlay.System; +namespace Wonky.Client.OverlaySystem; -public partial class SelectCustomerPagedOverlay : IDisposable +public partial class CustomerSearchOverlay : IDisposable { // ############################################################## - [Inject] public ICountryCatalogRepository CatalogRepo { get; set; } + [Inject] public ICountryCustomerRepository CustomerRepo { get; set; } [Inject] public HttpInterceptorService Interceptor { get; set; } [Inject] public UserPreferenceService PreferenceService { get; set; } - [Inject] public ILogger Logger { get; set; } + [Inject] public ILogger Logger { get; set; } // ############################################################## [Parameter] public string CountryCode { get; set; } = ""; - [Parameter] public EventCallback OnSelected { get; set; } + [Parameter] public EventCallback OnSelected { get; set; } // ############################################################## private string _modalDisplay = ""; private bool _showBackdrop; - private List Items { get; set; } = new(); + private List Companies { get; set; } = new(); private MetaData? PageData { get; set; } = new(); - private CatalogPager _pager = new(); + private CustomerPaging _pager = new(); private UserPreference _userPreference = new(); protected override async Task OnParametersSetAsync() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - await GetSalesItems(); + await GetCompanies(); } protected override async Task OnInitializedAsync() @@ -62,58 +63,58 @@ public partial class SelectCustomerPagedOverlay : IDisposable _pager.PageSize = Convert.ToInt32(_userPreference.PageSize); } - private async Task GetSalesItems() + private async Task GetCompanies() { - var pagingResponse = await CatalogRepo.GetSalesItemsPaged(CountryCode, _pager); - if (pagingResponse == null) - Task.Delay(250); - Items = pagingResponse.Items!; + var pagingResponse = await CustomerRepo.GetCompaniesPaged(CountryCode, _pager); + // if (pagingResponse == null) + // Task.Delay(250); + Companies = pagingResponse.Items; PageData = pagingResponse.MetaData; - Logger.LogDebug("PriceCatalogOverlay => Items <= {}", JsonSerializer.Serialize(Items)); } - private void SelectItem(string itemId, string quantity, string rate) + + private async Task SelectCompany(CompanyDto company) { - OnSelected.InvokeAsync(new SelectedSku { Quantity = quantity, Rate = rate, ItemId = itemId }); - Hide(); + await OnSelected.InvokeAsync(company); } + private async Task SetSelectedPage(int page) { - Items = new List(); + Companies = new List(); _pager.PageNumber = page; - await GetSalesItems(); + await GetCompanies(); } private async Task SetSearchPhrase(string searchTerm) { - Items = new List(); + Companies = new List(); _pager.PageNumber = 1; _pager.SearchTerm = searchTerm; - await GetSalesItems(); + await GetCompanies(); } private async Task SetPageSize(string pageSize) { - Items = new List(); + Companies = new List(); _pager.PageSize = Convert.ToInt32(pageSize); _pager.PageNumber = 1; - await GetSalesItems(); + await GetCompanies(); } private async Task SetSearchCol(string columnName) { - Items = new List(); + Companies = new List(); _pager.PageNumber = 1; _pager.SearchColumn = columnName; - await GetSalesItems(); + await GetCompanies(); } private async Task SetSortCol(string orderBy) { - Items = new List(); + Companies = new List(); _pager.OrderBy = orderBy; - await GetSalesItems(); + await GetCompanies(); } public void Show() @@ -123,7 +124,7 @@ public partial class SelectCustomerPagedOverlay : IDisposable StateHasChanged(); } - private void Hide() + public void Hide() { _modalDisplay = "none;"; _showBackdrop = false; diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor b/Wonky.Client/Pages/SystemUserCreatePage.razor index f41b9b5e..0c8f29ec 100644 --- a/Wonky.Client/Pages/SystemUserCreatePage.razor +++ b/Wonky.Client/Pages/SystemUserCreatePage.razor @@ -16,6 +16,7 @@ @using Microsoft.AspNetCore.Authorization @using Wonky.Client.Components +@using Wonky.Client.OverlaySystem @attribute [Authorize(Roles = "Admin")] @page "/system/users/create" @@ -27,84 +28,68 @@
- +
@* firstName *@
- - + +
@* lastName *@
- - + +
@* email *@
- - + +
@* phoneNumber *@
- - + +
@* salesRep *@
- - + +
@* countrycode *@
- + - +
-
- - -
-
- - -
-
- - -
-
- - -
@@ -113,7 +98,35 @@
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+
+ @_company.Name - @_company.Account - @_company.Phone +
+
+ +
+
+
Tilbage @@ -130,14 +143,14 @@
- +
- +
@@ -150,4 +163,6 @@ @if (Working) { -} \ No newline at end of file +} + + \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs index b35573ac..3f176d81 100644 --- a/Wonky.Client/Pages/SystemUserCreatePage.razor.cs +++ b/Wonky.Client/Pages/SystemUserCreatePage.razor.cs @@ -22,6 +22,7 @@ using Wonky.Client.Helpers; using Wonky.Client.HttpInterceptors; using Wonky.Client.HttpRepository; using Wonky.Client.Models; +using Wonky.Client.OverlaySystem; using Wonky.Entity.DTO; #pragma warning disable CS8618 @@ -37,8 +38,9 @@ public partial class SystemUserCreatePage : IDisposable [Inject] public IToastService Toaster { get; set; } // ############################################################# - private UserManagerCreateView NewUserInfo { get; set; } = new(); - private EditContext NewUserContext { get; set; } + private CreateUserInputModel CreateUserInput { get; set; } = new(); + private UserManagerCreateView CreateUserDto { get; set; } = new(); + private EditContext FormContext { get; set; } private bool ContextInvalid { get; set; } = true; private bool Working { get; set; } = true; private bool ReadOnly { get; set; } = true; @@ -47,16 +49,18 @@ public partial class SystemUserCreatePage : IDisposable private readonly JsonSerializerOptions _options = new() { PropertyNameCaseInsensitive = true }; private bool _webShop; + private CompanyDto _company = new(); + private CustomerSearchOverlay SearchOverlay { get; set; } protected override void OnParametersSet() { Interceptor.RegisterEvent(); Interceptor.RegisterBeforeSendEvent(); - NewUserContext = new EditContext(NewUserInfo); + FormContext = new EditContext(CreateUserInput); - NewUserContext.OnFieldChanged += ContextHandleFieldChanged!; - NewUserContext.OnValidationStateChanged += ContextValidationChanged; + FormContext.OnFieldChanged += ContextHandleFieldChanged!; + FormContext.OnValidationStateChanged += ContextValidationChanged; Working = false; } @@ -66,15 +70,33 @@ public partial class SystemUserCreatePage : IDisposable ReadOnly = true; Working = true; - NewUserInfo.AssignedRoles = Utils.MapSaveAssignedRoles(AssignedRoles); + CreateUserInput.AssignedRoles = Utils.MapSaveAssignedRoles(AssignedRoles); + CreateUserInput.EShop = _webShop; + CreateUserInput.CompanyId = !_webShop ? "" : _company.CompanyId; Toaster.ShowInfo("Sender data til server ..."); - await UserRepo.CreateUser(NewUserInfo); + + CreateUserDto = Mapper.MapCreateUser(CreateUserInput); + + await UserRepo.CreateUser(CreateUserDto); + Working = false; Toaster.ShowInfo("Bruger er oprettet ..."); } + private void ShowSearchOverlay() + { + SearchOverlay.Show(); + } + + private void OnSelectCompany(CompanyDto company) + { + _company = company; + CreateUserInput.CompanyId = _company.CompanyId; + SearchOverlay.Hide(); + } + private void ContextHandleFieldChanged(object? sender, FieldChangedEventArgs e) { Logger.LogDebug("contextHandleFieldChanged => e.FieldIdentifier.FieldName {}", e.FieldIdentifier.FieldName); @@ -102,10 +124,8 @@ public partial class SystemUserCreatePage : IDisposable { _webShop = false; } - - NewUserInfo.Passwd = PasswdInput.NewPassword; - ContextInvalid = !NewUserContext.Validate(); + ContextInvalid = !FormContext.Validate(); StateHasChanged(); } @@ -114,20 +134,20 @@ public partial class SystemUserCreatePage : IDisposable { ContextInvalid = true; - NewUserContext.OnFieldChanged -= ContextHandleFieldChanged; - NewUserContext.OnValidationStateChanged -= ContextValidationChanged; + FormContext.OnFieldChanged -= ContextHandleFieldChanged; + FormContext.OnValidationStateChanged -= ContextValidationChanged; - NewUserContext = new EditContext(NewUserInfo); + FormContext = new EditContext(CreateUserInput); - NewUserContext.OnFieldChanged += ContextHandleFieldChanged; - NewUserContext.OnValidationStateChanged += ContextValidationChanged; + FormContext.OnFieldChanged += ContextHandleFieldChanged; + FormContext.OnValidationStateChanged += ContextValidationChanged; } public void Dispose() { Interceptor.DisposeEvent(); - NewUserContext.OnFieldChanged -= ContextHandleFieldChanged!; - NewUserContext.OnValidationStateChanged -= ContextValidationChanged; + FormContext.OnFieldChanged -= ContextHandleFieldChanged!; + FormContext.OnValidationStateChanged -= ContextValidationChanged; } } \ No newline at end of file diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor b/Wonky.Client/Pages/SystemUserViewEditPage.razor index e9d09f5e..3172fac1 100644 --- a/Wonky.Client/Pages/SystemUserViewEditPage.razor +++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor @@ -114,26 +114,10 @@ Roller
-
- - -
-
- - -
-
- - -
-
- - -
@@ -142,6 +126,22 @@
+
+ + +
+
+ + +
+
+ + +
+
+ + +
diff --git a/Wonky.Client/wwwroot/css/20230607.css b/Wonky.Client/wwwroot/css/20230607.css index f18e6ce2..619127ef 100644 --- a/Wonky.Client/wwwroot/css/20230607.css +++ b/Wonky.Client/wwwroot/css/20230607.css @@ -1,5 +1,4 @@ -@import url('open-iconic/font/css/open-iconic-bootstrap.min.css'); -body { +body { font-size: 16px; } @@ -20,6 +19,7 @@ body { .action-link-element { cursor: pointer; } + .i-larger { font-size: 1.3rem; } @@ -118,9 +118,6 @@ a, .btn-link { .the-dead-bg { background-color: black; } - - - /* end state elements */ /* led elements */ diff --git a/Wonky.Entity/DTO/UserManagerCreateView.cs b/Wonky.Entity/DTO/UserManagerCreateView.cs index 2717ccf2..0b349336 100644 --- a/Wonky.Entity/DTO/UserManagerCreateView.cs +++ b/Wonky.Entity/DTO/UserManagerCreateView.cs @@ -22,10 +22,8 @@ namespace Wonky.Entity.DTO; public class UserManagerCreateView { [MaxLength(128)] public string CompanyId { get; set; } = ""; - [MaxLength(128)] public string ContactId { get; set; } = ""; - [Required(ErrorMessage = "Landekode skal udfyldes")] - [MaxLength(2, ErrorMessage = "Landekode er 2 bogstaver")] + [Required(ErrorMessage = "Land skal angives")] public string CountryCode { get; set; } = ""; [MaxLength(128, ErrorMessage = "Kort beskrivelse på højst 128 tegn.")]