diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor index 78d0655b..587aaf08 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor @@ -64,7 +64,7 @@ { _logger = new LoggerClient(LogWriters.ToArray()); - base.OnInitialized(); + await base.OnInitializedAsync(); } void ColumnChooserButton_Click() diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor index 3eb0b3f5..30f9af80 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor @@ -46,11 +46,12 @@ @{ + //TODO: a ManageTransfers-en ha új sofÅ‘rt adunk hozzá a UserProductMapping null lesz és elszáll! - J. var email = string.Empty; var transferToDriverDataItem = ((TransferToDriver)context.DataItem); if (HasReadPermission(transferToDriverDataItem.UserProductMappingId)) - email = transferToDriverDataItem.UserProductMapping.User.EmailAddress; + email = transferToDriverDataItem.UserProductMapping?.User.EmailAddress; } @email @@ -81,7 +82,7 @@ @{ var transferToDriverDataItem = (TransferToDriver)context.DataItem; - @_cars.FirstOrDefault(x => x.Id == transferToDriverDataItem.CarId)?.LicencePlate + @_cars.FirstOrDefault(x => x.Id == transferToDriverDataItem?.CarId)?.LicencePlate } diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index b5e8ad3d..a015fe1b 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -794,7 +794,9 @@ namespace TIAMWebApp.Server.Controllers var result = await _adminDal.AddTransferToDriverAsync(transferToDriver); //TODO: Send email to driver... - J. - return result ? transferToDriver : null; + //TODO: valamiért az AddTransferToDriverAsync nem tér vissza a Car-al és a UserProductMapping-el! - J. + //return result ? transferToDriver : null; + return result ? await _adminDal.GetTransferToDriverByIdAsync(transferToDriver.Id) : null; } //[Authorize]