Compare commits

...

4 Commits

Author SHA1 Message Date
Loretta 7da67aa554 fixes 2024-06-30 16:58:21 +02:00
Loretta e9dd0eae02 fix 2024-06-30 16:54:24 +02:00
Loretta df5a01a17e Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm 2024-06-30 16:41:50 +02:00
Loretta 61532c4502 fixes 2024-06-30 16:41:45 +02:00
4 changed files with 48 additions and 27 deletions

View File

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

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>
@ -338,6 +338,8 @@
} }
void Grid_CustomizeElement(GridCustomizeElementEventArgs e) void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
{
try
{ {
if (e.ElementType == GridElementType.HeaderCell) if (e.ElementType == GridElementType.HeaderCell)
{ {
@ -347,8 +349,12 @@
if (e.ElementType != GridElementType.DataRow) return; if (e.ElementType != GridElementType.DataRow) return;
var transferStatusType = (byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType"); var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
switch (transferStatusType) if (transferStatus == null) return;
var transferStatusByte = (byte)transferStatus;
switch (transferStatusByte)
{ {
case 5: case 5:
e.CssClass = "bg-important"; e.CssClass = "bg-important";
@ -364,6 +370,11 @@
break; break;
} }
} }
catch (Exception ex)
{
_logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
}
}
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{ {

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]

View File

@ -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 = "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)) }), 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));