diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs index e9569b12..04a505db 100644 --- a/TIAM.Database.Test/AdminDalTest.cs +++ b/TIAM.Database.Test/AdminDalTest.cs @@ -235,7 +235,7 @@ namespace TIAM.Database.Test await Dal.RemoveProductAsync(productId); //kitöröljük a szemetet, ha korábbról bentmaradt - J. - var company = new Company(companyId, "Test unit company...", null); + var company = new Company(companyId, "Test unit product...", null); Assert.IsTrue(await Dal.AddCompanyAsync(company)); Assert.IsNotNull(company); diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index 18642bce..df474003 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -80,6 +80,9 @@ namespace TIAM.Database.DataLayers.Admins #endregion TransferDestination #region TransferToDriver + public Task GetTransferToDriverById(Guid transferToDriverId, bool autoInclude = false) => SessionAsync(ctx => ctx.TransferToDrivers.FirstOrDefault(x=>x.Id == transferToDriverId)); + public Task> GetTransferToDriversByTransferId(Guid transferId, bool autoInclude = false) => SessionAsync(ctx => ctx.TransferToDrivers.Where(x => x.TransferId == transferId).ToList()); + public Task AddTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Add(transferToDriver).State == EntityState.Added); public Task UpdateTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Update(transferToDriver).State == EntityState.Modified); public Task RemoveTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Remove(transferToDriver).State == EntityState.Deleted); diff --git a/TIAM.Services/SignalRTags.cs b/TIAM.Services/SignalRTags.cs index 36999c6f..8cd33a83 100644 --- a/TIAM.Services/SignalRTags.cs +++ b/TIAM.Services/SignalRTags.cs @@ -25,9 +25,9 @@ public class SignalRTags : AcSignalRTags public const int AddCompany = 17; public const int RemoveCompany = 18; - public const int GetTransferToDriver = 22; + public const int GetTransferDriver = 22; //public const int GetTransferToDrivers = 23; - public const int GetTransferToDriversByContextId = 24; + public const int GetTransferDriversByTransferId = 24; public const int AddTransferToDriver = 25; public const int UpdateTransferToDriver = 26; public const int RemoveTransferToDriver = 27; diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 8dec11ea..bb92f2b6 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -145,7 +145,7 @@ - + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor index 9744e98a..0bf20c39 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -18,14 +18,13 @@ - - + + @@ -43,7 +42,7 @@ @code { [Parameter] public bool KeyboardNavigationEnabled { get; set; } - + [Parameter] public Guid? ContextId { get; set; } [Parameter] public ITransferToDriversRelation ParentData { get; set; } = null!; [Parameter] public EventCallback OnTransferToDriverChanged { get; set; } @@ -59,8 +58,6 @@ private void DataItemChanged(GridDataItemChangedEventArgs args) { - ParentData.TransferToDrivers.UpdateCollection(args.DataItem, args.TrackingState == TrackingState.Remove); - OnTransferToDriverChanged.InvokeAsync(args.DataItem); } diff --git a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs index 257634ed..3aca5bdf 100644 --- a/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs +++ b/TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs @@ -8,7 +8,7 @@ public class TransferToDriversGrid : TiamGrid { public TransferToDriversGrid() : base() { - GetAllMessageTag = SignalRTags.GetTransferToDriversByContextId; + GetAllMessageTag = SignalRTags.GetTransferDriversByTransferId; AddMessageTag = SignalRTags.AddTransferToDriver; UpdateMessageTag = SignalRTags.UpdateTransferToDriver; RemoveMessageTag = SignalRTags.RemoveTransferToDriver; diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 9401f234..c951e4eb 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -19,6 +19,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.Messages; using TIAMWebApp.Server.Services; using TIAMWebApp.Shared.Application.Models.ClientSide; using AyCode.Core.Extensions; +using TIAM.Entities.Users; namespace TIAMWebApp.Server.Controllers { @@ -403,17 +404,6 @@ namespace TIAMWebApp.Server.Controllers return result; } - [Authorize] - [HttpGet] - [Route(APIUrls.GetTransfersByDriverRouteName)] - [SignalR(SignalRTags.GetTransfersByDriverId)] - public Task GetDriverTransfers(Guid transferId, Guid userProductMappingId) - { - throw new NotImplementedException(); - //var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId); - //return result; - } - [AllowAnonymous] [HttpPost] [Route(APIUrls.GetTransferByIdRouteName)] @@ -437,5 +427,24 @@ namespace TIAMWebApp.Server.Controllers return transferToModify; } + [Authorize] + [HttpGet] + [Route(APIUrls.GetTransferDriverRouteName)] + [SignalR(SignalRTags.GetTransferDriver)] + public async Task GetTransferDriver(Guid transferDriverId) + { + var result = await _adminDal.GetTransferToDriverById(transferDriverId); + return result; + } + + [Authorize] + [HttpGet] + [Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [SignalR(SignalRTags.GetTransferDriversByTransferId)] + public async Task> GetTransferDrivers(Guid transferId) + { + var result = await _adminDal.GetTransferToDriversByTransferId(transferId); + return result; + } } } \ No newline at end of file diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 097f6a0b..2c0fec58 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -87,9 +87,6 @@ namespace TIAMWebApp.Shared.Application.Models public const string GetTransfersByUserIdRouteName = "GetTransfersByUserId"; public const string GetTransfersByUserId = TransferDataAPI + GetTransfersByUserIdRouteName; - public const string GetTransfersByDriverRouteName = "GetTransfersByDriverId"; - public const string GetTransfersByDriver = TransferDataAPI + GetTransfersByDriverRouteName; - public const string GetTransferByIdRouteName = "GetTransferById"; public const string GetTransferById = TransferDataAPI + GetTransferByIdRouteName; @@ -105,6 +102,12 @@ namespace TIAMWebApp.Shared.Application.Models public const string UpdateTransferDestinationRouteName = "UpdateTransferDestintion"; public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName; + public const string GetTransferDriverRouteName = "GetTransfersByDriverId"; + public const string GetTransferDriver = TransferDataAPI + GetTransferDriverRouteName; + + public const string GetTransferDriversByTransferIdRouteName = "GetTransfersByDriverId"; + public const string GetTransferDriversByTransferId = TransferDataAPI + GetTransferDriversByTransferIdRouteName; + //serviceprovider public const string CreateServiceProviderRouteName = "CreateServiceProvider/"; public const string CreateServiceProvider = ServiceProviderAPI + CreateServiceProviderRouteName; diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs index 30d1e701..5c3506aa 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs @@ -45,8 +45,8 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public Product SaveToProduct(Company company) { - Product NewProduct = new(this.Id, company.Id, company, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails); - return NewProduct; + Product newProduct = new(this.Id, company.Id, company, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails); + return newProduct; } } }