From 481fefb7a14e1edaf4111aed2d4fc33ced48d353 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 13 Mar 2024 19:59:27 +0100 Subject: [PATCH 1/3] bleh --- .../Transfers/TransferDestination.cs | 6 +++-- TIAMResources/TIAMResources.Designer.cs | 18 +++++++++++++ TIAMResources/TIAMResources.resx | 6 +++++ .../User/SysAdmins/TransferDestinations.razor | 4 ++- .../SysAdmins/TransferDestinations.razor.cs | 2 +- TIAMSharedUI/Resources/MyResources.hu.resx | 6 +++++ .../Controllers/TransferDataAPIController.cs | 22 ++++++++++++---- .../TransferDestinationWizardModel.cs | 25 +++++++++++++------ TIAMWebApp/Shared/Utility/ResourceKeys.cs | 2 ++ 9 files changed, 75 insertions(+), 16 deletions(-) diff --git a/TIAM.Entities/Transfers/TransferDestination.cs b/TIAM.Entities/Transfers/TransferDestination.cs index 92b530c6..59e6ef16 100644 --- a/TIAM.Entities/Transfers/TransferDestination.cs +++ b/TIAM.Entities/Transfers/TransferDestination.cs @@ -26,6 +26,8 @@ namespace TIAM.Entities.Transfers //public PriceType PriceType { get; set; } public double Price { get; set; } + public double Price2 { get; set; } + public double Price3 { get; set; } //TEMPORARY!!! public string? AddressString { get; set; } @@ -42,12 +44,12 @@ namespace TIAM.Entities.Transfers Id = id; AddressString = addressString; } - public TransferDestination(Guid id, string name, string addressString) : this(id, addressString) + public TransferDestination(Guid id, string name, string addressString, double price, double price2, double price3) : this(id, addressString) { Name = name; } - public TransferDestination(Guid id, string name, string description, string addressString) : this(id, name, addressString) + public TransferDestination(Guid id, string name, string description, string addressString, double price, double price2, double price3) : this(id, name, addressString, price, price2, price3) { Description = description; } diff --git a/TIAMResources/TIAMResources.Designer.cs b/TIAMResources/TIAMResources.Designer.cs index 1d32329c..a1080ab0 100644 --- a/TIAMResources/TIAMResources.Designer.cs +++ b/TIAMResources/TIAMResources.Designer.cs @@ -339,6 +339,24 @@ namespace TIAM.Resources { } } + /// + /// Looks up a localized string similar to Price 2. + /// + public static string Price2 { + get { + return ResourceManager.GetString("Price2", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Price 3. + /// + public static string Price3 { + get { + return ResourceManager.GetString("Price3", resourceCulture); + } + } + /// /// Looks up a localized string similar to Receiver Id. /// diff --git a/TIAMResources/TIAMResources.resx b/TIAMResources/TIAMResources.resx index 525a9471..7ecef8c6 100644 --- a/TIAMResources/TIAMResources.resx +++ b/TIAMResources/TIAMResources.resx @@ -210,6 +210,12 @@ Price + + Price 2 + + + Price 3 + Receiver Id diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor index 548d6d51..14df84f3 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor @@ -60,7 +60,9 @@ - + + + diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs index 98f7583d..641ed50e 100644 --- a/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs +++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferDestinations.razor.cs @@ -176,7 +176,7 @@ namespace TIAMSharedUI.Pages.User.SysAdmins { //add new transferwizardmodel to transferData array TransferDataFromDb = ((TransferDestinationWizardModel[])TransferDataFromDb).Append( - new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.PriceType, item.Address)).ToArray(); + new TransferDestinationWizardModel(item.Id, item.Name, item.Description, item.AddressString, item.Price, item.Price2, item.Price3, item.Address)).ToArray(); logToBrowserConsole.LogToBC($"TransferDataFromDb: {item.Name}"); } diff --git a/TIAMSharedUI/Resources/MyResources.hu.resx b/TIAMSharedUI/Resources/MyResources.hu.resx index c2e98cb4..f6f9f667 100644 --- a/TIAMSharedUI/Resources/MyResources.hu.resx +++ b/TIAMSharedUI/Resources/MyResources.hu.resx @@ -174,6 +174,12 @@ Transzfer + + Ár 2 + + + Ár 3 + Regisztráció diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index 134ee884..c815ab7d 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -52,7 +52,19 @@ namespace TIAMWebApp.Server.Controllers [Route(APIUrls.GetTransferDestinationsRouteName)] public async Task> GetTransferDestinations() { - return await _transferDestinationDal.Context.TransferDestinations.ToListAsync(); + var transferDestinations = await _adminDal.Context.TransferDestinations.ToListAsync(); + foreach (var transferDestination in transferDestinations) + { + Console.WriteLine($"TransferDestination: {transferDestination.Id}"); + Console.WriteLine($"TransferDestination: {transferDestination.AddressId}"); + Console.WriteLine($"TransferDestination: {transferDestination.Name}"); + Console.WriteLine($"TransferDestination: {transferDestination.Price}"); + Console.WriteLine($"TransferDestination: {transferDestination.Price2}"); + Console.WriteLine($"TransferDestination: {transferDestination.Price3}"); + Console.WriteLine($"TransferDestination: {transferDestination.AddressString}"); + Console.WriteLine($"TransferDestination: {transferDestination.Description}"); + } + return transferDestinations; } [AllowAnonymous] @@ -104,7 +116,7 @@ namespace TIAMWebApp.Server.Controllers Console.WriteLine($"TransferDestination to be created: {transferDestination.Price}"); //Console.WriteLine($"TransferDestination to be created: {transferDestination.Price2}"); //Console.WriteLine($"TransferDestination to be created: {transferDestination.Price3}"); - Console.WriteLine($"TransferDestination to be created: {transferDestination.PriceType}"); + //Console.WriteLine($"TransferDestination to be created: {transferDestination.PriceType}"); Console.WriteLine($"TransferDestination to be created: {transferDestination.AddressString}"); Console.WriteLine($"TransferDestination to be created: {transferDestination.Description}"); @@ -160,9 +172,9 @@ namespace TIAMWebApp.Server.Controllers Console.WriteLine($"TransferDestination to be updated: {transferDestination.Id}"); Console.WriteLine($"TransferDestination to be updated new name: {transferDestination.Name}"); Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price}"); - //Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price2}"); - //Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price3}"); - Console.WriteLine($"TransferDestination to be updated new priceType: {transferDestination.PriceType}"); + Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price2}"); + Console.WriteLine($"TransferDestination to be updated new price: {transferDestination.Price3}"); + //Console.WriteLine($"TransferDestination to be updated new priceType: {transferDestination.PriceType}"); Console.WriteLine($"TransferDestination to be updated new address: {transferDestination.AddressString}"); Console.WriteLine($"TransferDestination to be updated new description: {transferDestination.Description}"); diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs index a2d29a81..af8caf35 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs @@ -42,7 +42,16 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels [DataType("Price")] [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))] public double Price { get; set; } - + + [Required(ErrorMessage = "The price should be specified.")] + [DataType("Price")] + [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))] + public double Price2 { get; set; } + + [Required(ErrorMessage = "The price should be specified.")] + [DataType("Price")] + [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))] + public double Price3 { get; set; } public PriceType PriceType { get; set; } public Address Address { get; set; } @@ -57,9 +66,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public TransferDestinationWizardModel() { } - public TransferDestinationWizardModel(string name, string description, string addressString, double price, PriceType priceType, Address address) :this(Guid.NewGuid(), name, description, addressString, price, priceType, address) + public TransferDestinationWizardModel(string name, string description, string addressString, double price, double price2, double price3, Address address) :this(Guid.NewGuid(), name, description, addressString, price, price2, price3, address) { } - public TransferDestinationWizardModel(Guid id, string name, string description, string addressString, double price, PriceType priceType, Address address) + public TransferDestinationWizardModel(Guid id, string name, string description, string addressString, double price, double price2, double price3, Address address) { Id = id.ToString(); @@ -67,7 +76,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels Description = description; AddressString = addressString; Price = price; - PriceType = priceType; + Price2 = price2; + Price3 = price3; + //PriceType = priceType; Address = address; } @@ -81,9 +92,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels destination.Description = model.Description; destination.AddressString = model.AddressString; destination.Price = model.Price; - //destination.Price2 = model.Price; - //destination.Price3 = model.Price; - destination.PriceType = model.PriceType; + destination.Price2 = model.Price2; + destination.Price3 = model.Price3; + //destination.PriceType = model.PriceType; destination.Address = model.Address; if (destination.Address == null) diff --git a/TIAMWebApp/Shared/Utility/ResourceKeys.cs b/TIAMWebApp/Shared/Utility/ResourceKeys.cs index b31e631b..3b7e47fe 100644 --- a/TIAMWebApp/Shared/Utility/ResourceKeys.cs +++ b/TIAMWebApp/Shared/Utility/ResourceKeys.cs @@ -22,6 +22,8 @@ public const string ConfirmPasswordReset = "ConfirmPasswordReset"; public const string ConfirmEmail = "ConfirmEmail"; public const string Price = "Price"; + public const string Price2 = "Price 2"; + public const string Price3 = "Price 3"; public const string Driver = "Driver"; //wizard From c0ec3b624f465230344670855f4c769c4ff1a5e1 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 27 Mar 2024 12:39:11 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Whatta=20fuck=3F=20Nem=20is=20volt=20kimen?= =?UTF-8?q?=C5=91m.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TIAMSharedUI/Pages/AppLaunch.razor | 6 +-- .../Pages/Components/AuthComponent.razor.cs | 4 +- TIAMSharedUI/Pages/Index.razor | 2 + .../User/Hotels/CreateAndManageTransfer.razor | 45 ++++++++++++++++ TIAMSharedUI/Shared/SliderItemSelector.razor | 37 ++++++++++--- TIAMSharedUI/Shared/Users/AdminNavMenu.razor | 11 ++-- TIAMWebApp/Client/Services/SupplierService.cs | 2 +- .../Client/Services/UserDataServiceWeb.cs | 14 ++--- TIAMWebApp/Client/Services/WizardProcessor.cs | 3 ++ TIAMWebApp/Server/.config/dotnet-tools.json | 12 +++++ .../Controllers/TransferDataAPIController.cs | 54 +++++++++++++++++++ .../PublishProfiles/FolderProfile1.pubxml | 6 ++- .../Shared/Models/ClientSide/Setting.cs | 4 +- .../TransferDestinationWizardModel.cs | 8 +-- .../UI/WizardModels/TransferWizardModel.cs | 30 +++++++++-- TIAMWebApp/Shared/Models/UserSessionModel.cs | 11 ++-- .../Shared/Services/ImageDataService.cs | 2 +- .../Shared/Services/TransferDataService.cs | 25 ++++++--- 18 files changed, 229 insertions(+), 47 deletions(-) create mode 100644 TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor create mode 100644 TIAMWebApp/Server/.config/dotnet-tools.json diff --git a/TIAMSharedUI/Pages/AppLaunch.razor b/TIAMSharedUI/Pages/AppLaunch.razor index 8eb450d7..9bfd818d 100644 --- a/TIAMSharedUI/Pages/AppLaunch.razor +++ b/TIAMSharedUI/Pages/AppLaunch.razor @@ -14,13 +14,12 @@ @inject ISecureStorageHandler SecureStorageHandler @inject ISessionService sessionService; @inject HttpClient http; -

AppLaunch

@{ if (string.IsNullOrWhiteSpace(TrackingId)) { TrackingId = ""; -

Loading...

+ //

Loading...

} else { @@ -28,7 +27,6 @@ } } -Loading.... @code { @@ -57,7 +55,7 @@ Loading.... logToBrowserConsole = new LogToBrowserConsole(JSRuntime); //wait for 5 seconds - await Task.Delay(1000); + //await Task.Delay(1000); if (!string.IsNullOrWhiteSpace(userDetailsStr)) { diff --git a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs index df029ad0..9b1452c3 100644 --- a/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs +++ b/TIAMSharedUI/Pages/Components/AuthComponent.razor.cs @@ -20,13 +20,13 @@ namespace TIAMSharedUI.Pages.Components [CascadingParameter] private PopupMessageBox PopupMessageBox { get; set; } = default!; - public bool IsVisible = true; + public bool IsVisible = false; protected override async Task OnInitializedAsync() { await base.OnInitializedAsync(); IsLoggedIn = sessionService.IsAuthenticated; - await PopupMessageBox.ShowAsync("AuthComponent", "Initialized", null, null, null, PopupMessageBox.ButtonOk); + //await PopupMessageBox.ShowAsync("AuthComponent", "Initialized", null, null, null, PopupMessageBox.ButtonOk); //if (await PopupMessageBox.Show("Cancel", "Cancel this stuff", //PopupMessageBox.ButtonNo, PopupMessageBox.ButtonYes) == PopupMessageBox.ButtonNo) diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index ac23d498..66667f38 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -117,6 +117,8 @@ public async Task SubmitForm(object Result) { + + var transfer = await WizardProcessor.ProcessWizardAsync(Result.GetType(), Result); logToBrowserConsole.LogToBC($"Submitted nested form: {Result.GetType().FullName}"); navManager.NavigateTo("/transfer2/" + transfer.Id); diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor new file mode 100644 index 00000000..399b7da6 --- /dev/null +++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor @@ -0,0 +1,45 @@ +@page "/user/createAndManageTransfer" +@using TIAMSharedUI.Shared +@using TIAMWebApp.Shared.Application.Models; +@using TIAMWebApp.Shared.Application.Interfaces; +@layout AdminLayout +@inject IPopulationStructureDataProvider DataProvider +@inject ISupplierService SupplierService +@inject IUserDataService UserDataService +Transfer + + + + +
+ + + + +
+ +
+
+ +
+ +
+ + + +
+ + +@code { + string Id = "2312-32132121-32123"; + bool isUserLoggedIn; + int userType = 0; + + protected override void OnInitialized() + { + base.OnInitialized(); + + } + +} + diff --git a/TIAMSharedUI/Shared/SliderItemSelector.razor b/TIAMSharedUI/Shared/SliderItemSelector.razor index 4863dd3d..1d432f77 100644 --- a/TIAMSharedUI/Shared/SliderItemSelector.razor +++ b/TIAMSharedUI/Shared/SliderItemSelector.razor @@ -55,8 +55,25 @@ + + @{ + + for (int i = 0; i < Destinations.Count; i++) + { + var destination = Destinations[i]; + var j = i + 1; +
+
+

@destination.Name

+

@destination.AddressString

+
+
+ } + + + } -
+ @*

Liszt Ferenc Airport

@@ -73,7 +90,7 @@

Chain Bridge

-
+
*@

Please type an address or swipe to select from preset destinations!

@@ -222,10 +239,10 @@ { if(firstRender) { - var dotNetObjRef = DotNetObjectReference.Create(this); - JSRuntime.InvokeVoidAsync("setOwlId", OwlId); - JSRuntime.InvokeVoidAsync("InitOwl", OwlId); - JSRuntime.InvokeVoidAsync("CStoJSCall", dotNetObjRef); + // var dotNetObjRef = DotNetObjectReference.Create(this); + // JSRuntime.InvokeVoidAsync("setOwlId", OwlId); + // JSRuntime.InvokeVoidAsync("InitOwl", OwlId); + // JSRuntime.InvokeVoidAsync("CStoJSCall", dotNetObjRef); } @@ -277,7 +294,15 @@ { Destinations = await TransferDataService.GetDestinationsAsync(); Content = TextValue; + InitOwl(); } + private void InitOwl() + { + var dotNetObjRef = DotNetObjectReference.Create(this); + JSRuntime.InvokeVoidAsync("setOwlId", OwlId); + JSRuntime.InvokeVoidAsync("InitOwl", OwlId); + JSRuntime.InvokeVoidAsync("CStoJSCall", dotNetObjRef); + } } diff --git a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor index 2ea7d92c..0be24562 100644 --- a/TIAMSharedUI/Shared/Users/AdminNavMenu.razor +++ b/TIAMSharedUI/Shared/Users/AdminNavMenu.razor @@ -48,12 +48,6 @@ -
- - Cards - -
-
System Admin @@ -94,6 +88,11 @@ Hotel Dashboard
+
+ + Transfer + +
Manage diff --git a/TIAMWebApp/Client/Services/SupplierService.cs b/TIAMWebApp/Client/Services/SupplierService.cs index 39f749e2..27551c42 100644 --- a/TIAMWebApp/Client/Services/SupplierService.cs +++ b/TIAMWebApp/Client/Services/SupplierService.cs @@ -16,7 +16,7 @@ namespace TIAMWebApp.Client.Services Task ISupplierService.GetSuppliersAsync() { - return http.GetFromJsonAsync("SupplierAPI"); + return http.GetFromJsonAsync("api/v1/SupplierAPI"); } } } diff --git a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs index 27eeb8ca..da5c84e0 100644 --- a/TIAMWebApp/Client/Services/UserDataServiceWeb.cs +++ b/TIAMWebApp/Client/Services/UserDataServiceWeb.cs @@ -51,7 +51,7 @@ namespace TIAMWebApp.Client.Services logToBrowserConsole.LogToBC($"{hasProperties.Count} properties found"); //create user session model - var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto.Profile?.Name, hasProperties, 1); + var user = new UserSessionModel(userModelDto.Id, UserType.User, userModelDto, hasProperties, 1); return user; } else @@ -64,7 +64,7 @@ namespace TIAMWebApp.Client.Services public async Task TestUserApi(int Param) { - var url = $"{Setting.BaseUrl}/{APIUrls.UserTest}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.UserTest}"; var response = await http.PostAsJsonAsync(url, Param); @@ -75,7 +75,7 @@ namespace TIAMWebApp.Client.Services public async Task AuthenticateUser(LoginModel loginModel) { string result = string.Empty; - var url = $"{Setting.BaseUrl}/{APIUrls.AuthenticateUser}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.AuthenticateUser}"; var response = await http.PostAsJsonAsync(url, loginModel); @@ -107,7 +107,7 @@ namespace TIAMWebApp.Client.Services bool isSuccess = true; string result = string.Empty; - var url = $"{Setting.BaseUrl}/{APIUrls.CreateUser}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateUser}"; logToBrowserConsole.LogToBC("CreateUser url: " + url); var response = await http.PostAsJsonAsync(url, regModel); result = await response.Content.ReadAsStringAsync(); @@ -133,13 +133,13 @@ namespace TIAMWebApp.Client.Services public async Task GetUserByEmailAsync(string email) { - var url = $"{Setting.BaseUrl}/{APIUrls.GetUserByEmail}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserByEmail}"; return await http.GetFromJsonAsync(url); } public async Task GetUserByIdAsync(Guid id) { - var url = $"{Setting.BaseUrl}/{APIUrls.GetUserById}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetUserById}"; logToBrowserConsole.LogToBC("GetUserByIdAsync url: " + url + ", " + id.ToString()); var response = await http.PostAsJsonAsync(url, id); @@ -154,7 +154,7 @@ namespace TIAMWebApp.Client.Services logToBrowserConsole.LogToBC("RefreshToken() called"); bool isTokenRefreshed = false; - var url = $"{Setting.BaseUrl}/{APIUrls.RefreshToken}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.RefreshToken}"; //var url = APIUrls.RefreshToken; var serializedStr = JsonConvert.SerializeObject(new AuthenticateRequestAndResponse diff --git a/TIAMWebApp/Client/Services/WizardProcessor.cs b/TIAMWebApp/Client/Services/WizardProcessor.cs index cdc5bcf6..7a914030 100644 --- a/TIAMWebApp/Client/Services/WizardProcessor.cs +++ b/TIAMWebApp/Client/Services/WizardProcessor.cs @@ -1,10 +1,12 @@ using AyCode.Interfaces.Enums; using AyCode.Interfaces.Messages; using AyCode.Models.Messages; +using System.Diagnostics; using TIAM.Entities.Transfers; //using TIAM.Entities.TransferDestinations; using TIAMWebApp.Shared.Application.Interfaces; using TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels; +using TIAMWebApp.Shared.Application.Utility; using static AyCode.Interfaces.Enums.IMessageTypes; namespace TIAMWebApp.Client.Services @@ -33,6 +35,7 @@ namespace TIAMWebApp.Client.Services return result as TModelType; case "TransferWizardModel": + Console.WriteLine("TransferWizardModel"); var transferResult = await TransferDataService.CreateTransfer((TransferWizardModel)data); return transferResult as TModelType; diff --git a/TIAMWebApp/Server/.config/dotnet-tools.json b/TIAMWebApp/Server/.config/dotnet-tools.json new file mode 100644 index 00000000..d9d129ce --- /dev/null +++ b/TIAMWebApp/Server/.config/dotnet-tools.json @@ -0,0 +1,12 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "8.0.3", + "commands": [ + "dotnet-ef" + ] + } + } +} \ No newline at end of file diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index eef35a0f..bd14fc76 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -71,6 +71,60 @@ namespace TIAMWebApp.Server.Controllers return null;//await _transferDestinationDal.Context.TransferDestinations.FirstOrDefaultAsync(x => x.Address == address); } + [AllowAnonymous] + [HttpPost] + [Route(APIUrls.CreateTransferRouteName)] + public async Task CreateTransfer([FromBody] JsonElement serializedTransferModel) + { + Console.WriteLine("CreateTransfer called!"); + if (string.IsNullOrEmpty(serializedTransferModel.GetRawText())) + { + return BadRequest("SerializedTramsferDestinationWizardModel is required"); + } + else + { + TransferWizardModel? transfer = JObject.Parse(serializedTransferModel.GetRawText()).ToObject(); + + if (transfer != null) + { + + var id = Guid.NewGuid(); + //TransferDestination transferDestination = new TransferDestination(id, transferDestinationModel.Name, transferDestinationModel.Description, transferDestinationModel.AddressString); + + + if (string.IsNullOrEmpty(transfer.PhoneNumber) || string.IsNullOrEmpty(transfer.EmailAddress)) + { + return BadRequest("Invalid request"); + } + else + { + Console.WriteLine($"Transfer to be created: {id}"); + Console.WriteLine($"Transfer to be created: {transfer.Id}"); + Console.WriteLine($"Transfer to be created: {transfer.Destination}"); + Console.WriteLine($"Transfer to be created: {transfer.PickupAddress}"); + Console.WriteLine($"Transfer to be created: {transfer.TripDate}"); + Console.WriteLine($"Transfer to be created: {transfer.NumberOfPassengers}"); + Console.WriteLine($"Transfer to be created: {transfer.FullName}"); + Console.WriteLine($"Transfer to be created: {transfer.PhoneNumber}"); + Console.WriteLine($"Transfer to be created: {transfer.EmailAddress}"); + + + //await _transferDestinationDal.Context.TransferDestinations.AddAsync(transferDestination); + await _adminDal.AddTransferAsync(transfer.CopyToTransfer()); + return Ok(transfer); + } + } + else + { + return BadRequest("Invalid request"); + } + + + } + + + } + [AllowAnonymous] [HttpPost] [Route(APIUrls.CreateTransferDestinationRouteName)] diff --git a/TIAMWebApp/Server/Properties/PublishProfiles/FolderProfile1.pubxml b/TIAMWebApp/Server/Properties/PublishProfiles/FolderProfile1.pubxml index 8e9786ce..6e634529 100644 --- a/TIAMWebApp/Server/Properties/PublishProfiles/FolderProfile1.pubxml +++ b/TIAMWebApp/Server/Properties/PublishProfiles/FolderProfile1.pubxml @@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. --> - false + true false true Release @@ -13,5 +13,9 @@ https://go.microsoft.com/fwlink/?LinkID=208121. C:\REPOS\AYCODE\Publish\Server FileSystem <_TargetId>Folder + + net8.0 + 9d0f60cb-0462-4bdb-91bd-cadb574ab5a5 + false \ No newline at end of file diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index 02bc21a1..a67c706a 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -9,7 +9,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide public class Setting { public static UserBasicDetails UserBasicDetails { get; set; } - public const string BaseUrl = "https://localhost:7116"; + //public const string BaseUrl = "https://localhost:7116"; + public const string BaseUrl = "https://touriam.mangoweb.hu"; + public const string ApiBaseUrl = "https://touriam.mangoweb.hu"; public const bool DarkMode = false; public static string Locale { get; set; } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs index af8caf35..78f67e88 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferDestinationWizardModel.cs @@ -46,12 +46,12 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels [Required(ErrorMessage = "The price should be specified.")] [DataType("Price")] [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))] - public double Price2 { get; set; } + public double? Price2 { get; set; } [Required(ErrorMessage = "The price should be specified.")] [DataType("Price")] [Display(Name = ResourceKeys.Price, ResourceType = typeof(TIAMResources))] - public double Price3 { get; set; } + public double? Price3 { get; set; } public PriceType PriceType { get; set; } public Address Address { get; set; } @@ -66,9 +66,9 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels public TransferDestinationWizardModel() { } - public TransferDestinationWizardModel(string name, string description, string addressString, double price, double price2, double price3, Address address) :this(Guid.NewGuid(), name, description, addressString, price, price2, price3, address) + public TransferDestinationWizardModel(string name, string description, string addressString, double price, double? price2, double? price3, Address address) :this(Guid.NewGuid(), name, description, addressString, price, price2, price3, address) { } - public TransferDestinationWizardModel(Guid id, string name, string description, string addressString, double price, double price2, double price3, Address address) + public TransferDestinationWizardModel(Guid id, string name, string description, string addressString, double price, double? price2, double? price3, Address address) { Id = id.ToString(); diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs index 9ca41d22..9d93ad9c 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; +using TIAM.Entities.Transfers; using TIAM.Resources; namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels @@ -15,15 +16,13 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels { public Guid Id { get; set; } - //[Required(ErrorMessage = "The Username value should be specified.")] - //[Required(ErrorMessage = "The destination address should be specified.")] + [Destination(ErrorMessage = "The destination value is invalid.")] [DataType("TransferDestination")] [Display(Name = ResourceKeys.Destination, ResourceType = typeof(TIAMResources))] public string? Destination { get; set; } - //[Required(ErrorMessage = "The Username value should be specified.")] - //[Required(ErrorMessage = "The pickup address should be specified.")] + [DataType("TransferDestination")] [Display(Name = ResourceKeys.PickupAddress, ResourceType = typeof(TIAMResources))] public string? PickupAddress { get; set; } @@ -106,6 +105,29 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels Driver = driver; } + public Transfer CopyToTransfer() + { + var transfer = new Transfer + { + Id = this.Id, + + ToAddress = this.Destination, + FromAddress = this.PickupAddress, + Appointment = this.TripDate, + PassengerCount = Convert.ToByte(this.NumberOfPassengers), + //FullName = model.FullName, + //PhoneNumber = model.PhoneNumber, + //EmailAddress = model.EmailAddress, + Price = this.Price, + UserProductMappingId = Guid.NewGuid(), + TransferStatusType = TIAM.Core.Enums.TransferStatusType.OrderSubmitted, + Comment = "Transfer order", + ReferralProductId = Guid.NewGuid(), + }; + + return transfer; + } + } [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Parameter, AllowMultiple = false)] diff --git a/TIAMWebApp/Shared/Models/UserSessionModel.cs b/TIAMWebApp/Shared/Models/UserSessionModel.cs index 88f384ff..50eb0c90 100644 --- a/TIAMWebApp/Shared/Models/UserSessionModel.cs +++ b/TIAMWebApp/Shared/Models/UserSessionModel.cs @@ -1,28 +1,33 @@ using System.Collections.Generic; using Microsoft.IdentityModel.Tokens; using TIAM.Entities.Users; +using TIAM.Models.Dtos.Users; namespace TIAMWebApp.Shared.Application.Models { public class UserSessionModel { + //TODO: add user class + public UserModelDto UserModelDto { get; set; } public Guid UserId { get; set; } public UserType UserType { get; set; } - public string? UserName { get; set; } + public string? UserName => UserModelDto?.Profile?.Name; public string DisplayName => string.IsNullOrWhiteSpace(UserName) ? UserId.ToString() : UserName; public Dictionary? HasProperties { get; set; } public int UserRoles { get; set; } public Dictionary UserRolesDictionary { get; set; } - public UserSessionModel(Guid userId, UserType userType, string? userName, Dictionary? hasProperties, int userRoles) + public UserSessionModel(Guid userId, UserType userType, UserModelDto userModelDto, Dictionary? hasProperties, int userRoles) { UserId = userId; UserType = userType; - UserName = userName; + UserModelDto = userModelDto; HasProperties = hasProperties; //UserRoles = userRoles; //UserRolesDictionary = new Dictionary(); + + //UserModelDto.ServiceProviders[0]. } } diff --git a/TIAMWebApp/Shared/Services/ImageDataService.cs b/TIAMWebApp/Shared/Services/ImageDataService.cs index 35b06201..b4190f65 100644 --- a/TIAMWebApp/Shared/Services/ImageDataService.cs +++ b/TIAMWebApp/Shared/Services/ImageDataService.cs @@ -56,7 +56,7 @@ namespace TIAMWebApp.Shared.Application.Services public async Task UploadImageAsync(MultipartContent image) { - var url = $"{Setting.BaseUrl}/{APIUrls.UploadImage}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.UploadImage}"; var response = await _http.PostAsync(url, image); //var result = new WizardProcessorResult(); diff --git a/TIAMWebApp/Shared/Services/TransferDataService.cs b/TIAMWebApp/Shared/Services/TransferDataService.cs index accd07ed..a9e70e58 100644 --- a/TIAMWebApp/Shared/Services/TransferDataService.cs +++ b/TIAMWebApp/Shared/Services/TransferDataService.cs @@ -22,7 +22,8 @@ namespace TIAMWebApp.Shared.Application.Services public async Task> GetDestinationsAsync() { - var url = $"{Setting.BaseUrl}/{APIUrls.GetTransferDestinations}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetTransferDestinations}"; + //var url = $"{APIUrls.GetTransferDestinations}"; logToBrowserConsole.LogToBC(url); List? response = await http.GetFromJsonAsync>(url); if(response == null) @@ -32,19 +33,19 @@ namespace TIAMWebApp.Shared.Application.Services public async Task GetTransferDestinationbyCoordinatesAsync(string destinationId) { - var url = $"{Setting.BaseUrl}/{APIUrls.GetTransferDestinationByCoordinates}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetTransferDestinationByCoordinates}"; return await http.GetFromJsonAsync(url); } public async Task GetTransferDestinationbyAddressAsync(string destinationId) { - var url = $"{Setting.BaseUrl}/{APIUrls.GetTransferDestinationByAddress}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.GetTransferDestinationByAddress}"; return await http.GetFromJsonAsync(url); } public async Task CreateTransferDestination(TransferDestination model) { - var url = $"{Setting.BaseUrl}/{APIUrls.CreateTransferDestination}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateTransferDestination}"; var response = await http.PostAsJsonAsync(url, model); //var result = new WizardProcessorResult(); @@ -64,10 +65,20 @@ namespace TIAMWebApp.Shared.Application.Services } public async Task CreateTransfer(TransferWizardModel model) - { - var url = $"{Setting.BaseUrl}/{APIUrls.CreateTransferDestination}"; + { + logToBrowserConsole.LogToBC("CreateTransfer called"); + logToBrowserConsole.LogToBC(model.PickupAddress); + logToBrowserConsole.LogToBC(model.Destination); + logToBrowserConsole.LogToBC(model.EmailAddress); + logToBrowserConsole.LogToBC(model.PhoneNumber); + logToBrowserConsole.LogToBC(model.TripDate.ToString()); + logToBrowserConsole.LogToBC(model.NumberOfPassengers.ToString()); + model.Id = Guid.NewGuid(); + + var url = $"{Setting.ApiBaseUrl}/{APIUrls.CreateTransfer}"; var response = await http.PostAsJsonAsync(url, model); + //var result = new WizardProcessorResult(); //if (response.IsSuccessStatusCode) @@ -86,7 +97,7 @@ namespace TIAMWebApp.Shared.Application.Services public async Task UpdateTransferDestination(TransferDestination model) { - var url = $"{Setting.BaseUrl}/{APIUrls.UpdateTransferDestination}"; + var url = $"{Setting.ApiBaseUrl}/{APIUrls.UpdateTransferDestination}"; var response = await http.PostAsJsonAsync(url, model); //var result = new WizardProcessorResult(); From 3c7449b7b0e6ecb35131ba795a71ab2e78a64c37 Mon Sep 17 00:00:00 2001 From: Adam Date: Wed, 27 Mar 2024 23:50:22 +0100 Subject: [PATCH 3/3] api url fix in settings --- .../Controllers/TransferDataAPIController.cs | 41 ------------ .../Server/Services/TransferBackendService.cs | 64 +++++++++++++++++++ .../Shared/Models/ClientSide/Setting.cs | 7 +- .../UI/WizardModels/TransferWizardModel.cs | 2 +- 4 files changed, 69 insertions(+), 45 deletions(-) create mode 100644 TIAMWebApp/Server/Services/TransferBackendService.cs diff --git a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs index c81e2371..566bbaac 100644 --- a/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs +++ b/TIAMWebApp/Server/Controllers/TransferDataAPIController.cs @@ -48,48 +48,7 @@ namespace TIAMWebApp.Server.Controllers _adminDal = adminDal; } - public double GetTransferPrice(Guid productId, Guid fromTransferDestinationId, Guid toTranferDestinationId) - { - throw new NotImplementedException(); - } - public double GetTransferPrice(Guid productId, TransferDestination fromTransferDestination, TransferDestination toTransferDestination, in byte seatNumber) - { - var product = _adminDal.GetProductById(productId); - - if (product == null) return -1; - - return GetTransferPrice(product, fromTransferDestination, toTransferDestination, in seatNumber); - } - - public double GetTransferPrice(Product product, TransferDestination fromTransferDestination, TransferDestination toTransferDestination, in byte seatNumber) - { - var baseDestination = product.Profile.AddressId == fromTransferDestination.AddressId ? toTransferDestination : fromTransferDestination; - - var transferDestinationToProduct = _adminDal.GetTransferDestinationToProduct(product.Id, baseDestination.Id); - - var tranferDestinationPrice = transferDestinationToProduct ?? baseDestination as ITransfeDestinationPrices; - - var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber); - - //TODO: ExtraPrice - J. - - return price; - } - - public double GetSeatNumberPrice(in ITransfeDestinationPrices transfeDestinationPrices, in byte seatNumber) - => GetSeatNumberPrice(transfeDestinationPrices.Price, transfeDestinationPrices.Price2, transfeDestinationPrices.Price3, seatNumber); - - public double GetSeatNumberPrice(in double price, in double? price2, in double? price3, in byte seatNumber) - { - if (seatNumber >= (byte)SeatNumberPriceType.Price3SeatNum) - return price3 ?? price; //TODO: *seatnum percent - J. - - if (seatNumber >= (byte)SeatNumberPriceType.Price2SeatNum) - return price2 ?? price; //TODO: *seatnum percent - J. - - return price; - } //public double GetExtraPrice(bool? extraPriceType){} diff --git a/TIAMWebApp/Server/Services/TransferBackendService.cs b/TIAMWebApp/Server/Services/TransferBackendService.cs new file mode 100644 index 00000000..cbb94703 --- /dev/null +++ b/TIAMWebApp/Server/Services/TransferBackendService.cs @@ -0,0 +1,64 @@ +using TIAM.Core.Enums; +using TIAM.Database.DataLayers.Admins; +using TIAM.Database.DataLayers.Users; +using TIAM.Entities.Products; +using TIAM.Entities.Transfers; + +namespace TIAMWebApp.Server.Services +{ + public class TransferBackendService + { + private readonly IConfiguration _configuration; + public AdminDal _adminDal; + + public TransferBackendService(IConfiguration configuration, AdminDal adminDal) + { + + _configuration = configuration; + _adminDal = adminDal; + } + + public double GetTransferPrice(Guid productId, Guid fromTransferDestinationId, Guid toTranferDestinationId) + { + throw new NotImplementedException(); + } + + public double GetTransferPrice(Guid productId, TransferDestination fromTransferDestination, TransferDestination toTransferDestination, in byte seatNumber) + { + var product = _adminDal.GetProductById(productId); + + if (product == null) return -1; + + return GetTransferPrice(product, fromTransferDestination, toTransferDestination, in seatNumber); + } + + public double GetTransferPrice(Product product, TransferDestination fromTransferDestination, TransferDestination toTransferDestination, in byte seatNumber) + { + var baseDestination = product.Profile.AddressId == fromTransferDestination.AddressId ? toTransferDestination : fromTransferDestination; + + var transferDestinationToProduct = _adminDal.GetTransferDestinationToProduct(product.Id, baseDestination.Id); + + var tranferDestinationPrice = transferDestinationToProduct ?? baseDestination as ITransfeDestinationPrices; + + var price = GetSeatNumberPrice(in tranferDestinationPrice, seatNumber); + + //TODO: ExtraPrice - J. + + return price; + } + + public double GetSeatNumberPrice(in ITransfeDestinationPrices transfeDestinationPrices, in byte seatNumber) + => GetSeatNumberPrice(transfeDestinationPrices.Price, transfeDestinationPrices.Price2, transfeDestinationPrices.Price3, seatNumber); + + public double GetSeatNumberPrice(in double price, in double? price2, in double? price3, in byte seatNumber) + { + if (seatNumber >= (byte)SeatNumberPriceType.Price3SeatNum) + return price3 ?? price; //TODO: *seatnum percent - J. + + if (seatNumber >= (byte)SeatNumberPriceType.Price2SeatNum) + return price2 ?? price; //TODO: *seatnum percent - J. + + return price; + } + } +} diff --git a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs index a67c706a..2d0bac42 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/Setting.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/Setting.cs @@ -9,9 +9,10 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide public class Setting { public static UserBasicDetails UserBasicDetails { get; set; } - //public const string BaseUrl = "https://localhost:7116"; - public const string BaseUrl = "https://touriam.mangoweb.hu"; - public const string ApiBaseUrl = "https://touriam.mangoweb.hu"; + public const string BaseUrl = "https://localhost:7116"; + 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 bool DarkMode = false; public static string Locale { get; set; } } diff --git a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs index 9d93ad9c..d07af510 100644 --- a/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs +++ b/TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/TransferWizardModel.cs @@ -122,7 +122,7 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels UserProductMappingId = Guid.NewGuid(), TransferStatusType = TIAM.Core.Enums.TransferStatusType.OrderSubmitted, Comment = "Transfer order", - ReferralProductId = Guid.NewGuid(), + }; return transfer;