Zyzf/PIbd-22_Kalyshev_Y_V_BlacksmithWorkshop_Base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

done

Browse Source
This commit is contained in:
Калышев Ян 2023-06-17 09:34:50 -07:00
parent d0f44687ad
commit 4d986a887e
7 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ComponentViewModel.cs
View File

@ -15,7 +15,7 @@ namespace BlacksmithWorkshopContracts.ViewModels
public int Id { get; set; }
[Column(title: "Название компонента", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ComponentName { get; set; } = string.Empty;
[Column(title: "Цена", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
[Column(title: "Цена", formattedNumber: true, gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public double Cost { get; set; }
}
}

2
BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/ManufactureViewModel.cs
View File

@ -15,7 +15,7 @@ namespace BlacksmithWorkshopContracts.ViewModels
public int Id { get; set; }
[Column(title: "Название изделия", gridViewAutoSize: GridViewAutoSize.Fill, isUseAutoSize: true)]
public string ManufactureName { get; set; } = string.Empty;
[Column(title: "Цена", width: 150)]
[Column(title: "Цена", width: 150, formattedNumber: true)]
public double Price { get; set; }
[Column(visible: false)]
public Dictionary<int, (IComponentModel, int)> ManufactureComponents

2
BlacksmithWorkshop/BlacksmithWorkshopContracts/ViewModels/OrderViewModel.cs
View File

@ -29,7 +29,7 @@ namespace BlacksmithWorkshopContracts.ViewModels
public string? ImplementerFIO { get; set; } = string.Empty;
[Column(title: "Количество", width: 150)]
public int Count { get; set; }
[Column(title: "Сумма", width: 150)]
[Column(title: "Сумма", width: 150, formattedNumber: true)]
public double Sum { get; set; }
[Column(title: "Статус", width: 150)]
public OrderStatus Status { get; set; } = OrderStatus.Неизвестен;

6
BlacksmithWorkshop/BlacksmithWorkshopDatabaseImplement/Models/Shop.cs
View File

@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Diagnostics;
using System.Linq;
using System.Runtime.Serialization;
using System.Text;
using System.Threading.Tasks;
using BlacksmithWorkshopContracts.BindingModels;
@ -14,13 +15,18 @@ namespace BlacksmithWorkshopDatabaseImplement.Models
{
public class Shop : IShopModel
{
[DataMember]
public int Id { get; set; }
[DataMember]
[Required]
public string ShopName { get; set; } = string.Empty;
[DataMember]
[Required]
public string Address { get; set; } = string.Empty;
[DataMember]
[Required]
public DateTime DateOpening { get; set; }
[DataMember]
[Required]
public int Capacity { get; set; }
private Dictionary<int, (IManufactureModel, int)>? _listManufacture = null;

4
BlacksmithWorkshop/BlacksmithWorkshopRestApi/BlacksmithWorkshopRestApi.csproj
View File

@ -7,6 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="6.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>

4
BlacksmithWorkshop/BlacksmithWorkshopShopApp/BlacksmithWorkshopShopApp.csproj
View File

@ -7,6 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
</ItemGroup>

2
BlacksmithWorkshop/BlacksmithWorkshopView/BlacksmithWorkshopView.csproj
View File

@ -14,7 +14,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.0" />
<PackageReference Include="ReportViewerCore.WinForms" Version="15.1.17" />
</ItemGroup>