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

Merge branch 'v0.0.5.1' of https://git.aycode.com/Adam/TourIAm into v0.0.5.1

This commit is contained in:
Adam 2025-09-26 15:37:29 +02:00
parent eda1da7cca 8e33abbf7b
commit a1de704cef
1 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,7 @@
@page "/sysadmin/transfers"
@using System.Drawing
@using System.Security.Cryptography
@using System.Text
@using BlazorAnimation
@using TIAM.Core.Consts
@using TIAM.Core.Enums
@ -20,6 +23,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
@using AyCode.Utils.Extensions
@using DevExpress.Data.Filtering
@using TIAM.Entities.Drivers
@using TIAM.Entities.Emails
@ -121,11 +125,24 @@
<DxGridDataColumn FieldName="Price" Caption="Price" Width="70" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="Revenue" Caption="Revenue" Width="70" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="FullName" />
<DxGridDataColumn Caption="Driver" Width="120">
<DxGridDataColumn Caption="Driver" Width="120" Name="@DriversColumnNameConst">
<CellDisplayTemplate>
@{
var keyItem = (Transfer)context.DataItem;
<text>@(string.Join(", ", keyItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.Name)))</text>
var tranferItem = (Transfer)context.DataItem;
var driverBgStyle = "border-radius: 10px; float: left; width: 20px; height: 20px; margin: 4px;";
var firstTransferDriver = tranferItem.TransferToDrivers.FirstOrDefault();
var firstDriverName = firstTransferDriver?.UserProductMapping?.User?.Profile?.Name;
if (!firstDriverName.IsNullOrWhiteSpace())
{
driverBgStyle += $" background-color: $#{firstDriverName.GetHashCode():X8} !important";
}
<div>
<div style="@driverBgStyle"></div>
<div style="position: relative; float: left;">@(string.Join(", ", tranferItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.Name)))</div>
</div>
}
</CellDisplayTemplate>
@ -165,7 +182,7 @@
</DxTabPage>
<DxTabPage Text="Driver">
<TransferToDriverGridComponent ContextId="((Transfer)context.DataItem).Id" ParentData="(Transfer)context.DataItem"
CommandColumnVisible="((Transfer)context.DataItem).TransferStatusType < TransferStatusType.Finished"
CommandColumnVisible="((Transfer)context.DataItem).TransferStatusType < TransferStatusType.Finished"
OnTransferToDriverChanged="OnTransferToDriverChanged" />
</DxTabPage>
</DxTabs>
@ -268,6 +285,7 @@
@code {
private const string DriversColumnNameConst = "DriverNames";
private LoggerClient<ManageTransfers> _logger;
private bool _popupVisible;
@ -353,27 +371,35 @@
{
e.Style = "background-color: rgba(0, 0, 0, 0.08)";
e.CssClass = "header-bold";
if (e.Column.Name == DriversColumnNameConst)
{
//TODO: LoaderIcon
//loaderIcon.Visible = _allTransfersDrivers?.Count == 0;
// if (_allTransfersDrivers?.Count == 0)
// {
// //e.CssClass += " loaderIcon";
// }
}
}
if (e.ElementType != GridElementType.DataRow) return;
var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
if (transferStatus == null) return;
if (e.Grid?.GetRowValue(e.VisibleIndex, nameof(Transfer.TransferStatusType)) is not TransferStatusType transferStatusValue) return;
var transferStatusByte = (byte)transferStatus;
switch (transferStatusByte)
switch (transferStatusValue)
{
case 5:
case TransferStatusType.OrderSubmitted:
e.CssClass = "bg-important";
break;
case > 5 and < 35:
case > TransferStatusType.OrderSubmitted and < TransferStatusType.Finished:
e.CssClass = "bg-attention";
break;
case 35:
case TransferStatusType.Finished:
e.CssClass = "bg-finished";
break;
case > 35:
case > TransferStatusType.Finished:
e.CssClass = "bg-cancel";
break;
}
@ -590,10 +616,8 @@
// _allTransfersDrivers = await AdminSignalRClient.GetTransferToDriversByProductId(TiamConstClient.TransferProductId);
// RefreshDatasourceAllTransferToDrivers(transfers);
//TODO: itt kell az animált Driver column töltő icon-t megjeleníteni! - J.
AdminSignalRClient.GetTransferToDriversByProductIdAsync(TiamConstClient.TransferProductId, response =>
{
//TODO: itt kell a Driver column töltő icon-t eltüntetni! - J.
if (response.ResponseData == null || response.ResponseData.Count == 0) return Task.CompletedTask;
_allTransfersDrivers.AddRange(response.ResponseData);