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

....

This commit is contained in:
Loretta 2024-06-25 14:56:19 +02:00
parent a885188d5a
commit 4900dfb2c4
7 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
TIAM.Database.Test/AdminDalTest.cs
View File

@ -485,7 +485,7 @@ namespace TIAM.Database.Test
var transferToDriver = new TransferToDriver(Guid.NewGuid(), transferId, userProductMappingId, carId, car.LicencePlate, 12000); var transferToDriver = new TransferToDriver(Guid.NewGuid(), transferId, userProductMappingId, carId, car.LicencePlate, 12000);
transfer.Payed = true; transfer.Paid = true;
//transfer.UserProductToCarId = userProductToCarId; //transfer.UserProductToCarId = userProductToCarId;
//transfer.UserProductMappingId = userProductMappingId; //transfer.UserProductMappingId = userProductMappingId;
transfer.TransferStatusType = TransferStatusType.AssignedToDriver; transfer.TransferStatusType = TransferStatusType.AssignedToDriver;
@ -504,7 +504,7 @@ namespace TIAM.Database.Test
Assert.IsNotNull(car); Assert.IsNotNull(car);
Assert.IsTrue(car.Id == carId); Assert.IsTrue(car.Id == carId);
Assert.IsTrue(transfer.Payed); Assert.IsTrue(transfer.Paid);
//Assert.IsTrue(transfer.UserProductToCarId == userProductToCarId); //Assert.IsTrue(transfer.UserProductToCarId == userProductToCarId);
Assert.IsTrue(transfer.TransferStatusType == TransferStatusType.AssignedToDriver); Assert.IsTrue(transfer.TransferStatusType == TransferStatusType.AssignedToDriver);
Assert.IsTrue(transfer.Id == transferId, "transfer.Id != transferId"); Assert.IsTrue(transfer.Id == transferId, "transfer.Id != transferId");

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

@ -33,7 +33,7 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign
[Required] public DateTime Appointment { get; set; } [Required] public DateTime Appointment { get; set; }
public bool Payed { get; set; } public bool Paid { get; set; }
public double? Price { get; set; } public double? Price { get; set; }
public byte PassengerCount { get; set; } public byte PassengerCount { get; set; }
public byte LuggageCount { get; set; } public byte LuggageCount { get; set; }

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

@ -111,7 +111,7 @@
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="PaymentId" DisplayFormat="N"/> <DxGridDataColumn FieldName="PaymentId" DisplayFormat="N"/>
<DxGridDataColumn Caption="Paid" FieldName="Payed"/> <DxGridDataColumn Caption="Paid" FieldName="Paid" />
<DxGridDataColumn FieldName="FromAddress"/> <DxGridDataColumn FieldName="FromAddress"/>
<DxGridDataColumn FieldName="ToAddress"/> <DxGridDataColumn FieldName="ToAddress"/>
<DxGridDataColumn FieldName="Appointment" DisplayFormat="g" Width="140" /> <DxGridDataColumn FieldName="Appointment" DisplayFormat="g" Width="140" />

7
TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
View File

@ -17,6 +17,7 @@
@using AyCode.Interfaces.Addresses @using AyCode.Interfaces.Addresses
@using TIAM.Entities.Emails @using TIAM.Entities.Emails
@using AyCode.Blazor.Components.Services @using AyCode.Blazor.Components.Services
@using AyCode.Core.Extensions
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject AdminSignalRClient AdminSignalRClient; @inject AdminSignalRClient AdminSignalRClient;
@ -24,7 +25,7 @@
<MessageDetailGrid @ref="_messageGrid" <MessageDetailGrid @ref="_messageGrid"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
ContextIds="new[] {ContextId}" ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])"
KeyFieldName="Id" KeyFieldName="Id"
CustomizeElement="CustomizeElement" CustomizeElement="CustomizeElement"
TextWrapEnabled="false"> TextWrapEnabled="false">
@ -41,7 +42,7 @@
</CellDisplayTemplate> </CellDisplayTemplate>
</DxGridDataColumn> </DxGridDataColumn>
<DxGridDataColumn FieldName="IsReaded" Caption="Readed" Width="70" CaptionAlignment="GridTextAlignment.Center" /> <DxGridDataColumn FieldName="IsReaded" Caption="Readed" Width="70" CaptionAlignment="GridTextAlignment.Center" />
<DxGridDataColumn FieldName="Created" Width="100px" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" /> <DxGridDataColumn FieldName="Created" Width="100" SortIndex="0" SortOrder="GridColumnSortOrder.Descending" />
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
@{ @{
@ -61,7 +62,7 @@
@code { @code {
[Parameter] public bool KeyboardNavigationEnabled { get; set; } [Parameter] public bool KeyboardNavigationEnabled { get; set; }
[Parameter] public Guid ContextId { get; set; } [Parameter] public Guid? ContextId { get; set; }
//[Parameter] public IEmailMessageRelation ParentData { get; set; } = null!; //[Parameter] public IEmailMessageRelation ParentData { get; set; } = null!;
[Parameter] public bool IsSubjectVisible { get; set; } = true; [Parameter] public bool IsSubjectVisible { get; set; } = true;
[Parameter] public bool IsSenderEmailVisible { get; set; } = true; [Parameter] public bool IsSenderEmailVisible { get; set; } = true;

14
TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
View File

@ -40,13 +40,13 @@
DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode"> DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="true" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="true" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/> <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
<DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductName) FieldName="Name" /> <DxGridDataColumn FieldName="@nameof(Product.ServiceProvider.Name)" Caption="Company name" />
<DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductType) FieldName="ProductType" Width="140" /> <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductName) FieldName="Name" SortIndex="0"/>
<DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.Price) FieldName="Price" Width="40" /> <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductType) FieldName="ProductType" Width="130" />
<DxGridDataColumn FieldName="ServiceProviderId" Width="40" /> <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.Price) FieldName="Price" Width="100" />
<DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductDescription) FieldName="Description" Width="40" /> <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductDescription) FieldName="Description" />
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<DxTabs> <DxTabs>

3
TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
View File

@ -8,6 +8,7 @@
@using AyCode.Services.Loggers @using AyCode.Services.Loggers
@using TIAM.Core.Loggers @using TIAM.Core.Loggers
@using AyCode.Core @using AyCode.Core
@using AyCode.Core.Extensions
@using AyCode.Interfaces.Profiles.Dtos @using AyCode.Interfaces.Profiles.Dtos
@using TIAM.Entities.Addresses @using TIAM.Entities.Addresses
@using TIAM.Entities.Profiles @using TIAM.Entities.Profiles
@ -16,7 +17,7 @@
@inject AdminSignalRClient AdminSignalRClient @inject AdminSignalRClient AdminSignalRClient
<ProfileDetailGrid @ref="_profileGrid" <ProfileDetailGrid @ref="_profileGrid"
ContextIds="new[] {ParentData.ProfileId}" ContextIds="@(ParentData.ProfileId.IsNullOrEmpty() ? throw new InvalidDataException($"ParentData.ProfileId.IsNullOrEmpty(); ParentData.ProfileId: {ParentData.ProfileId}") : [ParentData.ProfileId])"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"
KeyboardNavigationEnabled="KeyboardNavigationEnabled" KeyboardNavigationEnabled="KeyboardNavigationEnabled"

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

@ -16,7 +16,7 @@
@inject AdminSignalRClient AdminSignalRClient; @inject AdminSignalRClient AdminSignalRClient;
<TransferToDriversDetailGrid @ref="_transferToDriversGrid" <TransferToDriversDetailGrid @ref="_transferToDriversGrid"
ContextIds="ContextId.IsNullOrEmpty() ? throw new InvalidDataException() : [ContextId.Value]" ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])"
DataSource="ParentData.TransferToDrivers" DataSource="ParentData.TransferToDrivers"
Logger="_logger" Logger="_logger"
SignalRClient="AdminSignalRClient" SignalRClient="AdminSignalRClient"