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

fixes

This commit is contained in:
Loretta 2024-06-30 16:41:45 +02:00
parent 13d7b0930a
commit 61532c4502
2 changed files with 44 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -143,7 +143,7 @@
</DxGridDataColumn>
<DxGridDataColumn FieldName="ReferralId" DisplayFormat="N" Visible="false" />
<DxGridDataColumn FieldName="Comment" Caption="Comment" />
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="125" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="125" Visible="false" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
</Columns>
<DetailRowTemplate>
<DxTabs>
@ -338,6 +338,8 @@
}
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
{
try
{
if (e.ElementType == GridElementType.HeaderCell)
{
@ -347,8 +349,12 @@
if (e.ElementType != GridElementType.DataRow) return;
var transferStatusType = (byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType");
switch (transferStatusType)
var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
if (transferStatus == null) return;
var transferStatusByte = (byte)transferStatus;
switch (transferStatusByte)
{
case 5:
e.CssClass = "bg-important";
@ -364,6 +370,11 @@
break;
}
}
catch (Exception ex)
{
_logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
}
}
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{

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

@ -591,14 +591,21 @@ namespace TIAMWebApp.Server.Controllers
[HttpPost]
[Route(APIUrls.UpdateTransferRouteName)]
[SignalR(SignalRTags.UpdateTransfer)]
public async Task<Transfer?> UpdateTransfer(Transfer transferToModify)
public async Task<Transfer?> UpdateTransfer(Transfer transfer)
{
_logger.Info($"UpdateTransfer called! + {transferToModify.Id}");
_logger.Info($"UpdateTransfer called! + {transfer.Id}");
return await _adminDal.UpdateTransferAsync(transferToModify);
return await _adminDal.UpdateTransferAsync(transfer);
}
//await _adminDal.UpdateTransferAsync(transferToModify);
//return transferToModify;
[NonAction]
[SignalR(SignalRTags.RemoveTransfer)]
public async Task<Transfer?> RemoveTransfer(Transfer transfer)
{
_logger.Info($"RemoveTransfer called! + {transfer.Id}");
var result = await _adminDal.RemoveTransferAsync(transfer);
return result ? transfer : null;
}
//[Authorize]