TransferToDriver in progress...

TIAM.Database.Test/AdminDalTest.cs

@@ -235,7 +235,7 @@ namespace TIAM.Database.Test
             
             await Dal.RemoveProductAsync(productId); //kitöröljük a szemetet, ha korábbról bentmaradt - J.
 
-            var company = new Company(companyId, "Test unit company...", null);
+            var company = new Company(companyId, "Test unit product...", null);
 
             Assert.IsTrue(await Dal.AddCompanyAsync(company));
             Assert.IsNotNull(company);

TIAM.Database/DataLayers/Admins/AdminDal.cs

@@ -80,6 +80,9 @@ namespace TIAM.Database.DataLayers.Admins
         #endregion TransferDestination
 
         #region TransferToDriver
+        public Task<TransferToDriver?> GetTransferToDriverById(Guid transferToDriverId, bool autoInclude = false) => SessionAsync(ctx => ctx.TransferToDrivers.FirstOrDefault(x=>x.Id == transferToDriverId));
+        public Task<List<TransferToDriver>> GetTransferToDriversByTransferId(Guid transferId, bool autoInclude = false) => SessionAsync(ctx => ctx.TransferToDrivers.Where(x => x.TransferId == transferId).ToList());
+
         public Task<bool> AddTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Add(transferToDriver).State == EntityState.Added);
         public Task<bool> UpdateTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Update(transferToDriver).State == EntityState.Modified);
         public Task<bool> RemoveTransferToDriverAsync(TransferToDriver transferToDriver) => TransactionAsync(ctx => ctx.TransferToDrivers.Remove(transferToDriver).State == EntityState.Deleted);

TIAM.Services/SignalRTags.cs

@@ -25,9 +25,9 @@ public class SignalRTags : AcSignalRTags
     public const int AddCompany = 17;
     public const int RemoveCompany = 18;
 
-    public const int GetTransferToDriver = 22;
+    public const int GetTransferDriver = 22;
     //public const int GetTransferToDrivers = 23;
-    public const int GetTransferToDriversByContextId = 24;
+    public const int GetTransferDriversByTransferId = 24;
     public const int AddTransferToDriver = 25;
     public const int UpdateTransferToDriver = 26;
     public const int RemoveTransferToDriver = 27;

TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor

@@ -30,7 +30,7 @@
         ShowFilterRow="true">
     <Columns>
         <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
+        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
         <DxGridDataColumn FieldName="AddressText" />
         <DxGridDataColumn FieldName="IsValid" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
         <DxGridDataColumn FieldName="IsHelper" Width="40" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />

TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor

@@ -145,7 +145,7 @@
                                                 <MessageDetailGridComponent ContextId="((Transfer)context.DataItem).Id" KeyboardNavigationEnabled="true" />                                               
                                             </DxTabPage>
                                             <DxTabPage Text="Driver">
-                                                <TransferToDriverGridComponent ParentData="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
+                                                <TransferToDriverGridComponent ContextId="((Transfer)context.DataItem).Id" ParentData="(Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
                                             </DxTabPage>
                                         </DxTabs>
                                     </DetailRowTemplate>

TIAMSharedUI/Pages/User/SysAdmins/ManageUserProductMappings.razor

@@ -151,27 +151,9 @@
         //         //transferToModify.Driver = myModel.Driver;
         //     }
         // }
-
-        //TODO: ne a teljes grid-et refresh-eljük, elég lenne csak az adott sort! - J.
-        await UpdateDataAsync();
     }
 
-    async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e)
+    protected override void OnInitialized()
-    {
-        //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
-        //remove orderData from orderData array
-        _logger.Info("orderData deleted");
-        //await UpdateDataAsync();
-    }
-
-    async Task UpdateDataAsync()
-    {
-        //refresh grid
-        
-        _logger.Info("orderData grid refreshed");
-    }
-
-    protected override async Task OnInitializedAsync()
     {        
         _logger = new LoggerClient<ManageUserProductMappings>(LogWriters.ToArray());
         

TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor

@@ -9,6 +9,7 @@
 @using TIAMWebApp.Shared.Application.Models.PageModels
 @using TIAMWebApp.Shared.Application.Utility
 @using AyCode.Services.Loggers
+@using AyCode.Core
 @layout AdminLayout
 @inject IEnumerable<IAcLogWriterClientBase> LogWriters
 @inject IStringLocalizer<TIAMResources> Localizer
@@ -75,8 +76,8 @@
                                 KeyFieldName="Id">
 
                             <Columns>
-                                <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
+                                <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
-                                <DxGridDataColumn Name="@Localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" />
+                                <DxGridDataColumn Name="@Localizer.GetString("Id")" FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
                                 <DxGridDataColumn Name="@Localizer.GetString("FullName")" FieldName="ProfileDto.FullName" />
                                 <DxGridDataColumn Name="@Localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber" />
                                 <DxGridDataColumn Name="@Localizer.GetString("Created")" FieldName="UserDto.Created" />
@@ -265,7 +266,6 @@
 
         if (e.IsNew)
         {
-            //add new orderData to orderData array
             var registration = new RegistrationModel();
             //TODO: Refractor to userDataService
             
@@ -284,7 +284,7 @@
         }
         else
         {
-            _logger.Info("orderData updated at id " + userModelDtoDetail.Id);
+            _logger.Info("UserData updated at id " + userModelDtoDetail.Id);
 
             //await transferDataService.UpdateTransferAsync((TransferWizardModel)e.EditModel);
             //modify transferData where transferData.Id == e.EditModel.Id
@@ -307,17 +307,14 @@
 
     async Task Grid_DataItemDeleting(GridDataItemDeletingEventArgs e)
     {
-        //await NwindDataService.RemoveEmployeeAsync((EditableEmployee)e.DataItem);
+        _logger.Info("UserData deleted");
-        //remove orderData from orderData array
-        _logger.Info("orderData deleted");
-        //await UpdateDataAsync();
     }
 
     async Task UpdateDataAsync()
     {
         //refresh grid
         UserData = (await UserDataService.GetUsersWithDetailsAsync()).OrderBy(x => x.ProfileDto?.Name).ToList();
-        _logger.Info("orderData grid refreshed");
+        _logger.Info("UserData grid refreshed");
     }
 
     protected override async Task OnInitializedAsync()

TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor

@@ -29,7 +29,7 @@
                    DetailExpandButtonDisplayMode="DetailExpandButtonDisplayMode">
     <Columns>
         <DxGridCommandColumn NewButtonVisible="false" DeleteButtonVisible="false" Width="70" MinWidth="70" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
+        <DxGridDataColumn FieldName="Id" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         <DxGridDataColumn FieldName="Name" />
         <DxGridDataColumn FieldName="FullName" />
         <DxGridDataColumn FieldName="Created" Width="40%" />

TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor

@@ -18,14 +18,13 @@
 
 
 <TransferToDriversDetailGrid @ref="_transferToDriversGrid"
+                             ContextIds="ContextId.IsNullOrEmpty() ? throw new InvalidDataException() : [ContextId.Value]"
                              DataSource="ParentData.TransferToDrivers"
                              Logger="_logger"
                              SignalRClient="AdminSignalRClient"
                              OnGridEditModelSaving="DataItemSaving"
                              OnGridItemDeleting="DataItemDeleting"
                              OnGridItemChanged="DataItemChanged"
-                             PageSize="5"
-                             AutoExpandAllGroupRows="true"
                              KeyboardNavigationEnabled="KeyboardNavigationEnabled"
                              KeyFieldName="Id"
                              ValidationEnabled="false"
@@ -34,8 +33,8 @@
                              ColumnResizeMode="GridColumnResizeMode.NextColumn"
                              ShowFilterRow="false">
     <Columns>
-        <DxGridCommandColumn NewButtonVisible="true" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
+        <DxGridCommandColumn Width="135" MinWidth="135" FixedPosition="GridColumnFixedPosition.Left" />
-        <DxGridDataColumn FieldName="Id" GroupIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" />
+        <DxGridDataColumn FieldName="Id" SortIndex="0" ShowInColumnChooser="AcDomain.IsDeveloperVersion" Visible="AcDomain.IsDeveloperVersion" DisplayFormat="N" />
         <DxGridDataColumn FieldName="CarId" Width="40%" />
         <DxGridDataColumn FieldName="LicencePlate" />
     </Columns>
@@ -43,7 +42,7 @@
 
 @code {
     [Parameter] public bool KeyboardNavigationEnabled { get; set; }
-
+    [Parameter] public Guid? ContextId { get; set; }
     [Parameter] public ITransferToDriversRelation ParentData { get; set; } = null!;
     [Parameter] public EventCallback<TransferToDriver> OnTransferToDriverChanged { get; set; }
 
@@ -59,8 +58,6 @@
 
     private void DataItemChanged(GridDataItemChangedEventArgs<TransferToDriver> args)
     {
-        ParentData.TransferToDrivers.UpdateCollection(args.DataItem, args.TrackingState == TrackingState.Remove);
-
         OnTransferToDriverChanged.InvokeAsync(args.DataItem);
     }
 

TIAMSharedUI/Shared/Components/Grids/TransferToDriversGrid.cs

@@ -8,7 +8,7 @@ public class TransferToDriversGrid : TiamGrid<TransferToDriver>
 {
     public TransferToDriversGrid() : base()
     {
-        GetAllMessageTag = SignalRTags.GetTransferToDriversByContextId;
+        GetAllMessageTag = SignalRTags.GetTransferDriversByTransferId;
         AddMessageTag = SignalRTags.AddTransferToDriver;
         UpdateMessageTag = SignalRTags.UpdateTransferToDriver;
         RemoveMessageTag = SignalRTags.RemoveTransferToDriver;

TIAMWebApp/Server/Controllers/TransferDataAPIController.cs

@@ -19,6 +19,7 @@ using TIAMWebApp.Shared.Application.Models.ClientSide.Messages;
 using TIAMWebApp.Server.Services;
 using TIAMWebApp.Shared.Application.Models.ClientSide;
 using AyCode.Core.Extensions;
+using TIAM.Entities.Users;
 
 namespace TIAMWebApp.Server.Controllers
 {
@@ -403,17 +404,6 @@ namespace TIAMWebApp.Server.Controllers
             return result;
         }
 
-        [Authorize]
-        [HttpGet]
-        [Route(APIUrls.GetTransfersByDriverRouteName)]
-        [SignalR(SignalRTags.GetTransfersByDriverId)]
-        public Task<string> GetDriverTransfers(Guid transferId, Guid userProductMappingId)
-        {
-            throw new NotImplementedException();
-            //var result = await _adminDal.GetTransfersByUserIdJsonAsync(userId);
-            //return result;
-        }
-
         [AllowAnonymous]
         [HttpPost]
         [Route(APIUrls.GetTransferByIdRouteName)]
@@ -437,5 +427,24 @@ namespace TIAMWebApp.Server.Controllers
             return transferToModify;
         }
 
+        [Authorize]
+        [HttpGet]
+        [Route(APIUrls.GetTransferDriverRouteName)]
+        [SignalR(SignalRTags.GetTransferDriver)]
+        public async Task<TransferToDriver?> GetTransferDriver(Guid transferDriverId)
+        {
+            var result = await _adminDal.GetTransferToDriverById(transferDriverId);
+            return result;
+        }
+
+        [Authorize]
+        [HttpGet]
+        [Route(APIUrls.GetTransferDriversByTransferIdRouteName)]
+        [SignalR(SignalRTags.GetTransferDriversByTransferId)]
+        public async Task<List<TransferToDriver>> GetTransferDrivers(Guid transferId)
+        {
+            var result = await _adminDal.GetTransferToDriversByTransferId(transferId);
+            return result;
+        }
     }
 }

TIAMWebApp/Shared/Models/APIUrls.cs

@@ -87,9 +87,6 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string GetTransfersByUserIdRouteName = "GetTransfersByUserId";
         public const string GetTransfersByUserId = TransferDataAPI + GetTransfersByUserIdRouteName;
 
-        public const string GetTransfersByDriverRouteName = "GetTransfersByDriverId";
-        public const string GetTransfersByDriver = TransferDataAPI + GetTransfersByDriverRouteName;
-
         public const string GetTransferByIdRouteName = "GetTransferById";
         public const string GetTransferById = TransferDataAPI + GetTransferByIdRouteName;
 
@@ -105,6 +102,12 @@ namespace TIAMWebApp.Shared.Application.Models
         public const string UpdateTransferDestinationRouteName = "UpdateTransferDestintion";
         public const string UpdateTransferDestination = TransferDataAPI + UpdateTransferDestinationRouteName;
 
+        public const string GetTransferDriverRouteName = "GetTransfersByDriverId";
+        public const string GetTransferDriver = TransferDataAPI + GetTransferDriverRouteName;
+
+        public const string GetTransferDriversByTransferIdRouteName = "GetTransfersByDriverId";
+        public const string GetTransferDriversByTransferId = TransferDataAPI + GetTransferDriversByTransferIdRouteName;
+
         //serviceprovider
         public const string CreateServiceProviderRouteName = "CreateServiceProvider/";
         public const string CreateServiceProvider = ServiceProviderAPI + CreateServiceProviderRouteName;

TIAMWebApp/Shared/Models/ClientSide/UI/WizardModels/ProductWizardModel.cs

@@ -45,8 +45,8 @@ namespace TIAMWebApp.Shared.Application.Models.ClientSide.UI.WizardModels
 
         public Product SaveToProduct(Company company)
         {
-            Product NewProduct = new(this.Id, company.Id, company, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails);
+            Product newProduct = new(this.Id, company.Id, company, this.ProductType, this.Name, this.Description, this.Price, this.JsonDetails);
-            return NewProduct;
+            return newProduct;
         }
     }
 }