diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 89677525..54ed85ca 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -143,7 +143,7 @@
-
+
@@ -339,29 +339,40 @@
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
{
- if (e.ElementType == GridElementType.HeaderCell)
+ try
{
- e.Style = "background-color: rgba(0, 0, 0, 0.08)";
- e.CssClass = "header-bold";
+ if (e.ElementType == GridElementType.HeaderCell)
+ {
+ e.Style = "background-color: rgba(0, 0, 0, 0.08)";
+ e.CssClass = "header-bold";
+ }
+
+ if (e.ElementType != GridElementType.DataRow) return;
+
+ var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
+ if (transferStatus == null) return;
+
+ var transferStatusByte = (byte)transferStatus;
+
+ switch (transferStatusByte)
+ {
+ case 5:
+ e.CssClass = "bg-important";
+ break;
+ case > 5 and < 35:
+ e.CssClass = "bg-attention";
+ break;
+ case 35:
+ e.CssClass = "bg-finished";
+ break;
+ case > 35:
+ e.CssClass = "bg-cancel";
+ break;
+ }
}
-
- if (e.ElementType != GridElementType.DataRow) return;
-
- var transferStatusType = (byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType");
- switch (transferStatusType)
+ catch (Exception ex)
{
- case 5:
- e.CssClass = "bg-important";
- break;
- case > 5 and < 35:
- e.CssClass = "bg-attention";
- break;
- case 35:
- e.CssClass = "bg-finished";
- break;
- case > 35:
- e.CssClass = "bg-cancel";
- break;
+ _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
}
}
diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
index d5c97e39..4047a33d 100644
--- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
+++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs
@@ -591,14 +591,21 @@ namespace TIAMWebApp.Server.Controllers
[HttpPost]
[Route(APIUrls.UpdateTransferRouteName)]
[SignalR(SignalRTags.UpdateTransfer)]
- public async Task UpdateTransfer(Transfer transferToModify)
+ public async Task 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);
+ }
+
+ [NonAction]
+ [SignalR(SignalRTags.RemoveTransfer)]
+ public async Task RemoveTransfer(Transfer transfer)
+ {
+ _logger.Info($"RemoveTransfer called! + {transfer.Id}");
- //await _adminDal.UpdateTransferAsync(transferToModify);
- //return transferToModify;
+ var result = await _adminDal.RemoveTransferAsync(transfer);
+ return result ? transfer : null;
}
//[Authorize]