Enhance grids: add links, format dates, show modifiers
- Made ID columns clickable links to related edit pages
- Added ModifierId and Modified columns to item/pallet grids
- Applied consistent date formatting ("yyyy.MM.dd hh:mm")
- Updated usings for required namespaces
- Cleaned up lazy loading code and added null checks for safety
This commit is contained in:
parent
a7387f88cf
commit
73ee9fade1
|
|
@ -20,7 +20,7 @@
|
||||||
<Columns>
|
<Columns>
|
||||||
<MgGridDataColumn FieldName="Id" SortIndex="0" SortOrder="GridColumnSortOrder.Descending"
|
<MgGridDataColumn FieldName="Id" SortIndex="0" SortOrder="GridColumnSortOrder.Descending"
|
||||||
UrlLink=@(FruitBankConstClient.BaseUrl+"/Admin/Order/Edit/{Id}") />
|
UrlLink=@(FruitBankConstClient.BaseUrl+"/Admin/Order/Edit/{Id}") />
|
||||||
<DxGridDataColumn FieldName="CustomerId" />
|
<MgGridDataColumn FieldName="CustomerId" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Customer/Edit/{CustomerId}") />
|
||||||
<DxGridDataColumn FieldName="@("Customer.Company")" Caption="Company" ReadOnly="true" />
|
<DxGridDataColumn FieldName="@("Customer.Company")" Caption="Company" ReadOnly="true" />
|
||||||
<DxGridDataColumn FieldName="OrderStatus" />
|
<DxGridDataColumn FieldName="OrderStatus" />
|
||||||
<DxGridDataColumn FieldName="IsMeasurable" ReadOnly="true" />
|
<DxGridDataColumn FieldName="IsMeasurable" ReadOnly="true" />
|
||||||
|
|
@ -31,10 +31,10 @@
|
||||||
|
|
||||||
<DxGridDataColumn FieldName="IsAllOrderItemAvgWeightValid" ReadOnly="true" Caption="AvgWeightValid" />
|
<DxGridDataColumn FieldName="IsAllOrderItemAvgWeightValid" ReadOnly="true" Caption="AvgWeightValid" />
|
||||||
|
|
||||||
<DxGridDataColumn FieldName="RevisorId" ReadOnly="true" />
|
<MgGridDataColumn FieldName="RevisorId" ReadOnly="true" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Customer/Edit/{RevisorId}") />
|
||||||
<DxGridDataColumn FieldName="MeasurementOwnerId" ReadOnly="true" />
|
<MgGridDataColumn FieldName="MeasurementOwnerId" ReadOnly="true" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Customer/Edit/{MeasurementOwnerId}") />
|
||||||
<DxGridDataColumn FieldName="DateOfReceipt" />
|
<DxGridDataColumn FieldName="DateOfReceipt" DisplayFormat="yyyy.MM.dd hh:mm" />
|
||||||
<DxGridDataColumn FieldName="CreatedOnUtc" ReadOnly="true" />
|
<DxGridDataColumn FieldName="CreatedOnUtc" ReadOnly="true" DisplayFormat="yyyy.MM.dd hh:mm" />
|
||||||
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
||||||
</Columns>
|
</Columns>
|
||||||
<DetailRowTemplate>
|
<DetailRowTemplate>
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
@using AyCode.Blazor.Components.Components.Grids
|
@using AyCode.Blazor.Components.Components.Grids
|
||||||
@using AyCode.Core.Helpers
|
@using AyCode.Core.Helpers
|
||||||
@using AyCode.Utils.Extensions
|
@using AyCode.Utils.Extensions
|
||||||
|
@using FruitBank.Common
|
||||||
@using FruitBank.Common.Dtos
|
@using FruitBank.Common.Dtos
|
||||||
@using FruitBank.Common.Models
|
@using FruitBank.Common.Models
|
||||||
@using FruitBankHybrid.Shared.Components.Grids.GenericAttributes
|
@using FruitBankHybrid.Shared.Components.Grids.GenericAttributes
|
||||||
|
|
@ -18,7 +19,7 @@
|
||||||
FilterMenuButtonDisplayMode="@(IsMasterGrid ? GridFilterMenuButtonDisplayMode.Never : GridFilterMenuButtonDisplayMode.Always)">
|
FilterMenuButtonDisplayMode="@(IsMasterGrid ? GridFilterMenuButtonDisplayMode.Never : GridFilterMenuButtonDisplayMode.Always)">
|
||||||
<Columns>
|
<Columns>
|
||||||
<DxGridDataColumn FieldName="Id" />
|
<DxGridDataColumn FieldName="Id" />
|
||||||
<DxGridDataColumn FieldName="OrderId" />
|
<MgGridDataColumn FieldName="OrderId" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Order/Edit/{OrderId}") />
|
||||||
<DxGridDataColumn FieldName="@("OrderDto.Customer.Company")" Caption="Company" ReadOnly="true" />
|
<DxGridDataColumn FieldName="@("OrderDto.Customer.Company")" Caption="Company" ReadOnly="true" />
|
||||||
<DxGridDataColumn FieldName="ProductId">
|
<DxGridDataColumn FieldName="ProductId">
|
||||||
<EditSettings>
|
<EditSettings>
|
||||||
|
|
@ -49,7 +50,7 @@
|
||||||
<DxGridDataColumn FieldName="AverageWeightDifference" ReadOnly="true" Visible="false" Caption="AvgWeightDiff" />
|
<DxGridDataColumn FieldName="AverageWeightDifference" ReadOnly="true" Visible="false" Caption="AvgWeightDiff" />
|
||||||
<DxGridDataColumn FieldName="AverageWeightIsValid" ReadOnly="true" Caption="AvgWeightValid" />
|
<DxGridDataColumn FieldName="AverageWeightIsValid" ReadOnly="true" Caption="AvgWeightValid" />
|
||||||
<DxGridDataColumn FieldName="IsAudited" ReadOnly="true" />
|
<DxGridDataColumn FieldName="IsAudited" ReadOnly="true" />
|
||||||
<DxGridDataColumn FieldName="@("OrderDto.CreatedOnUtc")" Caption="Rendelés ideje" ReadOnly="true" />
|
<DxGridDataColumn FieldName="@("OrderDto.CreatedOnUtc")" Caption="Rendelés ideje" ReadOnly="true" DisplayFormat="yyyy.MM.dd hh:mm" />
|
||||||
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
||||||
</Columns>
|
</Columns>
|
||||||
<DetailRowTemplate>
|
<DetailRowTemplate>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
@using AyCode.Blazor.Components.Components.Grids
|
@using AyCode.Blazor.Components.Components.Grids
|
||||||
@using AyCode.Utils.Extensions
|
@using AyCode.Utils.Extensions
|
||||||
|
@using FruitBank.Common
|
||||||
@using FruitBank.Common.Dtos
|
@using FruitBank.Common.Dtos
|
||||||
@using FruitBank.Common.Entities
|
@using FruitBank.Common.Entities
|
||||||
@using FruitBank.Common.Models
|
@using FruitBank.Common.Models
|
||||||
|
|
@ -32,6 +33,10 @@
|
||||||
|
|
||||||
<DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" />
|
<DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" />
|
||||||
<DxGridDataColumn FieldName="IsAudited" ReadOnly="true" />
|
<DxGridDataColumn FieldName="IsAudited" ReadOnly="true" />
|
||||||
|
|
||||||
|
<MgGridDataColumn FieldName="@nameof(OrderItemPallet.ModifierId)" ReadOnly="true" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Customer/Edit/{ModifierId}") />
|
||||||
|
<DxGridDataColumn FieldName="@nameof(OrderItemPallet.Modified)" ReadOnly="true" DisplayFormat="yyyy.MM.dd hh:mm" />
|
||||||
|
|
||||||
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
||||||
</Columns>
|
</Columns>
|
||||||
<ToolbarTemplate>
|
<ToolbarTemplate>
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,14 @@
|
||||||
@using AyCode.Utils.Extensions
|
@using AyCode.Blazor.Components.Components.Grids
|
||||||
|
@using AyCode.Utils.Extensions
|
||||||
|
@using FruitBank.Common
|
||||||
@using FruitBank.Common.Dtos
|
@using FruitBank.Common.Dtos
|
||||||
@using FruitBank.Common.Entities
|
@using FruitBank.Common.Entities
|
||||||
|
@using FruitBank.Common.Models
|
||||||
@using FruitBankHybrid.Shared.Databases
|
@using FruitBankHybrid.Shared.Databases
|
||||||
@using FruitBankHybrid.Shared.Services.SignalRs
|
@using FruitBankHybrid.Shared.Services.SignalRs
|
||||||
|
|
||||||
@inject FruitBankSignalRClient FruitBankSignalRClient
|
@inject FruitBankSignalRClient FruitBankSignalRClient
|
||||||
|
@inject LoggedInModel LoggedInModel
|
||||||
|
|
||||||
<MgGridBase @ref="gridOrderItemPallet" Data="ShippingItemPallets" IsMasterGrid="IsMasterGrid" AutoSaveLayoutName="GridShippingItemPallets"
|
<MgGridBase @ref="gridOrderItemPallet" Data="ShippingItemPallets" IsMasterGrid="IsMasterGrid" AutoSaveLayoutName="GridShippingItemPallets"
|
||||||
PageSize="@(IsMasterGrid ? 15 : 50)" ShowFilterRow="IsMasterGrid" ShowGroupPanel="IsMasterGrid"
|
PageSize="@(IsMasterGrid ? 15 : 50)" ShowFilterRow="IsMasterGrid" ShowGroupPanel="IsMasterGrid"
|
||||||
|
|
@ -26,6 +30,10 @@
|
||||||
<DxGridDataColumn FieldName="NetWeight" />
|
<DxGridDataColumn FieldName="NetWeight" />
|
||||||
|
|
||||||
<DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" />
|
<DxGridDataColumn FieldName="IsMeasured" ReadOnly="true" />
|
||||||
|
|
||||||
|
<MgGridDataColumn FieldName="@nameof(ShippingItemPallet.ModifierId)" ReadOnly="true" UrlLink=@(FruitBankConstClient.BaseUrl + "/Admin/Customer/Edit/{ModifierId}") />
|
||||||
|
<DxGridDataColumn FieldName="@nameof(ShippingItemPallet.Modified)" ReadOnly="true" DisplayFormat="yyyy.MM.dd hh:mm" />
|
||||||
|
|
||||||
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
<DxGridCommandColumn Visible="!IsMasterGrid" Width="120"></DxGridCommandColumn>
|
||||||
</Columns>
|
</Columns>
|
||||||
<GroupSummary>
|
<GroupSummary>
|
||||||
|
|
|
||||||
|
|
@ -72,14 +72,15 @@
|
||||||
</table>
|
</table>
|
||||||
}
|
}
|
||||||
|
|
||||||
<MgLazyLoadContent @ref="_lazyContentRef"
|
@* <MgLazyLoadContent @ref="_lazyContentRef"
|
||||||
MinHeight="800px"
|
MinHeight="800px"
|
||||||
RootMargin="50px"
|
RootMargin="50px"
|
||||||
OnContentVisible="OnPdfContainerVisibleAsync"
|
OnContentVisible="OnPdfContainerVisibleAsync"
|
||||||
ContainerStyle="margin-top: 30px;">
|
ContainerStyle="margin-top: 30px;">
|
||||||
<div id="pdfContainer" style="width: 100%; height: 800px; overflow-y: auto;">
|
<div id="pdfContainer" style="width: 100%; height: 800px; overflow-y: auto;">
|
||||||
</div>
|
</div>
|
||||||
</MgLazyLoadContent>
|
</MgLazyLoadContent>*@
|
||||||
|
|
||||||
</AfterColumnsTemplate>
|
</AfterColumnsTemplate>
|
||||||
|
|
||||||
@* <FooterTemplate Context="ctx">
|
@* <FooterTemplate Context="ctx">
|
||||||
|
|
@ -119,7 +120,7 @@
|
||||||
|
|
||||||
if (shippingDocument == null) return;
|
if (shippingDocument == null) return;
|
||||||
|
|
||||||
if (shippingDocument.ShippingDocumentToFiles?.Count > 0)
|
if (_lazyContentRef != null && shippingDocument.ShippingDocumentToFiles?.Count > 0)
|
||||||
{
|
{
|
||||||
// Store the PDF to render
|
// Store the PDF to render
|
||||||
_randomPdf = _pdfFiles[Random.Shared.Next(_pdfFiles.Length)];
|
_randomPdf = _pdfFiles[Random.Shared.Next(_pdfFiles.Length)];
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue