diff --git a/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj b/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj index 3227514..0467864 100644 --- a/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj +++ b/FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj @@ -9,15 +9,14 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5"> + <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0-preview.3.23174.2"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> - <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" /> - <PackageReference Include="Microsoft.ReportingServices.ReportViewerControl.Winforms" Version="150.1484.0" /> - <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" /> - <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.16" /> + <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-preview.3.23174.8" /> + <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.3.23174.8" /> + <PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" /> + <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" /> </ItemGroup> <ItemGroup> @@ -31,7 +30,7 @@ <ItemGroup> <None Update="ReportOrders.rdlc"> - <CopyToOutputDirectory>Never</CopyToOutputDirectory> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> </ItemGroup> diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs index 3206ab9..7fb943c 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs @@ -38,7 +38,6 @@ namespace AbstractShopBusinessLogic.BusinessLogics public List<ReportFurnitureComponentViewModel> GetFurnitureComponent() { var furnitures = _furnitureStorage.GetFullList(); - var components = _componentStorage.GetFullList(); var list = new List<ReportFurnitureComponentViewModel>(); foreach (var furniture in furnitures) { @@ -48,13 +47,10 @@ namespace AbstractShopBusinessLogic.BusinessLogics Components = new List<Tuple<string, int>>(), TotalCount = 0 }; - foreach (var component in components) + foreach (var component in furniture.FurnitureComponents) { - if (furniture.FurnitureComponents.ContainsKey(component.Id)) - { - record.Components.Add(new Tuple<string, int>(component.ComponentName, furniture.FurnitureComponents[component.Id].Item2)); - record.TotalCount += furniture.FurnitureComponents[component.Id].Item2; - } + record.Components.Add(new (component.Value.Item1.ComponentName, component.Value.Item2)); + record.TotalCount += component.Value.Item2; } list.Add(record); } diff --git a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj index d40e021..c8d5da0 100644 --- a/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj +++ b/FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj @@ -8,7 +8,7 @@ <ItemGroup> <PackageReference Include="DocumentFormat.OpenXml" Version="2.20.0" /> - <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" /> + <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0-preview.3.23174.8" /> <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" /> </ItemGroup> diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabaseImplement.csproj b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabaseImplement.csproj index faf708d..cfa719e 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabaseImplement.csproj +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabaseImplement.csproj @@ -7,9 +7,9 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.5" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.5" /> - <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.5"> + <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0-preview.3.23174.2" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.0-preview.3.23174.2" /> + <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-preview.3.23174.2"> <PrivateAssets>all</PrivateAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> </PackageReference> diff --git a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs index 0a4ce41..67bbf29 100644 --- a/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs +++ b/FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs @@ -18,7 +18,7 @@ namespace FurnitureAssemblyDatabaseImplement.Implements { using var context = new FurnitureAssemblyDatabase(); return context.Furnitures - .Include(x => x.Components) + .Include(x => x.Components) .ThenInclude(x => x.Component) .ToList() .Select(x => x.GetViewModel)