Alina/PIbd-21_BatylkinaAO_FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

4 лабораторная исправлена

Browse Source
This commit is contained in:
Alina Batylkina 2023-04-20 22:15:35 +04:00
parent c0d545c7e8
commit 7138cc713f
5 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
FurnitureAssembly/FurnitureAssembly/FurnitureAssemblyView.csproj
View File

@ -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>

10
FurnitureAssembly/FurnitureAssemblyBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -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);
}

2
FurnitureAssembly/FurnitureAssemblyBusinessLogic/FurnitureAssemblyBusinessLogic.csproj
View File

@ -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>

6
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/FurnitureAssemblyDatabaseImplement.csproj
View File

@ -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>

2
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Implements/FurnitureStorage.cs
View File

@ -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)