diff --git a/TIAM.Database/DataLayers/Admins/AdminDal.cs b/TIAM.Database/DataLayers/Admins/AdminDal.cs index df474003..709436f8 100644 --- a/TIAM.Database/DataLayers/Admins/AdminDal.cs +++ b/TIAM.Database/DataLayers/Admins/AdminDal.cs @@ -80,8 +80,8 @@ 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 GetTransferToDriverByIdAsync(Guid transferToDriverId, bool autoInclude = false) => SessionAsync(ctx => ctx.TransferToDrivers.FirstOrDefault(x=>x.Id == transferToDriverId)); + public Task> GetTransferToDriversByTransferIdAsync(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); @@ -209,12 +209,12 @@ namespace TIAM.Database.DataLayers.Admins #region EmailMessage public Task GetEmailMessageByIdAsync(Guid emailMessageId) => SessionAsync(ctx => ctx.GetEmailMessageById(emailMessageId)); - public Task> GetEmailMessagesByContextIdAsync(Guid contextId) => SessionAsync(ctx => ctx.GetEmailMessagesByContextId(contextId).ToList()); - public Task> GetEmailMessagesBySenderIdAsync(Guid senderId) => SessionAsync(ctx => ctx.GetEmailMessagesBySenderId(senderId).ToList()); - public Task> GetEmailMessagesBySenderEmailAddressAsync(string emailAddress) => SessionAsync(ctx => ctx.GetEmailMessagesBySenderEmailAddress(emailAddress).ToList()); - public Task> GetEmailMessagesAsync(Guid userId, Guid userProductMappingId) => SessionAsync(ctx => ctx.GetEmailMessages(userId, userProductMappingId).ToList()); - public Task> GetEmailMessagesAsync(Guid contextId, Guid userId, Guid userProductMappingId) => SessionAsync(ctx => ctx.GetEmailMessages(contextId, userId, userProductMappingId).ToList()); - public Task> GetAllEmailMessagesAsync() => SessionAsync(ctx => ctx.GetAllEmailMessages().ToList()); + public Task> GetEmailMessagesByContextIdAsync(Guid contextId) => SessionAsync(ctx => ctx.GetEmailMessagesByContextId(contextId).OrderByDescending(x=>x.Created).ToList()); + public Task> GetEmailMessagesBySenderIdAsync(Guid senderId) => SessionAsync(ctx => ctx.GetEmailMessagesBySenderId(senderId).OrderByDescending(x=>x.Created).ToList()); + public Task> GetEmailMessagesBySenderEmailAddressAsync(string emailAddress) => SessionAsync(ctx => ctx.GetEmailMessagesBySenderEmailAddress(emailAddress).OrderByDescending(x=>x.Created).ToList()); + public Task> GetEmailMessagesAsync(Guid userId, Guid userProductMappingId) => SessionAsync(ctx => ctx.GetEmailMessages(userId, userProductMappingId).OrderByDescending(x=>x.Created).ToList()); + public Task> GetEmailMessagesAsync(Guid contextId, Guid userId, Guid userProductMappingId) => SessionAsync(ctx => ctx.GetEmailMessages(contextId, userId, userProductMappingId).OrderByDescending(x=>x.Created).ToList()); + public Task> GetAllEmailMessagesAsync() => SessionAsync(ctx => ctx.GetAllEmailMessages().OrderByDescending(x=>x.Created).ToList()); public Task AddEmailMessageAsync(EmailMessage emailMessage) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index bb92f2b6..3ea82072 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -98,8 +98,8 @@ - - + + @{ var idKeyField = ((Transfer)context.DataItem).Id; @@ -114,7 +114,7 @@ - + @@ -128,7 +128,7 @@ - + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor index 461d3100..da6822cc 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @{ diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor index 0bf20c39..5bec22b1 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -15,8 +15,6 @@ @inject IEnumerable LogWriters @inject AdminSignalRClient AdminSignalRClient; - - + ColumnResizeMode="GridColumnResizeMode.NextColumn"> diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index c951e4eb..44960abd 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -433,7 +433,7 @@ namespace TIAMWebApp.Server.Controllers [SignalR(SignalRTags.GetTransferDriver)] public async Task GetTransferDriver(Guid transferDriverId) { - var result = await _adminDal.GetTransferToDriverById(transferDriverId); + var result = await _adminDal.GetTransferToDriverByIdAsync(transferDriverId); return result; } @@ -443,8 +443,39 @@ namespace TIAMWebApp.Server.Controllers [SignalR(SignalRTags.GetTransferDriversByTransferId)] public async Task> GetTransferDrivers(Guid transferId) { - var result = await _adminDal.GetTransferToDriversByTransferId(transferId); + var result = await _adminDal.GetTransferToDriversByTransferIdAsync(transferId); return result; } + + //[Authorize] + //[HttpGet] + //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [SignalR(SignalRTags.AddTransferToDriver)] + public async Task AddTransferDriver([FromBody] TransferToDriver transferToDriver) + { + var result = await _adminDal.AddTransferToDriverAsync(transferToDriver); + return result ? transferToDriver : null; + } + + //[Authorize] + //[HttpGet] + //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [SignalR(SignalRTags.UpdateTransferToDriver)] + public async Task UpdateTransferDriver([FromBody] TransferToDriver transferToDriver) + { + var result = await _adminDal.UpdateTransferToDriverAsync(transferToDriver); + return result ? transferToDriver : null; + } + + //[Authorize] + //[HttpGet] + //[Route(APIUrls.GetTransferDriversByTransferIdRouteName)] + [SignalR(SignalRTags.RemoveTransferToDriver)] + public async Task RemoveTransferDriver([FromBody] TransferToDriver transferToDriver) + { + var result = await _adminDal.RemoveTransferToDriverAsync(transferToDriver); + return result ? transferToDriver : null; + } + } } \ No newline at end of file