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

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

@ -143,7 +143,7 @@
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="ReferralId" DisplayFormat="N" Visible="false" /> <DxGridDataColumn FieldName="ReferralId" DisplayFormat="N" Visible="false" />
<DxGridDataColumn FieldName="Comment" Caption="Comment" /> <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> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<DxTabs> <DxTabs>
@ -339,29 +339,40 @@
void Grid_CustomizeElement(GridCustomizeElementEventArgs e) void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
{ {
if (e.ElementType == GridElementType.HeaderCell) try
{ {
e.Style = "background-color: rgba(0, 0, 0, 0.08)"; if (e.ElementType == GridElementType.HeaderCell)
e.CssClass = "header-bold"; {
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;
}
} }
catch (Exception ex)
if (e.ElementType != GridElementType.DataRow) return;
var transferStatusType = (byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType");
switch (transferStatusType)
{ {
case 5: _logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
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;
} }
} }

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

@ -591,14 +591,21 @@ namespace TIAMWebApp.Server.Controllers
[HttpPost] [HttpPost]
[Route(APIUrls.UpdateTransferRouteName)] [Route(APIUrls.UpdateTransferRouteName)]
[SignalR(SignalRTags.UpdateTransfer)] [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); [NonAction]
//return transferToModify; [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] //[Authorize]