diff --git a/TIAMSharedUI/Pages/User/MyServiceProviders.razor b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
index fd04f340..87e89e70 100644
--- a/TIAMSharedUI/Pages/User/MyServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/MyServiceProviders.razor
@@ -68,7 +68,8 @@
PageSize="12"
KeyFieldName="Id"
- ValidationEnabled="false"
+ ValidationEnabled="false"
+ DetailRowDisplayMode="GridDetailRowDisplayMode.Always"
CustomizeEditModel="Grid_CustomizeEditModel"
EditMode="GridEditMode.EditRow"
KeyboardNavigationEnabled="true">
@@ -83,6 +84,11 @@
+
+ @{
+ @(((Company)context.DataItem).Profile.Address.AddressText)
+ }
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
index 2d99bc54..68cfa3c5 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressDetailGridComponent.razor
@@ -13,6 +13,7 @@
@using TIAMSharedUI.Pages.Components.EditComponents
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Interfaces.Addresses
+@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject ITransferDataService transferDataService
@@ -37,15 +38,14 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="false">
-
-
+
+
-
-
+
+
-
-
+
@{
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
index 0168bab4..532c8c49 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/AddressGridComponent.razor
@@ -11,6 +11,7 @@
@using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids
@using TIAMSharedUI.Pages.Components.EditComponents
+@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject ITransferDataService transferDataService
@@ -30,11 +31,11 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="true">
-
-
+
+
-
-
+
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
index ab7f7ea7..18247ea6 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageServiceProviders.razor
@@ -12,6 +12,7 @@
@using AyCode.Core.Extensions;
@using TIAM.Entities.Addresses
@using TIAMSharedUI.Shared.Components.Grids
+@using AyCode.Core
@layout AdminLayout
@inject IEnumerable LogWriters
@inject IStringLocalizer localizer
@@ -92,29 +93,29 @@
KeyFieldName="Id">
-
-
+
+
-
+
@{
var keyField = context.Value as Guid?;
- var keyItem = (Company)context.DataItem;
if (keyField.IsNullOrEmpty())
{
-
+
}
else
{
- @keyField
+ @keyField.Value.ToString("N")
}
}
-
+
-
+
+
@*
*@
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
index 842507d3..6401fa80 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ManageTransfers.razor
@@ -104,22 +104,22 @@
KeyFieldName="Id">
-
-
+
+
@{
- var idKeyField = ((Transfer)context.DataItem).Id as Guid?;
- var editUri = $"mytransfers/{idKeyField}";
+ var idKeyField = ((Transfer)context.DataItem).Id;
+ var editUri = $"mytransfers/{idKeyField:N}";
- @context.Value
+ @context.Value
}
-
+
-
+
@@ -139,7 +139,7 @@
TransferStatusModel keyField = Statuses.FirstOrDefault(x => x.StatusValue == Convert.ToInt16(context.Value));
string transferStatusText = keyField.StatusName;
- @transferStatusText
+ @transferStatusText
}
@@ -156,16 +156,15 @@
+ ContextId="((Transfer)context.DataItem).Id">
-
-
+
+
-
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
index 7fe56619..9250f1d7 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ProfileGridComponent.razor
@@ -5,6 +5,7 @@
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
+@using AyCode.Core
@inject IServiceProviderDataService serviceProviderDataService
@inject IUserDataService userDataService
@inject IEnumerable LogWriters
@@ -26,7 +27,7 @@
ShowFilterRow="true">
-
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
index f3c1a5e1..54fd580e 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor
@@ -8,6 +8,7 @@
@using TIAMWebApp.Shared.Application.Utility
@using AyCode.Services.Loggers
@using TIAM.Core.Loggers
+@using AyCode.Core
@inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable LogWriters
@@ -27,8 +28,8 @@
ColumnResizeMode="GridColumnResizeMode.NextColumn"
ShowFilterRow="true">
-
-
+
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
index 030b7790..4984cf08 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/TransferToDriverGridComponent.razor
@@ -10,6 +10,7 @@
@using TIAMWebApp.Shared.Application.Services
@using AyCode.Core.Enums
@using AyCode.Core.Extensions
+@using AyCode.Core
@inject IUserDataService UserDataService
@inject IEnumerable LogWriters
@inject AdminSignalRClient AdminSignalRClient;
@@ -34,7 +35,7 @@
ShowFilterRow="false">
-
+
diff --git a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
index 66afd837..82e3b586 100644
--- a/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
+++ b/TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor
@@ -8,6 +8,7 @@
@using TIAM.Core.Loggers
@using AyCode.Core.Loggers
@using AyCode.Services.Loggers
+@using AyCode.Core
@inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable LogWriters
@@ -26,7 +27,7 @@
ShowFilterRow="true">
-
+
diff --git a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
index d159ee18..0dbdf208 100644
--- a/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
+++ b/TIAMSharedUI/Shared/Components/Grids/TiamGrid.cs
@@ -4,10 +4,12 @@ using AyCode.Core.Enums;
using AyCode.Core.Extensions;
using AyCode.Core.Helpers;
using AyCode.Core.Interfaces;
+using AyCode.Interfaces.Entities;
using AyCode.Services.SignalRs;
using AyCode.Utils.Extensions;
using DevExpress.Blazor;
using Microsoft.AspNetCore.Components;
+using Microsoft.AspNetCore.Components.Web;
using TIAMWebApp.Shared.Application.Services;
using TIAMWebApp.Shared.Application.Utility;
@@ -16,7 +18,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
public class GridDataItemChangingEventArgs : GridDataItemChangedEventArgs where TDataItem : class, IId
{
internal GridDataItemChangingEventArgs(TiamGrid grid, TDataItem dataItem, DataChangeMode dataChangeMode) : base(grid, dataItem, dataChangeMode)
- { }
+ {
+ }
public bool IsCanceled { get; set; }
}
@@ -42,7 +45,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
private string _gridLogName;
public TiamGrid() : base()
- { }
+ {
+ }
[Parameter] public LoggerClient Logger { get; set; }
[Parameter] public string GridName { get; set; }
@@ -56,7 +60,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
[Parameter] public int RemoveMessageTag { get; set; }
protected new EventCallback DataItemDeleting { get; set; }
- [Parameter] public EventCallback OnDataItemDeleting{ get; set; }
+ [Parameter] public EventCallback OnDataItemDeleting { get; set; }
protected new EventCallback EditModelSaving { get; set; }
[Parameter] public EventCallback OnEditModelSaving { get; set; }
@@ -111,6 +115,8 @@ namespace TIAMSharedUI.Shared.Components.Grids
if (firstRender)
{
if (_dataSource == null || _dataSource.Count == 0) RefreshDataSourceAsync().Forget();
+
+ //AutoFitColumnWidths();
}
}
@@ -124,6 +130,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
public Task RemoveDataItem(TDataItem dataItem, int messageTag) => PostDataToServerAsync(dataItem, messageTag, DataChangeMode.Remove);
public Task RemoveDataItem(Guid id) => RemoveDataItem(id, RemoveMessageTag);
+
public Task RemoveDataItem(Guid id, int messageTag)
{
var dataItem = _dataSource.FirstOrDefault(x => x.Id == id);
@@ -161,7 +168,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
Logger.Debug($"{_gridLogName} OnItemDeleting canceled");
return;
}
-
+
var dataItem = (e.DataItem as TDataItem)!;
await RemoveDataItem(dataItem);
}
@@ -221,13 +228,28 @@ namespace TIAMSharedUI.Shared.Components.Grids
//transfer = await devAdminSignalClient.PostDataAsync(SignalRTags.UpdateTransferAsync, transfer);
}
+
+ private void OnCustomizeElement(GridCustomizeElementEventArgs e)
+ {
+ if (e.ElementType == GridElementType.DetailCell)
+ {
+ e.Style = "padding: 0.5rem; opacity: 0.75";
+ }
+ else if (false && e.ElementType == GridElementType.DataCell && e.Column.Name == nameof(IId.Id))
+ {
+ e.Column.Visible = AcDomain.IsDeveloperVersion;
+ e.Column.ShowInColumnChooser = AcDomain.IsDeveloperVersion;
+ }
+ }
+
protected override Task SetParametersAsyncCore(ParameterView parameters)
{
if (!IsFirstInitializeParameters)
{
base.DataItemDeleting = EventCallback.Factory.Create(this, OnItemDeleting);
base.EditModelSaving = EventCallback.Factory.Create(this, OnItemSaving);
-
+ CustomizeElement += OnCustomizeElement;
+
//ShowFilterRow = true;
//PageSize = 4;
//ShowGroupPanel = true;
@@ -235,7 +257,6 @@ namespace TIAMSharedUI.Shared.Components.Grids
TextWrapEnabled = false;
- //var columns = GetColumns();
//var dataColumns = GetDataColumns();
//var idColumn = dataColumns.FirstOrDefault(x => x.FieldName == nameof(IId.Id));
@@ -251,6 +272,7 @@ namespace TIAMSharedUI.Shared.Components.Grids
return base.SetParametersAsyncCore(parameters);
}
+
protected override void OnParametersSet()
{
base.OnParametersSet();
diff --git a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
index 07d738f7..be9b565f 100644
--- a/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
+++ b/TIAMWebApp/Server/Services/DevAdminSignalRhub.cs
@@ -14,6 +14,10 @@ using System.Runtime.CompilerServices;
using MessagePack;
using TIAM.Entities.Addresses;
using TIAM.Entities.Profiles;
+using Microsoft.AspNetCore.Hosting;
+using System.Collections.Generic;
+using TIAM.Entities.Emails;
+using TIAM.Services.Server;
namespace TIAMWebApp.Server.Services;
@@ -57,7 +61,11 @@ public class DynamicMethodCallModel where TAttribute : TagAttribute
public object InstanceObject { get; init; }
public ConcurrentDictionary> MethodsByMessageTag { get; init; } = new();
- public DynamicMethodCallModel(Type instanceObjectType) : this(Activator.CreateInstance(instanceObjectType)!)
+
+ public DynamicMethodCallModel(Type instanceObjectType) : this(instanceObjectType, null!)
+ { }
+
+ public DynamicMethodCallModel(Type instanceObjectType, params object[] constructorParams) : this(Activator.CreateInstance(instanceObjectType, constructorParams)!)
{ }
public DynamicMethodCallModel(object instanceObject)
@@ -75,7 +83,7 @@ public class DynamicMethodCallModel where TAttribute : TagAttribute
public class DevAdminSignalRHub : Hub, IAcSignalRHubServer
{
- private readonly List> _dynamicMethodCallModels = new();
+ private readonly List> _dynamicMethodCallModels = [];
private readonly TIAM.Core.Loggers.Logger _logger;
private readonly AdminDal _adminDal;
@@ -93,6 +101,7 @@ public class DevAdminSignalRHub : Hub, IAcSignalRHubServe
_dynamicMethodCallModels.Add(new DynamicMethodCallModel(serviceProviderApiController));
_dynamicMethodCallModels.Add(new DynamicMethodCallModel(transferDataApiController));
_dynamicMethodCallModels.Add(new DynamicMethodCallModel(messageApiController));
+ //_dynamicMethodCallModels.Add(new DynamicMethodCallModel(typeof(AdminDal)));
}