Adam
/
TourIAm
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://git2.aycode.com/Adam/TourIAm

This commit is contained in:
Adam 2024-07-08 12:49:07 +02:00
parent 2bab0971d2 a26eb45d9f
commit 5921bd0f6c
27 changed files with 106 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TIAM.Entities/Transfers/Transfer.cs
View File

@ -42,6 +42,8 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign
public bool Paid { get; set; } public bool Paid { get; set; }
public double? Price { get; set; } public double? Price { get; set; }
public double? Revenue { get; set; }
public byte PassengerCount { get; set; } public byte PassengerCount { get; set; }
public byte LuggageCount { get; set; } public byte LuggageCount { get; set; }

3
TIAMSharedUI/Pages/Components/EditComponents/DynamicEditForm.razor
View File

@ -3,6 +3,7 @@
@using System.ComponentModel.DataAnnotations @using System.ComponentModel.DataAnnotations
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using System.Reflection @using System.Reflection
@using AyCode.Blazor.Components.Components
@using TIAM.Entities.Transfers @using TIAM.Entities.Transfers
@using TIAMSharedUI.Shared @using TIAMSharedUI.Shared
@using TIAMWebApp.Shared.Application.Utility @using TIAMWebApp.Shared.Application.Utility
@ -227,7 +228,7 @@ else
else if (property.PropertyType == typeof(IEnumerable<string>) && property.Name == "Occupation") else if (property.PropertyType == typeof(IEnumerable<string>) && property.Name == "Occupation")
{ {
editor.OpenComponent<DxComboBox<string, string>>(j); editor.OpenComponent<AcComboBox<string, string>>(j);
editor.AddAttribute(j++, "Data", AdditionalData.Occupations); editor.AddAttribute(j++, "Data", AdditionalData.Occupations);
editor.AddAttribute(j++, "Value", property.GetValue(Data)); editor.AddAttribute(j++, "Value", property.GetValue(Data));
editor.AddAttribute(j++, "ValueExpression", lambda); editor.AddAttribute(j++, "ValueExpression", lambda);

11
TIAMSharedUI/Pages/Components/FullNameEditor.razor
View File

@ -1,19 +1,20 @@
<h3> @using AyCode.Blazor.Components.Components
<h3>
@NullText @NullText
</h3> </h3>
<DxTextBox @ref="firstNameTextField" <AcTextBox @ref="firstNameTextField"
TextChanged="@((newValue) => OnFirstNameChanged(newValue))" TextChanged="@((newValue) => OnFirstNameChanged(newValue))"
TextExpression="@(() => FirstName)" TextExpression="@(() => FirstName)"
CssClass="form-field w-100" CssClass="form-field w-100"
NullText="First name"> NullText="First name">
</DxTextBox> </AcTextBox>
<DxTextBox @ref="lastNameTextField" <AcTextBox @ref="lastNameTextField"
TextChanged="@((newValue) => OnLastNameChanged(newValue))" TextChanged="@((newValue) => OnLastNameChanged(newValue))"
TextExpression="@(() => LastName)" TextExpression="@(() => LastName)"
CssClass="form-field w-100" CssClass="form-field w-100"
NullText="Last name"> NullText="Last name">
</DxTextBox> </AcTextBox>
@code { @code {

9
TIAMSharedUI/Pages/Components/FullNameEditor.razor.cs
View File

@ -1,11 +1,12 @@
using DevExpress.Blazor; using AyCode.Blazor.Components.Components;
using DevExpress.Blazor;
using DevExpress.Blazor.Base;
using Microsoft.AspNetCore.Components; using Microsoft.AspNetCore.Components;
namespace TIAMSharedUI.Pages.Components namespace TIAMSharedUI.Pages.Components
{ {
public partial class FullNameEditor : ComponentBase public partial class FullNameEditor : ComponentBase
{ {
[Parameter] [Parameter]
public string FirstName { get; set; } public string FirstName { get; set; }
@ -24,8 +25,8 @@ namespace TIAMSharedUI.Pages.Components
public EventCallback<string> LastNameChanged { get; set; } public EventCallback<string> LastNameChanged { get; set; }
public int InputDelay { get; set; } = 500; public int InputDelay { get; set; } = 500;
public DxTextBox firstNameTextField; public AcTextBox firstNameTextField;
public DxTextBox lastNameTextField; public AcTextBox lastNameTextField;
void OnFirstNameChanged(string newValue) void OnFirstNameChanged(string newValue)
{ {

2
TIAMSharedUI/Pages/Components/InputWizard.razor
View File

@ -2,7 +2,7 @@
@using System.ComponentModel.DataAnnotations @using System.ComponentModel.DataAnnotations
@using BlazorAnimation @using BlazorAnimation
@* <Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> *@ @* <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> *@
<EditForm Model="@Data" <EditForm Model="@Data"
OnValidSubmit="@HandleValidSubmit" OnValidSubmit="@HandleValidSubmit"

4
TIAMSharedUI/Pages/Login.razor
View File

@ -15,7 +15,7 @@
<div class="container mt-3"> <div class="container mt-3">
<div class="row d-flex justify-content-center align-items-center h-100"> <div class="row d-flex justify-content-center align-items-center h-100">
<div class="col-12 col-sm-6 px-5"> <div class="col-12 col-sm-6 px-5">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass inputwizardwrapper my-5"> <div class="card glass inputwizardwrapper my-5">
<div class="wrapper"> <div class="wrapper">
@ -63,7 +63,7 @@
</Animation> </Animation>
</div> </div>
<div class="col-12 col-sm-6 px-5"> <div class="col-12 col-sm-6 px-5">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<p> <p>
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. 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.

2
TIAMSharedUI/Pages/Register.razor
View File

@ -18,7 +18,7 @@
<div class="container mt-3"> <div class="container mt-3">
<div class="row d-flex justify-content-center align-items-center h-100"> <div class="row d-flex justify-content-center align-items-center h-100">
<div class="col-12 col-sm-6"> <div class="col-12 col-sm-6">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass inputwizardwrapper my-5"> <div class="card glass inputwizardwrapper my-5">
<div class="wrapper"> <div class="wrapper">
<div class="my-logo"> <div class="my-logo">

2
TIAMSharedUI/Pages/User/CardComponents/TransferCardComponent.razor
View File

@ -4,7 +4,7 @@
@inject IServiceProviderDataService ServiceProviderDataService @inject IServiceProviderDataService ServiceProviderDataService
<div class=" col-12 col-xl-3"> <div class=" col-12 col-xl-3">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">

2
TIAMSharedUI/Pages/User/Drivers/DriverManageCars.razor
View File

@ -29,7 +29,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">

6
TIAMSharedUI/Pages/User/Drivers/DriverManageTransfers.razor
View File

@ -67,7 +67,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<DxTabs> <DxTabs>
@ -81,7 +81,7 @@
Click="ColumnChooserButton_Click" /> Click="ColumnChooserButton_Click" />
</div> </div>
<TransferDetailGrid @ref="_gridTransfer" <TransferGrid @ref="_gridTransfer"
Logger="_logger" Logger="_logger"
GetAllMessageTag="SignalRTags.GetTransfersByUserProductMappingId" GetAllMessageTag="SignalRTags.GetTransfersByUserProductMappingId"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
@ -203,7 +203,7 @@
</EditFormTemplate> </EditFormTemplate>
</TransferDetailGrid> </TransferGrid>
</div> </div>
</DxTabPage> </DxTabPage>

10
TIAMSharedUI/Pages/User/Hotels/HotelComponent.razor
View File

@ -11,7 +11,7 @@
<div class="row py-3"> <div class="row py-3">
<div class=" col-12 col-xl-3"> <div class=" col-12 col-xl-3">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -59,7 +59,7 @@
</Animation> </Animation>
</div> </div>
<div class=" col-12 col-xl-3"> <div class=" col-12 col-xl-3">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -110,7 +110,7 @@
</Animation> </Animation>
</div> </div>
<div class=" col-12 col-xl-3"> <div class=" col-12 col-xl-3">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -176,7 +176,7 @@
</div> </div>
<div class=" col-12 col-xl-3"> <div class=" col-12 col-xl-3">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -228,7 +228,7 @@
</Animation> </Animation>
</div> </div>
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card glass card-admin" style="border-radius: 16px;"> <div class="card glass card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">

2
TIAMSharedUI/Pages/User/ManageMyServiceProvider.razor
View File

@ -29,7 +29,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)">
<div class="card"> <div class="card">
<DxTabs> <DxTabs>
<DxTabPage Text="Details"> <DxTabPage Text="Details">

2
TIAMSharedUI/Pages/User/MyServiceProviders.razor
View File

@ -28,7 +28,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/LogViewer.razor
View File

@ -28,7 +28,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageCars.razor
View File

@ -29,7 +29,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageDrivers.razor
View File

@ -28,7 +28,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageProducts.razor
View File

@ -22,7 +22,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
View File

@ -81,7 +81,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<CompanyGrid @ref="_gridCompany" <CompanyGrid @ref="_gridCompany"

2
TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinationToProducts.razor
View File

@ -29,7 +29,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageTransferDestinations.razor
View File

@ -20,7 +20,7 @@
<div class="col-12"> <div class="col-12">
<h3>@localizer.GetString("TransferDestination")</h3> <h3>@localizer.GetString("TransferDestination")</h3>
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<TransferDestinationGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetAllTransferDestinations"></TransferDestinationGridComponent> <TransferDestinationGridComponent DetailExpandButtonDisplayMode="GridDetailExpandButtonDisplayMode.Auto" GetAllTag="SignalRTags.GetAllTransferDestinations"></TransferDestinationGridComponent>

5
TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
View File

@ -65,10 +65,10 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<DxTabs> <DxTabs>+-
<DxTabPage Text="DataGrid"> <DxTabPage Text="DataGrid">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
@ -116,6 +116,7 @@
<DxGridDataColumn FieldName="LuggageCount" Caption="Luggages" Width="80" TextAlignment="GridTextAlignment.Center" CaptionAlignment="GridTextAlignment.Center" /> <DxGridDataColumn FieldName="LuggageCount" Caption="Luggages" Width="80" TextAlignment="GridTextAlignment.Center" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="FlightNumber" Caption="FlightNum" Width="95" TextAlignment="GridTextAlignment.Center" CaptionAlignment="GridTextAlignment.Center" /> <DxGridDataColumn FieldName="FlightNumber" Caption="FlightNum" Width="95" TextAlignment="GridTextAlignment.Center" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="Price" Caption="Price" Width="70" CaptionAlignment="GridTextAlignment.Center" /> <DxGridDataColumn FieldName="Price" Caption="Price" Width="70" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="Revenue" Caption="Revenue" Width="70" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="FullName" /> <DxGridDataColumn FieldName="FullName" />
<DxGridDataColumn FieldName="ContactPhone" Width="120" /> <DxGridDataColumn FieldName="ContactPhone" Width="120" />
<DxGridDataColumn FieldName="ContactEmail" Width="120"> <DxGridDataColumn FieldName="ContactEmail" Width="120">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor
View File

@ -29,7 +29,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

2
TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
View File

@ -58,7 +58,7 @@
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.FadeInUp" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<div class="d-flex flex-column mb-4 pb-2"> <div class="d-flex flex-column mb-4 pb-2">
<div class="align-self-end pl-2 pb-2"> <div class="align-self-end pl-2 pb-2">

12
TIAMSharedUI/Pages/User/SysAdmins/SysAdminComponent.razor
View File

@ -8,7 +8,7 @@
<div class="row py-3"> <div class="row py-3">
<div class=" col-12 col-xl-3 col-lg-6"> <div class=" col-12 col-xl-3 col-lg-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
@ -49,7 +49,7 @@
</div> </div>
<div class=" col-12 col-xl-3 col-lg-6"> <div class=" col-12 col-xl-3 col-lg-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -87,7 +87,7 @@
</Animation> </Animation>
</div> </div>
<div class=" col-12 col-xl-3 col-lg-6"> <div class=" col-12 col-xl-3 col-lg-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -125,7 +125,7 @@
</Animation> </Animation>
</div> </div>
<div class=" col-12 col-xl-3 col-lg-6"> <div class=" col-12 col-xl-3 col-lg-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -165,7 +165,7 @@
</Animation> </Animation>
</div> </div>
<div class="col-12 col-xl-6"> <div class="col-12 col-xl-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -208,7 +208,7 @@
</Animation> </Animation>
</div> </div>
<div class="col-12 col-xl-6"> <div class="col-12 col-xl-6">
<Animation Effect="@Effect.FadeInUp" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.FadeIn" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card card-admin" style="border-radius: 16px;"> <div class="card card-admin" style="border-radius: 16px;">
<div class="card-header py-2 px-4"> <div class="card-header py-2 px-4">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">

2
TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
View File

@ -219,7 +219,7 @@
private Task LoadComboBoxItems() private Task LoadComboBoxItems()
{ {
//TODO: CarModelDtoMin-t megcsinálni és azt lekérni a ComboBox-hoz! - J. //TODO: CarModelDtoMin-t megcsinálni és azt lekérni a ComboBox-hoz! - J.
return AdminSignalRClient.GetAllCarsAndDriversByProductIdAsync(_cars, _drivers, TiamConstClient.TransferProductId, StateHasChanged); return AdminSignalRClient.GetAllCarsAndDriversByProductIdAsync(TiamConstClient.TransferProductId, _cars, _drivers, StateHasChanged);
} }
private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args) private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args)

6
TIAMWebApp/Shared/Services/AdminSignalRClient.cs
View File

@ -43,9 +43,9 @@ namespace TIAMWebApp.Shared.Application.Services
return await GetAllAsync<List<Car>>(SignalRTags.GetAllCarsByProductId, [productId]) ?? []; return await GetAllAsync<List<Car>>(SignalRTags.GetAllCarsByProductId, [productId]) ?? [];
} }
public Task GetAllCarsAndDriversByProductIdAsync(List<Car> intoCars, List<UserProductMapping> intoDrivers, Guid productId, Action? callback = null) public Task GetAllCarsAndDriversByProductIdAsync(Guid productId, List<Car> intoCars, List<UserProductMapping> intoDrivers, Action? callback = null)
{ {
return GetAllCarsByProductIdAsync(intoCars, productId, () => return GetAllCarsByProductIdAsync(productId, intoCars, () =>
{ {
intoDrivers.Clear(); intoDrivers.Clear();
intoDrivers.AddRange(intoCars.DistinctBy(x => x.UserProductMappingId).Select(x => x.UserProductMapping)); intoDrivers.AddRange(intoCars.DistinctBy(x => x.UserProductMappingId).Select(x => x.UserProductMapping));
@ -54,7 +54,7 @@ namespace TIAMWebApp.Shared.Application.Services
}); });
} }
public Task GetAllCarsByProductIdAsync(List<Car> intoCars, Guid productId, Action? callback = null) public Task GetAllCarsByProductIdAsync(Guid productId, List<Car> intoCars, Action? callback = null)
{ {
Logger.Detail($"GetAllCarsByProductIdAsync client called; productId: {productId}"); Logger.Detail($"GetAllCarsByProductIdAsync client called; productId: {productId}");

57
Tiam.Services.Client.Tests/SignalRClientTest.cs
View File

@ -7,9 +7,11 @@ using Azure;
using DevExpress.Data.Filtering; using DevExpress.Data.Filtering;
using DevExpress.Data.Linq; using DevExpress.Data.Linq;
using DevExpress.Data.Linq.Helpers; using DevExpress.Data.Linq.Helpers;
using TIAM.Core.Consts;
using TIAM.Core.Enums; using TIAM.Core.Enums;
using TIAM.Core.Loggers; using TIAM.Core.Loggers;
using TIAM.Database.Test; using TIAM.Database.Test;
using TIAM.Entities.Drivers;
using TIAM.Entities.ServiceProviders; using TIAM.Entities.ServiceProviders;
using TIAM.Entities.Transfers; using TIAM.Entities.Transfers;
using TIAM.Entities.Users; using TIAM.Entities.Users;
@ -28,11 +30,13 @@ namespace Tiam.Services.Client.Tests
[TestInitialize] [TestInitialize]
public void TestInitialize() public void TestInitialize()
{ } {
}
[TestCleanup] [TestCleanup]
public void TearDown() public void TearDown()
{ } {
}
[DataTestMethod] [DataTestMethod]
[DataRow(CompanyIdString)] [DataRow(CompanyIdString)]
@ -176,12 +180,12 @@ namespace Tiam.Services.Client.Tests
var transferDestinationToProducts = await _signalRClient.GetByIdAsync<List<TransferDestinationToProduct>>(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId, transferDestId); var transferDestinationToProducts = await _signalRClient.GetByIdAsync<List<TransferDestinationToProduct>>(SignalRTags.GetTransferDestinationToProductsByTransferDestinationId, transferDestId);
Assert.IsNotNull(transferDestinationToProducts); Assert.IsNotNull(transferDestinationToProducts);
Assert.IsTrue(transferDestinationToProducts.Count > 0); Assert.IsTrue(transferDestinationToProducts.Count > 0);
Assert.IsTrue(transferDestinationToProducts.All(x=>x.TransferDestinationId == transferDestId)); Assert.IsTrue(transferDestinationToProducts.All(x => x.TransferDestinationId == transferDestId));
transferDestinationToProducts = await _signalRClient.GetByIdAsync<List<TransferDestinationToProduct>>(SignalRTags.GetTransferDestinationToProductsByProductId, productId); transferDestinationToProducts = await _signalRClient.GetByIdAsync<List<TransferDestinationToProduct>>(SignalRTags.GetTransferDestinationToProductsByProductId, productId);
Assert.IsNotNull(transferDestinationToProducts); Assert.IsNotNull(transferDestinationToProducts);
Assert.IsTrue(transferDestinationToProducts.Count > 0); Assert.IsTrue(transferDestinationToProducts.Count > 0);
Assert.IsTrue(transferDestinationToProducts.All(x=>x.ProductId == productId)); Assert.IsTrue(transferDestinationToProducts.All(x => x.ProductId == productId));
await _signalRClient.PostDataAsync(SignalRTags.RemoveTransferDestinationToProduct, transferDestinationToProduct); //mielõbb kitöröljük, h ne maradjon szemét a db-ben - J. await _signalRClient.PostDataAsync(SignalRTags.RemoveTransferDestinationToProduct, transferDestinationToProduct); //mielõbb kitöröljük, h ne maradjon szemét a db-ben - J.
@ -203,12 +207,12 @@ namespace Tiam.Services.Client.Tests
//_signalRDataSource.AsQueryable().Expression. //_signalRDataSource.AsQueryable().Expression.
//var filteredData = new List<Transfer>().AsQueryable().AppendWhere(converter, criteria) as IQueryable<Transfer>; //var filteredData = new List<Transfer>().AsQueryable().AppendWhere(converter, criteria) as IQueryable<Transfer>;
var transfers = await _signalRClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersByFilterText, [criteriaString]); var transfers = await _signalRClient.GetTransfersByFilterText(criteriaString);
//var transfers = await _signalRClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersByExpression, [userId, filteredData!.Expression]); //var transfers = await _signalRClient.GetAllAsync<List<Transfer>>(SignalRTags.GetTransfersByExpression, [userId, filteredData!.Expression]);
Assert.IsNotNull(transfers); Assert.IsNotNull(transfers);
Assert.IsTrue(transfers.Count > 0); Assert.IsTrue(transfers.Count > 0);
Assert.IsTrue(transfers.All(x=>statuses.Contains(x.TransferStatusType))); Assert.IsTrue(transfers.All(x => statuses.Contains(x.TransferStatusType)));
//var converter = new CriteriaToExpressionConverter(); //var converter = new CriteriaToExpressionConverter();
////CriteriaOperator critOps = CriteriaOperator.Parse(tdashboard.EmployeeFilter); ////CriteriaOperator critOps = CriteriaOperator.Parse(tdashboard.EmployeeFilter);
@ -227,5 +231,46 @@ namespace Tiam.Services.Client.Tests
//Assert.IsNotNull(filteredTransfers); //Assert.IsNotNull(filteredTransfers);
//Assert.IsTrue(filteredTransfers.All(x => x.LuggageCount == 1)); //Assert.IsTrue(filteredTransfers.All(x => x.LuggageCount == 1));
} }
[TestMethod]
public async Task GetAllTransfersTest_ReturnTransfers_WhenHasTransfers()
{
var transfers = await _signalRClient.GetTransfers();
Assert.IsNotNull(transfers);
Assert.IsTrue(transfers.Count > 0);
}
[TestMethod]
[DataRow("540271F6-C604-4C16-8160-D5A7CAFEDF00")]
public async Task GetTransfersByUserIdTest_ReturnTransfers_WhenAllTransfersByUserId(string userIdString)
{
var userId = Guid.Parse(userIdString);
var transfers = await _signalRClient.GetTransfersByUserId(userId);
Assert.IsNotNull(transfers);
Assert.IsTrue(transfers.Count > 0);
Assert.IsTrue(transfers.All(x => x.UserId == userId));
}
[TestMethod]
[DataRow("")]
public async Task GetAllCarsAndDriversByProductIdAsyncTest_ReturnCarsAndDrivers_WhenHasCarsAndDrivers(string productIdString)
{
var cars = new List<Car>();
var drivers = new List<UserProductMapping>();
var productId = TiamConstClient.TransferProductId; //Guid.Parse(productIdString);
await _signalRClient.GetAllCarsAndDriversByProductIdAsync(productId, cars, drivers);
await TaskHelper.WaitToAsync(() => drivers.Count > 0, 5000, 50);
Assert.IsTrue(cars.Count > 0);
Assert.IsTrue(drivers.Count > 0);
Assert.IsTrue(cars.All(car => drivers.Any(driver => driver.Id == car.UserProductMappingId && driver.ProductId == productId)));
Assert.IsTrue(drivers.All(driver => driver.ProductId == productId && cars.Any(car => car.UserProductMappingId == driver.Id)));
}
} }
} }