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

Compare commits

base: Adam:97c60db3f5882ab2e1bf7440cc3bf647a6de205b
Branches Tags
Adam:master
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:Fullepi_Sandbox
..
compare: Adam:40d89376547687832fceeca9d3e636dd7c46179d
Branches Tags
Adam:TIAM_v0.0.6.0
Adam:v0.0.5.1
Adam:master
Adam:Fullepi_Sandbox

No commits in common. "97c60db3f5882ab2e1bf7440cc3bf647a6de205b" and "40d89376547687832fceeca9d3e636dd7c46179d" have entirely different histories.
97c60db3f5 ... 40d8937654

9 changed files with 41 additions and 52 deletions
Show Stats Expand all files Collapse all files

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

@ -15,7 +15,9 @@
@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"
@ -64,11 +66,10 @@
ILogger _logger; ILogger _logger;
public void SaveAddress(object addressOwnerToSave) public void SaveAddress(Address addressToSave)
{ {
Grid.SaveChangesAsync(); Grid.SaveChangesAsync();
} }
protected override async Task OnInitializedAsync() protected override async Task OnInitializedAsync()

11
TIAMSharedUI/Pages/User/SysAdmins/Grid_MasterDetail_NestedGrid_DetailContent.razor
View File

@ -10,7 +10,12 @@
@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"
@ -41,6 +46,8 @@
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()
{ {
@ -50,6 +57,8 @@
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}");

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

@ -85,7 +85,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" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)"> <Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<CompanyGrid @ref="_gridCompany" <CompanyGrid @ref="_gridCompany"
Logger="_logger" Logger="_logger"

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

@ -15,7 +15,6 @@
@using TIAMWebApp.Shared.Application.Services @using TIAMWebApp.Shared.Application.Services
@using TIAMSharedUI.Shared.Components @using TIAMSharedUI.Shared.Components
@using TIAMSharedUI.Shared.Components.Grids @using TIAMSharedUI.Shared.Components.Grids
@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
@ -60,7 +59,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" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(500)"> <Animation Effect="@Effect.Pulse" Class="glass" Speed="@Speed.Fast" Delay="@TimeSpan.FromMilliseconds(250)">
<div class="card"> <div class="card">
<DxTabs> <DxTabs>
@ -144,13 +143,7 @@
</DxGridDataColumn> </DxGridDataColumn>
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<Grid_MasterDetail_NestedGrid_DetailContent Customer="(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">
@{ @{

29
TIAMSharedUI/Pages/User/SysAdmins/ManageUsers.razor
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 Name="@Localizer.GetString("Id")" FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" /> <DxGridDataColumn FieldName="Id" ShowInColumnChooser="false" SortIndex="0" Visible="false" />
<DxGridDataColumn Name="@Localizer.GetString("FullName")" FieldName="ProfileDto.FullName" /> <DxGridDataColumn FieldName="ProfileDto.FullName" />
<DxGridDataColumn Name="@Localizer.GetString("PhoneNumber")" FieldName="UserDto.PhoneNumber" /> <DxGridDataColumn FieldName="UserDto.PhoneNumber" />
<DxGridDataColumn Name="@Localizer.GetString("Created")" FieldName="UserDto.Created" /> <DxGridDataColumn FieldName="UserDto.Created" />
<DxGridDataColumn Name="@Localizer.GetString("EmailConfirmed")" FieldName="UserDto.EmailConfirmed" /> <DxGridDataColumn FieldName="UserDto.EmailConfirmed" />
<DxGridDataColumn FieldName="UserDto.RefferalId" /> <DxGridDataColumn FieldName="UserDto.RefferalId" />
<DxGridDataColumn FieldName="UserDto.EmailAddress"> <DxGridDataColumn FieldName="UserDto.EmailAddress">
<CellDisplayTemplate> <CellDisplayTemplate>
@ -107,21 +107,11 @@
</DxGridDataColumn> </DxGridDataColumn>
</Columns> </Columns>
<DetailRowTemplate> <DetailRowTemplate>
<DxTabs> <UserGrid_MasterDetail_NestedGrid_UserProductMapping UserModelDtoDetail="(UserModelDtoDetail)context.DataItem" KeyboardNavigationEnabled="true" />
<DxTabPage Text="Address"> </DetailRowTemplate>
<AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" /> <DetailRowTemplate>
</DxTabPage> <AddressGridComponent AddressContext="(UserModelDtoDetail)context.DataItem" ContextIdType="userdetailprofile" KeyboardNavigationEnabled="true" />
<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;
@ -240,6 +230,7 @@
} }
} }
void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e) void Grid_CustomizeEditModel(GridCustomizeEditModelEventArgs e)
{ {
if (!e.IsNew) return; if (!e.IsNew) return;

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

@ -13,7 +13,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2"> <div class="mb-2">
<h3>Profile</h3> Profile
</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<ProfileGridComponent>(LogWriters.ToArray()); _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
if(ContextIdType == null) if(ContextIdType == null)
{ {
//get all profiles from DB //get all profiles from DB

4
TIAMSharedUI/Pages/User/SysAdmins/ServiceProviderGridComponent.razor → TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_ServiceProviders.razor
View File

@ -12,7 +12,7 @@
@inject IEnumerable<IAcLogWriterClientBase> LogWriters @inject IEnumerable<IAcLogWriterClientBase> LogWriters
<div class="mb-2"> <div class="mb-2">
<h3>Companies owned</h3> UserProductMapping
</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<ServiceProviderGridComponent>(LogWriters.ToArray()); _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_ServiceProviders>(LogWriters.ToArray());
_detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>(); _detailGridData = UserModelDtoDetail.ServiceProviders ?? new List<Company>();
_availableServices = await ServiceProviderDataService.GetServiceProvidersAsync(); _availableServices = await ServiceProviderDataService.GetServiceProvidersAsync();

18
TIAMSharedUI/Pages/User/SysAdmins/UserProductMappingGridComponent.razor → TIAMSharedUI/Pages/User/SysAdmins/UserGrid_MasterDetail_NestedGrid_UserProductMapping.razor
View File

@ -11,7 +11,9 @@
@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"
@ -31,19 +33,19 @@
<DxGridDataColumn FieldName="ProductId" Width="40%" /> <DxGridDataColumn FieldName="ProductId" Width="40%" />
<DxGridDataColumn FieldName="Permissions" /> <DxGridDataColumn FieldName="Permissions" />
</Columns> </Columns>
<EditFormTemplate Context="UserEditFormContext"> <EditFormTemplate Context="EditFormContext">
@{ @{
var transfer2 = (UserProductMapping)UserEditFormContext.EditModel; var transfer2 = (UserProductMapping)EditFormContext.EditModel;
} }
<DxFormLayout CssClass="w-100"> <DxFormLayout CssClass="w-100">
<DxFormLayoutItem Caption="UserId" ColSpanMd="4"> <DxFormLayoutItem Caption="UserId" ColSpanMd="4">
@UserEditFormContext.GetEditor("UserId") @EditFormContext.GetEditor("UserId")
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem Caption="Product:" ColSpanMd="4"> <DxFormLayoutItem Caption="Product:" ColSpanMd="4">
<DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)UserEditFormContext.EditModel).ProductId" /> <DxComboBox Data="@_availableProducts" TextFieldName="Name" @bind-Value="((UserProductMapping)EditFormContext.EditModel).ProductId" />
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem Caption="Permissions" ColSpanMd="4"> <DxFormLayoutItem Caption="Permissions" ColSpanMd="4">
@UserEditFormContext.GetEditor("Permissions") @EditFormContext.GetEditor("Permissions")
</DxFormLayoutItem> </DxFormLayoutItem>
@ -59,14 +61,14 @@
[Parameter] [Parameter]
public UserModelDtoDetail UserModelDtoDetail { get; set; } public UserModelDtoDetail UserModelDtoDetail { get; set; }
private LoggerClient<UserProductMappingGridComponent> _logger; private LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping> _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<UserProductMappingGridComponent>(LogWriters.ToArray()); _logger = new LoggerClient<UserGrid_MasterDetail_NestedGrid_UserProductMapping>(LogWriters.ToArray());
_detailGridData = UserModelDtoDetail.UserProductMappings ?? new List<UserProductMapping>(); _detailGridData = UserModelDtoDetail.UserProductMappings ?? new List<UserProductMapping>();
_availableProducts = await ServiceProviderDataService.GetAllProductsAsync(); _availableProducts = await ServiceProviderDataService.GetAllProductsAsync();

7
TIAMSharedUI/wwwroot/css/TourIAm.css
View File

@ -243,13 +243,6 @@ 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;