This commit is contained in:
Adam 2024-05-31 18:05:20 +02:00
parent 7a4e73fa8f
commit 09db366cef
9 changed files with 52 additions and 41 deletions

View File

@ -15,9 +15,7 @@
@inject ITransferDataService transferDataService @inject ITransferDataService transferDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2">
Profile
</div>
<DxGrid @ref="Grid" Data="_detailGridData" <DxGrid @ref="Grid" Data="_detailGridData"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
@ -66,10 +64,11 @@
ILogger _logger; ILogger _logger;
public void SaveAddress(Address addressToSave) public void SaveAddress(object addressOwnerToSave)
{ {
Grid.SaveChangesAsync(); Grid.SaveChangesAsync();
} }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()

View File

@ -10,12 +10,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2">
Contact Phone: @PhoneNumber
</div>
<div class="mb-2">
Contact Phone: @EmailAddress
</div>
<DxGrid Data="DetailGridData" <DxGrid Data="DetailGridData"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
@ -46,8 +41,6 @@
List<TransferToDriver> DetailGridData { get; set; } List<TransferToDriver> DetailGridData { get; set; }
public UserModelDtoDetail? UserModelDtoDetail; public UserModelDtoDetail? UserModelDtoDetail;
public string PhoneNumber = "";
public string EmailAddress = "";
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
@ -57,8 +50,6 @@
if (UserModelDtoDetail == null) return; if (UserModelDtoDetail == null) return;
PhoneNumber = UserModelDtoDetail.UserDto.PhoneNumber;
EmailAddress = UserModelDtoDetail.UserDto.EmailAddress;
DetailGridData = Customer.TransferToDrivers; DetailGridData = Customer.TransferToDrivers;
_logger.Info($"DetailGridData: {DetailGridData.Count}"); _logger.Info($"DetailGridData: {DetailGridData.Count}");

View File

@ -86,7 +86,7 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<DxGrid @ref="Grid2" <DxGrid @ref="Grid2"
Data="ServiceProviderDataList" Data="ServiceProviderDataList"

View File

@ -20,6 +20,7 @@
@using AyCode.Core.Helpers @using AyCode.Core.Helpers
@using AyCode.Interfaces.Entities @using AyCode.Interfaces.Entities
@using TIAM.Services @using TIAM.Services
@using TIAM.Models.Dtos.Users
@layout AdminLayout @layout AdminLayout
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
@inject IStringLocalizer<TIAMResources> localizer @inject IStringLocalizer<TIAMResources> localizer
@ -64,7 +65,7 @@
<div class="container"> <div class="container">
<div class="row"> <div class="row">
<div class=" col-12"> <div class=" col-12">
<Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.Pulse" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)">
<div class="card"> <div class="card">
<DxTabs> <DxTabs>
@ -133,7 +134,13 @@
</DxGridDataColumn> </DxGridDataColumn>
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
<DxTabs>
<DxTabPage Text="Driver">
<Grid_MasterDetail_NestedGrid_DetailContent Customer="(TIAM.Entities.Transfers.Transfer)context.DataItem" KeyboardNavigationEnabled="true" />
</DxTabPage>
</DxTabs>
</DetailRowTemplate> </DetailRowTemplate>
<EditFormTemplate Context="EditFormContext"> <EditFormTemplate Context="EditFormContext">
@{ @{

View File

@ -88,11 +88,11 @@
<Columns> <Columns>
<DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" /> <DxGridCommandColumn NewButtonVisible="false" Width="8%" FixedPosition="GridColumnFixedPosition.Left" />
<DxGridDataColumn FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" /> <DxGridDataColumn Name="@Localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" />
<DxGridDataColumn FieldName="ProfileDto.FullName" /> <DxGridDataColumn Name="@Localizer.GetString("FullName")" FieldName="ProfileDto.FullName" />
<DxGridDataColumn FieldName="UserDto.PhoneNumber" /> <DxGridDataColumn Name="@Localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber" />
<DxGridDataColumn FieldName="UserDto.Created" /> <DxGridDataColumn Name="@Localizer.GetString("Created")" FieldName="UserDto.Created" />
<DxGridDataColumn FieldName="UserDto.EmailConfirmed" /> <DxGridDataColumn Name="@Localizer.GetString("EmailConfirmed")" FieldName="UserDto.EmailConfirmed" />
<DxGridDataColumn FieldName="UserDto.RefferalId" /> <DxGridDataColumn FieldName="UserDto.RefferalId" />
<DxGridDataColumn FieldName="UserDto.EmailAddress"> <DxGridDataColumn FieldName="UserDto.EmailAddress">
<CellDisplayTemplate> <CellDisplayTemplate>
@ -107,11 +107,21 @@
</DxGridDataColumn> </DxGridDataColumn>
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<UserGrid_MasterDetail_NestedGrid_UserProductMapping UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" /> <DxTabs>
</DetailRowTemplate> <DxTabPage Text="Address">
<DetailRowTemplate> <AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" />
<AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" /> </DxTabPage>
<DxTabPage Text="Companies owned">
<ServiceProviderGridComponent UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" />
</DxTabPage>
<DxTabPage Text="Roles in services">
<UserProductMappingGridComponent UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" />
</DxTabPage>
</DxTabs>
</DetailRowTemplate> </DetailRowTemplate>
<EditFormTemplate Context="EditFormContext"> <EditFormTemplate Context="EditFormContext">
@{ @{
var transfer2 = (UserModelDtoDetail)EditFormContext.EditModel; var transfer2 = (UserModelDtoDetail)EditFormContext.EditModel;
@ -230,7 +240,6 @@
} }
} }
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{ {
if (!e.IsNew) return; if (!e.IsNew) return;

View File

@ -13,7 +13,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2"> <div class="mb-2">
Profile <h3>Profile</h3>
</div> </div>
<DxGrid Data="_detailGridData" <DxGrid Data="_detailGridData"
PageSize="5" PageSize="5"
@ -54,7 +54,7 @@
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray()); _logger = new LoggerClient<ProfileGridComponent>(LogWriters.ToArray());
if(ContextIdType == null) if(ContextIdType == null)
{ {
//get all profiles from DB //get all profiles from DB

View File

@ -12,7 +12,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2"> <div class="mb-2">
UserProductMapping <h3>Companies owned</h3>
</div> </div>
<DxGrid Data="_detailGridData" <DxGrid Data="_detailGridData"
PageSize="5" PageSize="5"
@ -71,7 +71,7 @@
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray()); _logger = new LoggerClient<ServiceProviderGridComponent>(LogWriters.ToArray());
_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>(); _detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
_availableServices = await ServiceProviderDataService.GetServiceProvidersAsync(); _availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();

View File

@ -11,9 +11,7 @@
@inject IServiceProviderDataService ServiceProviderDataService @inject IServiceProviderDataService ServiceProviderDataService
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2">
UserProductMapping
</div>
<DxGrid Data="_detailGridData" <DxGrid Data="_detailGridData"
PageSize="5" PageSize="5"
AutoExpandAllGroupRows="true" AutoExpandAllGroupRows="true"
@ -33,19 +31,19 @@
<DxGridDataColumn FieldName="ProductId" Width="40%" /> <DxGridDataColumn FieldName="ProductId" Width="40%" />
<DxGridDataColumn FieldName="Permissions" /> <DxGridDataColumn FieldName="Permissions" />
</Columns> </Columns>
<EditFormTemplate Context="EditFormContext"> <EditFormTemplate Context="UserEditFormContext">
@{ @{
var transfer2 = (UserProductMapping)EditFormContext.EditModel; var transfer2 = (UserProductMapping)UserEditFormContext.EditModel;
} }
<DxFormLayout CssClass="w-100"> <DxFormLayout CssClass="w-100">
<DxFormLayoutItem Caption="UserId" ColSpanMd="4"> <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
@EditFormContext.GetEditor("UserId") @UserEditFormContext.GetEditor("UserId")
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem Caption="Product:" ColSpanMd="4"> <DxFormLayoutItem Caption="Product:" ColSpanMd="4">
<DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)EditFormContext.EditModel).ProductId" /> <DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)UserEditFormContext.EditModel).ProductId" />
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem Caption="Permissions" ColSpanMd="4"> <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
@EditFormContext.GetEditor("Permissions") @UserEditFormContext.GetEditor("Permissions")
</DxFormLayoutItem> </DxFormLayoutItem>
@ -61,14 +59,14 @@
[Parameter] [Parameter]
public UserModelDtoDetail UserModelDtoDetail { get; set; } public UserModelDtoDetail UserModelDtoDetail { get; set; }
private LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping> _logger; private LoggerClient<UserProductMappingGridComponent> _logger;
List<UserProductMapping> _detailGridData; List<UserProductMapping> _detailGridData;
List<Product> _availableProducts; List<Product> _availableProducts;
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()
{ {
_logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping>(LogWriters.ToArray()); _logger = new LoggerClient<UserProductMappingGridComponent>(LogWriters.ToArray());
_detailGridData = UserModelDtoDetail.UserProductMappings ?? new List<UserProductMapping>(); _detailGridData = UserModelDtoDetail.UserProductMappings ?? new List<UserProductMapping>();
_availableProducts = await ServiceProviderDataService.GetAllProductsAsync(); _availableProducts = await ServiceProviderDataService.GetAllProductsAsync();

View File

@ -243,6 +243,13 @@ select {
box-shadow: none; box-shadow: none;
} }
.dxbl-grid .dxbl-grid-empty-data {
padding: 5px;
border-top: 0;
border-bottom: 0;
}
/*my blazor overrides end*/ /*my blazor overrides end*/
.custom-select { .custom-select {
padding: 10px 15px 10px 10px !important; padding: 10px 15px 10px 10px !important;