diff --git a/TIAM.Database/DataLayers/Users/UserDal.cs b/TIAM.Database/DataLayers/Users/UserDal.cs index 57f9b025..3c6a0052 100644 --- a/TIAM.Database/DataLayers/Users/UserDal.cs +++ b/TIAM.Database/DataLayers/Users/UserDal.cs @@ -37,6 +37,7 @@ namespace TIAM.Database.DataLayers.Users public Task GetUserModelDtoByIdAsync(Guid userId) => SessionAsync(x => x.GetUserModelDtoById(userId)); public Task GetUserModelDtoByEmailAsync(string email) => SessionAsync(x => x.GetUserModelDtoByEmail(email)); public Task> GetAllUsersModelDtoAsync() => SessionAsync(x => x.GetAllUsersModelDto().ToList()); + public Task> GetAllUsersModelDtoDetailAsync() => SessionAsync(x => x.GetAllUsersModelDetailDto().ToList()); public Task GetUserByPhoneNumberAsync(string phoneNumber) { diff --git a/TIAMMobileApp/Services/UserDataServiceMobile.cs b/TIAMMobileApp/Services/UserDataServiceMobile.cs index 5e6dd506..85c7cb81 100644 --- a/TIAMMobileApp/Services/UserDataServiceMobile.cs +++ b/TIAMMobileApp/Services/UserDataServiceMobile.cs @@ -147,9 +147,14 @@ namespace TIAMMobileApp.Services return (isSuccess, user); } - public async Task?> GetUsersAsync() + public async Task?> GetUsersAsync() { - return await http.GetFromJsonAsync>(APIUrls.GetUsers); + return await http.GetFromJsonAsync>(APIUrls.GetUsers); + } + + public async Task?> GetUsersWithDetailsAsync() + { + return await http.GetFromJsonAsync>(APIUrls.GetUsersWithDetails); } public async Task GetUserByEmailAsync(string email) diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor index 677472de..ede9c097 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor @@ -25,6 +25,7 @@ ColumnResizeMode="GridColumnResizeMode.NextColumn" ShowFilterRow="true"> + @@ -35,7 +36,7 @@ [Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] - public TIAM.Entities.Transfers.Transfer Customer { get; set; } + public Transfer Customer { get; set; } List DetailGridData { get; set; } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Products.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor similarity index 98% rename from TIAMSharedUI/Pages/User/SysAdmins/Products.razor rename to TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor index 1861d934..42e8227d 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Products.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor @@ -1,4 +1,4 @@ - +@page "/user/products" @using AyCode.Models.Messages @using TIAM.Entities.ServiceProviders @using TIAM.Resources @@ -8,6 +8,7 @@ @using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @using TIAMWebApp.Shared.Application.Models.ClientSide.Messages @using TIAMWebApp.Shared.Application.Utility +@layout AdminLayout @inject LogToBrowserConsole logToBrowserConsole @inject IStringLocalizer localizer @@ -97,5 +98,6 @@ @code { + } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/Products.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs similarity index 97% rename from TIAMSharedUI/Pages/User/SysAdmins/Products.razor.cs rename to TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs index 3bd7c8ba..a1df12ff 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/Products.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor.cs @@ -11,15 +11,21 @@ using Microsoft.AspNetCore.Components; using TIAM.Entities.ServiceProviders; using TIAM.Core.Enums; using TIAMWebApp.Shared.Application.Services; +using TIAMWebApp.Shared.Application.Utility; namespace TIAMSharedUI.Pages.User.SysAdmins { - public partial class Products :ComponentBase + public partial class ManageProducts :ComponentBase { IGrid Grid { get; set; } object? ProductData { get; set; } + public void ColumnChooserButton_Click() + { + Grid.ShowColumnChooser(); + } + public ProductWizardModel myModel = new ProductWizardModel(); @@ -158,10 +164,5 @@ namespace TIAMSharedUI.Pages.User.SysAdmins } } - void ColumnChooserButton_Click() - { - Grid.ShowColumnChooser(); - } - } } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor similarity index 85% rename from TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor rename to TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor index bd6a158c..1e256e24 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferManagement.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor @@ -69,6 +69,7 @@ Data="TransferData" AutoCollapseDetailRow="AutoCollapseDetailRow" KeyboardNavigationEnabled="true" + CustomizeElement="Grid_CustomizeElement" CustomizeEditModel="Grid_CustomizeEditModel" EditModelSaving="Grid_EditModelSaving" DataItemDeleting="Grid_DataItemDeleting" @@ -78,12 +79,13 @@ KeyFieldName="Id"> - - + + + @@ -154,7 +156,7 @@ @code { - public TransferWizardModel myModel = new TransferWizardModel(); + public Transfer myModel = new Transfer(); public List TransferData { get; set; } @@ -207,6 +209,30 @@ logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); } + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) + { + if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") == 5) + { + e.CssClass = "bg-important"; + } + else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") > 5 && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") < 35) + { + e.CssClass = "bg-attention"; + } + else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") == 35) + { + e.CssClass = "bg-finished"; + } + else if (e.ElementType == GridElementType.DataRow && (System.Byte)e.Grid.GetRowValue(e.VisibleIndex, "TransferStatusType") > 35) + { + e.CssClass = "bg-cancel"; + } + if (e.ElementType == GridElementType.HeaderCell) + { + e.Style = "background-color: rgba(0, 0, 0, 0.08)"; + e.CssClass = "header-bold"; + } + } protected override async Task OnAfterRenderAsync(bool firstRender) { @@ -232,6 +258,7 @@ async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e) { + bool success = false; if (e.IsNew) { //add new orderData to orderData array @@ -240,25 +267,24 @@ } else { - logToBrowserConsole.LogToBC("orderData updated at id " + ((TransferWizardModel)e.EditModel).Id); + logToBrowserConsole.LogToBC("orderData updated at id " + ((Transfer)e.EditModel).Id); - //await transferDataService.UpdateTransferAsync((TransferWizardModel)e.EditModel); - //modify transferData where transferData.Id == e.EditModel.Id + success = await transferDataService.UpdateTransferAsync((Transfer)e.EditModel); + } //get transfer from TransferData by Id - foreach (var transferToModify in (List)TransferData) - { - myModel = (TransferWizardModel)e.EditModel; + // foreach (var transferToModify in (List)TransferData) + // { + // myModel = (Transfer)e.EditModel; - if (transferToModify.Id == myModel.Id) - { - //transferToModify.Driver = myModel.Driver; - } - } - - //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); - await UpdateDataAsync(); + // if (transferToModify.Id == myModel.Id) + // { + // //transferToModify.Driver = myModel.Driver; + // } + // } + if(success) + await UpdateDataAsync(); } async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e) { @@ -270,7 +296,7 @@ async Task UpdateDataAsync() { //refresh grid - //DataSource = await NwindDataService.GetEmployeesEditableAsync(); + TransferData = await transferDataService.GetTransfersAsync(); logToBrowserConsole.LogToBC("orderData grid refreshed"); } diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor new file mode 100644 index 00000000..4c2377f0 --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor @@ -0,0 +1,325 @@ +@page "/user/users" +@using AyCode.Models.Messages +@using BlazorAnimation +@using TIAM.Core.Enums +@using TIAM.Entities.Products +@using TIAM.Entities.ServiceProviders +@using TIAM.Entities.Transfers +@using TIAM.Entities.Users +@using TIAM.Models.Dtos.Profiles +@using TIAM.Models.Dtos.Users +@using TIAM.Resources +@using TIAMSharedUI.Pages.Components +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Interfaces +@using TIAMWebApp.Shared.Application.Models +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI +@using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels +@using TIAMWebApp.Shared.Application.Models.ClientSide.Messages +@using TIAMWebApp.Shared.Application.Models.PageModels +@using TIAMWebApp.Shared.Application.Utility +@layout AdminLayout +@inject LogToBrowserConsole logToBrowserConsole +@inject IStringLocalizer localizer +@inject IWizardProcessor wizardProcessor +@inject IUserDataService userDataService +Transfers + +
+

Transfer management

+

Manage transfers here!

+
+ + + + + + +
+ + + +
+ + + +
+
+
+ +
+
+
+ +
+ + + + + + + + + + + + + + @{ + var keyField = context.Value; + var keyItem = (UserModelDtoDetail)context.DataItem; + + string buttonText = "Contact"; + + } + + + + + + + + @{ + var transfer2 = (UserModelDtoDetail)EditFormContext.EditModel; + } + + + @EditFormContext.GetEditor("UserDto.EmailAddress") + + + @EditFormContext.GetEditor("UserDto.EmailConfirmed") + + + @EditFormContext.GetEditor("UserDto.PhoneNumber") + + + @EditFormContext.GetEditor("Profile.Name") + + + + + + + + + +
+ +
+ +
+ +
+
+ +
+
+ +@code { + public UserModelDtoDetail myModel = new UserModelDtoDetail(); + + public List? UserData { get; set; } + + bool PopupVisible { get; set; } + + IGrid? Grid { get; set; } + object? MasterGridData { get; set; } + bool AutoCollapseDetailRow { get; set; } + + public List ignoreList = new List + { + "ReceiverEmailAddress", + "ReceiverId", + "SenderEmailAddress", + "SenderId", + "ContextId" + }; + + public MessageWizardModel messageWizardModel = new MessageWizardModel(); + + + + + async void SendMail(UserModelDtoDetail Item) + { + var user = await userDataService.GetUserDetailByIdAsync(Item.Id); + logToBrowserConsole.LogToBC($"Sending mail to {user.UserDto.EmailAddress}"); + + 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 email = await wizardProcessor.ProcessWizardAsync(Result.GetType(), Result); + + logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); + } + + void Grid_CustomizeElement(GridCustomizeElementEventArgs e) + { + if (e.ElementType == GridElementType.DataRow && e.VisibleIndex % 2 == 1) + { + e.CssClass = "bg-alt"; + } + if (e.ElementType == GridElementType.HeaderCell) + { + e.Style = "background-color: rgba(0, 0, 0, 0.08); font-style=bold"; + + } + } + + + void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (e.IsNew) + { + var userEditModel = (UserModelDtoDetail)e.EditModel; //TODO not valid cast + userEditModel.Id = Guid.NewGuid(); + + userEditModel.UserDto = new UserDtoDetail(); + userEditModel.UserDto.AffiliateId = Guid.NewGuid(); + userEditModel.UserDto.EmailAddress = ""; + userEditModel.UserDto.PhoneNumber = ""; + userEditModel.Profile = new ProfileDto(); + userEditModel.Profile.Name = "New user"; + + userEditModel.Products = new List(); + + userEditModel.ServiceProviders = new List(); + + userEditModel.UserProductMappings = new List(); + } + } + + async Task Grid_EditModelSaving(GridEditModelSavingEventArgs e) + { + if (e.IsNew) + { + //add new orderData to orderData array + RegistrationModel registration = new RegistrationModel(); + //TODO: Refractor to userDataService + Random random = new Random(); + string chars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; + string password = new string(Enumerable.Repeat(chars, 10) + .Select(s => s[random.Next(s.Length)]).ToArray()); + + registration.Email = ((UserModelDtoDetail)e.EditModel).UserDto.EmailAddress; + registration.PhoneNumber = ((UserModelDtoDetail)e.EditModel).UserDto.PhoneNumber; + registration.Password = password; + registration.ReferralId = null; + + + await userDataService.CreateGuestUser(registration); + logToBrowserConsole.LogToBC("New user created added"); + } + else + { + logToBrowserConsole.LogToBC("orderData updated at id " + ((UserModelDtoDetail)e.EditModel).Id); + + //await transferDataService.UpdateTransferAsync((TransferWizardModel)e.EditModel); + //modify transferData where transferData.Id == e.EditModel.Id + } + //get transfer from TransferData by Id + + // foreach (var transferToModify in (List)TransferData) + // { + // myModel = (Transfer)e.EditModel; + + // if (transferToModify.Id == myModel.Id) + // { + // //transferToModify.Driver = myModel.Driver; + // } + // } + + await UpdateDataAsync(); + } + async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e) + { + //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem); + //remove orderData from orderData array + logToBrowserConsole.LogToBC("orderData deleted"); + //await UpdateDataAsync(); + } + async Task UpdateDataAsync() + { + //refresh grid + UserData = await userDataService.GetUsersWithDetailsAsync(); + logToBrowserConsole.LogToBC("orderData grid refreshed"); + } + + protected override async Task OnInitializedAsync() + { + UserData = (await userDataService.GetUsersWithDetailsAsync())?.OrderBy(x => x.Profile?.Name).ToList(); + base.OnInitialized(); + } + + void ColumnChooserButton_Click() + { + Grid?.ShowColumnChooser(); + } + + protected override void OnAfterRender(bool firstRender) + { + if (firstRender) + { + Grid?.ExpandDetailRow(0); + } + } + void AutoCollapseDetailRow_Changed(bool newValue) + { + AutoCollapseDetailRow = newValue; + if (newValue) + { + Grid?.BeginUpdate(); + Grid?.CollapseAllDetailRows(); + Grid?.ExpandDetailRow(0); + Grid?.EndUpdate(); + } + } +} diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor new file mode 100644 index 00000000..52b7990d --- /dev/null +++ b/TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor @@ -0,0 +1,121 @@ +@using TIAM.Entities.Products +@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 +@inject IUserDataService NwindDataService +@inject IServiceProviderDataService serviceProviderDataService +@inject LogToBrowserConsole logToBrowserConsole + +
+ UserProductMapping +
+ + + + + + + + + + @{ + var transfer2 = (UserProductMapping)EditFormContext.EditModel; + } + + + @EditFormContext.GetEditor("UserId") + + + + + + @EditFormContext.GetEditor("Permissions") + + + + + + + + + +@code { + [Parameter] + public bool KeyboardNavigationEnabled { get; set; } + [Parameter] + public UserModelDtoDetail Customer { get; set; } + + List DetailGridData; + + List AvailableProducts; + + public UserModelDtoDetail UserInfo; + + protected override async Task OnInitializedAsync() + { + + //get userproductmappings by customer id + if (Customer.UserProductMappings == null) + DetailGridData = new List(); + else + DetailGridData = Customer.UserProductMappings; + + AvailableProducts = await serviceProviderDataService.GetAllProductsAsync(); + logToBrowserConsole.LogToBC($"DetailGridData: {DetailGridData.Count}"); + } + + void CustomizeEditModel(GridCustomizeEditModelEventArgs e) + { + if (e.IsNew) + { + UserProductMapping newProductMapping = new UserProductMapping(); + newProductMapping.ProductId = Guid.NewGuid(); + newProductMapping.UserId = Customer.Id; + newProductMapping.Permissions = 1; + + e.EditModel = newProductMapping; + } + } + + async Task EditModelSaving(GridEditModelSavingEventArgs e) + { + if (e.IsNew) + //add new orderData to orderData array + logToBrowserConsole.LogToBC("New orderData added"); + //await NwindDataService.InsertEmployeeAsync((EditableEmployee)e.EditModel); + else + logToBrowserConsole.LogToBC("orderData updated"); + + //await NwindDataService.UpdateEmployeeAsync((EditableEmployee)e.DataItem, (EditableEmployee)e.EditModel); + + await UpdateDataAsync(); + } + async Task DataItemDeleting(GridDataItemDeletingEventArgs e) + { + //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem); + //remove orderData from orderData array + logToBrowserConsole.LogToBC("orderData deleted"); + //await UpdateDataAsync(); + } + async Task UpdateDataAsync() + { + //DataSource = await NwindDataService.GetEmployeesEditableAsync(); + //refresh grid + logToBrowserConsole.LogToBC("orderData grid refreshed"); + } + +} \ No newline at end of file diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index 0be24562..a214d2e5 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -66,6 +66,11 @@ Transfers +
+ + Users + +
Destinations diff --git a/TIAMSharedUI/wwwroot/css/TourIAm.css b/TIAMSharedUI/wwwroot/css/TourIAm.css index 7b9111cb..d263b0e6 100644 --- a/TIAMSharedUI/wwwroot/css/TourIAm.css +++ b/TIAMSharedUI/wwwroot/css/TourIAm.css @@ -102,6 +102,23 @@ select { background-color: #f7279f !important; } +.bg-important { + background-color: #fb9e9e !important; +} + +.bg-attention { + background-color: #fbf89e !important; +} + +.bg-finished { + background-color: #9efba1 !important; +} + +.bg-cancel { + background-color: #999 !important; + color: #666 !important; +} + .bg-gradient { color: #fff !important; diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 572aa292..cb338a26 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -156,9 +156,22 @@ namespace TIAMWebApp.Client.Services } - public async Task?> GetUsersAsync() + public async Task?> GetUsersAsync() { - return await http.GetFromJsonAsync>(APIUrls.GetUsers); + return await http.GetFromJsonAsync>(APIUrls.GetUsers); + } + + public async Task?> GetUsersWithDetailsAsync() + { + + + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUsersWithDetails}"; + logToBrowserConsole.LogToBC("GetUserByEmailAsync url: " + url + "!"); + var response = await http.GetFromJsonAsync>(APIUrls.GetUsersWithDetails); + //var result = await response.Content.ReadAsStringAsync(); + //var user = JsonConvert.DeserializeObject(result); + return response; + } public async Task GetUserByEmailAsync(string email) diff --git a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs index 3fd352f8..ddd93ed4 100644 --- a/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs +++ b/TIAMWebApp/Server/Controllers/ServiceProviderAPIController.cs @@ -242,5 +242,25 @@ namespace TIAMWebApp.Server.Controllers } } + + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetAllProductsRouteName)] + [Tags("In-Progress", "Product")] + public async Task GetAllProducts() + { + Console.WriteLine("GetAllProducts called"); + + var products = _adminDal.GetProductsJson(); + if (products != null) + { + return products; + } + else + { + return null; + } + + } } } \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index bdc23045..65536470 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -321,5 +321,15 @@ namespace TIAMWebApp.Server.Controllers return result; } + + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UpdateTransferRouteName)] + public async Task UpdateTransfer(Transfer transferToModify) + { + Console.WriteLine("UpdateTransfer called!"); + return await _adminDal.UpdateTransferAsync(transferToModify); + } + } } \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/UserAPIController.cs b/TIAMWebApp/Server/Controllers/UserAPIController.cs index e62232b9..8d70aa5a 100644 --- a/TIAMWebApp/Server/Controllers/UserAPIController.cs +++ b/TIAMWebApp/Server/Controllers/UserAPIController.cs @@ -310,6 +310,48 @@ namespace TIAMWebApp.Server.Controllers } } + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.UpdateUser)] + public async Task UpdateUser([FromBody] JsonElement SerializedUserModel) + { + Console.WriteLine("UpdateUser called"); + + if (string.IsNullOrEmpty(SerializedUserModel.GetRawText())) + { + return BadRequest("SerializedUserModel is required"); + } + else + { + var user = JObject.Parse(SerializedUserModel.GetRawText()).ToObject(); + + if (user != null) + { + var userId = user.Id; + var email = user.Email; + var phoneNumber = user.PhoneNumber; + var password = user.Password; + + if (email is null || phoneNumber is null || password is null) + { + return BadRequest("Invalid request"); + } + else + { + Console.WriteLine($"User to be updated: {userId}"); + Console.WriteLine($"User to be updated: {email}"); + Console.WriteLine($"User to be updated: {phoneNumber}"); + Console.WriteLine($"User to be updated: {password}"); + + await _userDal.UpdateUserAsync(new User(userId, email, phoneNumber, password)); + } + } + + return Ok("yes"); + } + } + + [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateGuestUserRouteName)] @@ -385,6 +427,17 @@ namespace TIAMWebApp.Server.Controllers return _userDal.GetAllUsersModelDtoAsync(); } + [AllowAnonymous] + [HttpGet] + [Route(APIUrls.GetUsersWithDetailsRouteName)] + public Task> GetUsersWithDetails() + { + Console.WriteLine("GetUsersWithDetails called"); + //var users = await _userDal.Ctx.Users.ToListAsync();//.GetUsersAsync(); + //return users; + return _userDal.GetAllUsersModelDtoDetailAsync(); + } + [AllowAnonymous] [HttpPost] [Route("GetUserByEmail")] diff --git a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs index 7a0b7360..373954c3 100644 --- a/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IServiceProviderDataService.cs @@ -54,5 +54,7 @@ namespace TIAMWebApp.Shared.Application.Interfaces public Task> GetProductsForServiceProviderAsync(Guid serviceProviderId); + public Task> GetAllProductsAsync(); + } } diff --git a/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs b/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs index 9e0b2ef9..51c0ad8d 100644 --- a/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/ITransferDataService.cs @@ -18,6 +18,6 @@ namespace TIAMWebApp.Shared.Application.Interfaces Task GetTransferByIdAsync(Guid id); Task> GetTransfersAsync(); - Task UpdateTransferAsync(TransferWizardModel model); + Task UpdateTransferAsync(Transfer model); } } diff --git a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs index a0ef4e87..713d3954 100644 --- a/TIAMWebApp/Shared/Interfaces/IUserDataService.cs +++ b/TIAMWebApp/Shared/Interfaces/IUserDataService.cs @@ -23,7 +23,9 @@ namespace TIAMWebApp.Shared.Application.Interfaces //public Task> GetUserRolesAsync(UserModel userModel); - public Task?> GetUsersAsync(); + public Task?> GetUsersAsync(); + + public Task?> GetUsersWithDetailsAsync(); public Task GetUserByIdAsync(Guid id); public Task GetUserDetailByIdAsync(Guid id); diff --git a/TIAMWebApp/Shared/Models/APIUrls.cs b/TIAMWebApp/Shared/Models/APIUrls.cs index 05ff6d0e..1d6b9e7e 100644 --- a/TIAMWebApp/Shared/Models/APIUrls.cs +++ b/TIAMWebApp/Shared/Models/APIUrls.cs @@ -31,6 +31,9 @@ namespace TIAMWebApp.Shared.Application.Models public const string GetUsersRouteName = "GetUsers"; public const string GetUsers = UserAPI + GetUsersRouteName; + public const string GetUsersWithDetailsRouteName = "GetUsersWithDetails/"; + public const string GetUsersWithDetails = UserAPI + GetUsersWithDetailsRouteName; + public const string AuthenticateUserRouteName = "AuthenticateUser"; public const string AuthenticateUser = UserAPI + AuthenticateUserRouteName; @@ -40,6 +43,9 @@ namespace TIAMWebApp.Shared.Application.Models public const string CreateGuestUserRouteName = "CreateGuestUser"; public const string CreateGuestUser = UserAPI + CreateGuestUserRouteName; + public const string UpdateUserRouteName = "UpdateUser"; + public const string UpdateUser = UserAPI + UpdateUserRouteName; + public const string RefreshTokenRouteName = "RefreshToken"; public const string RefreshToken = UserAPI + RefreshTokenRouteName; @@ -79,7 +85,10 @@ namespace TIAMWebApp.Shared.Application.Models public const string CreateTransfersRouteName = "CreateTransfers"; public const string CreateTransfers = TransferDataAPI+CreateTransfersRouteName; - public const string UpdateTransferDestinationRouteName = "UpdateTransfer"; + public const string UpdateTransferRouteName = "UpdateTransfer"; + public const string UpdateTransfer = TransferDataAPI+UpdateTransferRouteName; + + public const string UpdateTransferDestinationRouteName = "UpdateTransferDestintion"; public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName; //serviceprovider @@ -98,6 +107,9 @@ namespace TIAMWebApp.Shared.Application.Models public const string AddProductRouteName = "AddProduct"; public const string AddProductRouteUrl = ServiceProviderAPI + AddProductRouteName; + public const string GetAllProductsRouteName = "GetAllProducts/"; + public const string GetAllProducts = ServiceProviderAPI + GetAllProductsRouteName; + public const string GetProductsByServiceProviderIdRouteName = "GetProductsByServiceProviderId"; public const string GetProductsByServiceProviderId = ServiceProviderAPI + GetProductsByServiceProviderIdRouteName; diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index 2d0bac42..a354429d 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -13,6 +13,8 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide public const string ApiBaseUrl = "https://localhost:7116"; //public const string BaseUrl = "https://touriam.mangoweb.hu"; //public const string ApiBaseUrl = "https://touriam.mangoweb.hu"; + //public const string BaseUrl = "https://test.touriam.com"; + //public const string ApiBaseUrl = "https://test.touriam.com"; public const bool DarkMode = false; public static string Locale { get; set; } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs index a150ba0c..7fbc1625 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModelExtensions.cs @@ -43,7 +43,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels FromAddress = obj.PickupAddress, Appointment = obj.TripDate, PassengerCount = Convert.ToByte(obj.NumberOfPassengers), - //TODO: ContactName = obj.FullName, + ContactName = obj.FullName, ContactPhone = obj.PhoneNumber, ContactEmail = obj.EmailAddress, Price = obj.Price, diff --git a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs index 2e0a5ce1..350d6a37 100644 --- a/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs +++ b/TIAMWebApp/Shared/Services/ServiceProviderDataService.cs @@ -9,6 +9,7 @@ using TIAM.Entities.ServiceProviders; using TIAM.Entities.Users; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models; +using TIAMWebApp.Shared.Application.Models.ClientSide; using TIAMWebApp.Shared.Application.Utility; namespace TIAMWebApp.Shared.Application.Services @@ -153,5 +154,19 @@ namespace TIAMWebApp.Shared.Application.Services return null; } } + + public async Task> GetAllProductsAsync() + { + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetAllProducts}"; + var response = await http.GetFromJsonAsync(url, typeof (List)); + if (response != null) + { + return (List)response; + } + else + { + return null; + } + } } } diff --git a/TIAMWebApp/Shared/Services/TransferDataService.cs b/TIAMWebApp/Shared/Services/TransferDataService.cs index e0ead92f..6525e88c 100644 --- a/TIAMWebApp/Shared/Services/TransferDataService.cs +++ b/TIAMWebApp/Shared/Services/TransferDataService.cs @@ -179,9 +179,25 @@ namespace TIAMWebApp.Shared.Application.Services return response; } - public Task UpdateTransferAsync(TransferWizardModel model) + public async Task UpdateTransferAsync(Transfer model) { - return null; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.UpdateTransfer}"; + var response = await http.PostAsJsonAsync(url, model); + + //var result = new WizardProcessorResult(); + + //if (response.IsSuccessStatusCode) + //{ + // result.IsSucces = true; + // result.ResultJson = await response.Content.ReadAsStringAsync(); + //} + + if (!response.IsSuccessStatusCode) + return false; + + var result = (bool)(await response.Content.ReadFromJsonAsync(typeof(bool)))!; + + return result; } } }