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-04-13 17:51:07 +02:00
parent 3b3b8ae700 1378e0199e
commit 3265731367
5 changed files with 493 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TIAMSharedUI/Pages/User/SysAdmins/LogViewerGridComponent.razor
View File

@ -129,7 +129,7 @@
private static DateTime _toDate = DateTime.Today;
private static int _takeCount = 250;
private object[] _contextParams = new object[3] { _takeCount, _fromDate, _toDate };
private object[] _contextParams = [_takeCount, _fromDate, _toDate];
private LoggerClient<LogViewerGridComponent> _logger;
private static List<LogLevel> _selectedLogLevels = [LogLevel.Error, LogLevel.Warning, LogLevel.Suggest];
@ -154,12 +154,12 @@
if (_selectedLogLevels.Count > 0)
{
filterCriteria = new InOperator(nameof(LogLevel), _selectedLogLevels);
filterCriteria = new InOperator(nameof(LogItemViewerModel.LogLevel), _selectedLogLevels);
filterText = GetFilterText(_selectedLogLevels);
}
_filterText = filterText;
_logViewerGrid.SetFieldFilterCriteria(nameof(LogLevel), filterCriteria);
_logViewerGrid.SetFieldFilterCriteria(nameof(LogItemViewerModel.LogLevel), filterCriteria);
}
private async Task OnValueChangedTakeCount(int value)
@ -199,7 +199,7 @@
{
if (e.ElementType != GridElementType.DataRow) return;
var logLevelObject = e.Grid?.GetRowValue(e.VisibleIndex, nameof(LogLevel));
var logLevelObject = e.Grid?.GetRowValue(e.VisibleIndex, nameof(LogItemViewerModel.LogLevel));
if (logLevelObject == null) return;
var levelObject = (LogLevel)logLevelObject;

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

@ -21,6 +21,7 @@
@using AyCode.Core
@using AyCode.Core.Helpers
@using DevExpress.Data.Filtering
@using TIAM.Entities.Drivers
@using TIAM.Entities.Emails
@using TIAMSharedUI.Shared.Components.BaseComponents
@using TIAM.Services
@ -89,6 +90,7 @@ Closed="EulaPopupClosed">
OnGridItemChanged="DataSourceItemChanged"
OnGridItemDeleting="DataItemDeleting"
OnGridEditModelSaving="DataItemSaving"
SelectedDataItemChanged="OnSelectedDataItemChanged"
CustomizeElement="Grid_CustomizeElement"
CustomizeEditModel="Grid_CustomizeEditModel"
EditMode="GridEditMode.EditForm"
@ -122,9 +124,8 @@ Closed="EulaPopupClosed">
<DxGridDataColumn Caption="Driver" Width="120">
<CellDisplayTemplate>
@{
var keyField = context.Value;
var keyItem = (Transfer)context.DataItem;
<DriverDisplayNameComponent TransferId="@keyItem.Id"></DriverDisplayNameComponent>
<text>@(string.Join(", ", keyItem.TransferToDrivers.Select(x => x.UserProductMapping?.User?.Profile?.GetFullName())))</text>
}
</CellDisplayTemplate>
@ -135,9 +136,8 @@ Closed="EulaPopupClosed">
<DxGridDataColumn FieldName="ContactEmail" Width="120">
<CellDisplayTemplate>
@{
var keyField = context.Value;
var keyItem = (Transfer)context.DataItem;
string buttonText = "Contact";
var buttonText = "Contact";
<DxButton Click="() => SendMail(keyItem)" Text="@buttonText" RenderStyle="ButtonRenderStyle.Primary" />
}
</CellDisplayTemplate>
@ -148,8 +148,8 @@ Closed="EulaPopupClosed">
<CellDisplayTemplate>
@{
TransferStatusModel keyField = TransferStatusModel.GetStatusModel((TransferStatusType)context.Value);
string transferStatusText = keyField.StatusName;
var keyField = TransferStatusModel.GetStatusModel((TransferStatusType)context.Value);
var transferStatusText = keyField.StatusName;
<text>@transferStatusText</text>
}
</CellDisplayTemplate>
@ -220,10 +220,15 @@ Closed="EulaPopupClosed">
<ToolbarTemplate>
<div>
<DxTagBox Data="@TransferStatusModel.AllStatuses.Values" Values="@_selectedCategories" @ref="_filterTag"
ValuesChanged="(IEnumerable<TransferStatusModel> values) => TagBox_ValuesChanged(values)"
<DxTagBox Data="@(Enum.GetValues<TransferStatusType>().ToList())" Values="@_selectedCategories"
NullText="Select status type..." ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" aria-label="Select status type"
ValuesChanged="(IEnumerable<TransferStatusType> values) => TagBox_ValuesChanged(values)" />
@*//NE TÖRÖLD KI! - J.
<DxTagBox TData="@(TransferStatusModel)" TValue="@(TransferStatusModel)" Data="@TransferStatusModel.AllStatuses.Values" Values="@_selectedCategories"
@ref="_filterTag" ValuesChanged="(IEnumerable<TransferStatusModel> values) => TagBox_ValuesChanged(values)"
ValueFieldName="StatusValue" TextFieldName="StatusName" NullText="Select status type..."
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" aria-label="Select status type" />
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto" aria-label="Select status type" />*@
</div>
</ToolbarTemplate>
</TransferGrid>
@ -278,8 +283,12 @@ Closed="EulaPopupClosed">
"ContextType"
];
private static List<TransferStatusModel> _selectedCategories = TransferStatusModel.AllStatuses.Values.Where(x => x.StatusValue != TransferStatusType.Finished && x.StatusValue != TransferStatusType.UserCanceled && x.StatusValue != TransferStatusType.AdminDenied).ToList();
private string _filterText = GetFilterText(_selectedCategories.Select(x => x.StatusValue).ToList());
private static List<TransferStatusType> _selectedCategories = Enum.GetValues<TransferStatusType>().Where(x => x != TransferStatusType.Finished && x != TransferStatusType.UserCanceled && x != TransferStatusType.AdminDenied).ToList();
private string _filterText = GetFilterText(_selectedCategories);
// NE TÖRÖLD KI! - J.
// private static List<TransferStatusModel> _selectedCategories = TransferStatusModel.AllStatuses.Values.Where(x => x.StatusValue != TransferStatusType.Finished && x.StatusValue != TransferStatusType.UserCanceled && x.StatusValue != TransferStatusType.AdminDenied).ToList();
// private string _filterText = GetFilterText(_selectedCategories.Select(x => x.StatusValue).ToList());
private MessageWizardModel _messageWizardModel = new();
@ -288,10 +297,6 @@ Closed="EulaPopupClosed">
DateTime StartDate { get; set; } = DateTime.Today;
DxSchedulerDataStorage _dataStorage = new();
private Dictionary<Guid, string> driverNamesByTransferId = [];
void SendMail(Transfer item)
{
_logger.Info($"Preparing mail to {item.ContactEmail}, {item.Id}");
@ -336,7 +341,7 @@ Closed="EulaPopupClosed">
CancelCreateClick();
}
async void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
void Grid_CustomizeElement(GridCustomizeElementEventArgs e)
{
try
{
@ -346,8 +351,6 @@ Closed="EulaPopupClosed">
e.CssClass = "header-bold";
}
if (e.ElementType != GridElementType.DataRow) return;
var transferStatus = e.Grid?.GetRowValue(e.VisibleIndex, "TransferStatusType");
@ -370,16 +373,11 @@ Closed="EulaPopupClosed">
e.CssClass = "bg-cancel";
break;
}
}
catch (Exception ex)
{
_logger.Error($"Grid_CustomizeElement; {ex.Message}", ex);
}
}
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
@ -401,7 +399,7 @@ Closed="EulaPopupClosed">
private static string GetFilterText(ICollection<TransferStatusType> selectedTransferStatuses)
=> selectedTransferStatuses.Count == 0 ? string.Empty : CriteriaOperator.FromLambda<Transfer>(t => selectedTransferStatuses.Contains(t.TransferStatusType)).ToString();
void TagBox_ValuesChanged(IEnumerable<TransferStatusModel> newSelectedCategories)
void TagBox_ValuesChanged(IEnumerable<TransferStatusType> newSelectedCategories)
{
var filterText = string.Empty;
InOperator? filterCriteria = null;
@ -410,14 +408,34 @@ Closed="EulaPopupClosed">
if (_selectedCategories.Count > 0)
{
filterCriteria = new InOperator("TransferStatusType", _selectedCategories.Select(c => c.StatusValue));
filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList());
filterCriteria = new InOperator(nameof(Transfer.TransferStatusType), _selectedCategories);
filterText = GetFilterText(_selectedCategories);
}
_filterText = filterText;
_gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria);
_gridTransfer.SetFieldFilterCriteria(nameof(Transfer.TransferStatusType), filterCriteria);
}
// NE TÖRÖLD KI! - J.
// void TagBox_ValuesChanged(IEnumerable<TransferStatusModel> newSelectedCategories)
// {
// var filterText = string.Empty;
// InOperator? filterCriteria = null;
// _selectedCategories = newSelectedCategories.ToList();
// //_selectedCategories.Clear();
// //_selectedCategories.AddRange(newSelectedCategories);
// if (_selectedCategories.Count > 0)
// {
// filterCriteria = new InOperator(nameof(Transfer.TransferStatusType), _selectedCategories.Select(c => c.StatusValue));
// filterText = GetFilterText(_selectedCategories.Select(x => (TransferStatusType)x.StatusValue).ToList());
// }
// _filterText = filterText;
// _gridTransfer.SetFieldFilterCriteria(nameof(Transfer.TransferStatusType), filterCriteria);
// }
private void DataSourceChanged(IList<Transfer> transfers)
{
_logger.Info("DataSourceChanged called");
@ -461,7 +479,10 @@ Closed="EulaPopupClosed">
protected override Task OnInitializedAsync()
{
_logger = new LoggerClient<ManageTransfers>(_logWriters.ToArray());
// var result = AdminSignalRClient.GetTransferDrivers
//await AdminSignalRClient.GetAllCarsByProductIdAsync(TiamConstClient.TransferProductId, _cars, StateHasChanged);
//await base.OnInitializedAsync();
return base.OnInitializedAsync();
}
@ -521,4 +542,34 @@ Closed="EulaPopupClosed">
}
}
private void OnSelectedDataItemChanged(object selectedRow)
{
if (selectedRow is not Transfer selectedTransfer) return;
RefreshTransferToDriversData(selectedTransfer, () => { _gridTransfer.Reload(); });
}
private void RefreshTransferToDriversData(Transfer? transfer, Action? callback = null)
{
try
{
if (transfer == null || transfer.TransferToDrivers.Count != 0 || transfer.TransferStatusType < TransferStatusType.AssignedToDriver)
return;
AdminSignalRClient.GetByIdAsync<List<TransferToDriver>?>(SignalRTags.GetTransferDriversByTransferId, x =>
{
if (x?.ResponseData == null) return Task.CompletedTask;
transfer.TransferToDrivers.UpdateCollection(x.ResponseData, false);
callback?.Invoke();
return Task.CompletedTask;
}, transfer.Id).Forget();
}
catch (Exception ex)
{
_logger.Error($"RefreshTransferToDriversData error; transferId: {transfer?.Id}", ex);
}
}
}

2
TIAMSharedUI/Shared/Components/Grids/TransferGrid.cs
View File

@ -6,8 +6,6 @@ namespace TIAMSharedUI.Shared.Components.Grids;
public class TransferGrid : TiamGrid<Transfer>
{
public TransferGrid() : base()
{
GetAllMessageTag = SignalRTags.GetTransfersByFilterText;//SignalRTags.GetTransfers;

4
TIAMWebApp/Server/appsettings.json
View File

@ -2,8 +2,8 @@
"ConnectionStrings": {
//"DeveloperDbConnection": "Data Source=185.51.190.197;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"
"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"
//"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEVRELEASE;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"
//"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEV;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"
"DeveloperDbConnection": "Data Source=194.164.235.47;Initial Catalog=TIAM_DEVRELEASE;Trusted_Connection=false;Encrypt=false;TrustServerCertificate=True;Connect Timeout=200;User ID=Anata_Development_Team;Password=v6f_?xNfg9N1;MultipleActiveResultSets=true"
},
"Logging": {
"LogLevel": {

2
TIAMWebApp/Shared/Services/AdminSignalRClient.cs
View File

@ -2,6 +2,7 @@
using AyCode.Core.Consts;
using AyCode.Core.Helpers;
using AyCode.Services.Loggers;
using AyCode.Services.SignalRs;
using Microsoft.Extensions.DependencyInjection;
using TIAM.Entities.Drivers;
using TIAM.Entities.Transfers;
@ -109,7 +110,6 @@ namespace TIAMWebApp.Shared.Application.Services
public async Task<List<TransferToDriver>> GetTransferDrivers(Guid transferId)
=> await GetByIdAsync<List<TransferToDriver>>(SignalRTags.GetTransferDriversByTransferId, transferId) ?? [];
public async Task<TransferToDriver?> AddTransferDriver(TransferToDriver transferToDriver)
{
throw new NotImplementedException();