diff --git a/TIAMSharedUI/Pages/Components/AddressSearchAndSelectComponent.razor b/TIAMSharedUI/Pages/Components/AddressSearchAndSelectComponent.razor index 11a7f9ad..3836d28a 100644 --- a/TIAMSharedUI/Pages/Components/AddressSearchAndSelectComponent.razor +++ b/TIAMSharedUI/Pages/Components/AddressSearchAndSelectComponent.razor @@ -1,10 +1,11 @@ @using AyCode.Blazor.Components.Components +@using AyCode.Core.Helpers @using TIAMWebApp.Shared.Application.Services @inject GooglePlacesService GooglePlacesService - +
@@ -22,7 +23,7 @@ else {

No address found

} - +
@code { @@ -30,6 +31,8 @@ else [Parameter] public EventCallback AddressChanged { get; set; } + [Parameter] public string CssClass { get; set; } + private string Address { get; set; } private List Predictions { get; set; } = new(); private PredictionItem selectedPrediction { get; set; } @@ -38,7 +41,7 @@ else get => selectedPrediction; set { - SetNewDestination(value.Description); + SetNewDestination(value.Description).Forget(); selectedPrediction = value; } } diff --git a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor index e4a9e5ab..fa645810 100644 --- a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor +++ b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor @@ -53,7 +53,7 @@ else [Parameter] public bool isEditing { get; set; } = false; [Parameter] public bool userAvailable { get; set; } [Parameter] public UserModelDtoDetail userModelDtodetail { get; set; } - [Parameter] public Product CurrentProduct { get; set; } + [Parameter] public Product? CurrentProduct { get; set; } = null; string _formSubmitResult = ""; private string _spinnerClass = ""; diff --git a/TIAMSharedUI/Pages/Index.razor b/TIAMSharedUI/Pages/Index.razor index 4e8dffa1..c2e934da 100644 --- a/TIAMSharedUI/Pages/Index.razor +++ b/TIAMSharedUI/Pages/Index.razor @@ -24,8 +24,8 @@ - -
+ +@*
@@ -39,10 +39,10 @@
-
+
*@ -
+
diff --git a/TIAMSharedUI/Pages/TransferFinal.razor b/TIAMSharedUI/Pages/TransferFinal.razor index 2e075e0c..db36fd68 100644 --- a/TIAMSharedUI/Pages/TransferFinal.razor +++ b/TIAMSharedUI/Pages/TransferFinal.razor @@ -1,4 +1,4 @@ -@page "/transfer2" +@page "/transfer2/{transferId:guid}" Transferdetails @inject NavigationManager navManager @@ -67,6 +67,8 @@ @code { + [Parameter] public Guid? transferId { get; set; } + public void next() => navManager.NavigateTo("/transfer"); public void previous() => navManager.NavigateTo("/transfer3"); } diff --git a/TIAMSharedUI/Pages/TransferPage.razor b/TIAMSharedUI/Pages/TransferPage.razor index e90b8293..51b483e1 100644 --- a/TIAMSharedUI/Pages/TransferPage.razor +++ b/TIAMSharedUI/Pages/TransferPage.razor @@ -1,5 +1,6 @@ @page "/transfer" @using TIAMSharedUI.Pages.Components +@using TIAMSharedUI.Pages.Components.EditComponents @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Interfaces @using TIAMWebApp.Shared.Application.Models.ClientSide.UI @@ -10,18 +11,18 @@ @inject IWizardProcessor WizardProcessor Transfer - -
+ +
- - + SubtitleResourceString="TransferSubtitle"> *@ +
diff --git a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor index c2c6111d..46f1150d 100644 --- a/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor +++ b/TIAMSharedUI/Pages/User/Hotels/CreateAndManageTransfer.razor @@ -17,7 +17,6 @@ @inherits BasePageComponent @layout AdminLayout @inject IPopulationStructureDataProvider DataProvider -@inject ISessionService SessionService @inject IUserDataService UserDataService @inject IEnumerable LogWriters @inject AdminSignalRClient _adminSignalRClient @@ -71,9 +70,9 @@ private Product selectedHotel { get; set; } public Product SelectedHotel { - get - { - return selectedHotel; + get + { + return selectedHotel; } set { @@ -100,16 +99,19 @@ protected override void OnInitialized() { _logger = new LoggerClient(LogWriters.ToArray()); - - if (SessionService.User.UserModelDto.Products.Count() > 0) + if (_sessionService.User != null) { - if (SessionService.User.UserModelDto.Products.Any(x => x.ProductType == TIAM.Core.Enums.ProductType.Hotel)) + + if (_sessionService.User.UserModelDto.Products.Count() > 0) { - Hotels = SessionService.GetHotels(); - if(!SelectedHotelInitialized) + if (_sessionService.User.UserModelDto.Products.Any(x => x.ProductType == TIAM.Core.Enums.ProductType.Hotel)) { - SelectedHotel = Hotels[0]; - SelectedHotelInitialized = true; + Hotels = _sessionService.GetHotels(); + if (!SelectedHotelInitialized) + { + SelectedHotel = Hotels[0]; + SelectedHotelInitialized = true; + } } } } diff --git a/TIAMSharedUI/Shared/ComboboxItemSelector.razor b/TIAMSharedUI/Shared/ComboboxItemSelector.razor index 3f295c35..5aba6ae6 100644 --- a/TIAMSharedUI/Shared/ComboboxItemSelector.razor +++ b/TIAMSharedUI/Shared/ComboboxItemSelector.razor @@ -18,14 +18,13 @@ @using TIAMWebApp.Shared.Application.Services @inject GooglePlacesService GooglePlacesService - - + + - + @* diff --git a/TIAMSharedUI/Shared/Components/Navbar.razor b/TIAMSharedUI/Shared/Components/Navbar.razor index 6e43bd38..7835acf2 100644 --- a/TIAMSharedUI/Shared/Components/Navbar.razor +++ b/TIAMSharedUI/Shared/Components/Navbar.razor @@ -12,10 +12,10 @@ TourIam Logo - -