Compare commits
4 Commits
4b2dbfb6ef
...
7da67aa554
| Author | SHA1 | Date |
|---|---|---|
|
|
7da67aa554 | |
|
|
e9dd0eae02 | |
|
|
df5a01a17e | |
|
|
61532c4502 |
|
|
@ -21,6 +21,9 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign
|
|||
public int OrderId { get; set; }
|
||||
|
||||
public Guid UserId { get; set; }
|
||||
/// <summary>
|
||||
/// HOTEL ProductId!!!!
|
||||
/// </summary>
|
||||
public Guid? ProductId { get; set; }
|
||||
//public Guid? UserProductMappingId { get; set; }
|
||||
//public Guid? UserProductToCarId { get; set; }
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
[NonAction]
|
||||
[SignalR(SignalRTags.RemoveTransfer)]
|
||||
public async Task<Transfer?> 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]
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ namespace Tiam.Services.Client.Tests
|
|||
{
|
||||
private const string UserIdString = "540271F6-C604-4C16-8160-D5A7CAFEDF00";
|
||||
private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
|
||||
private const string TransferIdString = "108E5A63-AA9E-47BE-ACFA-00306FFC5215";
|
||||
private const string TransferIdString = "E5A4793D-79EE-4B39-B72B-6FC38FEBDDD5";
|
||||
|
||||
private readonly SignalRDataSource<Transfer> _signalRDataSource = new(new AdminSignalRClient(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRDataSourceTest)) }),
|
||||
SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));
|
||||
|
|
|
|||
Loading…
Reference in New Issue