From a26eb45d9f3c4091a885511883aa2ac249dbfae9 Mon Sep 17 00:00:00 2001 From: Loretta Date: Mon, 8 Jul 2024 07:31:22 +0200 Subject: [PATCH] Add Revenue to Transfer; improvements, fixes, etc... --- TIAM.Entities/Transfers/Transfer.cs | 2 ++ .../Components/EditComponents/DynamicEditForm.razor | 3 ++- TIAMSharedUI/Pages/Components/FullNameEditor.razor | 11 ++++++----- .../Pages/Components/FullNameEditor.razor.cs | 9 +++++---- TIAMSharedUI/Pages/Components/InputWizard.razor | 2 +- TIAMSharedUI/Pages/Login.razor | 4 ++-- TIAMSharedUI/Pages/Register.razor | 2 +- .../User/CardComponents/TransferCardComponent.razor | 2 +- .../Pages/User/Drivers/DriverManageCars.razor | 2 +- .../Pages/User/Drivers/DriverManageTransfers.razor | 6 +++--- TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor | 10 +++++----- .../Pages/User/ManageMyServiceProvider.razor | 2 +- TIAMSharedUI/Pages/User/MyServiceProviders.razor | 2 +- TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor | 2 +- TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor | 2 +- .../Pages/User/SysAdmins/ManageDrivers.razor | 2 +- .../Pages/User/SysAdmins/ManageProducts.razor | 2 +- .../User/SysAdmins/ManageServiceProviders.razor | 2 +- .../ManageTransferDestinationToProducts.razor | 2 +- .../User/SysAdmins/ManageTransferDestinations.razor | 2 +- .../Pages/User/SysAdmins/ManageTransfers.razor | 5 +++-- .../User/SysAdmins/ManageUserProductMappings.razor | 2 +- TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor | 2 +- .../Pages/User/SysAdmins/SysAdminComponent.razor | 12 ++++++------ 24 files changed, 49 insertions(+), 43 deletions(-) diff --git a/TIAM.Entities/Transfers/Transfer.cs b/TIAM.Entities/Transfers/Transfer.cs index f11a2b59..da467b03 100644 --- a/TIAM.Entities/Transfers/Transfer.cs +++ b/TIAM.Entities/Transfers/Transfer.cs @@ -42,6 +42,8 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign public bool Paid { get; set; } public double? Price { get; set; } + public double? Revenue { get; set; } + public byte PassengerCount { get; set; } public byte LuggageCount { get; set; } diff --git a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor index 115f70a4..bd8840dd 100644 --- a/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor +++ b/TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor @@ -3,6 +3,7 @@ @using System.ComponentModel.DataAnnotations @using AyCode.Services.Loggers @using System.Reflection +@using AyCode.Blazor.Components.Components @using TIAM.Entities.Transfers @using TIAMSharedUI.Shared @using TIAMWebApp.Shared.Application.Utility @@ -227,7 +228,7 @@ else else if (property.PropertyType == typeof(IEnumerable) && property.Name == "Occupation") { - editor.OpenComponent>(j); + editor.OpenComponent>(j); editor.AddAttribute(j++, "Data", AdditionalData.Occupations); editor.AddAttribute(j++, "Value", property.GetValue(Data)); editor.AddAttribute(j++, "ValueExpression", lambda); diff --git a/TIAMSharedUI/Pages/Components/FullNameEditor.razor b/TIAMSharedUI/Pages/Components/FullNameEditor.razor index 9ccb75cc..844a735b 100644 --- a/TIAMSharedUI/Pages/Components/FullNameEditor.razor +++ b/TIAMSharedUI/Pages/Components/FullNameEditor.razor @@ -1,19 +1,20 @@ -

+@using AyCode.Blazor.Components.Components +

@NullText

- - - + - + @code { diff --git a/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs b/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs index 76267243..4ac49034 100644 --- a/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs +++ b/TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs @@ -1,11 +1,12 @@ -using DevExpress.Blazor; +using AyCode.Blazor.Components.Components; +using DevExpress.Blazor; +using DevExpress.Blazor.Base; using Microsoft.AspNetCore.Components; namespace TIAMSharedUI.Pages.Components { public partial class FullNameEditor : ComponentBase { - [Parameter] public string FirstName { get; set; } @@ -24,8 +25,8 @@ namespace TIAMSharedUI.Pages.Components public EventCallback LastNameChanged { get; set; } public int InputDelay { get; set; } = 500; - public DxTextBox firstNameTextField; - public DxTextBox lastNameTextField; + public AcTextBox firstNameTextField; + public AcTextBox lastNameTextField; void OnFirstNameChanged(string newValue) { diff --git a/TIAMSharedUI/Pages/Components/InputWizard.razor b/TIAMSharedUI/Pages/Components/InputWizard.razor index e53f73de..0a19994c 100644 --- a/TIAMSharedUI/Pages/Components/InputWizard.razor +++ b/TIAMSharedUI/Pages/Components/InputWizard.razor @@ -2,7 +2,7 @@ @using System.ComponentModel.DataAnnotations @using BlazorAnimation -@* *@ +@* *@
- +
@@ -63,7 +63,7 @@
- +

Welcome back to Budapest Airport Transfer Services! We're delighted to have you return to our platform. Please sign in to access your account and manage your bookings effortlessly. If you're new here, feel free to create an account to unlock exclusive benefits and enjoy a seamless booking experience. diff --git a/TIAMSharedUI/Pages/Register.razor b/TIAMSharedUI/Pages/Register.razor index 79b36773..312b79d8 100644 --- a/TIAMSharedUI/Pages/Register.razor +++ b/TIAMSharedUI/Pages/Register.razor @@ -18,7 +18,7 @@

- +