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 @@ + 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, }; }