diff --git a/FruitBank.Common.Server/FruitBank.Common.Server.csproj b/FruitBank.Common.Server/FruitBank.Common.Server.csproj index 4d7a8d1..a4a0331 100644 --- a/FruitBank.Common.Server/FruitBank.Common.Server.csproj +++ b/FruitBank.Common.Server/FruitBank.Common.Server.csproj @@ -13,6 +13,7 @@ + diff --git a/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj b/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj index 8a08473..60d7f74 100644 --- a/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj +++ b/FruitBankHybrid.Shared.Common/FruitBankHybrid.Shared.Common.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable diff --git a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj index 5117819..2a80cce 100644 --- a/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj +++ b/FruitBankHybrid.Shared.Tests/FruitBankHybrid.Shared.Tests.csproj @@ -1,7 +1,7 @@ - net9.0 + net10.0 latest enable enable diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor index 804dda9..acf03a1 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderDto.razor @@ -14,7 +14,7 @@ ShowFilterRow="IsMasterGrid" ShowGroupPanel="IsMasterGrid" AutoExpandAllGroupRows="false" CssClass="@GridCss" - ColumnResizeMode="GridColumnResizeMode.NextColumn" VirtualScrollingEnabled="IsMasterGrid" + ColumnResizeMode="GridColumnResizeMode.NextColumn" FilterMenuButtonDisplayMode="@(IsMasterGrid ? GridFilterMenuButtonDisplayMode.Never : GridFilterMenuButtonDisplayMode.Always)"> @@ -44,19 +44,19 @@ - + @{ var orderItemPalletDtos = orderDto?.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets).ToList() ?? []; } - + @{ // var orderItemPalletDtos = orderDto?.OrderItemDtos.SelectMany(oi => oi.OrderItemPallets).ToList() ?? []; // } - + @{ var genericAttributeDtos = new AcObservableCollection(orderDto.GenericAttributes); diff --git a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor index 7fbcc63..8ff39fb 100644 --- a/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor +++ b/FruitBankHybrid.Shared/Components/GridDetailOrderItemDto.razor @@ -62,7 +62,7 @@ } - + @{ var genericAttributeDtos = new AcObservableCollection(orderItemDto.GenericAttributes); diff --git a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor index 6d30316..5189b9c 100644 --- a/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor +++ b/FruitBankHybrid.Shared/Components/GridProductDtoTemplate.razor @@ -60,7 +60,7 @@ } - + @{ var genericAttributeDtos = new AcObservableCollection(productDto.GenericAttributes); diff --git a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj index 99c2167..be7cb06 100644 --- a/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj +++ b/FruitBankHybrid.Shared/FruitBankHybrid.Shared.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable @@ -14,7 +14,7 @@ - + diff --git a/FruitBankHybrid.Shared/Layout/NavMenu.razor b/FruitBankHybrid.Shared/Layout/NavMenu.razor index 613268f..ff72e57 100644 --- a/FruitBankHybrid.Shared/Layout/NavMenu.razor +++ b/FruitBankHybrid.Shared/Layout/NavMenu.razor @@ -37,6 +37,15 @@ + @if (LoggedInModel.IsDeveloper) + { +
+ + Leltározás + +
+ } + @if (LoggedInModel.IsAdministrator) {
diff --git a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs index dd70eb4..4550ffd 100644 --- a/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs +++ b/FruitBankHybrid.Shared/Pages/MeasuringOut.razor.cs @@ -108,8 +108,10 @@ namespace FruitBankHybrid.Shared.Pages lock (_lock) { var localOrderDto = SelectedDayOrders.FirstOrDefault(o => o.OrderItemDtos.Any(oi => oi.Id == orderItemDto.Id)); - var localOrderItemDto = localOrderDto?.OrderItemDtos.First(x => x.Id == orderItemDto.Id)!; + var localOrderItemDto = localOrderDto?.OrderItemDtos.FirstOrDefault(x => x.Id == orderItemDto.Id); + if (localOrderItemDto == null) return; + localOrderItemDto.Quantity = orderItemDto.Quantity; localOrderItemDto.GenericAttributes.UpdateBaseEntityCollection(orderItemDto.GenericAttributes, false); } diff --git a/FruitBankHybrid.Shared/Pages/StockTaking.razor b/FruitBankHybrid.Shared/Pages/StockTaking.razor new file mode 100644 index 0000000..68da626 --- /dev/null +++ b/FruitBankHybrid.Shared/Pages/StockTaking.razor @@ -0,0 +1,22 @@ +@page "/StockTaking" +@using FruitBankHybrid.Shared.Databases + +

Leltározás

+ + + +
+ + + + + + + + + +
\ No newline at end of file diff --git a/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs b/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs new file mode 100644 index 0000000..7c13668 --- /dev/null +++ b/FruitBankHybrid.Shared/Pages/StockTaking.razor.cs @@ -0,0 +1,13 @@ +using Microsoft.AspNetCore.Components; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FruitBankHybrid.Shared.Pages +{ + public partial class StockTaking : ComponentBase + { + } +} diff --git a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj index 580bf2a..72e968a 100644 --- a/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj +++ b/FruitBankHybrid.Web.Client/FruitBankHybrid.Web.Client.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable true diff --git a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj index bad6e49..0734204 100644 --- a/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj +++ b/FruitBankHybrid.Web/FruitBankHybrid.Web.csproj @@ -1,7 +1,7 @@  - net9.0 + net10.0 enable enable diff --git a/FruitBankHybrid/FruitBankHybrid.csproj b/FruitBankHybrid/FruitBankHybrid.csproj index 7fc20f5..ab6363c 100644 --- a/FruitBankHybrid/FruitBankHybrid.csproj +++ b/FruitBankHybrid/FruitBankHybrid.csproj @@ -1,8 +1,8 @@  - net9.0-android;net9.0-ios - $(TargetFrameworks);net9.0-windows10.0.26100.0 + net10.0-android;net10.0-ios + $(TargetFrameworks);net10.0-windows10.0.26100.0 Exe FruitBankHybrid @@ -27,9 +27,9 @@ 15.0 15.0 - 29.0 - 10.0.17763.0 - 10.0.17763.0 + 33.0 + 10.0.19041.0 + 10.0.19041.0 False False SHA256 @@ -53,14 +53,14 @@ true - + apk True False True - + False True apk @@ -89,8 +89,8 @@ - - + +