Belnik/PIbd-21_Belianin_N.N._FurnitureAssembly
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PIbd-21 Belianin N.N. LabWork06_Hard #12

Closed
Belnik wants to merge 12 commits from LabWork06_Hard into LabWork05_Hard
pull from: LabWork06_Hard
merge into: Belnik:LabWork05_Hard
Conversation 1 Commits 12 Files Changed 199 +36 -30
15 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 95b789ee16 - Show all commits

2
FurnitureAssembly/FurnitureAssemblyBusinessLogic/BussinessLogic/OrderLogic.cs
View File

@ -158,7 +158,7 @@ namespace FurnitureAssemblyBusinessLogic.BussinessLogic
throw new InvalidOperationException("Дата создания должна быть более ранней, нежели дата завершения");
}
_logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. FurnitureId:{Id}. Sum:{Sum}", model.Id, model.Sum, model.FurnitureId, model.Sum);
_logger.LogInformation("Order. OrderId:{Id}, Sum:{Sum}. ClientId:{ClientId}. FurnitureId:{Id}", model.Id, model.Sum, model.ClientId, model.FurnitureId);
}
// Обновление статуса заказа

4
FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/ClientSearchModel.cs
View File

@ -11,10 +11,10 @@ namespace FurnitureAssemblyContracts.SearchModels
{
public int? Id { get; set; }
public string? ClientFIO { get; set; }
public string? Email { get; set; }
public string? ClientFIO { get; set; }
public string? Password { get; set; }
}
}

4
FurnitureAssembly/FurnitureAssemblyContracts/SearchModels/OrderSearchModel.cs
View File

@ -16,13 +16,15 @@ namespace FurnitureAssemblyContracts.SearchModels
// для поиска по клиенту
public int? ClientId { get; set; }
// для поиска по исполнителю
// Для поиска по исполнителю
public int? ImplementerId { get; set; }
// Два поля для возможности производить выборку
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
// Для статуса заказа
public OrderStatus? Status { get; set; }
}
}

1
FurnitureAssembly/FurnitureAssemblyDataModels/Models/IClientModel.cs
View File

@ -6,6 +6,7 @@ using System.Threading.Tasks;
namespace FurnitureAssemblyDataModels.Models
{
// Интерфейс, отвечающий за клиента
public interface IClientModel : IId
{
string ClientFIO { get; }

2
FurnitureAssembly/FurnitureAssemblyDataModels/Models/IImplementerModel.cs
View File

@ -6,7 +6,7 @@ using System.Threading.Tasks;
namespace FurnitureAssemblyDataModels.Models
{
// Модель исполнителя
// Интерфейс, отвечающий за исполнителя
public interface IImplementerModel : IId
{
string ImplementerFIO { get; }

6
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Client.cs
View File

@ -34,7 +34,8 @@ namespace FurnitureAssemblyDatabaseImplement.Models
{
return null;
}
return new()
return new Client()
{
Id = model.Id,
ClientFIO = model.ClientFIO,
@ -49,6 +50,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models
{
return;
}
ClientFIO = model.ClientFIO;
Email = model.Email;
Password = model.Password;
@ -59,7 +61,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models
Id = Id,
ClientFIO = ClientFIO,
Email = Email,
Password = Password,
Password = Password
};
}
}

6
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Furniture.cs
View File

@ -101,13 +101,13 @@ namespace FurnitureAssemblyDatabaseImplement.Models
var furniture = context.Furnitures.First(x => x.Id == Id);
foreach(var mwp in model.FurnitureWorkPieces)
foreach(var fwp in model.FurnitureWorkPieces)
{
context.FurnitureWorkPieces.Add(new FurnitureWorkPiece
{
Furniture = furniture,
WorkPiece = context.WorkPieces.First(x => x.Id == mwp.Key),
Count = mwp.Value.Item2
WorkPiece = context.WorkPieces.First(x => x.Id == fwp.Key),
Count = fwp.Value.Item2
});
context.SaveChanges();

2
FurnitureAssembly/FurnitureAssemblyDatabaseImplement/Models/Implementer.cs
View File

@ -27,7 +27,7 @@ namespace FurnitureAssemblyDatabaseImplement.Models
[Required]
public int Qualification { get; set; }
//для реализации связи один ко многим с заказами
// Для реализации связи один ко многим с заказами
[ForeignKey("ImplementerId")]
public virtual List<Order> Order { get; set; } = new();

2
FurnitureAssembly/FurnitureAssemblyFileImplement/DataFileSingleton.cs
View File

@ -81,7 +81,7 @@ namespace FurnitureAssemblyFileImplement
private static void SaveData<T>(List<T> data, string filename, string xmlNodeName, Func<T, XElement> selectFunction)
{
if(data != null)
if (data != null)
{
new XDocument(new XElement(xmlNodeName, data.Select(selectFunction).ToArray())).Save(filename);
}

2
FurnitureAssembly/FurnitureAssemblyFileImplement/Implements/OrderStorage.cs
View File

@ -63,7 +63,7 @@ namespace FurnitureAssemblyFileImplement.Implements
return source.Orders.Select(x => GetViewModel(x)).ToList();
}
// Для загрузки названий изделия в заказе
// Для загрузки названий изделия и исполнителя в заказе
private OrderViewModel GetViewModel(Order order)
{
var viewModel = order.GetViewModel;

2
FurnitureAssembly/FurnitureAssemblyFileImplement/Models/Order.cs
View File

@ -20,7 +20,7 @@ namespace FurnitureAssemblyFileImplement.Models
public int ClientId { get; private set; }
public int? ImplementerId { get; set; }
public int? ImplementerId { get; private set; }
public int Count { get; private set; }

2
FurnitureAssembly/FurnitureAssemblyListImplement/DataListSingleton.cs
View File

@ -42,7 +42,7 @@ namespace FurnitureAssemblyListImplement
public static DataListSingleton GetInstance()
{
if(_instance == null)
if (_instance == null)
{
_instance = new DataListSingleton();
}

2
FurnitureAssembly/FurnitureAssemblyListImplement/Implements/OrderStorage.cs
View File

@ -107,7 +107,7 @@ namespace FurnitureAssemblyListImplement.Implements
return null;
}
// Метод для записи названия изделия на форме с заказами
// Метод для записи названия изделия на форме с заказами и исполнителя
private OrderViewModel GetViewModel(Order order)
{
var viewModel = order.GetViewModel;

1
FurnitureAssembly/FurnitureAssemblyListImplement/Models/Order.cs
View File

@ -61,6 +61,7 @@ namespace FurnitureAssemblyListImplement.Models
{
return;
}
Status = model.Status;
DateImplement = model.DateImplement;
}

28
FurnitureAssembly/FurnitureAssemblyRestApi/FurnitureAssemblyRestApi.csproj
View File

@ -1,20 +1,20 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FurnitureAssemblyBusinessLogic\FurnitureAssemblyBusinessLogic.csproj" />
<ProjectReference Include="..\FurnitureAssemblyContracts\FurnitureAssemblyContracts.csproj" />
<ProjectReference Include="..\FurnitureAssemblyDatabaseImplement\FurnitureAssemblyDatabaseImplement.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\FurnitureAssemblyBusinessLogic\FurnitureAssemblyBusinessLogic.csproj" />
<ProjectReference Include="..\FurnitureAssemblyContracts\FurnitureAssemblyContracts.csproj" />
<ProjectReference Include="..\FurnitureAssemblyDatabaseImplement\FurnitureAssemblyDatabaseImplement.csproj" />
</ItemGroup>
</Project>