diff --git a/FruitBank.Common/Entities/Partner.cs b/FruitBank.Common/Entities/Partner.cs index c3bc472..377d7ee 100644 --- a/FruitBank.Common/Entities/Partner.cs +++ b/FruitBank.Common/Entities/Partner.cs @@ -1,4 +1,4 @@ -using FruitBank.Common.Entities; +using FruitBank.Common.Interfaces; using LinqToDB.Mapping; using Mango.Nop.Core.Entities; diff --git a/FruitBank.Common/Entities/Shipping.cs b/FruitBank.Common/Entities/Shipping.cs index 2a39536..6ab098c 100644 --- a/FruitBank.Common/Entities/Shipping.cs +++ b/FruitBank.Common/Entities/Shipping.cs @@ -1,4 +1,5 @@ -using LinqToDB.Mapping; +using FruitBank.Common.Interfaces; +using LinqToDB.Mapping; using Mango.Nop.Core.Entities; namespace FruitBank.Common.Entities; diff --git a/FruitBank.Common/Entities/ShippingDocument.cs b/FruitBank.Common/Entities/ShippingDocument.cs index 40cbc32..2863c89 100644 --- a/FruitBank.Common/Entities/ShippingDocument.cs +++ b/FruitBank.Common/Entities/ShippingDocument.cs @@ -1,4 +1,5 @@ -using LinqToDB.Mapping; +using FruitBank.Common.Interfaces; +using LinqToDB.Mapping; using Mango.Nop.Core.Entities; namespace FruitBank.Common.Entities; diff --git a/FruitBank.Common/Entities/ShippingItem.cs b/FruitBank.Common/Entities/ShippingItem.cs index 4bab46f..272fc39 100644 --- a/FruitBank.Common/Entities/ShippingItem.cs +++ b/FruitBank.Common/Entities/ShippingItem.cs @@ -1,4 +1,5 @@ using AyCode.Core.Interfaces; +using FruitBank.Common.Interfaces; using LinqToDB.Mapping; using Mango.Nop.Core.Entities; diff --git a/FruitBank.Common/Entities/IPartner.cs b/FruitBank.Common/Interfaces/IPartner.cs similarity index 90% rename from FruitBank.Common/Entities/IPartner.cs rename to FruitBank.Common/Interfaces/IPartner.cs index 4cbd8f7..e8d899f 100644 --- a/FruitBank.Common/Entities/IPartner.cs +++ b/FruitBank.Common/Interfaces/IPartner.cs @@ -1,7 +1,7 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -namespace FruitBank.Common.Entities; +namespace FruitBank.Common.Interfaces; public interface IPartner : IEntityInt, ITimeStampInfo { diff --git a/FruitBank.Common/Entities/IShipping.cs b/FruitBank.Common/Interfaces/IShipping.cs similarity index 86% rename from FruitBank.Common/Entities/IShipping.cs rename to FruitBank.Common/Interfaces/IShipping.cs index fa555e8..0aae7ed 100644 --- a/FruitBank.Common/Entities/IShipping.cs +++ b/FruitBank.Common/Interfaces/IShipping.cs @@ -1,7 +1,7 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -namespace FruitBank.Common.Entities; +namespace FruitBank.Common.Interfaces; public interface IShipping : IEntityInt, ITimeStampInfo { diff --git a/FruitBank.Common/Entities/IShippingDocument.cs b/FruitBank.Common/Interfaces/IShippingDocument.cs similarity index 90% rename from FruitBank.Common/Entities/IShippingDocument.cs rename to FruitBank.Common/Interfaces/IShippingDocument.cs index 7e50b92..b74944f 100644 --- a/FruitBank.Common/Entities/IShippingDocument.cs +++ b/FruitBank.Common/Interfaces/IShippingDocument.cs @@ -1,7 +1,7 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -namespace FruitBank.Common.Entities; +namespace FruitBank.Common.Interfaces; public interface IShippingDocument: IEntityInt, ITimeStampInfo { diff --git a/FruitBank.Common/Entities/IShippingItem.cs b/FruitBank.Common/Interfaces/IShippingItem.cs similarity index 90% rename from FruitBank.Common/Entities/IShippingItem.cs rename to FruitBank.Common/Interfaces/IShippingItem.cs index 74f7507..6a12f87 100644 --- a/FruitBank.Common/Entities/IShippingItem.cs +++ b/FruitBank.Common/Interfaces/IShippingItem.cs @@ -1,7 +1,7 @@ using AyCode.Interfaces.Entities; using AyCode.Interfaces.TimeStampInfo; -namespace FruitBank.Common.Entities; +namespace FruitBank.Common.Interfaces; public interface IShippingItem : IEntityInt, ITimeStampInfo { diff --git a/FruitBank.Common/Models/MeasuringModel.cs b/FruitBank.Common/Models/MeasuringModel.cs index 6bab660..483b4f2 100644 --- a/FruitBank.Common/Models/MeasuringModel.cs +++ b/FruitBank.Common/Models/MeasuringModel.cs @@ -4,18 +4,35 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using AyCode.Core.Interfaces; +using FruitBank.Common.Entities; namespace FruitBank.Common.Models { public class MeasuringModel : IAcSerializableToJson { - public MeasuringModel() { } + public string Name { get; set; } + + public Shipping Shipping { get; set; } + public List Partners { get; set; } + public List ShippingItems { get; set; } + public List ShippingDocuments { get; set; } + + + public MeasuringModel() + { + } public MeasuringModel(string name) : this() { Name = name; } - public string Name { get; set; } + public MeasuringModel(Shipping shipping, List partners, List shippingItems, List shippingDocuments) : this() + { + Shipping = shipping; + Partners = partners ?? []; + ShippingItems = shippingItems ?? []; + ShippingDocuments = shippingDocuments ?? []; + } } } diff --git a/FruitBankHybrid.Shared/Pages/Chat.razor b/FruitBankHybrid.Shared/Pages/Chat.razor index cd8c722..5e98d82 100644 --- a/FruitBankHybrid.Shared/Pages/Chat.razor +++ b/FruitBankHybrid.Shared/Pages/Chat.razor @@ -6,7 +6,7 @@ - +
    @foreach (var m in _messages) diff --git a/FruitBankHybrid.Shared/Pages/Chat.razor.cs b/FruitBankHybrid.Shared/Pages/Chat.razor.cs index 51bcc3a..b3d6a09 100644 --- a/FruitBankHybrid.Shared/Pages/Chat.razor.cs +++ b/FruitBankHybrid.Shared/Pages/Chat.razor.cs @@ -37,7 +37,7 @@ namespace FruitBankHybrid.Shared.Pages _logger.Info("OnInitializedAsync"); } - private async Task Send() + private async Task GetPartner() { var measuringModel = new MeasuringModel(); @@ -46,6 +46,7 @@ namespace FruitBankHybrid.Shared.Pages _message = string.Empty; measuringModel.Name = (await FruitBankSignalRClient.GetPartnerById(partnerId))?.Name!; + //measuringModel.Name = (await FruitBankSignalRClient.GetMeasuringModelByShippingId(partnerId))?.Name!; } _messages.Add((_userName, measuringModel?.Name ?? "ERROR")); diff --git a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs index 0b466ee..f5237de 100644 --- a/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs +++ b/FruitBankHybrid.Shared/Services/SignalRs/FruitBankSignalRClient.cs @@ -19,7 +19,7 @@ namespace FruitBankHybrid.Shared.Services.SignalRs } public Task GetMeasuringModelByShippingId(int shippingId) - => GetAllAsync(SignalRTags.GetMeasuringModelByShippingId); + => GetByIdAsync(SignalRTags.GetMeasuringModelByShippingId, shippingId); //public Task GetWelcomeMessageAsync(string message, Action? callback = null) //{