From df4715360ee0cc07a333bdcf3c95f98cff4ad951 Mon Sep 17 00:00:00 2001 From: Loretta Date: Mon, 29 Sep 2025 13:33:34 +0200 Subject: [PATCH] improvements, fixes, etc... --- FruitBank.Common.Server/FruitBankConst.cs | 3 + FruitBank.Common/Entities/Shipping.cs | 2 + .../IFruitBankDataControllerCommon.cs | 2 + .../Interfaces/IMeasuringAttributeValues.cs | 9 +++ FruitBank.Common/Interfaces/IShipping.cs | 1 + .../Interfaces/MeasuringAttributeValues.cs | 27 +++++++ FruitBank.Common/Models/LoggedInModel.cs | 46 ++++++++++++ FruitBank.Common/SignalRs/SignalRTags.cs | 1 + .../FruitBankClientTests.cs | 23 +++++- .../FruitBankHybrid.Shared.csproj | 12 ++-- .../Layout/MainLayout.razor | 37 ++++++---- .../Layout/MainLayout.razor.cs | 25 +++++++ FruitBankHybrid.Shared/Layout/NavMenu.razor | 47 +++++++----- .../Layout/NavMenu.razor.bak | 30 -------- FruitBankHybrid.Shared/Pages/Home.razor.cs | 5 +- FruitBankHybrid.Shared/Pages/Login.razor | 72 ++++++++++--------- FruitBankHybrid.Shared/Pages/Login.razor.cs | 35 ++++++++- .../Pages/MeasuringIn.razor | 8 +-- .../Pages/MeasuringIn.razor.cs | 7 +- .../Pages/MeasuringOut.razor.cs | 4 +- .../SignalRs/FruitBankSignalRClient.cs | 5 +- .../FruitBankHybrid.Web.Client.csproj | 10 +-- FruitBankHybrid.Web.Client/Program.cs | 2 + .../FruitBankHybrid.Web.csproj | 12 ++-- FruitBankHybrid.Web/Program.cs | 6 +- FruitBankHybrid/MauiProgram.cs | 25 ++++--- 26 files changed, 315 insertions(+), 141 deletions(-) create mode 100644 FruitBank.Common/Interfaces/IMeasuringAttributeValues.cs create mode 100644 FruitBank.Common/Interfaces/MeasuringAttributeValues.cs create mode 100644 FruitBank.Common/Models/LoggedInModel.cs create mode 100644 FruitBankHybrid.Shared/Layout/MainLayout.razor.cs delete mode 100644 FruitBankHybrid.Shared/Layout/NavMenu.razor.bak diff --git a/FruitBank.Common.Server/FruitBankConst.cs b/FruitBank.Common.Server/FruitBankConst.cs index 284a463..3236365 100644 --- a/FruitBank.Common.Server/FruitBankConst.cs +++ b/FruitBank.Common.Server/FruitBankConst.cs @@ -10,7 +10,10 @@ namespace FruitBank.Common.Server public class FruitBankConst : AcConst { public static string ProjectIdString = "aad53443-2ee2-4650-8a99-97e907265e4e"; + public static string MeasuringRoleSystemName = "Measuring"; + public static string MeasuringRevisorRoleSystemName = "MeasuringRevisor"; + public static string IsMeasureableAttributeName = "IsMeasurable"; static FruitBankConst() { diff --git a/FruitBank.Common/Entities/Shipping.cs b/FruitBank.Common/Entities/Shipping.cs index 2e888fd..4458883 100644 --- a/FruitBank.Common/Entities/Shipping.cs +++ b/FruitBank.Common/Entities/Shipping.cs @@ -13,6 +13,8 @@ public class Shipping : MgEntityBase, IShipping public string LicencePlate { get; set; } public bool IsAllMeasured { get; set; } + public DateTime? MeasuredDate { get; set; } + [Association(ThisKey = nameof(Id), OtherKey = nameof(ShippingDocument.ShippingId), CanBeNull = true)] public List? ShippingDocuments { get; set; } diff --git a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs index 64bcff5..d274b88 100644 --- a/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs +++ b/FruitBank.Common/Interfaces/IFruitBankDataControllerCommon.cs @@ -2,6 +2,7 @@ using FruitBank.Common.Models; using Mango.Nop.Core.Dtos; using Mango.Nop.Core.Models; +using Nop.Core.Domain.Customers; namespace FruitBank.Common.Interfaces; @@ -38,6 +39,7 @@ public interface IFruitBankDataControllerCommon #region Customer public Task?> GetMeasuringUsers(); + public Task?> GetCustomerRolesByCustomerId(int customerId); #endregion Customer #region Product diff --git a/FruitBank.Common/Interfaces/IMeasuringAttributeValues.cs b/FruitBank.Common/Interfaces/IMeasuringAttributeValues.cs new file mode 100644 index 0000000..07dd864 --- /dev/null +++ b/FruitBank.Common/Interfaces/IMeasuringAttributeValues.cs @@ -0,0 +1,9 @@ +namespace FruitBank.Common.Interfaces; + +public interface IMeasuringAttributeValues +{ + double? NetWeight { get; set; } + double? GrossWeight { get; set; } + + bool? IsMeasurable { get; set; } +} \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/IShipping.cs b/FruitBank.Common/Interfaces/IShipping.cs index dd64664..0e9ed03 100644 --- a/FruitBank.Common/Interfaces/IShipping.cs +++ b/FruitBank.Common/Interfaces/IShipping.cs @@ -10,6 +10,7 @@ public interface IShipping : IEntityInt, ITimeStampInfo DateTime ShippingDate { get; set; } string LicencePlate { get; set; } bool IsAllMeasured { get; set; } + DateTime? MeasuredDate { get; set; } public List? ShippingDocuments { get; set; } } \ No newline at end of file diff --git a/FruitBank.Common/Interfaces/MeasuringAttributeValues.cs b/FruitBank.Common/Interfaces/MeasuringAttributeValues.cs new file mode 100644 index 0000000..36ca6ac --- /dev/null +++ b/FruitBank.Common/Interfaces/MeasuringAttributeValues.cs @@ -0,0 +1,27 @@ +namespace FruitBank.Common.Interfaces; + +public class MeasuringAttributeValues : IMeasuringAttributeValues +{ + public double? NetWeight { get; set; } + public double? GrossWeight { get; set; } + public bool? IsMeasurable { get; set; } + + public MeasuringAttributeValues() + { + } + + public MeasuringAttributeValues(double? netWeight, double? grossWeight, bool? isMeasurable) + { + Initialize(netWeight, grossWeight, isMeasurable); + } + + public void Initialize(double? netWeight, double? grossWeight, bool? isMeasurable) + { + NetWeight = netWeight; + GrossWeight = grossWeight; + IsMeasurable = isMeasurable; + } + + public bool HasValues() + => NetWeight != null && GrossWeight != null && IsMeasurable != null; +} \ No newline at end of file diff --git a/FruitBank.Common/Models/LoggedInModel.cs b/FruitBank.Common/Models/LoggedInModel.cs new file mode 100644 index 0000000..1b7cb00 --- /dev/null +++ b/FruitBank.Common/Models/LoggedInModel.cs @@ -0,0 +1,46 @@ +using AyCode.Core; +using Mango.Nop.Core.Dtos; +using Mango.Nop.Core.Models; +using Nop.Core.Domain.Customers; + +namespace FruitBank.Common.Models; + +public class LoggedInModel +{ + public bool IsLoggedIn => CustomerDto != null; + + public CustomerDto? CustomerDto { get; private set; } + public List CustomerRoles { get; private set; } = []; + + public LoggedInModel() + { + } + + public LoggedInModel(CustomerDto? customerDto) + { + InitLoggedInCustomer(customerDto); + } + + public LoggedInModel(MgLoginModelResponse loginModelResponse) : this(loginModelResponse.CustomerDto) + { + } + + public void InitLoggedInCustomer(CustomerDto? customerDto) + { + LogOut(); + + if (customerDto != null) CustomerDto = customerDto; + } + + public void InitCustomerRoles(List customerRoles) + { + CustomerRoles.Clear(); + CustomerRoles.AddRange(customerRoles); + } + + public void LogOut() + { + CustomerDto = null; + CustomerRoles.Clear(); + } +} \ No newline at end of file diff --git a/FruitBank.Common/SignalRs/SignalRTags.cs b/FruitBank.Common/SignalRs/SignalRTags.cs index 6917a43..dd2894f 100644 --- a/FruitBank.Common/SignalRs/SignalRTags.cs +++ b/FruitBank.Common/SignalRs/SignalRTags.cs @@ -33,6 +33,7 @@ public class SignalRTags : AcSignalRTags public const int GetMeasuringUsers = 70; public const int GetCustomerDtoById = 71; + public const int GetCustomerRolesByCustomerId = 72; public const int GetProductDtos = 80; public const int GetProductDtoById = 81; diff --git a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs index 834572a..3b1c742 100644 --- a/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs +++ b/FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs @@ -6,12 +6,15 @@ using FruitBank.Common.Interfaces; using FruitBank.Common.Loggers; using FruitBankHybrid.Shared.Services.SignalRs; using System.Diagnostics.CodeAnalysis; +using System.Runtime.InteropServices.JavaScript; +using FruitBank.Common; namespace FruitBankHybrid.Shared.Tests { [TestClass] public sealed class FruitBankClientTests { + private const int CustomerIdAasdDsserverCom = 6;//aasd@dsserver.com private const string Fixture = "_test.temp"; private FruitBankSignalRClient _signalRClient = null!; @@ -88,7 +91,8 @@ namespace FruitBankHybrid.Shared.Tests var shippings = await _signalRClient.GetNotMeasuredShippings(); Assert.IsNotNull(shippings); - Assert.IsTrue(shippings.All(s => !s.IsAllMeasured)); + var ShippingMeasuredDateAddDay = 1000; //dfd + Assert.IsTrue(shippings.All(s => !s.IsAllMeasured || s.MeasuredDate != null || s.MeasuredDate < DateTime.Now.AddDays(ShippingMeasuredDateAddDay))); } //[TestMethod] @@ -159,7 +163,9 @@ namespace FruitBankHybrid.Shared.Tests [DataTestMethod] [DataRow(1)] - //[DataRow(2)] + [DataRow(2)] + //[DataRow(3)] + //[DataRow(4)] public async Task UpdateShippingItemTest(int shippingItemId) { var originalShippingItem = await GetShippingItemByIdTest(shippingItemId); @@ -249,6 +255,17 @@ namespace FruitBankHybrid.Shared.Tests Assert.IsTrue(users.All(x => !x.Email.IsNullOrEmpty() && !x.Deleted)); } + [TestMethod] + [DataRow(CustomerIdAasdDsserverCom)] + public async Task GetCustomerRolesByCustomerIdTest(int customerId) + { + var customerRoles = await _signalRClient.GetCustomerRolesByCustomerId(customerId); + + Assert.IsNotNull(customerRoles); + Assert.IsTrue(customerRoles.Count > 0); + Assert.IsTrue(customerRoles.Any(cr => cr.SystemName == "Measuring")); + } + #endregion Customer #region Product @@ -265,6 +282,7 @@ namespace FruitBankHybrid.Shared.Tests #endregion Product + #region Login [TestMethod] [DataRow("aasd@dsserver.com", "Asdasd123456")] public async Task LoginMeasuringUserTest_TrueIfHasCustomerDto(string email, string password) @@ -289,5 +307,6 @@ namespace FruitBankHybrid.Shared.Tests Assert.IsFalse(loginModelResponse.ErrorMessage.IsNullOrWhiteSpace()); Console.WriteLine($"Succes: {loginModelResponse.ErrorMessage}"); } + #endregion Login } } diff --git a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj index 5025ca6..96ba4eb 100644 --- a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj +++ b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj @@ -11,7 +11,7 @@ - + @@ -46,19 +46,19 @@ ..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.Resources.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.Viewer.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Data.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Utils.v25.1.dll + ..\..\NopCommerce.Common\4.70\Libraries\Mango.Nop.Core\bin\FruitBank\Debug\net9.0\Mango.Nop.Core.dll diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor b/FruitBankHybrid.Shared/Layout/MainLayout.razor index a9ea6a6..b602d09 100644 --- a/FruitBankHybrid.Shared/Layout/MainLayout.razor +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor @@ -1,23 +1,30 @@ -@inherits LayoutComponentBase +@using FruitBank.Common.Models +@inherits LayoutComponentBase
-
- -
+
+ +
-
-
- Kijelentkezés -
+
+
+ @if (LoggedInModel.IsLoggedIn) + { + + @* Kijelentkezés *@ + } +
-
- @Body -
-
+
+ + @Body + +
+
- An unhandled error has occurred. - Reload - 🗙 + An unhandled error has occurred. + Reload + 🗙
diff --git a/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs new file mode 100644 index 0000000..da1a724 --- /dev/null +++ b/FruitBankHybrid.Shared/Layout/MainLayout.razor.cs @@ -0,0 +1,25 @@ +using FruitBank.Common.Models; +using Microsoft.AspNetCore.Components; + +namespace FruitBankHybrid.Shared.Layout; + +public partial class MainLayout : LayoutComponentBase +{ + [Inject] public required LoggedInModel LoggedInModel { get; set; } + + private EventCallback RefreshMainLayoutEventCallback => EventCallback.Factory.Create(this, RefreshMainLayout); + private NavMenu _navMenu = null!; + + private void OnLogoutClick() + { + LoggedInModel.LogOut(); + + RefreshMainLayout(); + } + + public void RefreshMainLayout() + { + _navMenu.RefreshNavMenu(); + StateHasChanged(); + } +} \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor index 6c32408..10bdb2d 100644 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor +++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor @@ -1,4 +1,8 @@ -
+@using AyCode.Core +@using FruitBank.Common.Models +@inject LoggedInModel LoggedInModel + +
FruitBank Measuring
@@ -8,21 +12,25 @@
+@code +{ + public void RefreshNavMenu() + { + StateHasChanged(); + } +} \ No newline at end of file diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor.bak b/FruitBankHybrid.Shared/Layout/NavMenu.razor.bak deleted file mode 100644 index ff289fd..0000000 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor.bak +++ /dev/null @@ -1,30 +0,0 @@ -
-
- FruitBankHybrid -
-
- - - -
- -
- diff --git a/FruitBankHybrid.Shared/Pages/Home.razor.cs b/FruitBankHybrid.Shared/Pages/Home.razor.cs index da2ed1f..36eae70 100644 --- a/FruitBankHybrid.Shared/Pages/Home.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Home.razor.cs @@ -1,9 +1,12 @@ -using Microsoft.AspNetCore.Components; +using FruitBank.Common.Models; +using Microsoft.AspNetCore.Components; namespace FruitBankHybrid.Shared.Pages; public partial class Home : ComponentBase { + [Inject] public required LoggedInModel LoggedInModel { get; set; } + private string Factor => FormFactor.GetFormFactor(); private string Platform => FormFactor.GetPlatform(); diff --git a/FruitBankHybrid.Shared/Pages/Login.razor b/FruitBankHybrid.Shared/Pages/Login.razor index 8405fdc..6dd9489 100644 --- a/FruitBankHybrid.Shared/Pages/Login.razor +++ b/FruitBankHybrid.Shared/Pages/Login.razor @@ -3,46 +3,50 @@

Bejelentkezés

- - - - -
- @ctxCombo.DataItem.Email -
- @ctxCombo.DataItem.FullName - @ctxCombo.DataItem.Email + +@if (!LoggedInModel.IsLoggedIn) +{ + + + + +
+ @ctxCombo.DataItem.Email +
+ @ctxCombo.DataItem.FullName + @ctxCombo.DataItem.Email +
-
- - - + + + - - - + + + - - - + + + - + +}
- @(LoginModelResponse?.CustomerDto == null ? LoginModelResponse?.ErrorMessage : LoginModelResponse?.CustomerDto.FullName) + @(LoggedInModel.CustomerDto == null ? LoginModelResponse?.ErrorMessage : LoggedInModel.CustomerDto.FullName + $" [{_rolesText}]")
\ No newline at end of file diff --git a/FruitBankHybrid.Shared/Pages/Login.razor.cs b/FruitBankHybrid.Shared/Pages/Login.razor.cs index f1e4b20..2921158 100644 --- a/FruitBankHybrid.Shared/Pages/Login.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Login.razor.cs @@ -3,6 +3,7 @@ using AyCode.Core.Loggers; using AyCode.Interfaces.Users; using AyCode.Utils.Extensions; using FruitBank.Common.Loggers; +using FruitBank.Common.Models; using FruitBankHybrid.Shared.Services.Loggers; using FruitBankHybrid.Shared.Services.SignalRs; using Mango.Nop.Core.Dtos; @@ -17,6 +18,7 @@ public partial class Login : ComponentBase { [Inject] public required IEnumerable LogWriters { get; set; } [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } + [Inject] public required LoggedInModel LoggedInModel { get; set; } private ILogger _logger = null!; private List Users { get; set; } @@ -24,20 +26,31 @@ public partial class Login : ComponentBase private string PasswordValue { get; set; } = string.Empty; private MgLoginModelResponse? LoginModelResponse { get; set; } + + [CascadingParameter] + public EventCallback UpdateStyle { get; set; } protected override async Task OnInitializedAsync() { _logger = new LoggerClient(LogWriters.ToArray()); _logger.Info("OnInitializedAsync"); - Users = await FruitBankSignalRClient.GetMeasuringUsers() ?? []; - SelectedUser = Users.FirstOrDefault(); + if (!LoggedInModel.IsLoggedIn) + { + Users = await FruitBankSignalRClient.GetMeasuringUsers() ?? []; + SelectedUser = Users.FirstOrDefault(); + } + else _rolesText = string.Join("; ", LoggedInModel.CustomerRoles.Select(x => x.Name)); await base.OnInitializedAsync(); } + private string _rolesText = string.Empty; private async Task OnLoginClick() { + if (LoggedInModel.IsLoggedIn) return; + + _rolesText = string.Empty; if (SelectedUser == null || PasswordValue.IsNullOrWhiteSpace()) { LoginModelResponse = new MgLoginModelResponse @@ -49,11 +62,27 @@ public partial class Login : ComponentBase } LoginModelResponse = await FruitBankSignalRClient.LoginMeasuringUser(SelectedUser.Email, PasswordValue); + + if (LoginModelResponse is { IsSuccesLogin: true }) + { + LoggedInModel.InitLoggedInCustomer(LoginModelResponse.CustomerDto); + + var customerRoles = await FruitBankSignalRClient.GetCustomerRolesByCustomerId(LoginModelResponse.CustomerDto!.Id); + if (customerRoles != null) + { + LoggedInModel.InitCustomerRoles(customerRoles); + + _rolesText = string.Join("; ", LoggedInModel.CustomerRoles.Select(x => x.Name)); + } + } + + await UpdateStyle.InvokeAsync(); + StateHasChanged(); } protected async Task OnPasswordKeyDown(KeyboardEventArgs e) { - if (e.Key == "Enter") await OnLoginClick(); + if (!LoggedInModel.IsLoggedIn && e.Key == "Enter") await OnLoginClick(); } private string GetImageFileName(CustomerDto employee) diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor index fddd82f..5701971 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor @@ -103,14 +103,14 @@ @* *@ - - + + + BeginRow="false"> - diff --git a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs index 50814c0..0800832 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringIn.razor.cs @@ -26,6 +26,7 @@ namespace FruitBankHybrid.Shared.Pages { [Inject] public required IEnumerable LogWriters { get; set; } [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } + [Inject] public required LoggedInModel LoggedInModel { get; set; } private ILogger _logger = null!; @@ -54,14 +55,11 @@ namespace FruitBankHybrid.Shared.Pages private async Task RefreshShippingsFromDb(DateTime dateTime) { - var shippings = await FruitBankSignalRClient.GetShippings() ?? []; + var shippings = await FruitBankSignalRClient.GetNotMeasuredShippings() ?? []; _shippingDates = shippings.Select(shipping => new ShippingDateModel(shipping.Id, shipping.ShippingDate.Date, shipping.IsAllMeasured)).ToList(); NotMeasuredShippings = shippings.Where(shipping => DaysEqual(shipping.ShippingDate.Date, dateTime)).ToList(); - //if (getAllShipping) NotMeasuredShippings = await FruitBankSignalRClient.GetShippings() ?? []; - //else NotMeasuredShippings = await FruitBankSignalRClient.GetNotMeasuredShippings() ?? []; - SelectedShipping = NotMeasuredShippings.FirstOrDefault(); } @@ -124,6 +122,7 @@ namespace FruitBankHybrid.Shared.Pages SelectedShippingItem.MeasuredQuantity = shippingItemFromDb.MeasuredQuantity; SelectedShippingItem.MeasuredNetWeight = shippingItemFromDb.MeasuredNetWeight; SelectedShippingItem.MeasuredGrossWeight = shippingItemFromDb.MeasuredGrossWeight; + //SelectedShippingItem.IsMeasurable = shippingItemFromDb.IsMeasurable; SelectedShippingItem.IsMeasured = shippingItemFromDb.IsMeasured; if (SelectedShippingDocument != null) diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index c1c63cf..54a82e9 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs @@ -1,4 +1,5 @@ -using Microsoft.AspNetCore.Components; +using FruitBank.Common.Models; +using Microsoft.AspNetCore.Components; using System; using System.Collections.Generic; using System.Linq; @@ -9,5 +10,6 @@ namespace FruitBankHybrid.Shared.Pages { public partial class MeasuringOut : ComponentBase { + [Inject] public required LoggedInModel LoggedInModel { get; set; } } } diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index c31168a..bcb2c4f 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -10,6 +10,7 @@ using FruitBank.Common.SignalRs; using FruitBankHybrid.Shared.Services.Loggers; using Mango.Nop.Core.Dtos; using Mango.Nop.Core.Models; +using Nop.Core.Domain.Customers; namespace FruitBankHybrid.Shared.Services.SignalRs { @@ -94,7 +95,9 @@ namespace FruitBankHybrid.Shared.Services.SignalRs public Task?> GetMeasuringUsers() => GetAllAsync>(SignalRTags.GetMeasuringUsers); - + + public Task?> GetCustomerRolesByCustomerId(int customerId) + => GetAllAsync>(SignalRTags.GetCustomerRolesByCustomerId, [customerId]); #endregion Customer #region Product diff --git a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj index 6cfc12e..f453b39 100644 --- a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj +++ b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj @@ -40,19 +40,19 @@ ..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.Resources.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.Viewer.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Data.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Utils.v25.1.dll + diff --git a/FruitBankHybrid.Web.Client/Program.cs b/FruitBankHybrid.Web.Client/Program.cs index 8e6ab37..0e188af 100644 --- a/FruitBankHybrid.Web.Client/Program.cs +++ b/FruitBankHybrid.Web.Client/Program.cs @@ -1,5 +1,6 @@ using AyCode.Core.Loggers; using FruitBank.Common.Loggers; +using FruitBank.Common.Models; using FruitBankHybrid.Shared.Services; using FruitBankHybrid.Shared.Services.SignalRs; using FruitBankHybrid.Web.Client.Services; @@ -14,6 +15,7 @@ builder.Services.AddDevExpressBlazor(configure => configure.SizeMode = DevExpres builder.Services.AddSingleton(); //builder.Services.AddScoped(); +builder.Services.AddSingleton(); builder.Services.AddScoped(); #if DEBUG diff --git a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj index f3c9748..ee14c32 100644 --- a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj +++ b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj @@ -14,7 +14,7 @@ - + @@ -57,19 +57,19 @@ ..\..\..\..\Aycode\Source\AyCode.Core\AyCode.Services.Server\bin\FruitBank\Debug\net9.0\AyCode.Utils.dll - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.Resources.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Blazor.v25.1.Viewer.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Data.v25.1.dll + - C:\Program Files\DevExpress 25.1\Components\Bin\NetCore\DevExpress.Utils.v25.1.dll + diff --git a/FruitBankHybrid.Web/Program.cs b/FruitBankHybrid.Web/Program.cs index 8405b86..85791d4 100644 --- a/FruitBankHybrid.Web/Program.cs +++ b/FruitBankHybrid.Web/Program.cs @@ -1,5 +1,6 @@ using AyCode.Core.Loggers; using FruitBank.Common; +using FruitBank.Common.Models; using FruitBank.Common.Server.Services.Loggers; using FruitBank.Common.Server.Services.SignalRs; using FruitBankHybrid.Shared.Services; @@ -14,8 +15,9 @@ builder.Services.AddMvc(); builder.Services.AddSingleton(); -builder.Services.AddSingleton(); -builder.Services.AddSingleton(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); +builder.Services.AddScoped(); //builder.Services.AddSingleton(); //builder.Services.AddScoped(); diff --git a/FruitBankHybrid/MauiProgram.cs b/FruitBankHybrid/MauiProgram.cs index 04299fb..2fd08d3 100644 --- a/FruitBankHybrid/MauiProgram.cs +++ b/FruitBankHybrid/MauiProgram.cs @@ -1,11 +1,12 @@ -using FruitBankHybrid.Services; +using AyCode.Core.Loggers; +using FruitBank.Common.Loggers; +using FruitBank.Common.Models; +using FruitBankHybrid.Services; +using FruitBankHybrid.Services.Loggers; using FruitBankHybrid.Shared.Services; +using FruitBankHybrid.Shared.Services.SignalRs; //using DevExpress.Maui; using Microsoft.Extensions.Logging; -using FruitBankHybrid.Shared.Services.SignalRs; -using FruitBank.Common.Loggers; -using AyCode.Core.Loggers; -using FruitBankHybrid.Services.Loggers; namespace FruitBankHybrid { @@ -24,18 +25,20 @@ namespace FruitBankHybrid fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular"); }); - // Add device-specific services used by the FruitBankHybrid.Shared project - builder.Services.AddSingleton(); - //builder.Services.AddScoped(); - builder.Services.AddScoped(); + // Add device-specific services used by the FruitBankHybrid.Shared project + builder.Services.AddSingleton(); + + builder.Services.AddSingleton(); + //builder.Services.AddScoped(); + builder.Services.AddScoped(); #if DEBUG - builder.Services.AddSingleton(); + builder.Services.AddSingleton(); #endif - builder.Services.AddSingleton(); + builder.Services.AddSingleton(); builder.Services.AddMauiBlazorWebView();