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

Compare commits

base: Adam:7da67aa554150d8a8e3cfeaa306a163b47a5099a
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:4b2dbfb6efb3bac87ce32ce4010fc0415e1fce92
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "7da67aa554150d8a8e3cfeaa306a163b47a5099a" and "4b2dbfb6efb3bac87ce32ce4010fc0415e1fce92" have entirely different histories.
7da67aa554 ... 4b2dbfb6ef

4 changed files with 27 additions and 48 deletions
Show Stats Expand all files Collapse all files

3
TIAM.Entities/Transfers/Transfer.cs
View File

@ -21,9 +21,6 @@ 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; }

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

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

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

2
Tiam.Services.Client.Tests/SignalRDataSourceTest.cs
View File

@ -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 = "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)) }),
SignalRTiamCrudTags.TransferByUserCrudTags, Guid.Parse(UserIdString));