From fdff71ec88ef5313ceca7bb8001ce19b7878d1ef Mon Sep 17 00:00:00 2001 From: Safgerd Date: Mon, 27 Feb 2023 01:24:54 +0400 Subject: [PATCH] =?UTF-8?q?LabWork1=5FBase:=20=D0=9C=D0=B8=D0=BD=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutomobilePlant/AutomobilePlant/FormCarComponent.cs | 1 - AutomobilePlant/AutomobilePlant/FormCars.cs | 1 + AutomobilePlant/AutomobilePlant/FormComponents.cs | 1 - AutomobilePlant/AutomobilePlant/FormMain.cs | 1 + .../BusinessLogicContracts/IComponentLogic.cs | 1 - AutomobilePlant/AutomobilePlantDataModels/Models/IOrderModel.cs | 1 - .../AutomobilePlantListImplements/Implements/OrderStorage.cs | 1 + AutomobilePlant/AutomobilePlantListImplements/Models/Car.cs | 1 + 8 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AutomobilePlant/AutomobilePlant/FormCarComponent.cs b/AutomobilePlant/AutomobilePlant/FormCarComponent.cs index 155b689..49f3bd9 100644 --- a/AutomobilePlant/AutomobilePlant/FormCarComponent.cs +++ b/AutomobilePlant/AutomobilePlant/FormCarComponent.cs @@ -86,6 +86,5 @@ namespace AutomobilePlant DialogResult = DialogResult.Cancel; Close(); } - } } diff --git a/AutomobilePlant/AutomobilePlant/FormCars.cs b/AutomobilePlant/AutomobilePlant/FormCars.cs index ed7fdbc..c68e240 100644 --- a/AutomobilePlant/AutomobilePlant/FormCars.cs +++ b/AutomobilePlant/AutomobilePlant/FormCars.cs @@ -29,6 +29,7 @@ namespace AutomobilePlant { LoadData(); } + private void LoadData() { try diff --git a/AutomobilePlant/AutomobilePlant/FormComponents.cs b/AutomobilePlant/AutomobilePlant/FormComponents.cs index 8e83ff2..f9a7d77 100644 --- a/AutomobilePlant/AutomobilePlant/FormComponents.cs +++ b/AutomobilePlant/AutomobilePlant/FormComponents.cs @@ -110,6 +110,5 @@ namespace AutomobilePlant { LoadData(); } - } } diff --git a/AutomobilePlant/AutomobilePlant/FormMain.cs b/AutomobilePlant/AutomobilePlant/FormMain.cs index a67b0f9..32fc6e2 100644 --- a/AutomobilePlant/AutomobilePlant/FormMain.cs +++ b/AutomobilePlant/AutomobilePlant/FormMain.cs @@ -29,6 +29,7 @@ namespace AutomobilePlant { LoadData(); } + private void LoadData() { _logger.LogInformation("Загрузка заказов"); diff --git a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicContracts/IComponentLogic.cs b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicContracts/IComponentLogic.cs index 05bd306..8b1ccff 100644 --- a/AutomobilePlant/AutomobilePlantContracts/BusinessLogicContracts/IComponentLogic.cs +++ b/AutomobilePlant/AutomobilePlantContracts/BusinessLogicContracts/IComponentLogic.cs @@ -16,6 +16,5 @@ namespace AutomobilePlantContracts.BusinessLogicContracts bool Create(ComponentBindingModel model); bool Update(ComponentBindingModel model); bool Delete(ComponentBindingModel model); - } } diff --git a/AutomobilePlant/AutomobilePlantDataModels/Models/IOrderModel.cs b/AutomobilePlant/AutomobilePlantDataModels/Models/IOrderModel.cs index b009e8a..5cfd10e 100644 --- a/AutomobilePlant/AutomobilePlantDataModels/Models/IOrderModel.cs +++ b/AutomobilePlant/AutomobilePlantDataModels/Models/IOrderModel.cs @@ -17,6 +17,5 @@ namespace AutomobilePlantDataModels.Models OrderStatus Status { get; } DateTime DateCreate { get; } DateTime? DateImplement { get; } - } } diff --git a/AutomobilePlant/AutomobilePlantListImplements/Implements/OrderStorage.cs b/AutomobilePlant/AutomobilePlantListImplements/Implements/OrderStorage.cs index 9e90182..1b1c2a3 100644 --- a/AutomobilePlant/AutomobilePlantListImplements/Implements/OrderStorage.cs +++ b/AutomobilePlant/AutomobilePlantListImplements/Implements/OrderStorage.cs @@ -94,6 +94,7 @@ namespace AutomobilePlantListImplements.Implements } return null; } + public OrderViewModel? Delete(OrderBindingModel model) { for (int i = 0; i < _source.Orders.Count; ++i) diff --git a/AutomobilePlant/AutomobilePlantListImplements/Models/Car.cs b/AutomobilePlant/AutomobilePlantListImplements/Models/Car.cs index 064573a..6b8e677 100644 --- a/AutomobilePlant/AutomobilePlantListImplements/Models/Car.cs +++ b/AutomobilePlant/AutomobilePlantListImplements/Models/Car.cs @@ -45,6 +45,7 @@ namespace AutomobilePlantListImplements.Models Price = model.Price; CarComponents = model.CarComponents; } + public CarViewModel GetViewModel => new() { Id = Id,