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

Merge branch 'main' of https://git.aycode.com/Adam/FruitBankHybridApp

This commit is contained in:
Adam 2025-10-21 00:21:24 +02:00
parent 0a78d54536 2d03a6d60b
commit 649a7b2c8c
11 changed files with 75 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FruitBank.Common/Dtos/ProductDto.cs
View File

@ -67,5 +67,5 @@ public class ProductDto : MgProductDto, IProductDto
set => throw new Exception($"ProductDto.IncomingQuantity not set"); set => throw new Exception($"ProductDto.IncomingQuantity not set");
} }
public bool HasMeasuringValues() => Id > 0 && NetWeight > 0 && IsMeasurable; public bool HasMeasuringValues() => Id > 0 && NetWeight != 0 && IsMeasurable;
} }

2
FruitBank.Common/Entities/MeasuringItemPalletBase.cs
View File

@ -30,7 +30,7 @@ public abstract class MeasuringItemPalletBase : MgEntityBase, IMeasuringItemPall
public double PalletWeight public double PalletWeight
{ {
get => _palletWeight; get => _palletWeight;
set => _palletWeight = double.Round(value, 1); set => _palletWeight = double.Round(value, 0);
} }
[NotColumn, JsonIgnore, System.Text.Json.Serialization.JsonIgnore] [NotColumn, JsonIgnore, System.Text.Json.Serialization.JsonIgnore]

13
FruitBankHybrid.Shared.Tests/FruitBankClientTests.cs
View File

@ -183,10 +183,10 @@ namespace FruitBankHybrid.Shared.Tests
if (!productDto.IsMeasurable) continue; if (!productDto.IsMeasurable) continue;
var shippingItemSumWeight = double.Round(shippingItems.Where(x => x.IsMeasured && x.ProductId == productDto.Id).Sum(x => x.MeasuredNetWeight), 1); //var shippingItemSumWeight = double.Round(shippingItems.Where(x => x.IsMeasured && x.ProductId == productDto.Id).Sum(x => x.MeasuredNetWeight), 1);
Assert.IsTrue(shippingItemSumWeight == productDto!.NetWeight, $"{productDto}; shippingItemSum NetWeight: {shippingItemSumWeight} == {productDto.NetWeight}"); //Assert.IsTrue(shippingItemSumWeight == productDto!.NetWeight, $"{productDto}; shippingItemSum NetWeight: {shippingItemSumWeight} == {productDto.NetWeight}");
shippingItemSumWeight = double.Round(shippingItems.Where(x => x.IsMeasured && x.ProductId == productDto.Id).Sum(x => x.MeasuredGrossWeight), 1); //shippingItemSumWeight = double.Round(shippingItems.Where(x => x.IsMeasured && x.ProductId == productDto.Id).Sum(x => x.MeasuredGrossWeight), 1);
} }
} }
@ -247,6 +247,7 @@ namespace FruitBankHybrid.Shared.Tests
public async Task UpdateShippingItemAsync(int shippingItemId, int incQuantity, double incPalletWeight, double incGrossWeight, double incTare) public async Task UpdateShippingItemAsync(int shippingItemId, int incQuantity, double incPalletWeight, double incGrossWeight, double incTare)
{ {
incPalletWeight = double.Round(incPalletWeight, 0);
Console.WriteLine($"params: {shippingItemId}; {incQuantity}; {incPalletWeight}; {incGrossWeight}; {incTare}"); Console.WriteLine($"params: {shippingItemId}; {incQuantity}; {incPalletWeight}; {incGrossWeight}; {incTare}");
var originalShippingItem = await GetShippingItemByIdAsync(shippingItemId); var originalShippingItem = await GetShippingItemByIdAsync(shippingItemId);
@ -453,7 +454,7 @@ namespace FruitBankHybrid.Shared.Tests
[TestMethod] [TestMethod]
[DataRow(1, true)] [DataRow(1, true)]
[DataRow(5, true)] [DataRow(5, true)]
[DataRow(6, false)] //[DataRow(6, false)]
[DataRow(33, true)] [DataRow(33, true)]
[DataRow(64, false)] [DataRow(64, false)]
[DataRow(7, false)] [DataRow(7, false)]
@ -468,7 +469,9 @@ namespace FruitBankHybrid.Shared.Tests
Assert.IsNotNull(productDto); Assert.IsNotNull(productDto);
if (isMeasurableExcepted) Assert.IsTrue(productDto.HasMeasuringValues(), $"{productDto.IsMeasurable}, {productDto.NetWeight}"); //if (productDto.Id == 6) return productDto;
if (isMeasurableExcepted) Assert.IsTrue(productDto.HasMeasuringValues(), $"{productDto} {productDto.IsMeasurable}, {productDto.NetWeight}");
else else
{ {
Assert.IsTrue(productDto.Id > 0); Assert.IsTrue(productDto.Id > 0);

10
FruitBankHybrid.Shared/Components/PalletItemComponent.razor
View File

@ -81,7 +81,7 @@
private string GetOrderItemPalletsCssClassNames(string fieldName) private string GetOrderItemPalletsCssClassNames(string fieldName)
=> MeasuringService.GetCustomItemPalletsCssClassNames(fieldName, PalletItem, IsMeasurable); => MeasuringService.GetCustomItemPalletsCssClassNames(fieldName, PalletItem, IsMeasurable, MaxTrayQuantity);
private async Task PalletItemSaveClick() private async Task PalletItemSaveClick()
{ {
@ -98,6 +98,8 @@
if (OnPalletItemSaved != null) await OnPalletItemSaved.Invoke(responseShippingItemPallet); if (OnPalletItemSaved != null) await OnPalletItemSaved.Invoke(responseShippingItemPallet);
//LoadingPanelVisible = false; //LoadingPanelVisible = false;
StateHasChanged();
} }
protected async Task OnItemUpdating(string fieldName, object newValue, TPalletItem palletItem) protected async Task OnItemUpdating(string fieldName, object newValue, TPalletItem palletItem)
@ -108,13 +110,13 @@
switch (fieldName) switch (fieldName)
{ {
case nameof(IMeasuringItemPalletBase.PalletWeight): case nameof(IMeasuringItemPalletBase.PalletWeight):
palletItem.PalletWeight = (double)newValue; palletItem.PalletWeight = double.Round((double)newValue, 0);
if (palletItem.PalletWeight < 0) palletItem.PalletWeight = 0; if (palletItem.PalletWeight < 0) palletItem.PalletWeight = 0;
break; break;
case nameof(IMeasuringItemPalletBase.TareWeight): case nameof(IMeasuringItemPalletBase.TareWeight):
palletItem.TareWeight = (double)newValue; palletItem.TareWeight = double.Round((double)newValue, 1);
if (palletItem.TareWeight < 0) palletItem.TareWeight = 0; if (palletItem.TareWeight < 0) palletItem.TareWeight = 0;
break; break;
@ -126,7 +128,7 @@
break; break;
case nameof(IMeasuringItemPalletBase.GrossWeight): case nameof(IMeasuringItemPalletBase.GrossWeight):
palletItem.GrossWeight = (double)newValue; palletItem.GrossWeight = double.Round((double)newValue, 1);
if (palletItem.GrossWeight < 0) palletItem.GrossWeight = 0; if (palletItem.GrossWeight < 0) palletItem.GrossWeight = 0;
break; break;

7
FruitBankHybrid.Shared/Layout/MainLayout.razor.cs
View File

@ -5,16 +5,23 @@ namespace FruitBankHybrid.Shared.Layout;
public partial class MainLayout : LayoutComponentBase public partial class MainLayout : LayoutComponentBase
{ {
[Inject] public required NavigationManager NavManager{ get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; } [Inject] public required LoggedInModel LoggedInModel { get; set; }
private EventCallback RefreshMainLayoutEventCallback => EventCallback.Factory.Create(this, RefreshMainLayout); private EventCallback RefreshMainLayoutEventCallback => EventCallback.Factory.Create(this, RefreshMainLayout);
private NavMenu _navMenu = null!; private NavMenu _navMenu = null!;
protected override void OnInitialized()
{
if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
}
private void OnLogoutClick() private void OnLogoutClick()
{ {
LoggedInModel.LogOut(); LoggedInModel.LogOut();
RefreshMainLayout(); RefreshMainLayout();
NavManager.NavigateTo("/Login");
} }
public void RefreshMainLayout() public void RefreshMainLayout()

5
FruitBankHybrid.Shared/Pages/Home.razor.cs
View File

@ -5,9 +5,14 @@ namespace FruitBankHybrid.Shared.Pages;
public partial class Home : ComponentBase public partial class Home : ComponentBase
{ {
[Inject] public required NavigationManager NavManager{ get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; } [Inject] public required LoggedInModel LoggedInModel { get; set; }
private string Factor => FormFactor.GetFormFactor(); private string Factor => FormFactor.GetFormFactor();
private string Platform => FormFactor.GetPlatform(); private string Platform => FormFactor.GetPlatform();
protected override void OnInitialized()
{
//if (!LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/Login");
}
} }

1
FruitBankHybrid.Shared/Pages/Login.razor
View File

@ -14,6 +14,7 @@
ValueFieldName="@nameof(CustomerDto.Id)" ValueFieldName="@nameof(CustomerDto.Id)"
TextFieldName="@nameof(CustomerDto.FullName)" TextFieldName="@nameof(CustomerDto.FullName)"
CssClass="cw-320" CssClass="cw-320"
DropDownBodyCssClass="dd-body-class"
InputId="cbItemTemplate"> InputId="cbItemTemplate">
<ItemDisplayTemplate Context="ctxCombo"> <ItemDisplayTemplate Context="ctxCombo">
<div class="combobox-item-template"> <div class="combobox-item-template">

3
FruitBankHybrid.Shared/Pages/Login.razor.cs
View File

@ -19,6 +19,7 @@ public partial class Login : ComponentBase
[Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; } [Inject] public required IEnumerable<IAcLogWriterClientBase> LogWriters { get; set; }
[Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; } [Inject] public required FruitBankSignalRClient FruitBankSignalRClient { get; set; }
[Inject] public required LoggedInModel LoggedInModel { get; set; } [Inject] public required LoggedInModel LoggedInModel { get; set; }
[Inject] public required NavigationManager NavManager{ get; set; }
private ILogger _logger = null!; private ILogger _logger = null!;
//private List<CustomerDto> Users { get; set; } //private List<CustomerDto> Users { get; set; }
@ -77,6 +78,8 @@ public partial class Login : ComponentBase
} }
await UpdateStyle.InvokeAsync(); await UpdateStyle.InvokeAsync();
if (LoggedInModel.IsLoggedIn) NavManager.NavigateTo("/");
StateHasChanged(); StateHasChanged();
} }

44
FruitBankHybrid.Shared/Pages/MeasuringOut.razor
View File

@ -64,16 +64,26 @@
</ItemDisplayTemplate> </ItemDisplayTemplate>
<Buttons> <Buttons>
<DxEditorButton IconCssClass="editor-icon editor-icon-add" Text="R" Tooltip="Adatok frissítése..." <DxEditorButton IconCssClass="editor-icon editor-icon-add" Text="R" Tooltip="Adatok frissítése..."
Click="() => OnOrdersRefreshClick()" /> Click="() => OnOrdersRefreshClick()" />
</Buttons> </Buttons>
</DxComboBox> </DxComboBox>
</DxFormLayoutItem> </DxFormLayoutItem>
<DxFormLayoutItem ColSpanMd="2"> @if (HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)
<DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="@(SelectedOrder != null)" CssClass="w-100" {
Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Mérés indítása" : "Mérés folyamatban...")" <DxFormLayoutItem ColSpanMd="2">
Click="() => OnStartMeasuringClick()" /> <DxButton Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0)" Visible="@(SelectedOrder != null)" CssClass="w-100"
</DxFormLayoutItem> Text="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId == 0 ? "Mérés indítása" : "Mérés folyamatban...")"
Click="() => OnStartMeasuringClick()" />
</DxFormLayoutItem>
}
else
{
<DxFormLayoutItem ColSpanMd="2" Caption="Mérést indította" CaptionCssClass="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
<DxTextBox Enabled="false" Text="@(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder?.MeasurementOwnerId)?.Email)" />
</DxFormLayoutItem>
}
<DxFormLayoutItem ColSpanMd="1"></DxFormLayoutItem> <DxFormLayoutItem ColSpanMd="1"></DxFormLayoutItem>
@if (SelectedOrder != null && LoggedInModel.IsRevisor) @if (SelectedOrder != null && LoggedInModel.IsRevisor)
{ {
@ -91,22 +101,20 @@
} }
else if (!HasMeasuringAccess) else if (!HasMeasuringAccess)
{ {
@* var userIds = @SelectedOrder.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets.Where(x => x.Id > 0 && x.CreatorId.HasValue).Select(x => x.CreatorId!.Value)).ToHashSet(); <div style="margin-top: 50px;">
var a = string.Join("; ", LoggedInModel.MeasuringUsers.Where(x => userIds.Contains(x.Id)).Select(x => x.Email)); <H3>Mások végzik a mérést!</H3>
</div>
<span style="margin-top: 20px;">Mérést végzi: @a</span> *@
<span style="margin-top: 20px;">Mások végzik a mérést! Mérést végzi: @(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder.MeasurementOwnerId)?.Email)</span>
} }
else else
{ {
@* var userIds = @SelectedOrder.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets.Where(x => x.Id > 0 && x.CreatorId.HasValue).Select(x => x.CreatorId!.Value)).ToHashSet(); //Átvétel dátuma október 23. [AUDITED] 15:51 - Vegetable Kft. Rendelés azonosító: #8
var a = string.Join("; ", LoggedInModel.MeasuringUsers.Where(x => userIds.Contains(x.Id)).Select(x => x.Email));
<span style="margin-top: 20px;">Mérést végzi: @a</span> *@
<span style="margin-top: 20px;">Mérést végzi: @(LoggedInModel.MeasuringUsers.FirstOrDefault(x => x.Id == SelectedOrder.MeasurementOwnerId)?.Email)</span>
<div style="margin-top: 50px;"> <div style="margin-top: 50px;">
<DxAccordion Data="@SelectedOrder?.OrderItemDtos" Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId > 0)" <h3 style="margin-bottom: 30px;" class="@(SelectedOrder?.IsMeasured == true ? "text-success" : "")">
Rendelés azonosító: #@(SelectedOrder?.CustomOrderNumber)
</h3>
<DxAccordion Data="@SelectedOrder?.OrderItemDtos" Enabled="@(HasMeasuringAccess && SelectedOrder?.MeasurementOwnerId > 0 && !(SelectedOrder?.IsComplete ?? false))"
ExpandMode="AccordionExpandMode.SingleOrNone" ExpandMode="AccordionExpandMode.SingleOrNone"
ExpandCollapseAction="AccordionExpandCollapseAction.ExpandButtonClick" ExpandCollapseAction="AccordionExpandCollapseAction.ExpandButtonClick"
AnimationType="LayoutAnimationType.Slide"> AnimationType="LayoutAnimationType.Slide">
@ -129,7 +137,7 @@
if (isValidAndMeasured) cssClass = "text-success"; if (isValidAndMeasured) cssClass = "text-success";
else if (isValid) cssClass = string.Empty; else if (isValid) cssClass = string.Empty;
<h5 class="@cssClass">@($"{selectedOrderItemDto.ProductName} - {trayQuantity}/{selectedOrderItemDto.Quantity} rekesz, {(selectedOrderItemDto.IsMeasurable ? "net súly: " + selectedOrderItemDto.NetWeight + "kg." : "nem mérendő!")}")</h5> <h5 class="@cssClass">@($"{selectedOrderItemDto.ProductName} - [{trayQuantity}/{selectedOrderItemDto.Quantity} rekesz, {(selectedOrderItemDto.IsMeasurable ? "net.súly: " + selectedOrderItemDto.NetWeight + "kg." : "nem mérendő!")}]")</h5>
} }
} }
</ItemHeaderTextTemplate> </ItemHeaderTextTemplate>

29
FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs
View File

@ -98,34 +98,33 @@ namespace FruitBankHybrid.Shared.Pages
{ {
//LoadingPanelVisible = true; //LoadingPanelVisible = true;
var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id); var orderFromDb = await FruitBankSignalRClient.GetOrderDtoById(orderDto.Id);
if (orderFromDb != null) if (orderFromDb != null)
{ {
orderDto.OrderStatus = orderFromDb.OrderStatus; orderDto.OrderStatus = orderFromDb.OrderStatus;
orderDto.GenericAttributes.UpdateBaseEntityCollection(orderFromDb.GenericAttributes, false); orderDto.GenericAttributes.UpdateBaseEntityCollection(orderFromDb.GenericAttributes, false);
if (LoggedInModel.IsRevisor) //if (LoggedInModel.IsRevisor)
{ //{
orderDto.OrderItemDtos.UpdateCollection(orderFromDb.OrderItemDtos, false); // orderDto.OrderItemDtos.UpdateCollection(orderFromDb.OrderItemDtos, false);
var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets); // var orderItemPalletsByOrderId = orderFromDb.OrderItemDtos.Where(o => o.OrderItemPallets.Count > 0).ToDictionary(k => k.Id, v => v.OrderItemPallets);
foreach (var orderItemDto in orderDto.OrderItemDtos) // foreach (var orderItemDto in orderDto.OrderItemDtos)
{ // {
if (orderItemPalletsByOrderId.TryGetValue(orderDto.Id, out var orderItemPallets)) // if (orderItemPalletsByOrderId.TryGetValue(orderDto.Id, out var orderItemPallets))
orderItemDto.OrderItemPallets.UpdateCollection(orderItemPallets, false); // orderItemDto.OrderItemPallets.UpdateCollection(orderItemPallets, false);
} // }
} //}
} }
} }
LoadingPanelVisible = false; LoadingPanelVisible = false;
HasMeasuringAccess = orderDto?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false; HasMeasuringAccess = orderDto?.HasMeasuringAccess(LoggedInModel.CustomerDto?.Id, LoggedInModel.IsRevisor) ?? false;
if (!HasMeasuringAccess) StateHasChanged();
{
//await Task.Delay(250); if (!HasMeasuringAccess && orderDto != null)
await DialogService.ShowMessageBoxAsync("Információ", "A mérés már folyamatban, válasszon másik rendelést!", MessageBoxRenderStyle.Info); 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)

5
FruitBankHybrid.Shared/Services/MeasuringService.cs
View File

@ -36,7 +36,7 @@ public class MeasuringService
return string.Empty; return string.Empty;
} }
public static string GetCustomItemPalletsCssClassNames(string fieldName, IMeasuringItemPalletBase shippingItemPallet, bool isMeasurable) public static string GetCustomItemPalletsCssClassNames(string fieldName, IMeasuringItemPalletBase shippingItemPallet, bool isMeasurable, int? maxTrayQuantity = null)
{ {
//if (shippingItemPallet.NetWeight < 0) return "text-danger"; //if (shippingItemPallet.NetWeight < 0) return "text-danger";
@ -49,7 +49,8 @@ public class MeasuringService
return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.PalletWeight < 0 || shippingItemPallet.NetWeight < 0 ? "text-danger" : ""); return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.PalletWeight < 0 || shippingItemPallet.NetWeight < 0 ? "text-danger" : "");
break; break;
case nameof(ShippingItemPallet.TrayQuantity): case nameof(ShippingItemPallet.TrayQuantity):
return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.TrayQuantity < 0 ? "text-danger" : ""); //return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.TrayQuantity < 0 || (maxTrayQuantity.HasValue && shippingItemPallet.TrayQuantity > maxTrayQuantity.Value) ? "text-danger" : "");
return shippingItemPallet.TrayQuantity < 0 || (maxTrayQuantity.HasValue && shippingItemPallet.TrayQuantity > maxTrayQuantity.Value) ? "text-danger" : (IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : "");
break; break;
case nameof(ShippingItemPallet.GrossWeight): case nameof(ShippingItemPallet.GrossWeight):
return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.GrossWeight < 0 || shippingItemPallet.NetWeight < 0 ? "text-danger" : ""); return IsCustomItemPalletMeasuredAndValid(shippingItemPallet, isMeasurable) ? "text-success" : (shippingItemPallet.GrossWeight < 0 || shippingItemPallet.NetWeight < 0 ? "text-danger" : "");