From 4900dfb2c41bfa9f6b98f1526cf53bfe45069e38 Mon Sep 17 00:00:00 2001
From: Loretta <jozsef.b@aycode.com>
Date: Tue, 25 Jun 2024 14:56:19 +0200
Subject: [PATCH] ....

---
 TIAM.Database.Test/AdminDalTest.cs                 |  4 ++--
 TIAM.Entities/Transfers/Transfer.cs                |  2 +-
 .../Pages/User/SysAdmins/ManageTransfers.razor     |  2 +-
 .../SysAdmins/MessageDetailGridComponent.razor     |  7 ++++---
 .../SysAdmins/ProductDetailGridComponent.razor     | 14 +++++++-------
 .../User/SysAdmins/ProfileGridComponent.razor      |  3 ++-
 .../SysAdmins/TransferToDriverGridComponent.razor  |  2 +-
 7 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/TIAM.Database.Test/AdminDalTest.cs b/TIAM.Database.Test/AdminDalTest.cs
index 04a505db..1e50a671 100644
--- a/TIAM.Database.Test/AdminDalTest.cs
+++ b/TIAM.Database.Test/AdminDalTest.cs
@@ -485,7 +485,7 @@ namespace TIAM.Database.Test
 
             var transferToDriver = new TransferToDriver(Guid.NewGuid(), transferId, userProductMappingId, carId, car.LicencePlate, 12000);
 
-            transfer.Payed = true;
+            transfer.Paid = true;
             //transfer.UserProductToCarId = userProductToCarId;
             //transfer.UserProductMappingId = userProductMappingId;
             transfer.TransferStatusType = TransferStatusType.AssignedToDriver;
@@ -504,7 +504,7 @@ namespace TIAM.Database.Test
             Assert.IsNotNull(car);
             Assert.IsTrue(car.Id == carId);
 
-            Assert.IsTrue(transfer.Payed);
+            Assert.IsTrue(transfer.Paid);
             //Assert.IsTrue(transfer.UserProductToCarId == userProductToCarId);
             Assert.IsTrue(transfer.TransferStatusType == TransferStatusType.AssignedToDriver);
             Assert.IsTrue(transfer.Id == transferId, "transfer.Id != transferId");
diff --git a/TIAM.Entities/Transfers/Transfer.cs b/TIAM.Entities/Transfers/Transfer.cs
index cf589973..eb20a4f1 100644
--- a/TIAM.Entities/Transfers/Transfer.cs
+++ b/TIAM.Entities/Transfers/Transfer.cs
@@ -33,7 +33,7 @@ public class Transfer: IEntityGuid, IAcFullName, ITimeStampInfo, IProductForeign
 
     [Required] public DateTime Appointment { get; set; }
     
-    public bool Payed { get; set; }
+    public bool Paid { get; set; }
     public double? Price { get; set; }
     public byte PassengerCount { get; set; }
     public byte LuggageCount { get; set; }
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 121d91e0..d5102a77 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -111,7 +111,7 @@
                                             </CellDisplayTemplate>
                                         </DxGridDataColumn>
                                         <DxGridDataColumn FieldName="PaymentId" DisplayFormat="N"/>
-                                        <DxGridDataColumn Caption="Paid" FieldName="Payed"/>
+                                        <DxGridDataColumn Caption="Paid" FieldName="Paid" />
                                         <DxGridDataColumn FieldName="FromAddress"/>
                                         <DxGridDataColumn FieldName="ToAddress"/>
                                         <DxGridDataColumn FieldName="Appointment" DisplayFormat="g" Width="140" />
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
index ad010260..48da4ea1 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/MessageDetailGridComponent.razor
@@ -17,6 +17,7 @@
 @using AyCode.Interfaces.Addresses
 @using TIAM.Entities.Emails
 @using AyCode.Blazor.Components.Services
+@using AyCode.Core.Extensions
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject AdminSignalRClient AdminSignalRClient;
 
@@ -24,7 +25,7 @@
 <MessageDetailGrid @ref="_messageGrid"
                    Logger="_logger"
                    SignalRClient="AdminSignalRClient"
-                   ContextIds="new[] {ContextId}"
+                   ContextIds="@(ContextId.IsNullOrEmpty() ? throw new InvalidDataException($"ContextId.IsNullOrEmpty(); ContextId: {ContextId}") : [ContextId.Value])"
                    KeyFieldName="Id"
                    CustomizeElement="CustomizeElement"
                    TextWrapEnabled="false">
@@ -41,7 +42,7 @@
             </CellDisplayTemplate>
         </DxGridDataColumn>
         <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>
     <DetailRowTemplate>
         @{
@@ -61,7 +62,7 @@
 
 @code {
     [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 bool IsSubjectVisible { get; set; } = true;
     [Parameter] public bool IsSenderEmailVisible { get; set; } = true;
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
index 561751e6..3e6a20cb 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProductDetailGridComponent.razor
@@ -40,13 +40,13 @@
                    DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
     <Columns>
         <DxGridCommandColumn NewButtonVisible="true" Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
-
-        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductName) FieldName="Name" />
-        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductType) FieldName="ProductType" Width="140" />
-        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.Price) FieldName="Price" Width="40" />
-        <DxGridDataColumn FieldName="ServiceProviderId" Width="40" />        
-        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductDescription) FieldName="Description" Width="40" />
+        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N"/>
+        
+        <DxGridDataColumn FieldName="@nameof(Product.ServiceProvider.Name)" Caption="Company name" />
+        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductName) FieldName="Name" SortIndex="0"/>
+        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductType) FieldName="ProductType" Width="130" />
+        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.Price) FieldName="Price" Width="100" />
+        <DxGridDataColumn Caption=@Localizer.GetString(ResourceKeys.ProductDescription) FieldName="Description" />
     </Columns>
     <DetailRowTemplate>
         <DxTabs>
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
index 7b8c89f5..1b54e0b5 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
@@ -8,6 +8,7 @@
 @using AyCode.Services.Loggers
 @using TIAM.Core.Loggers
 @using AyCode.Core
+@using AyCode.Core.Extensions
 @using AyCode.Interfaces.Profiles.Dtos
 @using TIAM.Entities.Addresses
 @using TIAM.Entities.Profiles
@@ -16,7 +17,7 @@
 @inject AdminSignalRClient AdminSignalRClient
 
 <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"
                    SignalRClient="AdminSignalRClient"
                    KeyboardNavigationEnabled="KeyboardNavigationEnabled"
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
index 5bec22b1..83d87ade 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
@@ -16,7 +16,7 @@
 @inject AdminSignalRClient AdminSignalRClient;
 
 <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"
                              Logger="_logger"
                              SignalRClient="AdminSignalRClient"