From d40d256ab7dbdda3eaad28f8b939bedb4e2113fd Mon Sep 17 00:00:00 2001 From: Loretta Date: Tue, 25 Jun 2024 19:15:42 +0200 Subject: [PATCH 1/4] fix --- .../Controllers/ServiceProviderAPIController.cs | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index cba3d280..fe16c273 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -371,19 +371,12 @@ namespace TIAMWebApp.Server.Controllers [Route(APIUrls.AddProductRouteName)] [Tags("In-Progress", "Product")] [SignalR(SignalRTags.AddProduct)] - public async Task AddProduct([FromBody] Product product) + public async Task AddProduct([FromBody] Product product) { _logger.Info(@"AddProduct called"); - if (product == null) - { - return BadRequest("Product is required"); - } - else - { - var result = await adminDal.AddProductAsync(product); - return Ok(product); - } + var result = await adminDal.AddProductAsync(product); + return product; } //[HttpPost] From 8537933931e665c2ec7a2dfdef72f78dde6c332b Mon Sep 17 00:00:00 2001 From: Loretta Date: Wed, 26 Jun 2024 07:42:35 +0200 Subject: [PATCH 2/4] Devexpress v24.1.3; TransferStatusType filter in progress.... --- TIAMMobileApp/TIAMMobileApp.csproj | 6 +- .../User/SysAdmins/ManageTransfers.razor | 51 +++++++++--- .../Shared/Components/Grids/TiamGrid.cs | 2 +- TIAMSharedUI/TIAMSharedUI.csproj | 2 +- TIAMSharedUI/TIAMSharedUI.csproj.bak | 82 +++++++++++++++++++ .../ClientSide/UI/TransferStatusModel.cs | 4 +- 6 files changed, 129 insertions(+), 18 deletions(-) create mode 100644 TIAMSharedUI/TIAMSharedUI.csproj.bak 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; From b4c16ecf831aaa66c2d32dbd7694eea1dfa49814 Mon Sep 17 00:00:00 2001 From: Loretta Date: Wed, 26 Jun 2024 07:50:44 +0200 Subject: [PATCH 3/4] fix --- TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index c4dbeb57..b64d3f67 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -133,7 +133,7 @@ @{ - TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == Convert.ToInt16(context.Value)); + TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == (byte)context.Value)!; string transferStatusText = keyField.StatusName; @transferStatusText } From 81f09c3253d5ad3290d7773cbab7797d2e1b636d Mon Sep 17 00:00:00 2001 From: Loretta Date: Wed, 26 Jun 2024 08:22:17 +0200 Subject: [PATCH 4/4] TransferStatusType filter in progress v1.1.... --- .../User/SysAdmins/ManageTransfers.razor | 58 ++++++++++--------- 1 file changed, 32 insertions(+), 26 deletions(-) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index b64d3f67..b0e6eecf 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -150,22 +150,22 @@ - + @{ - var transfer2 = (Transfer)EditFormContext.EditModel; + var transfer2 = (Transfer)editFormContext.EditModel; } - @EditFormContext.GetEditor("FirstName") + @editFormContext.GetEditor("FirstName") - @EditFormContext.GetEditor("LastName") + @editFormContext.GetEditor("LastName") - @EditFormContext.GetEditor("ToAddress") + @editFormContext.GetEditor("ToAddress") - @EditFormContext.GetEditor("FromAddress") + @editFormContext.GetEditor("FromAddress") @@ -176,15 +176,15 @@ - @EditFormContext.GetEditor("PassengerCount") + @editFormContext.GetEditor("PassengerCount") - @EditFormContext.GetEditor("Payed") + @editFormContext.GetEditor("Payed") - @EditFormContext.GetEditor("TransferStatusType") + @editFormContext.GetEditor("TransferStatusType") @@ -192,7 +192,7 @@
- @@ -231,24 +231,15 @@ @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; + private DxTagBox _filterTag; - List SelectedCategories { get; set; } = [];//[Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!]; + List SelectedCategories { get; set; } + = Statuses.Where(x => x.StatusValue != (byte)TransferStatusType.Finished && x.StatusValue != (byte)TransferStatusType.UserCanceled && x.StatusValue != (byte)TransferStatusType.AdminDenied).ToList(); public List IgnoreList = [ @@ -317,7 +308,7 @@ public async Task SubmitForm(object result) { - var messageModel = result as MessageWizardModel; + var messageModel = (result as MessageWizardModel)!; messageModel.ContextId = _messageWizardModel.ContextId; //messageModel.SenderId = sessionService.User.UserId; @@ -385,14 +376,29 @@ transferEditModel.ContactEmail = "your@email.address"; } + 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 void DataSourceChanged(IList transfers) { _logger.Info("DataSourceChanged called"); InitializeAppointments(transfers); - // if(!SelectedCategories.Any()) - // SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!]; + if (SelectedCategories.Count > 0) + TagBox_ValuesChanged(SelectedCategories); + + if(!SelectedCategories.Any()) + SelectedCategories = [Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!]; + + // var filterTransferStatusType = Statuses.FirstOrDefault(x => x.StatusValue == (byte)TransferStatusType.Finished)!; @@ -481,7 +487,7 @@ { if (firstRender) { - _gridTransfer.ExpandDetailRow(0); + //_gridTransfer.ExpandDetailRow(0); } }