From b2711064b4237ee0eac3e3951d82b55430de26aa Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 17 Jun 2024 11:04:11 +0200 Subject: [PATCH] razor pages --- TIAMSharedUI/Pages/EditTransfers.razor | 116 +++++++++++++++++- .../User/SysAdmins/ManageTransfers.razor | 20 +-- .../MessageDetailGridComponent.razor | 67 ++++++++++ .../User/SysAdmins/MessageGridComponent.razor | 65 ++++++++++ .../Controllers/TransferDataAPIController.cs | 4 +- 5 files changed, 252 insertions(+), 20 deletions(-) create mode 100644 TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor create mode 100644 TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor diff --git a/TIAMSharedUI/Pages/EditTransfers.razor b/TIAMSharedUI/Pages/EditTransfers.razor index 1aa79188..f5a29181 100644 --- a/TIAMSharedUI/Pages/EditTransfers.razor +++ b/TIAMSharedUI/Pages/EditTransfers.razor @@ -1,16 +1,22 @@ @page "/mytransfers/{transferId:guid}" @using TIAM.Entities.Transfers +@using TIAM.Resources @using TIAMWebApp.Shared.Application.Interfaces @using AyCode.Services.Loggers @using TIAM.Core.Enums +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Utility +@using TIAMSharedUI.Pages.User.SysAdmins +@using TIAMSharedUI.Pages.Components @inject HttpClient Http @inject NavigationManager navManager @inject IEnumerable LogWriters @inject ITransferDataService transferDataService @inject SumupService SumUpService @inject NavigationManager navigationManager +@inject IStringLocalizer localizer +@inject IWizardProcessor wizardProcessor Transfer details
@@ -18,6 +24,32 @@

Manage your transfer here

+ + + + + + + + + @if (isLoading) {
@@ -33,7 +65,10 @@ else if (!string.IsNullOrEmpty(errorMessage)) } else { -
+
+ + + @if (!editMode) { @@ -203,6 +238,12 @@ else } + + + + + +
} @@ -216,9 +257,82 @@ else private LoggerClient _logger; + private MessageWizardModel _messageWizardModel = new(); + + private bool _popupVisible; + private bool _autoCollapseDetailRow; + + + public List IgnoreList = + [ + "ReceiverEmailAddress", + "ReceiverFullName", + "ReceiverId", + "SenderEmailAddress", + "SenderFullName", + "SenderId", + "ContextId", + ]; + List StatusTypes = new List(); private bool editMode = false; + void SendMail(Transfer item) + { + _logger.Info($"Sending mail to {item.ContactEmail}, {item.Id}"); + + _messageWizardModel.ReceiverId = item.UserId; + _messageWizardModel.ContextId = item.Id; + _messageWizardModel.SenderEmailAddress = "info@touriam.com"; + _messageWizardModel.ReceiverEmailAddress = item.ContactEmail; + _messageWizardModel.ReceiverFullName = item.FullName; + _popupVisible = true; + } + + void CancelCreateClick() + { + + _popupVisible = false; + } + + void EulaPopupClosed() + { + //cancel clicked + + } + + void EulaPopupClosing(PopupClosingEventArgs args) + { + //myModel = new TransferWizardModel(); + _messageWizardModel = new MessageWizardModel(); + } + + public async Task SubmitForm(object result) + { + var messageModel = result as MessageWizardModel; + messageModel.ContextId = _messageWizardModel.ContextId; + //messageModel.SenderId = sessionService.User.UserId; + + string FormatEmailContent() + { + return $@" + + +

Dear {messageModel.SenderFullName},

+

{messageModel.Content}:

+

Best regards,
Tour I Am team

+ + "; + } + + messageModel.Content = FormatEmailContent(); + + _logger.Info(messageModel.Content); + var email = await wizardProcessor.ProcessWizardAsync(result.GetType(), messageModel); + + _logger.Info($"Submitted nested form: {result.GetType().FullName}"); + } + private async Task Pay() { if (transfer != null) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index 842507d3..642b1107 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -1,6 +1,7 @@ @page "/user/transfers" @using BlazorAnimation @using TIAM.Core.Enums +@using TIAM.Entities.Emails @using TIAM.Entities.Transfers @using TIAM.Resources @using TIAMSharedUI.Pages.Components @@ -150,26 +151,11 @@ - - - - - - - - - - - - - + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor new file mode 100644 index 00000000..64932a3d --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor @@ -0,0 +1,67 @@ +@using AyCode.Core +@using TIAM.Entities.Products +@using TIAM.Entities.ServiceProviders +@using TIAM.Entities.Transfers +@using TIAM.Entities.Drivers +@using TIAM.Entities.Users +@using TIAM.Models.Dtos.Users +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Utility +@using AyCode.Services.Loggers +@using TIAM.Core.Loggers +@using TIAM.Entities.Addresses +@using TIAMSharedUI.Shared.Components.Grids +@using TIAMSharedUI.Pages.Components.EditComponents +@using TIAMWebApp.Shared.Application.Services +@using AyCode.Interfaces.Addresses +@inject IServiceProviderDataService serviceProviderDataService +@inject IUserDataService userDataService +@inject ITransferDataService transferDataService +@inject IEnumerable LogWriters +@inject AdminSignalRClient AdminSignalRClient; + + + + + + + + + + + + @{ + var keyField = (string)messageContext.Value; + } +
@((MarkupString)keyField)
+
+
+ +
+ +
+ +@code { + [Parameter] public bool KeyboardNavigationEnabled { get; set; } + [Parameter] public Guid? ContextId { get; set; } + [Parameter] public bool IsSubjectVisible { get; set; } = true; + [Parameter] public bool IsSenderEmailVisible { get; set; } = true; + + + private Guid? _contextId = null!; + private MessageGrid _messageGrid = null!; + private LoggerClient _logger = null!; + + protected override void OnInitialized() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + //DataSource = new List
(); + + } + +} diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor new file mode 100644 index 00000000..4bdc72b1 --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageGridComponent.razor @@ -0,0 +1,65 @@ +@using TIAM.Entities.Products +@using TIAM.Entities.ServiceProviders +@using TIAM.Entities.Transfers +@using TIAM.Entities.Drivers +@using TIAM.Entities.Users +@using TIAM.Models.Dtos.Users +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Utility +@using AyCode.Services.Loggers +@using TIAM.Core.Loggers +@using TIAM.Entities.Addresses +@using TIAMSharedUI.Shared.Components.Grids +@using TIAMSharedUI.Pages.Components.EditComponents +@using TIAMWebApp.Shared.Application.Services +@using AyCode.Interfaces.Addresses +@inject IServiceProviderDataService serviceProviderDataService +@inject IUserDataService userDataService +@inject ITransferDataService transferDataService +@inject IEnumerable LogWriters +@inject AdminSignalRClient AdminSignalRClient; + + + + + + + + + + + + + + + + + +@code { + [Parameter] public bool KeyboardNavigationEnabled { get; set; } + + + private Guid? _contextId = null!; + private MessageGrid _messageGrid = null!; + private LoggerClient _logger = null!; + + protected override void OnInitialized() + { + _logger = new LoggerClient(LogWriters.ToArray()); + + //DataSource = new List
(); + + } + +} \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 433356f9..2ece8fd4 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -267,7 +267,7 @@ namespace TIAMWebApp.Server.Controllers

{transfer.FullName}

{transfer.PassengerCount}

Please confirm the transfer by clicking on the following link:

-

Confirm Transfer

+

Confirm Transfer

If you did not request this transfer, please disregard this email.

Thank you,
Tour I Am team

@@ -356,7 +356,7 @@ namespace TIAMWebApp.Server.Controllers

{createdTransfer.FullName}

{createdTransfer.PassengerCount}

Please confirm the transfer by clicking on the following link:

-

Confirm Transfer

+

Confirm Transfer

If you did not request this transfer, please disregard this email.

Thank you,
Tour I Am team