From 36883c907c0486b9ebe755c91b37dd5eb73b8478 Mon Sep 17 00:00:00 2001 From: Ismailov_Rovshan Date: Sun, 9 Apr 2023 01:23:43 +0400 Subject: [PATCH] fix --- .../BindingModels/FurnitureBindingModel.cs | 4 ++++ .../OfficePackage/AbstractSaveToPdfMaster.cs | 1 - .../Models/FurnitureMaterial.cs | 5 +++-- .../FurnitureFactoryDataBaseImplement/Models/Material.cs | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/FurnitureFactory/FurnitureContracts/BindingModels/FurnitureBindingModel.cs b/FurnitureFactory/FurnitureContracts/BindingModels/FurnitureBindingModel.cs index 685d4b8..baaed9d 100644 --- a/FurnitureFactory/FurnitureContracts/BindingModels/FurnitureBindingModel.cs +++ b/FurnitureFactory/FurnitureContracts/BindingModels/FurnitureBindingModel.cs @@ -26,5 +26,9 @@ namespace FurnitureContracts.BindingModels public string OrdersName { get; set; } = string.Empty; public string MasterName { get; set; } = string.Empty; + + public Dictionary FurnitureMaterials { get; set; } + + public DateTime DateTo { get; set; } } } diff --git a/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/AbstractSaveToPdfMaster.cs b/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/AbstractSaveToPdfMaster.cs index dd678a1..cd1e7ed 100644 --- a/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/AbstractSaveToPdfMaster.cs +++ b/FurnitureFactory/FurnitureFactoryBusinessLogic/OfficePackage/AbstractSaveToPdfMaster.cs @@ -37,7 +37,6 @@ namespace FurnitureFactoryBusinessLogic.OfficePackage }); } - SavePdf(info); } diff --git a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/FurnitureMaterial.cs b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/FurnitureMaterial.cs index 6cbc145..2db4620 100644 --- a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/FurnitureMaterial.cs +++ b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/FurnitureMaterial.cs @@ -1,4 +1,5 @@ -using System; +using FurnitureFactoryDataModels.Models; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Linq; @@ -7,7 +8,7 @@ using System.Threading.Tasks; namespace FurnitureFactoryDataBaseImplement.Models { - public class FurnitureMaterial + public class FurnitureMaterial { public int Id { get; set; } [Required] diff --git a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Material.cs b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Material.cs index 3f9e8c2..4642379 100644 --- a/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Material.cs +++ b/FurnitureFactory/FurnitureFactoryDataBaseImplement/Models/Material.cs @@ -7,7 +7,7 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; -using System.Threading.HeadsetModules; + namespace FurnitureFactoryDataBaseImplement.Models {