From 5b82fd1c9e67201d71ec31a4e29db82e68025920 Mon Sep 17 00:00:00 2001
From: Danila_Mochalov <volzhankaonelove@yandex.ru>
Date: Sat, 22 Apr 2023 23:24:25 +0400
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=D1=81=D1=81=D1=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LawFirm/LawFirm/FormMain.cs                               | 2 +-
 LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs | 3 ++-
 LawFirm/LawFirmContracts/DI/DependencyManager.cs          | 2 +-
 LawFirm/LawFirmContracts/LawFirmContracts.csproj          | 1 +
 LawFirm/LawFirmDatabaseImplement/Models/Order.cs          | 4 ++--
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/LawFirm/LawFirm/FormMain.cs b/LawFirm/LawFirm/FormMain.cs
index 895f8d2..7ad3cd7 100644
--- a/LawFirm/LawFirm/FormMain.cs
+++ b/LawFirm/LawFirm/FormMain.cs
@@ -121,7 +121,7 @@ namespace LawFirmView
                 {
                     var operationResult = _orderLogic.FinishOrder(new OrderBindingModel
                     {
-                        Id = id
+                        Id = id,
                     });
                     if (!operationResult)
                     {
diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
index dff58a7..697c36a 100644
--- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
+++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/OrderLogic.cs
@@ -70,7 +70,8 @@ namespace LawFirmBusinessLogic.BusinessLogics
                 DateCreate = viewModel.DateCreate,
                 DateImplement = viewModel.DateImplement,
                 Count = viewModel.Count,
-                Sum = viewModel.Sum
+                Sum = viewModel.Sum,
+                ImplementerId = viewModel.ImplementerId
             };
             if (rawModel.ImplementerId.HasValue)
             {
diff --git a/LawFirm/LawFirmContracts/DI/DependencyManager.cs b/LawFirm/LawFirmContracts/DI/DependencyManager.cs
index 34338cd..7402eaf 100644
--- a/LawFirm/LawFirmContracts/DI/DependencyManager.cs
+++ b/LawFirm/LawFirmContracts/DI/DependencyManager.cs
@@ -17,7 +17,7 @@ namespace LawFirmContracts.DI
 
         private DependencyManager()
         {
-            _dependencyManager = new ServiceDependencyContainer();
+            _dependencyManager = new UnityDependencyContainer();
         }
 
         public static DependencyManager Instance { get { if (_manager == null) { lock (_locjObject) { _manager = new DependencyManager(); } } return _manager; } }
diff --git a/LawFirm/LawFirmContracts/LawFirmContracts.csproj b/LawFirm/LawFirmContracts/LawFirmContracts.csproj
index bdfcc48..fb5cb24 100644
--- a/LawFirm/LawFirmContracts/LawFirmContracts.csproj
+++ b/LawFirm/LawFirmContracts/LawFirmContracts.csproj
@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="NLog.Extensions.Logging" Version="5.2.1" />
     <PackageReference Include="Unity" Version="5.11.10" />
+    <PackageReference Include="Unity.Microsoft.Logging" Version="5.11.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs
index 8078761..5413a8f 100644
--- a/LawFirm/LawFirmDatabaseImplement/Models/Order.cs
+++ b/LawFirm/LawFirmDatabaseImplement/Models/Order.cs
@@ -88,8 +88,8 @@ namespace LawFirmDatabaseImplement.Models
                     DateImplement = DateImplement,
                     Id = Id,
                     Status = Status,
-                    DocumentName = Document.DocumentName,
-                    ClientFIO = Client.ClientFIO,
+                    DocumentName = Document?.DocumentName ?? string.Empty,
+                    ClientFIO = Client?.ClientFIO ?? string.Empty,
                     ImplementerFIO = Implementer?.ImplementerFIO ?? string.Empty,
                 };
             }