diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs index 975a780..04262b1 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs @@ -11,6 +11,7 @@ using ToolsDesktop.Models; using ToolsModule.Attributes; using ToolsModule.BindingModels; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Interfaces; diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs index 78cba3c..f5768db 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs +++ b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs @@ -10,7 +10,7 @@ using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.Attributes; using ToolsModule.BindingModels; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Interfaces; diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs b/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs index e372764..681b66b 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs +++ b/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs @@ -3,6 +3,7 @@ using ToolsModule.Enums; using ToolsModule.Interfaces; using ToolsModule.Models; using System.Collections.Generic; +using ToolsModule.DependencyManagment; namespace ToolsModule.BusinessLogics { diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs b/DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs similarity index 89% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs index 7fc6d3f..105a04b 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/DependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs @@ -1,12 +1,11 @@ -using ToolsModule.Interfaces; -using System; +using System; -namespace ToolsModule.BusinessLogics +namespace ToolsModule.DependencyManagment { - /// - /// Менеджер для работы с зависимостями - /// - public class DependencyManager + /// + /// Менеджер для работы с зависимостями + /// + public class DependencyManager { private readonly IDependencyManager _dependencyManager; diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs b/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs similarity index 95% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs index 39b1fbf..d5ccab7 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Interfaces +namespace ToolsModule.DependencyManagment { /// /// Интерфейс установки зависмости между элементами diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs b/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs similarity index 86% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs rename to DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs index e639c6e..85ca7a2 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IDependencyRegistration.cs +++ b/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Interfaces +namespace ToolsModule.DependencyManagment { /// /// Интерфейс для регистрации зависимостей в модулях diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs b/DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs similarity index 89% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs rename to DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs index 74feea9..e7f4709 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/ServiceProviderLoader.cs +++ b/DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs @@ -1,18 +1,17 @@ -using ToolsModule.Extensions; -using ToolsModule.Interfaces; -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; using System.Xml.XPath; +using ToolsModule.Extensions; -namespace ToolsModule.BusinessLogics +namespace ToolsModule.DependencyManagment { - /// - /// Загрузчик данных - /// - public static partial class ServiceProviderLoader + /// + /// Загрузчик данных + /// + public static partial class ServiceProviderLoader { private static readonly string _configFileName = "DepartmentPortal.config"; diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs b/DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs similarity index 71% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs rename to DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs index dfd0089..b3c36dd 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/UnityContainerManager.cs +++ b/DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs @@ -1,14 +1,13 @@ -using ToolsModule.Interfaces; -using System; +using System; using Unity; using Unity.Lifetime; -namespace ToolsModule.BusinessLogics +namespace ToolsModule.DependencyManagment { - /// - /// Работа с UnityContainer - /// - public class UnityContainerManager : IDependencyManager + /// + /// Работа с UnityContainer + /// + public class UnityContainerManager : IDependencyManager { private readonly IUnityContainer _unityContainer; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs index fd7477f..54b6fbd 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs @@ -6,6 +6,7 @@ using DepartmentContract.ViewModels; using SecurityContract.BindingModels; using SecurityContract.Logics.IGenericEntityLogic; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs index 849ab35..35687a7 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs @@ -16,6 +16,7 @@ using System.Text; using System.Text.Json; using System.Threading.Tasks; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; using ToolsModule.Extensions; using ToolsModule.Interfaces; diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs index 95b4acb..eaa4472 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs @@ -1,7 +1,6 @@ using DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic; using DepartmentContract.Logics.IGenericEntityLogic; -using ToolsModule.BusinessLogics; -using ToolsModule.Interfaces; +using ToolsModule.DependencyManagment; namespace DepartmentBusinessLogic { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs index ae074aa..c74d9a0 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs @@ -1,8 +1,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentDatabaseImplementation.Implementations; using DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService; -using ToolsModule.BusinessLogics; -using ToolsModule.Interfaces; +using ToolsModule.DependencyManagment; namespace DepartmentDatabaseImplementation { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs index beef28a..57f886f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs @@ -1,16 +1,16 @@ using DepartmentWindowsDesktop.EntityControls; +using System.Collections.Generic; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BindingModels; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; using ToolsModule.Interfaces; using ToolsModule.Models; -using System.Collections.Generic; namespace DepartmentWindowsDesktop { - public class DepartmentWindowDesktopExtension : IWindowDesktopExtension + public class DepartmentWindowDesktopExtension : IWindowDesktopExtension { public List GetListControlEntityList() { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs index c624632..d33031f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index a0dd3f2..5217b30 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -12,6 +12,7 @@ using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Extensions; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index c17f732..bfcb722 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -12,6 +12,7 @@ using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Extensions; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs index b70aaff..b183c65 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs index cadce67..30db0bf 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs @@ -12,6 +12,7 @@ using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Extensions; namespace DepartmentWindowsDesktop.EntityControls diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs index 906a1bd..29f91e1 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs @@ -1,17 +1,17 @@ -using ToolsModule.BusinessLogics; -using ToolsModule.Extensions; -using ToolsModule.Interfaces; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; using System.Windows.Forms; +using ToolsModule.DependencyManagment; +using ToolsModule.Extensions; +using ToolsModule.Interfaces; namespace DepartmentPortalDesctop { - /// - /// Форма входа в систему - /// - public partial class FormEnter : Form + /// + /// Форма входа в систему + /// + public partial class FormEnter : Form { public FormEnter() { diff --git a/DepartmentPortal/DepartmentPortalDesctop/Program.cs b/DepartmentPortal/DepartmentPortalDesctop/Program.cs index 23f28a1..4e8066a 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/Program.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/Program.cs @@ -1,12 +1,12 @@ using CoreDatabase; -using ToolsModule.BusinessLogics; -using ToolsModule.Interfaces; using System; using System.Windows.Forms; +using ToolsModule.DependencyManagment; +using ToolsModule.Interfaces; namespace DepartmentPortalDesctop { - static class Program + static class Program { /// /// The main entry point for the application. diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs index 5080331..a137498 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs @@ -2,8 +2,7 @@ using SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic; using SecurityContract.Logics; using SecurityContract.Logics.IGenericEntityLogic; -using ToolsModule.BusinessLogics; -using ToolsModule.Interfaces; +using ToolsModule.DependencyManagment; namespace SecurityBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs index 017538e..fe53f53 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs @@ -2,8 +2,7 @@ using SecurityContract.Services.IGenericEntityService; using SecurityDatabaseImplementation.Implementations; using SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService; -using ToolsModule.BusinessLogics; -using ToolsModule.Interfaces; +using ToolsModule.DependencyManagment; namespace SecurityDatabaseImplementation { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs index d6a24cf..328e832 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs @@ -9,7 +9,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace SecurityWindowsDesktop.EntityControls diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs index 2044bcb..2b2ff66 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs @@ -1,17 +1,17 @@ -using ToolsDesktop.Interfaces; +using SecurityWindowsDesktop.EntityControls; +using SecurityWindowsDesktop.SpecialControls; +using System.Collections.Generic; +using ToolsDesktop.Interfaces; using ToolsDesktop.Models; using ToolsModule.BindingModels; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; using ToolsModule.Interfaces; using ToolsModule.Models; -using SecurityWindowsDesktop.EntityControls; -using SecurityWindowsDesktop.SpecialControls; -using System.Collections.Generic; namespace SecurityWindowsDesktop { - public class SecurityWindowDesktopExtension : IWindowDesktopExtension + public class SecurityWindowDesktopExtension : IWindowDesktopExtension { public List GetListControlEntityList() { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs index 6edca73..d9653f7 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs @@ -6,7 +6,7 @@ using System.Xml.Linq; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace SecurityWindowsDesktop.SpecialControls diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs index ff8bc6a..7b637cd 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs @@ -5,7 +5,7 @@ using System.Xml.Linq; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; +using ToolsModule.DependencyManagment; using ToolsModule.Enums; namespace SecurityWindowsDesktop.SpecialControls