Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
Adam 2024-07-25 08:32:32 +02:00
parent 32c705383b 7674c1177a
commit 4b7692c0e6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
View File

@ -64,7 +64,7 @@
{ {
_logger = new LoggerClient<ManageDrivers>(LogWriters.ToArray()); _logger = new LoggerClient<ManageDrivers>(LogWriters.ToArray());
base.OnInitialized(); await base.OnInitializedAsync();
} }
void ColumnChooserButton_Click() void ColumnChooserButton_Click()

5
TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
View File

@ -46,11 +46,12 @@
<DxGridDataColumn FieldName="@userEmailFieldName" Caption="Driver" SortIndex="0" ReadOnly="!DriverId.IsNullOrEmpty()" Visible="DriverId.IsNullOrEmpty()"> <DxGridDataColumn FieldName="@userEmailFieldName" Caption="Driver" SortIndex="0" ReadOnly="!DriverId.IsNullOrEmpty()" Visible="DriverId.IsNullOrEmpty()">
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
//TODO: a ManageTransfers-en ha új sofőrt adunk hozzá a UserProductMapping null lesz és elszáll! - J.
var email = string.Empty; var email = string.Empty;
var transferToDriverDataItem = ((TransferToDriver)context.DataItem); var transferToDriverDataItem = ((TransferToDriver)context.DataItem);
if (HasReadPermission(transferToDriverDataItem.UserProductMappingId)) if (HasReadPermission(transferToDriverDataItem.UserProductMappingId))
email = transferToDriverDataItem.UserProductMapping.User.EmailAddress; email = transferToDriverDataItem.UserProductMapping?.User.EmailAddress;
} }
<text>@email</text> <text>@email</text>
</CellDisplayTemplate> </CellDisplayTemplate>
@ -81,7 +82,7 @@
<CellDisplayTemplate> <CellDisplayTemplate>
@{ @{
var transferToDriverDataItem = (TransferToDriver)context.DataItem; var transferToDriverDataItem = (TransferToDriver)context.DataItem;
<text>@_cars.FirstOrDefault(x => x.Id == transferToDriverDataItem.CarId)?.LicencePlate</text> <text>@_cars.FirstOrDefault(x => x.Id == transferToDriverDataItem?.CarId)?.LicencePlate</text>
} }
</CellDisplayTemplate> </CellDisplayTemplate>
<CellEditTemplate> <CellEditTemplate>

4
TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
View File

@ -794,7 +794,9 @@ namespace TIAMWebApp.Server.Controllers
var result = await _adminDal.AddTransferToDriverAsync(transferToDriver); var result = await _adminDal.AddTransferToDriverAsync(transferToDriver);
//TODO: Send email to driver... - J. //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] //[Authorize]