Add MgCardView component & refactor MeasuringOut to tabs
Introduced a reusable, responsive MgCardView<TItem> component for displaying data as cards with optional filtering and paging. Refactored the MeasuringOut page to use a tabbed interface: daily tasks are now shown as filterable cards, and measuring details are separated into a dedicated tab. Improved UI clarity, code organization, and maintainability.
This commit is contained in:
parent
ff1a5b63c1
commit
84f4990ff4
|
|
@ -10,7 +10,7 @@
|
||||||
|
|
||||||
<h3>Áru bevételezés</h3>
|
<h3>Áru bevételezés</h3>
|
||||||
|
|
||||||
<div style="margin-top: 50px;">
|
<div style="margin-top: 30px;">
|
||||||
<DxLoadingPanel @bind-Visible="LoadingPanelVisible"
|
<DxLoadingPanel @bind-Visible="LoadingPanelVisible"
|
||||||
IsContentBlocked="true"
|
IsContentBlocked="true"
|
||||||
ApplyBackgroundShading="true"
|
ApplyBackgroundShading="true"
|
||||||
|
|
|
||||||
|
|
@ -7,13 +7,13 @@
|
||||||
@using FruitBank.Common.SignalRs
|
@using FruitBank.Common.SignalRs
|
||||||
@using FruitBankHybrid.Shared.Components
|
@using FruitBankHybrid.Shared.Components
|
||||||
@using FruitBankHybrid.Shared.Services
|
@using FruitBankHybrid.Shared.Services
|
||||||
|
@using AyCode.Blazor.Components.Components.CardViews
|
||||||
@using Nop.Core.Domain.Orders
|
@using Nop.Core.Domain.Orders
|
||||||
<h3>Áru kiadás</h3>
|
<h3>Áru kiadás</h3>
|
||||||
|
|
||||||
<DxDialogProvider />
|
<DxDialogProvider />
|
||||||
|
|
||||||
<div style="margin-top: 50px;">
|
<div style="margin-top: 30px;">
|
||||||
|
|
||||||
<DxLoadingPanel @bind-Visible="LoadingPanelVisible"
|
<DxLoadingPanel @bind-Visible="LoadingPanelVisible"
|
||||||
IsContentBlocked="true"
|
IsContentBlocked="true"
|
||||||
ApplyBackgroundShading="true"
|
ApplyBackgroundShading="true"
|
||||||
|
|
@ -22,231 +22,267 @@
|
||||||
IndicatorAnimationType="WaitIndicatorAnimationType.Spin"
|
IndicatorAnimationType="WaitIndicatorAnimationType.Spin"
|
||||||
Text="Adatok szinkronizálása folyamatban...">
|
Text="Adatok szinkronizálása folyamatban...">
|
||||||
|
|
||||||
<DxFormLayout CaptionPosition="CaptionPosition.Vertical" CssClass="w-100">
|
<DxFormLayout CaptionPosition="CaptionPosition.Vertical" CssClass="w-100 measuring-form-layout">
|
||||||
<DxFormLayoutItem Caption="Dátum" ColSpanMd="3"
|
<DxFormLayoutItem Caption="Dátum" ColSpanXs="8" ColSpanSm="8" ColSpanMd="2"
|
||||||
CaptionCssClass="@(SelectedOrder != null && _measuringDates.Where(x => MeasurementService.DaysEqual(x.DateTime, SelectedOrder.DateOfReceiptOrCreated)).All(x => x.IsMeasured) ? "text-success" : "")">
|
CaptionCssClass="@(SelectedOrder != null && _measuringDates.Where(x => MeasurementService.DaysEqual(x.DateTime, SelectedOrder.DateOfReceiptOrCreated)).All(x => x.IsMeasured) ? "text-success" : "")">
|
||||||
<div class="container-fluid p-0">
|
<DxDateEdit DisplayFormat="m"
|
||||||
<div class="row">
|
Format="m"
|
||||||
<div class="col-9 p-0">
|
Context="ctxOrderDate"
|
||||||
<DxDateEdit DisplayFormat="m"
|
Date="@(SelectedOrder?.DateOfReceiptOrCreated.Date ?? DateTime.Now.Date)"
|
||||||
Format="m"
|
CustomDisabledDate="@OnCustomDisabledMeasuringDate"
|
||||||
Context="ctxOrderDate"
|
DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))"
|
||||||
Date="@(SelectedOrder?.DateOfReceiptOrCreated.Date ?? DateTime.Now.Date)"
|
InputId="deDisabledDates"
|
||||||
CustomDisabledDate="@OnCustomDisabledMeasuringDate"
|
PickerDisplayMode="DatePickerDisplayMode.Calendar">
|
||||||
DateChanged="@((DateTime newValue) => OnMeasuringDateChanged(newValue))"
|
<DayCellTemplate>
|
||||||
InputId="deDisabledDates"
|
@{
|
||||||
PickerDisplayMode="DatePickerDisplayMode.Calendar">
|
var cssClass = GetMeasuringDateCssClassNames(ctxOrderDate);
|
||||||
<DayCellTemplate>
|
if (!cssClass.IsNullOrWhiteSpace())
|
||||||
@{
|
{
|
||||||
var cssClass = GetMeasuringDateCssClassNames(ctxOrderDate);
|
<a class="@GetMeasuringDateCssClassNames(ctxOrderDate)">@ctxOrderDate.Day.ToString()</a>
|
||||||
if (!cssClass.IsNullOrWhiteSpace())
|
}
|
||||||
{
|
else
|
||||||
<a class="@GetMeasuringDateCssClassNames(ctxOrderDate)">@ctxOrderDate.Day.ToString()</a>
|
{
|
||||||
}
|
<a>@ctxOrderDate.Day.ToString()</a>
|
||||||
else
|
}
|
||||||
{
|
}
|
||||||
<a>@ctxOrderDate.Day.ToString()</a>
|
</DayCellTemplate>
|
||||||
}
|
</DxDateEdit>
|
||||||
}
|
|
||||||
</DayCellTemplate>
|
|
||||||
</DxDateEdit>
|
|
||||||
</div>
|
|
||||||
<div class="col-3 p-0">
|
|
||||||
<DxSpinEdit T="int" Value="1" Increment="1" MinValue="1" ValueChanged="async i => await RefreshOrdersFromDb(DateTime.Now, i)"></DxSpinEdit>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</DxFormLayoutItem>
|
</DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Caption="Napok száma" ColSpanXs="4" ColSpanSm="4" ColSpanMd="1">
|
||||||
<DxFormLayoutItem Caption="Átvétel időpontja:" ColSpanMd="5" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
|
<DxSpinEdit T="int" Value="1" Increment="1" MinValue="1"
|
||||||
<DxComboBox Data="@SelectedDayOrders"
|
ValueChanged="async i => await RefreshOrdersFromDb(DateTime.Now, i)" />
|
||||||
@bind-Value="@SelectedOrder"
|
|
||||||
Text="Válasszon időpontot..."
|
|
||||||
ValueFieldName="@nameof(OrderDto.Id)"
|
|
||||||
TextFieldName="@nameof(OrderDto.TimeOfReceiptText)"
|
|
||||||
CssClass="cw-480"
|
|
||||||
Context="ctxOrder"
|
|
||||||
DropDownBodyCssClass="dd-body-class"
|
|
||||||
SearchMode="ListSearchMode.AutoSearch"
|
|
||||||
SearchFilterCondition="ListSearchFilterCondition.Contains"
|
|
||||||
SearchTextParseMode="ListSearchTextParseMode.GroupWordsByAnd"
|
|
||||||
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
|
|
||||||
DropDownTriggerMode="DropDownTriggerMode.Click"
|
|
||||||
ListRenderMode="ListRenderMode.Entire"
|
|
||||||
ShowDropDownButton="false"
|
|
||||||
SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<OrderDto> args) => OnSelectedOrderChanged(args))"
|
|
||||||
InputId="cbOrders">
|
|
||||||
<ItemDisplayTemplate>
|
|
||||||
<span class="@(ctxOrder.DataItem.IsMeasured ? "text-success" : "")">@ctxOrder.DisplayText</span>
|
|
||||||
</ItemDisplayTemplate>
|
|
||||||
<Buttons>
|
|
||||||
<DxEditorButton IconCssClass="editor-icon editor-icon-add" Text="R" Tooltip="Adatok frissítése..."
|
|
||||||
Click="() => OnOrdersRefreshClick()" />
|
|
||||||
</Buttons>
|
|
||||||
</DxComboBox>
|
|
||||||
</DxFormLayoutItem>
|
</DxFormLayoutItem>
|
||||||
|
|
||||||
@if (SelectedOrder == null)
|
|
||||||
{
|
|
||||||
<DxFormLayoutItem ColSpanMd="2" />
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (SelectedOrder is { MeasurementOwnerId: 0, IsComplete: false } && HasMeasuringAccess)
|
|
||||||
{
|
|
||||||
<DxFormLayoutItem ColSpanMd="2">
|
|
||||||
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="(SelectedOrder != null)"
|
|
||||||
CssClass="w-100"
|
|
||||||
Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? " Indítás" : "Folyamatban...")"
|
|
||||||
Click="() => OnStartMeasuringClick()" />
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
<DxFormLayoutItem ColSpanMd="2" Caption="Indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? " text-success" : "")">
|
|
||||||
<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.LastName)" />
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@* <DxFormLayoutItem ColSpanMd="1"></DxFormLayoutItem> *@
|
|
||||||
@if (SelectedOrder != null && LoggedInModel.IsRevisor)
|
|
||||||
{
|
|
||||||
var isCompleteOrder = SelectedOrder.IsComplete;
|
|
||||||
|
|
||||||
<DxFormLayoutItem Caption="Revizor:" ColSpanMd="2" CaptionCssClass="@(isCompleteOrder ? "text-success" : "")">
|
|
||||||
<DxButton Text="@(isCompleteOrder ? "Lezárva" : "Lezárás")"
|
|
||||||
Enabled="@(!isCompleteOrder && IsAllOrderItemPalletAudited)" CssClass="w-100"
|
|
||||||
Click="() => OnMeasuringAuditorClick()" />
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
}
|
|
||||||
</DxFormLayout>
|
</DxFormLayout>
|
||||||
|
|
||||||
@if (SelectedOrder == null || LoadingPanelVisible)
|
<DxTabs ActiveTabIndex="(int)_activeTab" ActiveTabIndexChanged="i => _activeTab = (MeasuringTab)i" RenderMode="TabsRenderMode.OnDemand" CssClass="measuring-tabs">
|
||||||
{
|
<DxTabPage Text="Napi feladatok">
|
||||||
}
|
<div class="p-3">
|
||||||
else if (!HasMeasuringAccess)
|
<MgCardView TItem="OrderDto" Data="@FilteredOrders"
|
||||||
{
|
ShowFilterPanel="true"
|
||||||
<div style="margin-top: 30px;">
|
OnCardClick="NavigateToMeasuringTab">
|
||||||
<H3>Mások végzik a mérést!</H3>
|
<FilterPanel>
|
||||||
</div>
|
<DxTagBox Data="@(Enum.GetValues<MeasuringStatus>())"
|
||||||
}
|
NullText="Összes státusz"
|
||||||
else
|
@bind-Values="_statusFilter"
|
||||||
{
|
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
|
||||||
string? orderNote;
|
CssClass="cw-480" />
|
||||||
if (!(orderNote = SelectedOrder?.OrderNotes.LastOrDefault(x => x.Note.StartsWith('*'))?.Note).IsNullOrWhiteSpace())
|
</FilterPanel>
|
||||||
{
|
<CardTemplate>
|
||||||
<div class="container-fluid p-0" style="margin-top: 20px">
|
<div class="d-flex justify-content-between align-items-start mb-2">
|
||||||
<b> Megjegyzés: </b><span>@(orderNote) </span>
|
<h6 class="mb-0">#@context.CustomOrderNumber</h6>
|
||||||
|
<span class="badge @GetOrderStatusBadgeCssClass(context.MeasuringStatus)">@GetOrderStatusText(context.MeasuringStatus)</span>
|
||||||
|
</div>
|
||||||
|
<div class="text-muted small mb-2">
|
||||||
|
<strong>@context.DateOfReceiptOrCreated.ToString("H:mm")</strong> — @context.Customer.Company
|
||||||
|
</div>
|
||||||
|
@foreach (var item in context.OrderItemDtos)
|
||||||
|
{
|
||||||
|
<div class="@GetOrderStatusCssClass(item.MeasuringStatus) small">
|
||||||
|
@item.ProductName — @item.TrayQuantity/@item.Quantity rekesz
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</CardTemplate>
|
||||||
|
</MgCardView>
|
||||||
</div>
|
</div>
|
||||||
}
|
</DxTabPage>
|
||||||
|
<DxTabPage Text="Mérés">
|
||||||
|
<div class="p-3">
|
||||||
|
<DxFormLayout CaptionPosition="CaptionPosition.Vertical" CssClass="w-100">
|
||||||
|
<DxFormLayoutItem Caption="Átvétel időpontja:" ColSpanMd="5" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
|
||||||
|
<DxComboBox Data="@SelectedDayOrders"
|
||||||
|
@bind-Value="@SelectedOrder"
|
||||||
|
Text="Válasszon időpontot..."
|
||||||
|
ValueFieldName="@nameof(OrderDto.Id)"
|
||||||
|
TextFieldName="@nameof(OrderDto.TimeOfReceiptText)"
|
||||||
|
CssClass="cw-480"
|
||||||
|
Context="ctxOrder"
|
||||||
|
DropDownBodyCssClass="dd-body-class"
|
||||||
|
SearchMode="ListSearchMode.AutoSearch"
|
||||||
|
SearchFilterCondition="ListSearchFilterCondition.Contains"
|
||||||
|
SearchTextParseMode="ListSearchTextParseMode.GroupWordsByAnd"
|
||||||
|
ClearButtonDisplayMode="DataEditorClearButtonDisplayMode.Auto"
|
||||||
|
DropDownTriggerMode="DropDownTriggerMode.Click"
|
||||||
|
ListRenderMode="ListRenderMode.Entire"
|
||||||
|
ShowDropDownButton="true"
|
||||||
|
SelectedDataItemChanged="@((SelectedDataItemChangedEventArgs<OrderDto> args) => OnSelectedOrderChanged(args))"
|
||||||
|
InputId="cbOrders">
|
||||||
|
<ItemDisplayTemplate>
|
||||||
|
<span class="@(ctxOrder.DataItem.IsMeasured ? "text-success" : "")">@ctxOrder.DisplayText</span>
|
||||||
|
</ItemDisplayTemplate>
|
||||||
|
<Buttons>
|
||||||
|
<DxEditorButton IconCssClass="editor-icon editor-icon-add" Text="R" Tooltip="Adatok frissítése..."
|
||||||
|
Click="() => OnOrdersRefreshClick()" />
|
||||||
|
</Buttons>
|
||||||
|
</DxComboBox>
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
|
||||||
<div style="margin-top: 30px;">
|
@if (SelectedOrder == null)
|
||||||
<h4 style="margin-bottom: 30px;" class="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
|
{
|
||||||
Rendelés azonosító: #@(SelectedOrder?.CustomOrderNumber)
|
<DxFormLayoutItem ColSpanMd="5">
|
||||||
</h4>
|
<div class="alert alert-info mt-2" role="alert">
|
||||||
|
<i class="me-1">ℹ</i> Válasszon ki egy rendelést a mérés indításához.
|
||||||
<DxAccordion Data="@SelectedOrder?.OrderItemDtos" Enabled="@((HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId > 0 && (LoggedInModel.IsRevisor || !(SelectedOrder?.IsComplete ?? false))))"
|
</div>
|
||||||
ExpandMode="AccordionExpandMode.SingleOrNone"
|
</DxFormLayoutItem>
|
||||||
ExpandCollapseAction="AccordionExpandCollapseAction.ExpandButtonClick"
|
}
|
||||||
AnimationType="LayoutAnimationType.Slide">
|
else
|
||||||
<DataMappings>
|
{
|
||||||
<DxAccordionDataMapping Text=ProductName></DxAccordionDataMapping>
|
if (SelectedOrder is { MeasurementOwnerId: 0, IsComplete: false } && HasMeasuringAccess)
|
||||||
@* <DxAccordionDataMapping Text="OrderItemId" Level="1"></DxAccordionDataMapping> *@
|
|
||||||
</DataMappings>
|
|
||||||
<ItemHeaderTextTemplate>
|
|
||||||
@{
|
|
||||||
if (context.Level == 0)
|
|
||||||
{
|
{
|
||||||
var cssClass = "text-danger";
|
<DxFormLayoutItem ColSpanMd="2">
|
||||||
|
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="(SelectedOrder != null)"
|
||||||
var selectedOrderItemDto = (OrderItemDto)(context.DataItem);
|
CssClass="w-100"
|
||||||
var trayQuantity = selectedOrderItemDto.TrayQuantity; //selectedOrderItemDto.OrderItemPallets.Where(x => x.IsMeasured).Sum(x => x.TrayQuantity);
|
Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Indítás" : "Folyamatban...")"
|
||||||
|
Click="() => OnStartMeasuringClick()" />
|
||||||
var isValid = selectedOrderItemDto.IsValidMeasuringValues();
|
</DxFormLayoutItem>
|
||||||
var isValidAndMeasured = isValid && selectedOrderItemDto.IsMeasuredAndValid(); // && selectedOrderItemDto.;
|
}
|
||||||
|
else
|
||||||
if (isValid && !selectedOrderItemDto.AverageWeightIsValid) cssClass = "text-warning";
|
{
|
||||||
else if (isValidAndMeasured) cssClass = "text-success";
|
<DxFormLayoutItem ColSpanMd="2" Caption="Indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
|
||||||
else if (isValid) cssClass = string.Empty;
|
<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.LastName)" />
|
||||||
|
</DxFormLayoutItem>
|
||||||
var displayText = $"{selectedOrderItemDto.ProductName} - [{trayQuantity}/{selectedOrderItemDto.Quantity} rekesz, {(selectedOrderItemDto.IsMeasurable ? "net.súly: " + selectedOrderItemDto.NetWeight + "kg." : "nem mérendő!")}]";
|
|
||||||
if (selectedOrderItemDto.MeasuringStatus == MeasuringStatus.Audited) displayText = $"[{selectedOrderItemDto.MeasuringStatus}] " + displayText;
|
|
||||||
|
|
||||||
<h5 class="@cssClass">@(displayText)</h5>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</ItemHeaderTextTemplate>
|
|
||||||
<ItemContentTemplate>
|
|
||||||
@{
|
|
||||||
if (context.Level == 0)
|
|
||||||
{
|
|
||||||
var selectedOrderItem = (OrderItemDto)(context.DataItem);
|
|
||||||
|
|
||||||
<DxFormLayout Context="ctxFormLayout" Data="@selectedOrderItem" CaptionPosition="CaptionPosition.Vertical"
|
@if (SelectedOrder != null && LoggedInModel.IsRevisor)
|
||||||
CssClass="w-100">
|
{
|
||||||
<DxFormLayoutItem Context="ctxFormLayoutItem" ColSpanMd="12">
|
var isCompleteOrder = SelectedOrder.IsComplete;
|
||||||
@for (var index = 0; index < (selectedOrderItem?.OrderItemPallets?.Count ?? 0); index++)
|
|
||||||
|
<DxFormLayoutItem Caption="Revizor:" ColSpanMd="2" CaptionCssClass="@(isCompleteOrder ? "text-success" : "")">
|
||||||
|
<DxButton Text="@(isCompleteOrder ? "Lezárva" : "Lezárás")"
|
||||||
|
Enabled="@(!isCompleteOrder && IsAllOrderItemPalletAudited)" CssClass="w-100"
|
||||||
|
Click="() => OnMeasuringAuditorClick()" />
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
}
|
||||||
|
</DxFormLayout>
|
||||||
|
|
||||||
|
@if (SelectedOrder == null || LoadingPanelVisible)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else if (!HasMeasuringAccess)
|
||||||
|
{
|
||||||
|
<div class="alert alert-warning mt-4" role="alert">
|
||||||
|
<strong>⚠ Figyelem!</strong> Jelenleg más felhasználó végzi a mérést ennél a rendelésnél.
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
string? orderNote;
|
||||||
|
if (!(orderNote = SelectedOrder?.OrderNotes.LastOrDefault(x => x.Note.StartsWith('*'))?.Note).IsNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
<div class="alert alert-info mt-3" role="alert">
|
||||||
|
<strong>📝 Megjegyzés:</strong> @(orderNote)
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
|
||||||
|
<div class="mt-5">
|
||||||
|
<h4 class="mb-1 @(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
|
||||||
|
Rendelés azonosító: #@(SelectedOrder?.CustomOrderNumber)
|
||||||
|
</h4>
|
||||||
|
|
||||||
|
<DxAccordion Data="@SelectedOrder?.OrderItemDtos" Enabled="@((HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId > 0 && (LoggedInModel.IsRevisor || !(SelectedOrder?.IsComplete ?? false))))"
|
||||||
|
ExpandMode="AccordionExpandMode.SingleOrNone"
|
||||||
|
ExpandCollapseAction="AccordionExpandCollapseAction.ExpandButtonClick"
|
||||||
|
AnimationType="LayoutAnimationType.Slide">
|
||||||
|
<DataMappings>
|
||||||
|
<DxAccordionDataMapping Text=ProductName></DxAccordionDataMapping>
|
||||||
|
</DataMappings>
|
||||||
|
<ItemHeaderTextTemplate>
|
||||||
|
@{
|
||||||
|
if (context.Level == 0)
|
||||||
{
|
{
|
||||||
var localI = index + 1;
|
var cssClass = "text-danger";
|
||||||
var currentOrderItemPallet = selectedOrderItem!.OrderItemPallets![index];
|
|
||||||
|
|
||||||
<PalletItemComponent IsMeasurable="@selectedOrderItem.IsMeasurable"
|
var selectedOrderItemDto = (OrderItemDto)(context.DataItem);
|
||||||
MeasuringIndex="@localI"
|
var trayQuantity = selectedOrderItemDto.TrayQuantity; //selectedOrderItemDto.OrderItemPallets.Where(x => x.IsMeasured).Sum(x => x.TrayQuantity);
|
||||||
Editable="@(_enablePalletItems && !currentOrderItemPallet.IsAudited && !(SelectedOrder?.IsComplete ?? false))"
|
|
||||||
PalletItem="@currentOrderItemPallet"
|
var isValid = selectedOrderItemDto.IsValidMeasuringValues();
|
||||||
ProductId="@selectedOrderItem.ProductId"
|
var isValidAndMeasured = isValid && selectedOrderItemDto.IsMeasuredAndValid(); // && selectedOrderItemDto.;
|
||||||
MaxTrayQuantity="@selectedOrderItem.Quantity"
|
|
||||||
AddOrUpdateSignalRTag="SignalRTags.AddOrUpdateMeasuredOrderItemPallet"
|
if (isValid && !selectedOrderItemDto.AverageWeightIsValid) cssClass = "text-warning";
|
||||||
OnPalletItemSaveOrAuditClick="pallet => OnOrderItemSaveOrAuditClick(pallet, selectedOrderItem)"
|
else if (isValidAndMeasured) cssClass = "text-success";
|
||||||
OnPalletItemSaved="pallet => OnOrderItemPalletSaved(pallet, selectedOrderItem)"
|
else if (isValid) cssClass = string.Empty;
|
||||||
OnPalletItemValueChanged="pallet => OnOrderItemPalletValueChanged(pallet, selectedOrderItem)"
|
|
||||||
OnPalletItemAudited="pallet => OnOrderItemAudited(pallet, selectedOrderItem)">
|
var displayText = $"{selectedOrderItemDto.ProductName} - [{trayQuantity}/{selectedOrderItemDto.Quantity} rekesz, {(selectedOrderItemDto.IsMeasurable ? "net.súly: " + selectedOrderItemDto.NetWeight + "kg." : "nem mérendő!")}]";
|
||||||
</PalletItemComponent>
|
if (selectedOrderItemDto.MeasuringStatus == MeasuringStatus.Audited) displayText = $"[{selectedOrderItemDto.MeasuringStatus}] " + displayText;
|
||||||
|
|
||||||
|
<h5 class="@cssClass">@(displayText)</h5>
|
||||||
}
|
}
|
||||||
</DxFormLayoutItem>
|
|
||||||
|
|
||||||
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="2" BeginRow="true">
|
|
||||||
<DxButton Text="Új sor" Click="() => AddNewPalletItemClick(selectedOrderItem)" CssClass="w-100"
|
|
||||||
Visible="@(!(SelectedOrder?.IsComplete ?? false))"
|
|
||||||
Enabled="@(selectedOrderItem.OrderItemPallets[^1].Id > 0)" />
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="3">
|
|
||||||
<DxButton Text="Utolsó sor törlése" Click="() => LastPalletItemDeleteClick(selectedOrderItem)" CssClass="w-100"
|
|
||||||
Visible="@(!(SelectedOrder?.IsComplete ?? false))"
|
|
||||||
Enabled="@(selectedOrderItem.OrderItemPallets.Count > 1 && selectedOrderItem.OrderItemPallets[^1].Id <= 0)" />
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
|
|
||||||
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="7" />
|
|
||||||
|
|
||||||
<DxFormLayoutItem Context="vfdfgfd" ColSpanMd="12" BeginRow="true">
|
|
||||||
<DxFormLayout CssClass="w-100" Context="dfcadsc">
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false"><strong>TOTAL:</strong></DxFormLayoutItem>
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false" />
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false" />
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false" />
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false"><strong>Rekesz: @(selectedOrderItem.TrayQuantity) db</strong></DxFormLayoutItem>
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false"><strong>Br: @(selectedOrderItem.GrossWeight) kg</strong></DxFormLayoutItem>
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false"><strong>Net: @(selectedOrderItem.NetWeight) kg</strong></DxFormLayoutItem>
|
|
||||||
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false" />
|
|
||||||
</DxFormLayout>
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
|
|
||||||
@if (!_errorText.IsNullOrWhiteSpace())
|
|
||||||
{
|
|
||||||
<DxFormLayoutItem Context="ctxFromLayoutItemError" ColSpanMd="12" BeginRow="true">
|
|
||||||
<text>HIBA! @_errorText</text>
|
|
||||||
</DxFormLayoutItem>
|
|
||||||
//_errorText = string.Empty;
|
|
||||||
}
|
}
|
||||||
</DxFormLayout>
|
</ItemHeaderTextTemplate>
|
||||||
<div style="margin-bottom: 20px;"></div>
|
<ItemContentTemplate>
|
||||||
}
|
@{
|
||||||
}
|
if (context.Level == 0)
|
||||||
</ItemContentTemplate>
|
{
|
||||||
</DxAccordion>
|
var selectedOrderItem = (OrderItemDto)(context.DataItem);
|
||||||
</div>
|
|
||||||
}
|
<DxFormLayout Context="ctxFormLayout" Data="@selectedOrderItem" CaptionPosition="CaptionPosition.Vertical"
|
||||||
|
CssClass="w-100">
|
||||||
|
<DxFormLayoutItem Context="ctxFormLayoutItem" ColSpanMd="12">
|
||||||
|
@for (var index = 0; index < (selectedOrderItem?.OrderItemPallets?.Count ?? 0); index++)
|
||||||
|
{
|
||||||
|
var localI = index + 1;
|
||||||
|
var currentOrderItemPallet = selectedOrderItem!.OrderItemPallets![index];
|
||||||
|
|
||||||
|
<PalletItemComponent IsMeasurable="@selectedOrderItem.IsMeasurable"
|
||||||
|
MeasuringIndex="@localI"
|
||||||
|
Editable="@(_enablePalletItems && !currentOrderItemPallet.IsAudited && !(SelectedOrder?.IsComplete ?? false))"
|
||||||
|
PalletItem="@currentOrderItemPallet"
|
||||||
|
ProductId="@selectedOrderItem.ProductId"
|
||||||
|
MaxTrayQuantity="@selectedOrderItem.Quantity"
|
||||||
|
AddOrUpdateSignalRTag="SignalRTags.AddOrUpdateMeasuredOrderItemPallet"
|
||||||
|
OnPalletItemSaveOrAuditClick="pallet => OnOrderItemSaveOrAuditClick(pallet, selectedOrderItem)"
|
||||||
|
OnPalletItemSaved="pallet => OnOrderItemPalletSaved(pallet, selectedOrderItem)"
|
||||||
|
OnPalletItemValueChanged="pallet => OnOrderItemPalletValueChanged(pallet, selectedOrderItem)"
|
||||||
|
OnPalletItemAudited="pallet => OnOrderItemAudited(pallet, selectedOrderItem)">
|
||||||
|
</PalletItemComponent>
|
||||||
|
}
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
|
||||||
|
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="2" BeginRow="true">
|
||||||
|
<DxButton Text="Új sor" Click="() => AddNewPalletItemClick(selectedOrderItem)" CssClass="w-100"
|
||||||
|
Visible="@(!(SelectedOrder?.IsComplete ?? false))"
|
||||||
|
Enabled="@(selectedOrderItem.OrderItemPallets[^1].Id > 0)" />
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="3">
|
||||||
|
<DxButton Text="Utolsó sor törlése" Click="() => LastPalletItemDeleteClick(selectedOrderItem)" CssClass="w-100"
|
||||||
|
Visible="@(!(SelectedOrder?.IsComplete ?? false))"
|
||||||
|
Enabled="@(selectedOrderItem.OrderItemPallets.Count > 1 && selectedOrderItem.OrderItemPallets[^1].Id <= 0)" />
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
|
||||||
|
<DxFormLayoutItem Context="ctxFromLayoutNewPallet" ColSpanMd="7" />
|
||||||
|
|
||||||
|
<DxFormLayoutItem Context="vfdfgfd" ColSpanMd="12" BeginRow="true">
|
||||||
|
<DxFormLayout CssClass="w-100" Context="dfcadsc">
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false"><strong>TOTAL:</strong></DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false" />
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false" />
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false" />
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false"><strong>Rekesz: @(selectedOrderItem.TrayQuantity) db</strong></DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="2" BeginRow="false"><strong>Br: @(selectedOrderItem.GrossWeight) kg</strong></DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false"><strong>Net: @(selectedOrderItem.NetWeight) kg</strong></DxFormLayoutItem>
|
||||||
|
<DxFormLayoutItem Context="dfcadsc2" ColSpanMd="1" BeginRow="false" />
|
||||||
|
</DxFormLayout>
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
|
||||||
|
@if (!_errorText.IsNullOrWhiteSpace())
|
||||||
|
{
|
||||||
|
<DxFormLayoutItem Context="ctxFromLayoutItemError" ColSpanMd="12" BeginRow="true">
|
||||||
|
<div class="alert alert-danger" role="alert">
|
||||||
|
<strong>⚠ Hiba:</strong> @_errorText
|
||||||
|
</div>
|
||||||
|
</DxFormLayoutItem>
|
||||||
|
}
|
||||||
|
</DxFormLayout>
|
||||||
|
<div class="mb-3"></div>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</ItemContentTemplate>
|
||||||
|
</DxAccordion>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
</div>
|
||||||
|
</DxTabPage>
|
||||||
|
</DxTabs>
|
||||||
</DxLoadingPanel>
|
</DxLoadingPanel>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ using AyCode.Services.SignalRs;
|
||||||
using DevExpress.Blazor;
|
using DevExpress.Blazor;
|
||||||
using FruitBank.Common.Dtos;
|
using FruitBank.Common.Dtos;
|
||||||
using FruitBank.Common.Entities;
|
using FruitBank.Common.Entities;
|
||||||
|
using FruitBank.Common.Enums;
|
||||||
using FruitBank.Common.Models;
|
using FruitBank.Common.Models;
|
||||||
using FruitBank.Common.SignalRs;
|
using FruitBank.Common.SignalRs;
|
||||||
using FruitBankHybrid.Shared.Extensions;
|
using FruitBankHybrid.Shared.Extensions;
|
||||||
|
|
@ -30,8 +31,16 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
private LoggerClient _logger = null!;
|
private LoggerClient _logger = null!;
|
||||||
private string _errorText;
|
private string _errorText;
|
||||||
|
|
||||||
|
private enum MeasuringTab
|
||||||
|
{
|
||||||
|
DailyTasks = 0,
|
||||||
|
Measuring = 1
|
||||||
|
}
|
||||||
|
|
||||||
private bool _enablePalletItems = true;
|
private bool _enablePalletItems = true;
|
||||||
private int _lastDaysCount = 1;
|
private int _lastDaysCount = 1;
|
||||||
|
private MeasuringTab _activeTab = MeasuringTab.DailyTasks;
|
||||||
|
private IEnumerable<MeasuringStatus> _statusFilter = [MeasuringStatus.NotStarted, MeasuringStatus.Started, MeasuringStatus.Finnished];
|
||||||
public bool HasMeasuringAccess;
|
public bool HasMeasuringAccess;
|
||||||
public bool LoadingPanelVisible { get; set; } = true;
|
public bool LoadingPanelVisible { get; set; } = true;
|
||||||
public bool IsAllOrderItemPalletAudited => SelectedOrder?.IsAllOrderItemAudited ?? false;
|
public bool IsAllOrderItemPalletAudited => SelectedOrder?.IsAllOrderItemAudited ?? false;
|
||||||
|
|
@ -42,6 +51,12 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
|
|
||||||
private List<MeasuringDateSelectorModel> _measuringDates = null!;
|
private List<MeasuringDateSelectorModel> _measuringDates = null!;
|
||||||
|
|
||||||
|
private IReadOnlyList<OrderDto> FilteredOrders => SelectedDayOrders is null
|
||||||
|
? []
|
||||||
|
: _statusFilter.Any()
|
||||||
|
? SelectedDayOrders.Where(o => _statusFilter.Contains(o.MeasuringStatus)).ToList()
|
||||||
|
: SelectedDayOrders;
|
||||||
|
|
||||||
protected override async Task OnInitializedAsync()
|
protected override async Task OnInitializedAsync()
|
||||||
{
|
{
|
||||||
LoadingPanelVisible = true;
|
LoadingPanelVisible = true;
|
||||||
|
|
@ -187,7 +202,7 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
SelectedOrder ??= SelectedDayOrders.FirstOrDefault();
|
SelectedOrder ??= SelectedDayOrders.FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
LoadingPanelVisible = SelectedOrder != null; //Lefut a change és ott lesz false! - J.
|
LoadingPanelVisible = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task OnMeasuringDateChanged(DateTime selectedDateTime) => await RefreshOrdersFromDb(selectedDateTime, _lastDaysCount);
|
private async Task OnMeasuringDateChanged(DateTime selectedDateTime) => await RefreshOrdersFromDb(selectedDateTime, _lastDaysCount);
|
||||||
|
|
@ -206,42 +221,11 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
|
|
||||||
private async Task OnSelectedOrderChanged(SelectedDataItemChangedEventArgs<OrderDto> eventArgs)
|
private async Task OnSelectedOrderChanged(SelectedDataItemChangedEventArgs<OrderDto> eventArgs)
|
||||||
{
|
{
|
||||||
//var orderDtosFromDb = await FruitBankSignalRClient.GetPendingOrderDtos();
|
|
||||||
//if (orderDtosFromDb != null) RefreshOrderGenericAttributes(orderDtosFromDb, SelectedDayOrders);
|
|
||||||
//else MessageBox.ShowMessageBox("Hiba", "Az adatok letöltése sikertelen!", MessageBoxRenderStyle.Danger);
|
|
||||||
|
|
||||||
var orderDto = eventArgs.DataItem;
|
var orderDto = eventArgs.DataItem;
|
||||||
if (orderDto != null && !LoadingPanelVisible)
|
if (orderDto != null && !LoadingPanelVisible)
|
||||||
{
|
await RefreshOrderStatusFromDbAsync(orderDto);
|
||||||
//LoadingPanelVisible = true;
|
|
||||||
var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id);
|
|
||||||
|
|
||||||
if (orderFromDb != null)
|
await ApplyMeasuringAccessAsync(orderDto);
|
||||||
{
|
|
||||||
orderDto.OrderStatus = orderFromDb.OrderStatus;
|
|
||||||
orderDto.GenericAttributes.UpdateBaseEntityCollection(orderFromDb.GenericAttributes, false);
|
|
||||||
|
|
||||||
//if (LoggedInModel.IsRevisor)
|
|
||||||
//{
|
|
||||||
// orderDto.OrderItemDtos.UpdateCollection(orderFromDb.OrderItemDtos, false);
|
|
||||||
|
|
||||||
// var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets);
|
|
||||||
// foreach (var orderItemDto in orderDto.OrderItemDtos)
|
|
||||||
// {
|
|
||||||
// if (orderItemPalletsByOrderId.TryGetValue(orderDto.Id, out var orderItemPallets))
|
|
||||||
// orderItemDto.OrderItemPallets.UpdateCollection(orderItemPallets, false);
|
|
||||||
// }
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
LoadingPanelVisible = false;
|
|
||||||
HasMeasuringAccess = orderDto?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false;
|
|
||||||
|
|
||||||
StateHasChanged();
|
|
||||||
|
|
||||||
if (!HasMeasuringAccess && orderDto != null)
|
|
||||||
await DialogService.ShowMessageBoxAsync("Információ", "A mérés már folyamatban, válasszon másik rendelést!", MessageBoxRenderStyle.Info);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private Task OnOrderItemPalletValueChanged(OrderItemPallet orderItemPallet, OrderItemDto selectedOrderItemDto)
|
private Task OnOrderItemPalletValueChanged(OrderItemPallet orderItemPallet, OrderItemDto selectedOrderItemDto)
|
||||||
|
|
@ -383,6 +367,73 @@ namespace FruitBankHybrid.Shared.Pages
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Navigates from a card click (Napi feladatok tab) to the Mérés tab with the selected order.
|
||||||
|
/// Loads the full order from DB and switches the active tab.
|
||||||
|
/// </summary>
|
||||||
|
private async Task NavigateToMeasuringTab(OrderDto order)
|
||||||
|
{
|
||||||
|
LoadingPanelVisible = true;
|
||||||
|
SelectedOrder = order;
|
||||||
|
|
||||||
|
await RefreshOrderStatusFromDbAsync(order);
|
||||||
|
|
||||||
|
_activeTab = MeasuringTab.Measuring;
|
||||||
|
|
||||||
|
await ApplyMeasuringAccessAsync(order);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Fetches the latest order data from DB and updates status and generic attributes.
|
||||||
|
/// </summary>
|
||||||
|
private async Task RefreshOrderStatusFromDbAsync(OrderDto order)
|
||||||
|
{
|
||||||
|
var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(order.Id);
|
||||||
|
if (orderFromDb != null)
|
||||||
|
{
|
||||||
|
order.OrderStatus = orderFromDb.OrderStatus;
|
||||||
|
order.GenericAttributes.UpdateBaseEntityCollection(orderFromDb.GenericAttributes, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Sets measuring access, hides loading panel, refreshes UI, and shows info dialog if access is denied.
|
||||||
|
/// </summary>
|
||||||
|
private async Task ApplyMeasuringAccessAsync(OrderDto? order)
|
||||||
|
{
|
||||||
|
HasMeasuringAccess = order?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false;
|
||||||
|
LoadingPanelVisible = false;
|
||||||
|
|
||||||
|
StateHasChanged();
|
||||||
|
|
||||||
|
if (!HasMeasuringAccess && order != null)
|
||||||
|
await DialogService.ShowMessageBoxAsync("Információ", "A mérés már folyamatban, válasszon másik rendelést!", MessageBoxRenderStyle.Info);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string GetOrderStatusCssClass(MeasuringStatus status) => status switch
|
||||||
|
{
|
||||||
|
MeasuringStatus.Audited => "text-success",
|
||||||
|
MeasuringStatus.Finnished => "text-primary",
|
||||||
|
MeasuringStatus.Started => "text-warning",
|
||||||
|
_ => "text-muted"
|
||||||
|
};
|
||||||
|
|
||||||
|
private static string GetOrderStatusBadgeCssClass(MeasuringStatus status) => status switch
|
||||||
|
{
|
||||||
|
MeasuringStatus.Audited => "bg-success",
|
||||||
|
MeasuringStatus.Finnished => "bg-primary",
|
||||||
|
MeasuringStatus.Started => "bg-warning text-dark",
|
||||||
|
_ => "bg-secondary"
|
||||||
|
};
|
||||||
|
|
||||||
|
private static string GetOrderStatusText(MeasuringStatus status) => status switch
|
||||||
|
{
|
||||||
|
MeasuringStatus.Audited => "Lezárva",
|
||||||
|
MeasuringStatus.Finnished => "Kész",
|
||||||
|
MeasuringStatus.Started => "Folyamatban",
|
||||||
|
_ => "Nem kezdett"
|
||||||
|
};
|
||||||
|
|
||||||
public void Dispose()
|
public void Dispose()
|
||||||
{
|
{
|
||||||
FruitBankSignalRClient.OnMessageReceived -= SignalRClientOnMessageReceived;
|
FruitBankSignalRClient.OnMessageReceived -= SignalRClientOnMessageReceived;
|
||||||
|
|
|
||||||
|
|
@ -79,12 +79,19 @@ h1:focus {
|
||||||
|
|
||||||
.measuring-form-layout {
|
.measuring-form-layout {
|
||||||
margin-top: 15px;
|
margin-top: 15px;
|
||||||
margin-bottom: 25px;
|
margin-bottom: 10px;
|
||||||
padding: 8px;
|
padding: 8px;
|
||||||
background-color: lightgrey;
|
background-color: #e9eff5;
|
||||||
|
border: 1px solid #d5dde6;
|
||||||
border-radius: 8px;
|
border-radius: 8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.measuring-tabs {
|
||||||
|
border: 1px solid #d5dde6;
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 0;
|
||||||
|
}
|
||||||
|
|
||||||
.dd-body-class,
|
.dd-body-class,
|
||||||
.dd-body-class .dxbl-list-box-render-container {
|
.dd-body-class .dxbl-list-box-render-container {
|
||||||
max-height: 600px !important;
|
max-height: 600px !important;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue