Compare commits
No commits in common. "7da67aa554150d8a8e3cfeaa306a163b47a5099a" and "4b2dbfb6efb3bac87ce32ce4010fc0415e1fce92" have entirely different histories.
7da67aa554
...
4b2dbfb6ef
|
|
@ -21,9 +21,6 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign
|
||||||
public int OrderId { get; set; }
|
public int OrderId { get; set; }
|
||||||
|
|
||||||
public Guid UserId { get; set; }
|
public Guid UserId { get; set; }
|
||||||
/// <summary>
|
|
||||||
/// HOTEL ProductId!!!!
|
|
||||||
/// </summary>
|
|
||||||
public Guid? ProductId { get; set; }
|
public Guid? ProductId { get; set; }
|
||||||
//public Guid? UserProductMappingId { get; set; }
|
//public Guid? UserProductMappingId { get; set; }
|
||||||
//public Guid? UserProductToCarId { get; set; }
|
//public Guid? UserProductToCarId { get; set; }
|
||||||
|
|
|
||||||
|
|
@ -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" Visible="false" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
|
<DxGridDataColumn FieldName="Created" DisplayFormat="g" Width="125" CaptionAlignment="GridTextAlignment.Center" TextAlignment="GridTextAlignment.Center" />
|
||||||
</Columns>
|
</Columns>
|
||||||
<DetailRowTemplate>
|
<DetailRowTemplate>
|
||||||
<DxTabs>
|
<DxTabs>
|
||||||
|
|
@ -338,8 +338,6 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
|
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
{
|
||||||
if (e.ElementType == GridElementType.HeaderCell)
|
if (e.ElementType == GridElementType.HeaderCell)
|
||||||
{
|
{
|
||||||
|
|
@ -349,12 +347,8 @@
|
||||||
|
|
||||||
if (e.ElementType != GridElementType.DataRow) return;
|
if (e.ElementType != GridElementType.DataRow) return;
|
||||||
|
|
||||||
var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
|
var transferStatusType = (byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType");
|
||||||
if (transferStatus == null) return;
|
switch (transferStatusType)
|
||||||
|
|
||||||
var transferStatusByte = (byte)transferStatus;
|
|
||||||
|
|
||||||
switch (transferStatusByte)
|
|
||||||
{
|
{
|
||||||
case 5:
|
case 5:
|
||||||
e.CssClass = "bg-important";
|
e.CssClass = "bg-important";
|
||||||
|
|
@ -370,11 +364,6 @@
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
_logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
|
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -591,21 +591,14 @@ namespace TIAMWebApp.Server.Controllers
|
||||||
[HttpPost]
|
[HttpPost]
|
||||||
[Route(APIUrls.UpdateTransferRouteName)]
|
[Route(APIUrls.UpdateTransferRouteName)]
|
||||||
[SignalR(SignalRTags.UpdateTransfer)]
|
[SignalR(SignalRTags.UpdateTransfer)]
|
||||||
public async Task<Transfer?> UpdateTransfer(Transfer transfer)
|
public async Task<Transfer?> UpdateTransfer(Transfer transferToModify)
|
||||||
{
|
{
|
||||||
_logger.Info($"UpdateTransfer called! + {transfer.Id}");
|
_logger.Info($"UpdateTransfer called! + {transferToModify.Id}");
|
||||||
|
|
||||||
return await _adminDal.UpdateTransferAsync(transfer);
|
return await _adminDal.UpdateTransferAsync(transferToModify);
|
||||||
}
|
|
||||||
|
|
||||||
[NonAction]
|
//await _adminDal.UpdateTransferAsync(transferToModify);
|
||||||
[SignalR(SignalRTags.RemoveTransfer)]
|
//return transferToModify;
|
||||||
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]
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ namespace Tiam.Services.Client.Tests
|
||||||
{
|
{
|
||||||
private const string UserIdString = "540271F6-C604-4C16-8160-D5A7CAFEDF00";
|
private const string UserIdString = "540271F6-C604-4C16-8160-D5A7CAFEDF00";
|
||||||
private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
|
private const string CompanyIdString = "3587F169-683C-4EEE-BCB5-E8D57F8C6DCE";
|
||||||
private const string TransferIdString = "E5A4793D-79EE-4B39-B72B-6FC38FEBDDD5";
|
private const string TransferIdString = "108E5A63-AA9E-47BE-ACFA-00306FFC5215";
|
||||||
|
|
||||||
private readonly SignalRDataSource<Transfer> _signalRDataSource = new(new AdminSignalRClient(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRDataSourceTest)) }),
|
private readonly SignalRDataSource<Transfer> _signalRDataSource = new(new AdminSignalRClient(new List<IAcLogWriterClientBase> { new SignaRClientLogItemWriter(AppType.TestUnit, LogLevel.Detail, nameof(SignalRDataSourceTest)) }),
|
||||||
SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));
|
SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue