реафкторинг toolsmodule

DepartmentPortal/Common/CoreDatabase/AbstractGenerticEntityService.cs

@@ -1,13 +1,9 @@
 using CoreDatabase.Models;
 using Microsoft.EntityFrameworkCore;
-using ToolsModule.BindingModels;
-using ToolsModule.BusinessLogics;
-using ToolsModule.Enums;
-using ToolsModule.Interfaces;
-using ToolsModule.Models;
-using ToolsModule.ViewModels;
 using System;
 using System.Linq;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentMapping;
 
 namespace CoreDatabase
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlan.cs

@@ -1,10 +1,10 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecord.cs

@@ -1,11 +1,11 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecordTimeNormHour.cs

@@ -1,8 +1,8 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Classroom.cs

@@ -1,9 +1,9 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Discipline.cs

@@ -1,10 +1,10 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/DisciplineBlock.cs

@@ -1,9 +1,9 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/EducationDirection.cs

@@ -1,11 +1,11 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Employee.cs

@@ -1,11 +1,11 @@
-using CoreModels.ModelsDepartment;
-using CoreDatabase.Models.Security;
-using ToolsModule.Extensions;
-using ToolsModule.Interfaces;
+using CoreDatabase.Models.Security;
+using CoreModels.ModelsDepartment;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentExtension;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/EmployeePost.cs

@@ -1,7 +1,7 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Lecturer.cs

@@ -1,12 +1,12 @@
-using CoreModels.ModelsDepartment;
-using CoreDatabase.Models.Security;
-using ToolsModule.Extensions;
-using ToolsModule.Interfaces;
+using CoreDatabase.Models.Security;
+using CoreModels.ModelsDepartment;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentExtension;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicDegree.cs

@@ -1,9 +1,9 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicRank.cs

@@ -1,9 +1,9 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerPost.cs

@@ -1,8 +1,8 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Order.cs

@@ -1,11 +1,11 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/OrderStudentRecord.cs

@@ -1,9 +1,9 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistory.cs

@@ -1,10 +1,10 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistoryRecord.cs

@@ -1,8 +1,8 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Post.cs

@@ -1,8 +1,8 @@
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/Student.cs

@@ -1,13 +1,13 @@
-using CoreModels.Enums.Department;
+using CoreDatabase.Models.Security;
+using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using CoreDatabase.Models.Security;
-using ToolsModule.Extensions;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentExtension;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/StudentGroup.cs

@@ -1,12 +1,12 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/Department/TimeNorm.cs

@@ -1,11 +1,11 @@
 using CoreModels.Enums.Department;
 using CoreModels.ModelsDepartment;
-using ToolsModule.Interfaces;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Department
 {

DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs

@@ -1,7 +1,7 @@
-using ToolsModule.Attributes;
-using System;
+using System;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentMapping;
 
 namespace CoreDatabase.Models
 {

DepartmentPortal/Common/CoreDatabase/Models/Security/Access.cs

@@ -1,9 +1,8 @@
 using CoreModels.ModelsSecurity;
-using ToolsModule.Enums;
-using ToolsModule.Interfaces;
 using System;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Security
 {

DepartmentPortal/Common/CoreDatabase/Models/Security/EnviromentSetting.cs

@@ -1,7 +1,7 @@
 using CoreModels.ModelsSecurity;
-using ToolsModule.Interfaces;
 using System.ComponentModel.DataAnnotations;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Security
 {

DepartmentPortal/Common/CoreDatabase/Models/Security/Role.cs

@@ -1,9 +1,9 @@
 using CoreModels.ModelsSecurity;
-using ToolsModule.Interfaces;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Security
 {

DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs

@@ -1,12 +1,11 @@
-using CoreModels.ModelsSecurity;
-using CoreDatabase.Models.Department;
-using ToolsModule.Attributes;
-using ToolsModule.Interfaces;
+using CoreDatabase.Models.Department;
+using CoreModels.ModelsSecurity;
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Security
 {

DepartmentPortal/Common/CoreDatabase/Models/Security/UserRole.cs

@@ -1,7 +1,7 @@
 using CoreModels.ModelsSecurity;
-using ToolsModule.Interfaces;
 using System;
 using System.Runtime.Serialization;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase.Models.Security
 {

DepartmentPortal/Common/CoreDatabase/SecurityManager.cs

@@ -1,13 +1,11 @@
 using CoreDatabase.Models.Security;
-using ToolsModule.Enums;
-using ToolsModule.Interfaces;
-using ToolsModule.Models;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
 using System.Threading.Tasks;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreDatabase
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs

@@ -1,6 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs

@@ -1,6 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs

@@ -1,5 +1,5 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs

@@ -1,6 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs

@@ -1,5 +1,5 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs

@@ -1,5 +1,5 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs

@@ -1,10 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs

@@ -1,6 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs

@@ -1,5 +1,5 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Enums.Department;
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsDepartment
 {

DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs

@@ -1,7 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
-using ToolsModule.Enums;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsSecurity
 {

DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs

@@ -1,5 +1,6 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsSecurity
 {

DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs

@@ -1,5 +1,5 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
+using ToolsModule.ManagmentEntity;
 
 namespace CoreModels.ModelsSecurity
 {

DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsSecurity
 {

DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs

@@ -1,6 +1,7 @@
 using CoreModels.Tools;
-using ToolsModule.Attributes;
 using System;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace CoreModels.ModelsSecurity
 {

DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs

@@ -1,5 +1,5 @@
 using ToolsDesktop.Interfaces;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 using System;
 using System.Windows.Forms;
 

DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs

@@ -1,5 +1,5 @@
 using ToolsDesktop.Interfaces;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 using System;
 using System.Windows.Forms;
 

DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs

@@ -1,5 +1,5 @@
 using ToolsDesktop.Interfaces;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 using System;
 using System.Drawing;
 

DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs

@@ -1,5 +1,5 @@
 using ToolsDesktop.Interfaces;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 using System;
 using System.Drawing;
 

DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs

@@ -1,5 +1,5 @@
 using ToolsDesktop.Interfaces;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 using System;
 using System.Collections.Generic;
 using System.IO;

DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs

@@ -1,6 +1,6 @@
-using ToolsDesktop.Models;
-using ToolsModule.Enums;
-using System;
+using System;
+using ToolsDesktop.Models;
+using ToolsModule.ManagmentSecurity;
 
 namespace ToolsDesktop.Interfaces
 {

DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs

@@ -8,14 +8,10 @@ using ToolsDesktop.Enums;
 using ToolsDesktop.Helpers;
 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;
-using ToolsModule.ViewModels;
+using ToolsModule.ManagmentDependency;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentExtension;
+using ToolsModule.ManagmentMapping;
 
 namespace ToolsDesktop.Controls
 {

DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs

@@ -8,13 +8,10 @@ using ToolsDesktop.Enums;
 using ToolsDesktop.Helpers;
 using ToolsDesktop.Interfaces;
 using ToolsDesktop.Models;
-using ToolsModule.Attributes;
-using ToolsModule.BindingModels;
-using ToolsModule.DependencyManagment;
-using ToolsModule.Enums;
-using ToolsModule.Extensions;
-using ToolsModule.Interfaces;
-using ToolsModule.ViewModels;
+using ToolsModule.ManagmentDependency;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentExtension;
+using ToolsModule.ManagmentSecurity;
 
 namespace ToolsDesktop.Controls
 {

DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs

@@ -1,8 +1,8 @@
-using ToolsDesktop.Interfaces;
-using ToolsDesktop.Models;
-using ToolsModule.Enums;
-using System;
+using System;
 using System.Windows.Forms;
+using ToolsDesktop.Interfaces;
+using ToolsDesktop.Models;
+using ToolsModule.ManagmentSecurity;
 
 namespace ToolsDesktop.Controls
 {

DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs

@@ -1,8 +1,8 @@
-using ToolsDesktop.Interfaces;
-using ToolsDesktop.Models;
-using ToolsModule.Enums;
-using System;
+using System;
 using System.Windows.Forms;
+using ToolsDesktop.Interfaces;
+using ToolsDesktop.Models;
+using ToolsModule.ManagmentSecurity;
 
 namespace ToolsDesktop.Controls
 {

DepartmentPortal/Common/ToolsModule/ManagmentDependency/DependencyManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.DependencyManagment
+namespace ToolsModule.ManagmentDependency
 {
     /// <summary>
     /// Менеджер для работы с зависимостями
@@ -11,7 +11,7 @@ namespace ToolsModule.DependencyManagment
 
 		private static DependencyManager _manager;
 
-		private static readonly object _locjObject = new object();
+		private static readonly object _locjObject = new();
 
 		private DependencyManager()
 		{

DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyManager.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.DependencyManagment
+namespace ToolsModule.ManagmentDependency
 {
 	/// <summary>
 	/// Интерфейс установки зависмости между элементами

DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyRegistration.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.DependencyManagment
+namespace ToolsModule.ManagmentDependency
 {
 	/// <summary>
 	/// Интерфейс для регистрации зависимостей в модулях

DepartmentPortal/Common/ToolsModule/ManagmentDependency/ServiceProviderLoader.cs

@@ -4,39 +4,17 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Xml.XPath;
-using ToolsModule.Extensions;
+using ToolsModule.ManagmentExtension;
 
-namespace ToolsModule.DependencyManagment
+namespace ToolsModule.ManagmentDependency
 {
     /// <summary>
     /// Загрузчик данных
     /// </summary>
     public static partial class ServiceProviderLoader
 	{
-		private static readonly string _configFileName = "DepartmentPortal.config";
-
 		private static readonly string _pathToImplementationExt = "..\\..\\..\\..\\ImplementationExtensions\\";
 
-		/// <summary>
-		/// Получение данных с файла настроек
-		/// </summary>
-		/// <param name="key"></param>
-		/// <returns></returns>
-		public static string GetConfigData(string key)
-		{
-			var fileName = GetFile(_configFileName);
-			if (!File.Exists(fileName))
-			{
-				return string.Empty;
-			}
-
-			var doc = new XPathDocument(fileName);
-			var nav = doc.CreateNavigator();
-			var data = nav.SelectDescendants(key, "", false);
-			data.MoveNext();
-			return data.Current.Value;
-		}
-
 		/// <summary>
 		/// Загрузка всех классов-реализаций IImplementationExtension
 		/// </summary>

DepartmentPortal/Common/ToolsModule/ManagmentDependency/UnityContainerManager.cs

@@ -2,7 +2,7 @@
 using Unity;
 using Unity.Lifetime;
 
-namespace ToolsModule.DependencyManagment
+namespace ToolsModule.ManagmentDependency
 {
     /// <summary>
     /// Работа с UnityContainer

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ControlType.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.Enums
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Тип контрола, через который следует отображать свойство с ViewModel

DepartmentPortal/Common/ToolsModule/ManagmentEntity/CoreBusinessLogic.cs

@@ -1,11 +1,8 @@
-using ToolsModule.BindingModels;
-using ToolsModule.Enums;
-using ToolsModule.Interfaces;
-using ToolsModule.Models;
-using System.Collections.Generic;
-using ToolsModule.DependencyManagment;
+using System.Collections.Generic;
+using ToolsModule.ManagmentDependency;
+using ToolsModule.ManagmentSecurity;
 
-namespace ToolsModule.BusinessLogics
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Основа всех бизнес-логик

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ElementViewModel.cs

@@ -1,7 +1,7 @@
-using ToolsModule.Attributes;
-using System;
+using System;
+using ToolsModule.ManagmentMapping;
 
-namespace ToolsModule.ViewModels
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Возвращаемая запись

DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDependencyAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Оописание зависимости сущности от другой сущности (требуется для выстраивания последоватльности сохранения и загрузки данных, 

DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDescriptionAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Оописание класса из базы данных, его назначение (требуется для выстраивания иерархии с описанием классов, 

DepartmentPortal/Common/ToolsModule/ManagmentEntity/GenericBusinessLogic.cs

@@ -1,10 +1,7 @@
-using ToolsModule.BindingModels;
-using ToolsModule.Enums;
-using ToolsModule.Interfaces;
-using ToolsModule.ViewModels;
-using System;
+using System;
+using ToolsModule.ManagmentSecurity;
 
-namespace ToolsModule.BusinessLogics
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Базовый класс для логики сущности

DepartmentPortal/Common/ToolsModule/ManagmentEntity/GetBindingModel.cs

@@ -1,6 +1,7 @@
 using System;
+using ToolsModule.ManagmentSecurity;
 
-namespace ToolsModule.BindingModels
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Получение записи

DepartmentPortal/Common/ToolsModule/ManagmentEntity/IErrors.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ToolsModule.Interfaces
+namespace ToolsModule.ManagmentEntity
 {
     public interface IErrors
     {

DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityLogic.cs

@@ -1,7 +1,4 @@
-using ToolsModule.BindingModels;
-using ToolsModule.ViewModels;
-
-namespace ToolsModule.Interfaces
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Описание действий для логики сущности

DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityService.cs

@@ -1,7 +1,4 @@
-using ToolsModule.BindingModels;
-using ToolsModule.Models;
-
-namespace ToolsModule.Interfaces
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Описание действий для хранилища сущности

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ListViewModel.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ToolsModule.ViewModels
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Список возвращаемых значений

DepartmentPortal/Common/ToolsModule/ManagmentEntity/OperationResultModel.cs

@@ -1,8 +1,7 @@
-using ToolsModule.Enums;
-using System;
+using System;
 using System.Collections.Generic;
 
-namespace ToolsModule.Models
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Результат любой операции с сущностью

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ResultServiceStatusCode.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.Enums
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Статус результата операции

DepartmentPortal/Common/ToolsModule/ManagmentEntity/SetBindingModel.cs

@@ -1,6 +1,7 @@
 using System;
+using ToolsModule.ManagmentSecurity;
 
-namespace ToolsModule.BindingModels
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Сохранение записи по идентификатору

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementClassAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Настройка контрола отображения объекта класса (требуется для автоматизации вывода элемента, 

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementDependenceEntityAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Настройка контрола отображения? указывающая на дочерний контрол (требуется для автоматизации вывода элемента, 

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementPropertyAttribute.cs

@@ -1,7 +1,6 @@
-using ToolsModule.Enums;
-using System;
+using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
     /// <summary>
     /// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента, 

DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlListPropertyAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentEntity
 {
 	/// <summary>
 	/// Настройка отображения свойства класса при табличном выводе списка объектов класса (требуется для автоматизации вывода списка, 

DepartmentPortal/Common/ToolsModule/ManagmentExtension/StringExtension.cs

@@ -1,6 +1,6 @@
 using System.IO;
 
-namespace ToolsModule.Extensions
+namespace ToolsModule.ManagmentExtension
 {
 	public static class StringExtension
 	{

DepartmentPortal/Common/ToolsModule/ManagmentMapping/MapConfigurationAttribute.cs

@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentMapping
 {
     /// <summary>
     /// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса 

DepartmentPortal/Common/ToolsModule/ManagmentMapping/Mapper.cs

@@ -1,10 +1,10 @@
-using ToolsModule.Attributes;
-using System;
+using System;
 using System.Collections;
 using System.Linq;
 using System.Reflection;
+using ToolsModule.ManagmentSecurity;
 
-namespace ToolsModule.BusinessLogics
+namespace ToolsModule.ManagmentMapping
 {
     /// <summary>
     /// Маппер сущностей

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessBindingModel.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.BindingModels
+namespace ToolsModule.ManagmentSecurity
 {
 	/// <summary>
 	/// Информация для доступа к выполнению операций

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessOperation.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.Enums
+namespace ToolsModule.ManagmentSecurity
 {
     /// <summary>
     /// Операции в системе

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessType.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.Enums
+namespace ToolsModule.ManagmentSecurity
 {
 	/// <summary>
 	/// Тип операции

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/CheckRigthForMapAttribute.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace ToolsModule.Attributes
+namespace ToolsModule.ManagmentSecurity
 {
     /// <summary>
     /// Признак, гооврящий о том, что нужна проверка доступа к значению свойства при создании одного объекта на основе другого

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/IEntitySecurityExtenstion.cs

@@ -1,4 +1,4 @@
-namespace ToolsModule.Interfaces
+namespace ToolsModule.ManagmentSecurity
 {
 	/// <summary>
 	/// Работа с сущностями с применением скрытности для полей

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/ISecurityManager.cs

@@ -1,9 +1,8 @@
-using ToolsModule.Models;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace ToolsModule.Interfaces
+namespace ToolsModule.ManagmentSecurity
 {
     /// <summary>
     /// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя

DepartmentPortal/Common/ToolsModule/ManagmentSecurity/SecurityManagerCheckAccessModel.cs

@@ -1,7 +1,4 @@
-using ToolsModule.BindingModels;
-using ToolsModule.Enums;
-
-namespace ToolsModule.Models
+namespace ToolsModule.ManagmentSecurity
 {
     /// <summary>
     /// Данные для проверки доступа

DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs

@@ -2,8 +2,8 @@
 using DepartmentContract.Logics.IGenericEntityLogic;
 using DepartmentContract.Services.IGenericEntityService;
 using DepartmentContract.ViewModels;
-using ToolsModule.BusinessLogics;
-using ToolsModule.Enums;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic
 {

DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs

@@ -2,8 +2,8 @@
 using DepartmentContract.Logics.IGenericEntityLogic;
 using DepartmentContract.Services.IGenericEntityService;
 using DepartmentContract.ViewModels;
-using ToolsModule.BusinessLogics;
-using ToolsModule.Enums;
+using ToolsModule.ManagmentEntity;
+using ToolsModule.ManagmentSecurity;
 
 namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic
 {