diff --git a/TIAMMobileApp/TIAMMobileApp.csproj b/TIAMMobileApp/TIAMMobileApp.csproj
index 0ed45a47..fe1754e1 100644
--- a/TIAMMobileApp/TIAMMobileApp.csproj
+++ b/TIAMMobileApp/TIAMMobileApp.csproj
@@ -88,15 +88,15 @@
-
+
-
+
-
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index d5102a77..c4dbeb57 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -19,6 +19,7 @@
@using AyCode.Core.Consts
@using AyCode.Core
@using AyCode.Core.Helpers
+@using DevExpress.Data.Filtering
@using TIAM.Entities.Emails
@layout AdminLayout
@inject IEnumerable LogWriters
@@ -189,7 +190,14 @@
-
+
+
+
+
+
@@ -223,12 +231,25 @@
@code {
+
+ void TagBox_ValuesChanged(IEnumerable newSelectedCategories)
+ {
+ SelectedCategories = newSelectedCategories.ToList();
+ var filterCriteria = SelectedCategories.Any()
+ ? new InOperator("TransferStatusType", SelectedCategories.Select(c => c.StatusValue))
+ : null;
+
+ _gridTransfer.SetFieldFilterCriteria("TransferStatusType", filterCriteria);
+ }
+
private LoggerClient _logger;
private bool _popupVisible;
private bool _autoCollapseDetailRow;
private TransferGrid _gridTransfer;
+ List SelectedCategories { get; set; } = [];//[Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
+
public List IgnoreList =
[
"ReceiverEmailAddress",
@@ -240,17 +261,17 @@
"ContextId",
];
- public List Statuses { get; set; } =
+ public static List Statuses { get; set; } =
[
- new(Convert.ToInt16(TransferStatusType.OrderSubmitted), "Order submitted"),
- new(Convert.ToInt16(TransferStatusType.OrderConfirmed), "Order confirmed"),
- new(Convert.ToInt16(TransferStatusType.AssignedToDriver), "Assigned to driver"),
- new(Convert.ToInt16(TransferStatusType.DriverConfirmed), "Driver confirmed"),
- new(Convert.ToInt16(TransferStatusType.DriverEnRoute), "Driver enroute"),
- new(Convert.ToInt16(TransferStatusType.PassengerPickup), "Passenger in car"),
- new(Convert.ToInt16(TransferStatusType.Finished), "Finished"),
- new(Convert.ToInt16(TransferStatusType.UserCanceled), "User cancelled"),
- new(Convert.ToInt16(TransferStatusType.AdminDenied), "Admin cancelled")
+ new(Convert.ToByte(TransferStatusType.OrderSubmitted), "Order submitted"),
+ new(Convert.ToByte(TransferStatusType.OrderConfirmed), "Order confirmed"),
+ new(Convert.ToByte(TransferStatusType.AssignedToDriver), "Assigned to driver"),
+ new(Convert.ToByte(TransferStatusType.DriverConfirmed), "Driver confirmed"),
+ new(Convert.ToByte(TransferStatusType.DriverEnRoute), "Driver enroute"),
+ new(Convert.ToByte(TransferStatusType.PassengerPickup), "Passenger in car"),
+ new(Convert.ToByte(TransferStatusType.Finished), "Finished"),
+ new(Convert.ToByte(TransferStatusType.UserCanceled), "User cancelled"),
+ new(Convert.ToByte(TransferStatusType.AdminDenied), "Admin cancelled")
];
private MessageWizardModel _messageWizardModel = new();
@@ -369,6 +390,14 @@
_logger.Info("DataSourceChanged called");
InitializeAppointments(transfers);
+
+ // if(!SelectedCategories.Any())
+ // SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!];
+
+ // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!;
+
+ // if (SelectedCategories.All(x => x.StatusValue != filterTransferStatusType.StatusValue))
+ // SelectedCategories.Add(filterTransferStatusType);
}
private void DataSourceItemChanging(GridDataItemChangingEventArgs args)
diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
index 8a84bba3..09aebe07 100644
--- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
@@ -114,7 +114,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
Logger.Debug($"{_gridLogName} OnDataSourceLoaded");
Reload();
- _dataSource.LoadItem(_dataSource.First().Id).Forget();
+ //_dataSource.LoadItem(_dataSource.First().Id).Forget();
return OnDataSourceChanged.InvokeAsync(_dataSource);
}
diff --git a/TIAMSharedUI/TIAMSharedUI.csproj b/TIAMSharedUI/TIAMSharedUI.csproj
index baa25e1a..c274a95c 100644
--- a/TIAMSharedUI/TIAMSharedUI.csproj
+++ b/TIAMSharedUI/TIAMSharedUI.csproj
@@ -14,7 +14,7 @@
-
+
diff --git a/TIAMSharedUI/TIAMSharedUI.csproj.bak b/TIAMSharedUI/TIAMSharedUI.csproj.bak
new file mode 100644
index 00000000..baa25e1a
--- /dev/null
+++ b/TIAMSharedUI/TIAMSharedUI.csproj.bak
@@ -0,0 +1,82 @@
+
+
+
+ net8.0
+ enable
+ enable
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Core.Server.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Entities.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Interfaces.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Models.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Services.dll
+
+
+ ..\..\AyCode.Core\AyCode.Services.Server\bin\Debug\net8.0\AyCode.Utils.dll
+
+
+
+
+
+ MyResources.resx
+ True
+ True
+
+
+
+
+
+ PreserveNewest
+ MyResources.Designer.cs
+ PublicResXFileCodeGenerator
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs
index 7bdc4dd3..eef1cb87 100644
--- a/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs
+++ b/TIAMWebApp/Shared/Models/ClientSide/UI/TransferStatusModel.cs
@@ -2,10 +2,10 @@
{
public class TransferStatusModel
{
- public int StatusValue { get; set; }
+ public byte StatusValue { get; set; }
public string StatusName { get; set; }
- public TransferStatusModel(int statusValue, string statusName)
+ public TransferStatusModel(byte statusValue, string statusName)
{
StatusValue = statusValue;
StatusName = statusName;