diff --git a/DepartmentPortal/Common/CoreDatabase/AbstractGenerticEntityService.cs b/DepartmentPortal/Common/CoreDatabase/AbstractGenerticEntityService.cs index 22d1f98..050bc5f 100644 --- a/DepartmentPortal/Common/CoreDatabase/AbstractGenerticEntityService.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlan.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlan.cs index 00d4ad4..3d2f100 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlan.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecord.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecord.cs index 6831b0c..c01ff4d 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecord.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecordTimeNormHour.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecordTimeNormHour.cs index 5b3b5b9..bf73a2e 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecordTimeNormHour.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Classroom.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Classroom.cs index 83a2209..614cf61 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Classroom.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Discipline.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Discipline.cs index 123d7ee..59e0a4a 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Discipline.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/DisciplineBlock.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/DisciplineBlock.cs index 9b1711e..988bf62 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/DisciplineBlock.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/EducationDirection.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/EducationDirection.cs index 646cbd9..d7eea25 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/EducationDirection.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Employee.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Employee.cs index 64097b5..5442b12 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Employee.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/EmployeePost.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/EmployeePost.cs index 5851a13..23109af 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/EmployeePost.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Lecturer.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Lecturer.cs index 1d856f8..d4ee942 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Lecturer.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicDegree.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicDegree.cs index 947e3e5..ce533f3 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicDegree.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicRank.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicRank.cs index fbc52a3..486e471 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicRank.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerPost.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerPost.cs index 8e148d6..4428de7 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerPost.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Order.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Order.cs index a6a2992..b95cdc2 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Order.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderStudentRecord.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderStudentRecord.cs index e1d0997..ffb451e 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderStudentRecord.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistory.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistory.cs index bae30c5..34ac3e7 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistory.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistoryRecord.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistoryRecord.cs index e0e0792..e25431b 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistoryRecord.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Post.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Post.cs index 88db813..0d62c4a 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Post.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/Student.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/Student.cs index 7f8fd9b..31e8040 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/Student.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/StudentGroup.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/StudentGroup.cs index a2df439..5565682 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/StudentGroup.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Department/TimeNorm.cs b/DepartmentPortal/Common/CoreDatabase/Models/Department/TimeNorm.cs index d49f400..008bf68 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Department/TimeNorm.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs b/DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs index a47753f..69a9784 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs +++ b/DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs @@ -1,14 +1,14 @@ -using ToolsModule.Attributes; -using System; +using System; using System.ComponentModel.DataAnnotations.Schema; using System.Runtime.Serialization; +using ToolsModule.ManagmentMapping; namespace CoreDatabase.Models { - /// - /// Тип Id для всеъ сущностей - /// - [DataContract] + /// + /// Тип Id для всеъ сущностей + /// + [DataContract] public class IdEntity { [DataMember] diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Security/Access.cs b/DepartmentPortal/Common/CoreDatabase/Models/Security/Access.cs index 8483ffc..25c176d 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Security/Access.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Security/EnviromentSetting.cs b/DepartmentPortal/Common/CoreDatabase/Models/Security/EnviromentSetting.cs index 8b1b7c1..459a12d 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Security/EnviromentSetting.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Security/Role.cs b/DepartmentPortal/Common/CoreDatabase/Models/Security/Role.cs index 3dd2383..8b02c52 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Security/Role.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs b/DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs index e55008e..ed998fc 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs +++ b/DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs @@ -1,16 +1,15 @@ -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 { - [DataContract] + [DataContract] public class User : BaseEntity, IEntitySecurityExtenstion, IUserModel { [DataMember] diff --git a/DepartmentPortal/Common/CoreDatabase/Models/Security/UserRole.cs b/DepartmentPortal/Common/CoreDatabase/Models/Security/UserRole.cs index ab6e132..5d06832 100644 --- a/DepartmentPortal/Common/CoreDatabase/Models/Security/UserRole.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreDatabase/SecurityManager.cs b/DepartmentPortal/Common/CoreDatabase/SecurityManager.cs index 0a89367..714e6f1 100644 --- a/DepartmentPortal/Common/CoreDatabase/SecurityManager.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs index a80831a..61cba8e 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs @@ -1,6 +1,6 @@ using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs index 6b61c41..7286052 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs index afe5cae..64bd314 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs @@ -1,6 +1,6 @@ using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs index 4fd66a8..cf0b829 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs index 4bc9605..5f14605 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ToolsModule.Attributes; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs index 0c0c966..af00218 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs @@ -1,6 +1,6 @@ using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs index be01636..0302d09 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs index 8d56b93..681ac69 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs index 8328e75..cb099da 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs @@ -1,10 +1,11 @@ using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace CoreModels.ModelsDepartment { - [EntityDescription("EmployeeEmployeePost", "Связь сотрудника и должность кафедры")] + [EntityDescription("EmployeeEmployeePost", "Связь сотрудника и должность кафедры")] [EntityDependency("Post", "PostId", "К какой должности относится сотрудник")] [EntityDependency("Employee", "EmployeeId", "К какой должности относится сотрудник")] public interface IEmployeePostModel : IId diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs index f4ddbda..cd16ca8 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ToolsModule.Attributes; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs index a740e70..b1fae05 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs @@ -1,9 +1,9 @@ using CoreModels.Tools; -using ToolsModule.Attributes; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { - [EntityDescription("LecturerAcademicRank", "Ученое звание преподавателя кафедры")] + [EntityDescription("LecturerAcademicRank", "Ученое звание преподавателя кафедры")] public interface ILecturerAcademicRankModel : IId { string LecturerAcademicRankName { get; } diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs index a2fa873..539f6e2 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs index 2eae9bf..b184cc3 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs index 4d93541..1921d0e 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs @@ -1,11 +1,11 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { - [EntityDescription("Order", "Приказ")] + [EntityDescription("Order", "Приказ")] public interface IOrderModel : IId { string OrderNumber { get; } diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs index d69d4c1..906a51d 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs index 2ae97bc..543caa7 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs index e073d80..156e22c 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs @@ -1,6 +1,6 @@ using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs index 0284556..08bf155 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs @@ -1,9 +1,9 @@ using CoreModels.Tools; -using ToolsModule.Attributes; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { - [EntityDescription("Post", "Должность на кафедры")] + [EntityDescription("Post", "Должность на кафедры")] public interface IPostModel : IId { string PostName { get; } diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs index 109ef0c..1bf1c5d 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs @@ -1,11 +1,11 @@ using CoreModels.Enums.Department; using CoreModels.Tools; -using ToolsModule.Attributes; using System; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsDepartment { - [EntityDescription("StudentGroup", "Учебная группа кафедры")] + [EntityDescription("StudentGroup", "Учебная группа кафедры")] [EntityDependency("EducationDirection", "EducationDirectionId", "Направление, по которому учится группа")] [EntityDependency("Lecturer", "LecturerId", "Куратор группы")] public interface IStudentGroupModel : IId diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs index e997fbe..a59b9ae 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs b/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs index c8f16a7..46a4b0d 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs index 4e96f8b..5a2b80f 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs index f469cca..653efe1 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs index 6ba2341..81203fd 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs +++ b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs @@ -1,5 +1,5 @@ using CoreModels.Tools; -using ToolsModule.Attributes; +using ToolsModule.ManagmentEntity; namespace CoreModels.ModelsSecurity { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs index c6d0296..522cab6 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs b/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs index 4b1915a..34817c1 100644 --- a/DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs index 9ba2a46..c760f38 100644 --- a/DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs +++ b/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; diff --git a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs index 41d9a2b..0e74a8c 100644 --- a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs +++ b/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; diff --git a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs index 3ae1969..2274038 100644 --- a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs @@ -1,5 +1,5 @@ using ToolsDesktop.Interfaces; -using ToolsModule.Extensions; +using ToolsModule.ManagmentExtension; using System; using System.Drawing; diff --git a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs index cad3e1d..4bb2ee2 100644 --- a/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs +++ b/DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs @@ -1,5 +1,5 @@ using ToolsDesktop.Interfaces; -using ToolsModule.Extensions; +using ToolsModule.ManagmentExtension; using System; using System.Drawing; diff --git a/DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs b/DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs index 8a404e3..f305f5f 100644 --- a/DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs +++ b/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; diff --git a/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs b/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs index 0c2c23c..9908705 100644 --- a/DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs index 04262b1..69bf12c 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs index f5768db..fa8494f 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs index eb85b26..6a72ade 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs b/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs index aac2a99..f70d9a1 100644 --- a/DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs +++ b/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 { diff --git a/DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/DependencyManager.cs similarity index 95% rename from DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentDependency/DependencyManager.cs index 105a04b..6162581 100644 --- a/DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/DependencyManager.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.DependencyManagment +namespace ToolsModule.ManagmentDependency { /// /// Менеджер для работы с зависимостями @@ -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() { diff --git a/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyManager.cs similarity index 95% rename from DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyManager.cs index d5ccab7..2769313 100644 --- a/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyManager.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.DependencyManagment +namespace ToolsModule.ManagmentDependency { /// /// Интерфейс установки зависмости между элементами diff --git a/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyRegistration.cs similarity index 86% rename from DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyRegistration.cs index 85ca7a2..236eeb3 100644 --- a/DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyRegistration.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.DependencyManagment +namespace ToolsModule.ManagmentDependency { /// /// Интерфейс для регистрации зависимостей в модулях diff --git a/DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/ServiceProviderLoader.cs similarity index 70% rename from DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentDependency/ServiceProviderLoader.cs index e7f4709..70fb1f6 100644 --- a/DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs +++ b/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 { /// /// Загрузчик данных /// public static partial class ServiceProviderLoader { - private static readonly string _configFileName = "DepartmentPortal.config"; - private static readonly string _pathToImplementationExt = "..\\..\\..\\..\\ImplementationExtensions\\"; - /// - /// Получение данных с файла настроек - /// - /// - /// - 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; - } - /// /// Загрузка всех классов-реализаций IImplementationExtension /// diff --git a/DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/UnityContainerManager.cs similarity index 94% rename from DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentDependency/UnityContainerManager.cs index b3c36dd..b0ee492 100644 --- a/DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentDependency/UnityContainerManager.cs @@ -2,7 +2,7 @@ using Unity; using Unity.Lifetime; -namespace ToolsModule.DependencyManagment +namespace ToolsModule.ManagmentDependency { /// /// Работа с UnityContainer diff --git a/DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ControlType.cs similarity index 96% rename from DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ControlType.cs index cae4d31..0e113cc 100644 --- a/DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ControlType.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Enums +namespace ToolsModule.ManagmentEntity { /// /// Тип контрола, через который следует отображать свойство с ViewModel diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/CoreBusinessLogic.cs similarity index 80% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/CoreBusinessLogic.cs index 681b66b..8f39761 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/CoreBusinessLogic.cs @@ -1,16 +1,13 @@ -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 { - /// - /// Основа всех бизнес-логик - /// - public class CoreBusinessLogic + /// + /// Основа всех бизнес-логик + /// + public class CoreBusinessLogic { /// /// Менеджер безопасности diff --git a/DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ElementViewModel.cs similarity index 57% rename from DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ElementViewModel.cs index a17a2ea..ffe94a2 100644 --- a/DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ElementViewModel.cs @@ -1,12 +1,12 @@ -using ToolsModule.Attributes; -using System; +using System; +using ToolsModule.ManagmentMapping; -namespace ToolsModule.ViewModels +namespace ToolsModule.ManagmentEntity { - /// - /// Возвращаемая запись - /// - public class ElementViewModel + /// + /// Возвращаемая запись + /// + public class ElementViewModel { [ViewModelControlListProperty("Идентификатор", IsHide = true)] [MapConfiguration("Id")] diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDependencyAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDependencyAttribute.cs index 04a7e51..1b2ce80 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDependencyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { /// /// Оописание зависимости сущности от другой сущности (требуется для выстраивания последоватльности сохранения и загрузки данных, diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDescriptionAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDescriptionAttribute.cs index 9424c1e..6c03a52 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDescriptionAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { /// /// Оописание класса из базы данных, его назначение (требуется для выстраивания иерархии с описанием классов, diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/GenericBusinessLogic.cs similarity index 96% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/GenericBusinessLogic.cs index b34bfcf..c58186a 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs +++ b/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 { /// /// Базовый класс для логики сущности diff --git a/DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/GetBindingModel.cs similarity index 92% rename from DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/GetBindingModel.cs index 72c768c..53abec3 100644 --- a/DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/GetBindingModel.cs @@ -1,6 +1,7 @@ using System; +using ToolsModule.ManagmentSecurity; -namespace ToolsModule.BindingModels +namespace ToolsModule.ManagmentEntity { /// /// Получение записи diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IErrors.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IErrors.cs similarity index 87% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IErrors.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/IErrors.cs index 5b92b20..23441b6 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IErrors.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IErrors.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ToolsModule.Interfaces +namespace ToolsModule.ManagmentEntity { public interface IErrors { diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityLogic.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityLogic.cs similarity index 94% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityLogic.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityLogic.cs index 2dd785c..a588ad5 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityLogic.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityLogic.cs @@ -1,7 +1,4 @@ -using ToolsModule.BindingModels; -using ToolsModule.ViewModels; - -namespace ToolsModule.Interfaces +namespace ToolsModule.ManagmentEntity { /// /// Описание действий для логики сущности diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityService.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityService.cs similarity index 92% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityService.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityService.cs index 73dccfe..dac621c 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityService.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityService.cs @@ -1,7 +1,4 @@ -using ToolsModule.BindingModels; -using ToolsModule.Models; - -namespace ToolsModule.Interfaces +namespace ToolsModule.ManagmentEntity { /// /// Описание действий для хранилища сущности diff --git a/DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ListViewModel.cs similarity index 88% rename from DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ListViewModel.cs index 711e74b..d9c8e5b 100644 --- a/DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ListViewModel.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace ToolsModule.ViewModels +namespace ToolsModule.ManagmentEntity { /// /// Список возвращаемых значений diff --git a/DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/OperationResultModel.cs similarity index 98% rename from DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/OperationResultModel.cs index 6baa0df..5e32751 100644 --- a/DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs +++ b/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 { /// /// Результат любой операции с сущностью diff --git a/DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ResultServiceStatusCode.cs similarity index 93% rename from DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ResultServiceStatusCode.cs index 4f79959..9facd2d 100644 --- a/DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ResultServiceStatusCode.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Enums +namespace ToolsModule.ManagmentEntity { /// /// Статус результата операции diff --git a/DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/SetBindingModel.cs similarity index 80% rename from DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/SetBindingModel.cs index 4eb50e8..b30defc 100644 --- a/DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/SetBindingModel.cs @@ -1,6 +1,7 @@ using System; +using ToolsModule.ManagmentSecurity; -namespace ToolsModule.BindingModels +namespace ToolsModule.ManagmentEntity { /// /// Сохранение записи по идентификатору diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementClassAttribute.cs similarity index 95% rename from DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementClassAttribute.cs index bdc21b8..8b98e17 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementClassAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { /// /// Настройка контрола отображения объекта класса (требуется для автоматизации вывода элемента, diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementDependenceEntityAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementDependenceEntityAttribute.cs index 5822a9d..692c0e1 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementDependenceEntityAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { /// /// Настройка контрола отображения? указывающая на дочерний контрол (требуется для автоматизации вывода элемента, diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementPropertyAttribute.cs similarity index 86% rename from DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementPropertyAttribute.cs index 29dd263..4a5a0d7 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementPropertyAttribute.cs @@ -1,13 +1,12 @@ -using ToolsModule.Enums; -using System; +using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { - /// - /// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента, - /// применяется к классам ElementViewModel) - /// - [AttributeUsage(AttributeTargets.Property)] + /// + /// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента, + /// применяется к классам ElementViewModel) + /// + [AttributeUsage(AttributeTargets.Property)] public class ViewModelControlElementPropertyAttribute : Attribute { /// diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlListPropertyAttribute.cs similarity index 97% rename from DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlListPropertyAttribute.cs index c552806..374ebc0 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlListPropertyAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentEntity { /// /// Настройка отображения свойства класса при табличном выводе списка объектов класса (требуется для автоматизации вывода списка, diff --git a/DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs b/DepartmentPortal/Common/ToolsModule/ManagmentExtension/StringExtension.cs similarity index 94% rename from DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentExtension/StringExtension.cs index cadc4d6..a909e15 100644 --- a/DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentExtension/StringExtension.cs @@ -1,6 +1,6 @@ using System.IO; -namespace ToolsModule.Extensions +namespace ToolsModule.ManagmentExtension { public static class StringExtension { diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentMapping/MapConfigurationAttribute.cs similarity index 56% rename from DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentMapping/MapConfigurationAttribute.cs index 23227f5..52a5c18 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentMapping/MapConfigurationAttribute.cs @@ -1,15 +1,14 @@ using System; -using System.Collections.Generic; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentMapping { - /// - /// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса - /// (требуется для заполнения свойств объекта значениями одного класса значениями свойств объектов другого класса, - /// применяется при создании класса-описывающего сущность в хранилище из класса SetBindingModel - /// и из класса-описывающего сущность в хранилище в класс ElementViewModel) - /// - [AttributeUsage(AttributeTargets.Property)] + /// + /// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса + /// (требуется для заполнения свойств объекта значениями одного класса значениями свойств объектов другого класса, + /// применяется при создании класса-описывающего сущность в хранилище из класса SetBindingModel + /// и из класса-описывающего сущность в хранилище в класс ElementViewModel) + /// + [AttributeUsage(AttributeTargets.Property)] public class MapConfigurationAttribute : Attribute { /// diff --git a/DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs b/DepartmentPortal/Common/ToolsModule/ManagmentMapping/Mapper.cs similarity index 98% rename from DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentMapping/Mapper.cs index 0c85308..6d4653c 100644 --- a/DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs +++ b/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 { /// /// Маппер сущностей diff --git a/DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessBindingModel.cs similarity index 90% rename from DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessBindingModel.cs index 7cc437a..4ac56bd 100644 --- a/DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessBindingModel.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.BindingModels +namespace ToolsModule.ManagmentSecurity { /// /// Информация для доступа к выполнению операций diff --git a/DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessOperation.cs similarity index 98% rename from DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessOperation.cs index 515b974..d8dda2f 100644 --- a/DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessOperation.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Enums +namespace ToolsModule.ManagmentSecurity { /// /// Операции в системе diff --git a/DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessType.cs similarity index 88% rename from DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessType.cs index 404498f..535379b 100644 --- a/DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessType.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Enums +namespace ToolsModule.ManagmentSecurity { /// /// Тип операции diff --git a/DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/CheckRigthForMapAttribute.cs similarity index 90% rename from DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/CheckRigthForMapAttribute.cs index 23d264d..544ef1a 100644 --- a/DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/CheckRigthForMapAttribute.cs @@ -1,6 +1,6 @@ using System; -namespace ToolsModule.Attributes +namespace ToolsModule.ManagmentSecurity { /// /// Признак, гооврящий о том, что нужна проверка доступа к значению свойства при создании одного объекта на основе другого diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/IEntitySecurityExtenstion.cs similarity index 92% rename from DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/IEntitySecurityExtenstion.cs index a257a41..066bbd7 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/IEntitySecurityExtenstion.cs @@ -1,4 +1,4 @@ -namespace ToolsModule.Interfaces +namespace ToolsModule.ManagmentSecurity { /// /// Работа с сущностями с применением скрытности для полей diff --git a/DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/ISecurityManager.cs similarity index 84% rename from DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/ISecurityManager.cs index 57e5f89..2e93a29 100644 --- a/DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/ISecurityManager.cs @@ -1,14 +1,13 @@ -using ToolsModule.Models; -using System; +using System; using System.Collections.Generic; using System.Threading.Tasks; -namespace ToolsModule.Interfaces +namespace ToolsModule.ManagmentSecurity { - /// - /// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя - /// - public interface ISecurityManager + /// + /// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя + /// + public interface ISecurityManager { /// /// Аутентифицированный пользователь diff --git a/DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/SecurityManagerCheckAccessModel.cs similarity index 76% rename from DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs rename to DepartmentPortal/Common/ToolsModule/ManagmentSecurity/SecurityManagerCheckAccessModel.cs index b8b193d..5b6585e 100644 --- a/DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs +++ b/DepartmentPortal/Common/ToolsModule/ManagmentSecurity/SecurityManagerCheckAccessModel.cs @@ -1,12 +1,9 @@ -using ToolsModule.BindingModels; -using ToolsModule.Enums; - -namespace ToolsModule.Models +namespace ToolsModule.ManagmentSecurity { - /// - /// Данные для проверки доступа - /// - public class SecurityManagerCheckAccessModel + /// + /// Данные для проверки доступа + /// + public class SecurityManagerCheckAccessModel { /// /// Данные по пользователю diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs index 4b0ce27..d1b8bf4 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs +++ b/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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs index 7a09e7d..4b8da4b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs +++ b/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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs index ca27ca4..5e8ad98 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordTimeNormHourBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs index 627adc0..d06bf61 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/ClassroomBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs index 5e59f68..e4fba28 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBlockBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs index 4c95a0a..282f3f8 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/DisciplineBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs index 43eedcf..d1085bf 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EducationDirectionBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs index 2f99390..b457fc7 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeeBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs index 8484c6f..93e9f22 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/EmployeePostBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs index f81cb94..83a59f1 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicDegreeBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs index 383b105..0c8381b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerAcademicRankBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs index f4a1eb3..c47edd9 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs index 5da7163..a91ff75 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/LecturerPostBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs index 4b5e18e..74195fc 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs index 54b6fbd..e7bde8f 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderStudentRecordBusinessLogic.cs @@ -5,9 +5,10 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using SecurityContract.BindingModels; using SecurityContract.Logics.IGenericEntityLogic; -using ToolsModule.BusinessLogics; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; +using ToolsModule.ManagmentSecurity; namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs index 35687a7..02f3fd1 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryBusinessLogic.cs @@ -15,11 +15,10 @@ using System.Net.Http.Headers; 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; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentSecurity; namespace DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs index 252c7c2..c90241a 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/OrderSyncHistoryRecordBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs index 2983b44..3ad69f0 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/PostBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs index bb24c2b..01df1b3 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs index 13c493d..ebec6b9 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/StudentGroupBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs index 3f951c7..dece0dd 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/TimeNormBusinessLogic.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 { diff --git a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs index eaa4472..433483b 100644 --- a/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs +++ b/DepartmentPortal/Department/DepartmentBusinessLogic/DepartmentLogicDependencyRegistration.cs @@ -1,6 +1,6 @@ using DepartmentBusinessLogic.BusinessLogics.GenericBusinessLogic; using DepartmentContract.Logics.IGenericEntityLogic; -using ToolsModule.DependencyManagment; +using ToolsModule.ManagmentDependency; namespace DepartmentBusinessLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs index ba29501..66ff96e 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs index 3c98989..3bd9524 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs index cd57fcb..01094f1 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/AcademicPlanRecordTimeNormHourBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs index 69dc6ed..18505ff 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/ClassroomBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs index 1a09620..96213b2 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs index 52d5b58..ebd56c9 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/DisciplineBlockBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs index d99b236..a858251 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EducationDirectionBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs index f0f2231..642fddf 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeeBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs index 49f2824..4804450 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/EmployeePostBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs index 15b9cb1..e8688e5 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicDegreeBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs index 0571d98..d8bbacf 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerAcademicRankBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsDepartment; using System.ComponentModel.DataAnnotations; -using ToolsModule.BindingModels; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs index f514cac..183aeb5 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs index a7b4848..d143e5a 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/LecturerPostBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs index e2386bd..7e9c10d 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs index db7c8f3..4d9cde8 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderStudentRecordBindingModel.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs index 41b8810..8b5df7f 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs index 29f75e4..8a3423f 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/OrderSyncHistoryRecordBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs index 8e29bb3..5f03f52 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/PostBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs index 751cd36..0b83828 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs index 0a3835d..c18cb68 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/StudentGroupBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs b/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs index e6037f2..82393dd 100644 --- a/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/BindingModels/TimeNormBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.BindingModels { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs index dcb2048..0dd788e 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs index f3fbb72..cd4394c 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs index 57da9c5..8bdb59a 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IAcademicPlanRecordTimeNormHourLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs index 3f8498a..455b981 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IClassroomLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs index 4aa64df..4486213 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineBlockLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs index 2018088..c9ce4fe 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IDisciplineLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs index 8402a9c..ac9e3fb 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEducationDirectionLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs index 46681d4..34799ca 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeeLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs index ea69f32..316141e 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IEmployeePostLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs index 64dfe39..ef28ad0 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicDegreeLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs index 84433f8..71d8336 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerAcademicRankLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs index 623f095..d6c25c5 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs index bce902a..b959f25 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ILecturerPostLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs index 5c26d54..2c1bef1 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs index 0483dfa..bd24cbd 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderStudentRecordLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs index 14d355b..db1af6a 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryLogic.cs @@ -2,7 +2,7 @@ using DepartmentContract.ViewModels; using System; using System.Threading.Tasks; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs index 831d4f7..b0e8df1 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IOrderSyncHistoryRecordLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs index 0ef4724..6f63450 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IPostLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs index e4aba68..bee9b51 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentGroupLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs index fa2d7cf..df67ee1 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/IStudentLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs index 02d0900..985fc85 100644 --- a/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs +++ b/DepartmentPortal/Department/DepartmentContract/Logics/IGenericEntityLogic/ITimeNormLogic.cs @@ -1,6 +1,6 @@ using DepartmentContract.BindingModels; using DepartmentContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs index 02794a5..9b7f06b 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs index 32a74f0..75b0d75 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanRecordTimeNormHourService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs index 2b1dae5..75f3df8 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IAcademicPlanService.cs @@ -1,6 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs index 7bfcb2b..eb379c3 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IClassroomService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs index 3138f7f..97121f3 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineBlockService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs index 142cf78..76b80fd 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IDisciplineService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs index b63c31a..6707f15 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEducationDirectionService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs index eecce04..cff6cfa 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeePostService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs index 0e965de..c50ba23 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IEmployeeService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs index f6f20b7..a92491c 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicDegreeService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs index a7e84fd..b9c7c93 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerAcademicRankService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs index ca508c7..2b5bfc9 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerPostService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs index 354ccb8..874d40b 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ILecturerService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs index 900abf6..2a928e1 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs index 1353013..7d82394 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderStudentRecordService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs index 15c34be..5be7e80 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryRecordService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs index e2cc78e..da500e1 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IOrderSyncHistoryService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs index a79e12a..2841a0f 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IPostService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs index 8dd563d..9fefa42 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentGroupService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs index b1747a1..bd8b7fb 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/IStudentService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs index b13eff9..f178bf8 100644 --- a/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs +++ b/DepartmentPortal/Department/DepartmentContract/Services/IGenericEntityService/ITimeNormService.cs @@ -1,5 +1,5 @@ using DepartmentContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs index c8f1d72..0fd7fa4 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordTimeNormHourViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs index 1ddf256..99feea0 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanRecordViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs index d7dcb02..b4972a7 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/AcademicPlanViewModels.cs @@ -1,15 +1,14 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { - /// - /// Список учбеных планов - /// - public class AcademicPlanListViewModel : ListViewModel { } + /// + /// Список учбеных планов + /// + public class AcademicPlanListViewModel : ListViewModel { } /// /// Элемент учебного плана diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs index d66dc77..0dd0bfd 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/ClassroomViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs index 8f0ca57..08ef246 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineBlockViewModels.cs @@ -1,7 +1,5 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs index 97ea4ad..b11782b 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/DisciplineViewModels.cs @@ -1,8 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs index ae26718..c3d691e 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EducationDirectionViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs index e943359..2324670 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeePostViewModels.cs @@ -1,8 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs index d31400e..6d83a44 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/EmployeeViewModels.cs @@ -1,8 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs index 87caebc..ab9d9be 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicDegreeViewModels.cs @@ -1,7 +1,5 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs index f81e608..e05e459 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerAcademicRankViewModels.cs @@ -1,7 +1,5 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs index 79c97d9..b96b0a7 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerPostViewModels.cs @@ -1,8 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs index 0c42387..39b35c8 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/LecturerViewModels.cs @@ -1,15 +1,14 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { - /// - /// Список преподавателей - /// - public class LecturerListViewModel : ListViewModel { } + /// + /// Список преподавателей + /// + public class LecturerListViewModel : ListViewModel { } /// /// Элемент преподаватель @@ -30,7 +29,7 @@ namespace DepartmentContract.ViewModels public Guid? LecturerAcademicDegreeId { get; set; } [ViewModelControlListProperty("Уч. степень")] - [MapConfiguration("LecturerAcademicDegree.LecturerAcademicDegreeName", IsDifficle = true)] + [MapConfiguration("LecturerAcademicDegree.LecturerAcademicDegreeName", IsDifficle = true)] public string LecturerAcademicDegree { get; set; } [ViewModelControlElementProperty("Уч. звание", ControlType.ControlGuid, MustHaveValue = false, ReadOnly = false, ControlTypeObject = "DepartmentWindowsDesktop.EntityControls.ControlLecturerAcademicRankList, DepartmentWindowsDesktop")] diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs index 4759ba7..44ce9c5 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderStudentRecordViewModel.cs @@ -1,9 +1,7 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs index 45db119..5628e69 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryRecordViewModels.cs @@ -1,8 +1,7 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs index ab87417..9dc83a4 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderSyncHistoryViewModels.cs @@ -1,8 +1,6 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs index 60736e8..42d4ea9 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/OrderViewModels.cs @@ -1,9 +1,7 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs index a125417..b01f614 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/PostViewModels.cs @@ -1,14 +1,12 @@ using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { - /// - /// Список должностей - /// - public class PostListViewModel : ListViewModel { } + /// + /// Список должностей + /// + public class PostListViewModel : ListViewModel { } /// /// Элемент должности diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs index bfb8961..0b7778a 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentGroupViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs index c322de0..8482b74 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/StudentViewModels.cs @@ -1,9 +1,8 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs b/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs index 518e95b..ecff02c 100644 --- a/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs +++ b/DepartmentPortal/Department/DepartmentContract/ViewModels/TimeNormViewModels.cs @@ -1,9 +1,7 @@ using CoreModels.Enums.Department; using CoreModels.ModelsDepartment; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace DepartmentContract.ViewModels { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs index c74d9a0..3202e2b 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/DepartmentImplementationDependencyRegistration.cs @@ -1,7 +1,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentDatabaseImplementation.Implementations; using DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService; -using ToolsModule.DependencyManagment; +using ToolsModule.ManagmentDependency; namespace DepartmentDatabaseImplementation { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs index 76bd96c..4839e12 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordService.cs @@ -6,7 +6,7 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs index 7fbd91c..8d9d8c9 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanRecordTimeNormHourService.cs @@ -5,7 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs index 5dec3b9..bf160f2 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/AcademicPlanService.cs @@ -10,9 +10,8 @@ using System; using System.Collections.Generic; using System.Linq; using System.Xml.Linq; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs index 568dbee..0c1c198 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/ClassroomService.cs @@ -6,7 +6,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs index 7fcf1d1..8577dbb 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineBlockService.cs @@ -5,8 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs index 3e44f2c..dcc68a0 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/DisciplineService.cs @@ -5,9 +5,8 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs index b7d8286..75a1f18 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EducationDirectionService.cs @@ -5,8 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs index afd60d2..62a36ab 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeePostService.cs @@ -5,7 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs index 667d74c..8264956 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/EmployeeService.cs @@ -6,8 +6,7 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs index ec14b81..807107f 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicDegreeService.cs @@ -5,8 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs index e06129b..cefe91f 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerAcademicRankService.cs @@ -5,8 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs index a5a0b1f..da64168 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerPostService.cs @@ -5,7 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs index 60d361c..4096118 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/LecturerService.cs @@ -6,8 +6,7 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs index 271ebee..c82681a 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderService.cs @@ -5,9 +5,8 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs index ff036d1..90b1f3d 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderStudentRecordService.cs @@ -5,7 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs index 18fa6b1..df0449b 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryRecordService.cs @@ -6,9 +6,8 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs index e6bf002..c48c491 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/OrderSyncHistoryService.cs @@ -5,9 +5,8 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using System; using System.Linq; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs index ba951e8..9d982f7 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/PostService.cs @@ -5,8 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs index 90218a3..cce84e5 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentGroupService.cs @@ -6,8 +6,7 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs index 37d186b..5b32d6b 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/StudentService.cs @@ -6,8 +6,8 @@ using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System; using System.Linq; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs index 8297e55..5a5c04f 100644 --- a/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs +++ b/DepartmentPortal/Department/DepartmentDatabaseImplementation.csproj/Implementations/AbstractGenerticEntityService/TimeNormService.cs @@ -5,7 +5,7 @@ using DepartmentContract.Services.IGenericEntityService; using DepartmentContract.ViewModels; using Microsoft.EntityFrameworkCore; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace DepartmentDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs index 57f886f..526a63f 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/DepartmentWindowDesktopExtension.cs @@ -2,11 +2,8 @@ using System.Collections.Generic; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BindingModels; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; -using ToolsModule.Interfaces; -using ToolsModule.Models; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs index 4d5ef5b..3323fa0 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlan/ControlAcademicPlanList.cs @@ -9,7 +9,7 @@ using ToolsDesktop.Enums; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs index 4280796..771f473 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecord/ControlAcademicPlanRecordList.cs @@ -10,7 +10,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs index 1facac5..50f6a0c 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/AcademicPlanRecordTimeNormHour/ControlAcademicPlanRecordTimeNormHourList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs index add02c3..c1469b4 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Classroom/ControlClassroomList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs index d33031f..742e365 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Discipline/ControlDisciplineList.cs @@ -7,8 +7,8 @@ using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs index 1756291..7e83842 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/DisciplineBlock/ControlDisciplineBlockList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs index 587a00e..4e5661e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EducationDirection/ControlEducationDirectionList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs index 5217b30..debca2a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeElement.cs @@ -11,9 +11,9 @@ using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; -using ToolsModule.DependencyManagment; -using ToolsModule.Extensions; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentMapping; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs index 9576ad6..5de7146 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Employee/ControlEmployeeList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs index 73640a7..6bc38b5 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/EmployeePost/ControlEmployeePostList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs index bfcb722..9819b0d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerElement.cs @@ -11,9 +11,9 @@ using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; -using ToolsModule.DependencyManagment; -using ToolsModule.Extensions; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentMapping; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs index b1acd7b..9a55c88 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Lecturer/ControlLecturerList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs index eab4272..fa6c644 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicDegree/ControlLecturerAcademicDegreeList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs index 80b8f5f..14bee53 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerAcademicRank/ControlLecturerAcademicRankList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs index 543d79b..ff0d2c3 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/LecturerPost/ControlLecturerPostList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs index be86d30..54d500e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Order/ControlOrderList.cs @@ -5,7 +5,7 @@ using System; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs index b183c65..0acfa31 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderStudentRecord/ControlOrderStudentRecordList.cs @@ -7,8 +7,8 @@ using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs index 5742192..bbee6dd 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistory/ControlOrderSyncHistoryList.cs @@ -9,7 +9,7 @@ using ToolsDesktop.Enums; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs index 8adfbe8..5b94e05 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/OrderSyncHistoryRecord/ControlOrderSyncHistoryRecordList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs index e3ae80f..196d88e 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Post/ControlPostList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs index 30db0bf..8c65621 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentElement.cs @@ -11,9 +11,9 @@ using ToolsDesktop.Controls; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BusinessLogics; -using ToolsModule.DependencyManagment; -using ToolsModule.Extensions; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentMapping; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs index ff9b50f..d6a1f8a 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/Student/ControlStudentList.cs @@ -9,7 +9,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs index f5e6ab8..e18f10d 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/StudentGroup/ControlStudentGroupList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs index 6b10f09..e8b1dcd 100644 --- a/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs +++ b/DepartmentPortal/Department/DepartmentWindowsDesktop/EntityControls/TimeNorm/ControlTimeNormList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace DepartmentWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs index 29f91e1..523a19a 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/FormEnter.cs @@ -2,9 +2,9 @@ using System.Collections.Generic; using System.Threading.Tasks; using System.Windows.Forms; -using ToolsModule.DependencyManagment; -using ToolsModule.Extensions; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentSecurity; namespace DepartmentPortalDesctop { diff --git a/DepartmentPortal/DepartmentPortalDesctop/Program.cs b/DepartmentPortal/DepartmentPortalDesctop/Program.cs index 4e8066a..2278635 100644 --- a/DepartmentPortal/DepartmentPortalDesctop/Program.cs +++ b/DepartmentPortal/DepartmentPortalDesctop/Program.cs @@ -1,8 +1,8 @@ using CoreDatabase; using System; using System.Windows.Forms; -using ToolsModule.DependencyManagment; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace DepartmentPortalDesctop { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs index e8df696..7193fd3 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/BackupBusinessLogic.cs @@ -1,11 +1,11 @@ using SecurityContract.BindingModels; -using SecurityContract.Services; using SecurityContract.Logics; +using SecurityContract.Services; using System; using System.IO; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; -using ToolsModule.Extensions; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs index b7b3c8c..092854d 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/AccessBusinessLogic.cs @@ -1,9 +1,9 @@ using SecurityContract.BindingModels; -using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs index f0097da..6bc3476 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/EnviromentSettingBusinessLogic.cs @@ -1,9 +1,9 @@ using SecurityContract.BindingModels; -using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs index e75e199..97c27cb 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/RoleBusinessLogic.cs @@ -1,9 +1,9 @@ using SecurityContract.BindingModels; -using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs index 9cfadab..dd60406 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserBusinessLogic.cs @@ -1,11 +1,11 @@ using SecurityContract.BindingModels; -using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System; using System.Linq; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs index 2214a6b..65623da 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/GenericBusinessLogic/UserRoleBusinessLogic.cs @@ -1,9 +1,9 @@ using SecurityContract.BindingModels; -using SecurityContract.Services.IGenericEntityService; using SecurityContract.Logics.IGenericEntityLogic; +using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs index bc477e9..92897f6 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/BusinessLogics/SynchronizationBusinessLogic.cs @@ -1,8 +1,8 @@ -using SecurityContract.Services; -using SecurityContract.Logics; +using SecurityContract.Logics; +using SecurityContract.Services; using System; -using ToolsModule.BusinessLogics; -using ToolsModule.Enums; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityBusinessLogic.BusinessLogics { diff --git a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs index a137498..11e5ff3 100644 --- a/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs +++ b/DepartmentPortal/Security/SecurityBusinessLogic/SecurityLogicDependencyRegistration.cs @@ -2,7 +2,7 @@ using SecurityBusinessLogic.BusinessLogics.GenericBusinessLogic; using SecurityContract.Logics; using SecurityContract.Logics.IGenericEntityLogic; -using ToolsModule.DependencyManagment; +using ToolsModule.ManagmentDependency; namespace SecurityBusinessLogic { diff --git a/DepartmentPortal/Security/SecurityContract/BindingModels/AccessBindingModels.cs b/DepartmentPortal/Security/SecurityContract/BindingModels/AccessBindingModels.cs index b46eac2..03f3957 100644 --- a/DepartmentPortal/Security/SecurityContract/BindingModels/AccessBindingModels.cs +++ b/DepartmentPortal/Security/SecurityContract/BindingModels/AccessBindingModels.cs @@ -1,8 +1,8 @@ using CoreModels.ModelsSecurity; -using ToolsModule.BindingModels; -using ToolsModule.Enums; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentSecurity; namespace SecurityContract.BindingModels { diff --git a/DepartmentPortal/Security/SecurityContract/BindingModels/EnviromentSettingBindingModels.cs b/DepartmentPortal/Security/SecurityContract/BindingModels/EnviromentSettingBindingModels.cs index 5218d0c..4aec69b 100644 --- a/DepartmentPortal/Security/SecurityContract/BindingModels/EnviromentSettingBindingModels.cs +++ b/DepartmentPortal/Security/SecurityContract/BindingModels/EnviromentSettingBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsSecurity; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace SecurityContract.BindingModels { diff --git a/DepartmentPortal/Security/SecurityContract/BindingModels/RoleBindingModels.cs b/DepartmentPortal/Security/SecurityContract/BindingModels/RoleBindingModels.cs index 1d91585..01f2e4c 100644 --- a/DepartmentPortal/Security/SecurityContract/BindingModels/RoleBindingModels.cs +++ b/DepartmentPortal/Security/SecurityContract/BindingModels/RoleBindingModels.cs @@ -1,6 +1,6 @@ using CoreModels.ModelsSecurity; -using ToolsModule.BindingModels; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace SecurityContract.BindingModels { diff --git a/DepartmentPortal/Security/SecurityContract/BindingModels/UserBindingModels.cs b/DepartmentPortal/Security/SecurityContract/BindingModels/UserBindingModels.cs index f0b8b03..c9f0745 100644 --- a/DepartmentPortal/Security/SecurityContract/BindingModels/UserBindingModels.cs +++ b/DepartmentPortal/Security/SecurityContract/BindingModels/UserBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace SecurityContract.BindingModels { diff --git a/DepartmentPortal/Security/SecurityContract/BindingModels/UserRoleBindingModels.cs b/DepartmentPortal/Security/SecurityContract/BindingModels/UserRoleBindingModels.cs index 960d2fa..2f0439d 100644 --- a/DepartmentPortal/Security/SecurityContract/BindingModels/UserRoleBindingModels.cs +++ b/DepartmentPortal/Security/SecurityContract/BindingModels/UserRoleBindingModels.cs @@ -1,7 +1,7 @@ using CoreModels.ModelsSecurity; -using ToolsModule.BindingModels; using System; using System.ComponentModel.DataAnnotations; +using ToolsModule.ManagmentEntity; namespace SecurityContract.BindingModels { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IBackupLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IBackupLogic.cs index 47ecb19..c44d81d 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IBackupLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IBackupLogic.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IAccessLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IAccessLogic.cs index 26ba906..72ac35b 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IAccessLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IAccessLogic.cs @@ -1,6 +1,6 @@ using SecurityContract.BindingModels; using SecurityContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IEnviromentSettingLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IEnviromentSettingLogic.cs index 7a15280..5f81ea9 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IEnviromentSettingLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IEnviromentSettingLogic.cs @@ -1,6 +1,6 @@ using SecurityContract.BindingModels; using SecurityContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IRoleLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IRoleLogic.cs index c8e48a6..61b1a19 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IRoleLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IRoleLogic.cs @@ -1,6 +1,6 @@ using SecurityContract.BindingModels; using SecurityContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserLogic.cs index 7173d73..ddba768 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserLogic.cs @@ -1,6 +1,6 @@ using SecurityContract.BindingModels; using SecurityContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserRoleLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserRoleLogic.cs index 761496f..c42a0ed 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserRoleLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/IGenericEntityLogic/IUserRoleLogic.cs @@ -1,6 +1,6 @@ using SecurityContract.BindingModels; using SecurityContract.ViewModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics.IGenericEntityLogic { diff --git a/DepartmentPortal/Security/SecurityContract/Logics/ISynchronizationLogic.cs b/DepartmentPortal/Security/SecurityContract/Logics/ISynchronizationLogic.cs index 7b9ea36..92d8549 100644 --- a/DepartmentPortal/Security/SecurityContract/Logics/ISynchronizationLogic.cs +++ b/DepartmentPortal/Security/SecurityContract/Logics/ISynchronizationLogic.cs @@ -1,4 +1,4 @@ -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Logics { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs b/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs index 2d18dbf..c9023ff 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IBackupService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs index c59ec55..e7a7d77 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IAccessService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs index 157a0d2..e6ebafe 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IEnviromentSettingService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs index 4e87ee3..e1383f5 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IRoleService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs index 7eee7c2..667e1a6 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserRoleService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs index 70086d3..135e8a4 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/IGenericEntityService/IUserService.cs @@ -1,5 +1,5 @@ using SecurityContract.BindingModels; -using ToolsModule.Interfaces; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services.IGenericEntityService { diff --git a/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs b/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs index def3b58..2db7d56 100644 --- a/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityContract/Services/ISynchronizationService.cs @@ -1,4 +1,4 @@ -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace SecurityContract.Services { diff --git a/DepartmentPortal/Security/SecurityContract/ViewModels/AccessViewModels.cs b/DepartmentPortal/Security/SecurityContract/ViewModels/AccessViewModels.cs index f0b9d05..ce117b9 100644 --- a/DepartmentPortal/Security/SecurityContract/ViewModels/AccessViewModels.cs +++ b/DepartmentPortal/Security/SecurityContract/ViewModels/AccessViewModels.cs @@ -1,8 +1,8 @@ using CoreModels.ModelsSecurity; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; +using ToolsModule.ManagmentSecurity; namespace SecurityContract.ViewModels { diff --git a/DepartmentPortal/Security/SecurityContract/ViewModels/EnviromentSettingViewModels.cs b/DepartmentPortal/Security/SecurityContract/ViewModels/EnviromentSettingViewModels.cs index 73cf5d5..43668c8 100644 --- a/DepartmentPortal/Security/SecurityContract/ViewModels/EnviromentSettingViewModels.cs +++ b/DepartmentPortal/Security/SecurityContract/ViewModels/EnviromentSettingViewModels.cs @@ -1,7 +1,5 @@ using CoreModels.ModelsSecurity; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace SecurityContract.ViewModels { diff --git a/DepartmentPortal/Security/SecurityContract/ViewModels/RoleViewModels.cs b/DepartmentPortal/Security/SecurityContract/ViewModels/RoleViewModels.cs index 07232f2..85c1c14 100644 --- a/DepartmentPortal/Security/SecurityContract/ViewModels/RoleViewModels.cs +++ b/DepartmentPortal/Security/SecurityContract/ViewModels/RoleViewModels.cs @@ -1,7 +1,5 @@ using CoreModels.ModelsSecurity; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; +using ToolsModule.ManagmentEntity; namespace SecurityContract.ViewModels { diff --git a/DepartmentPortal/Security/SecurityContract/ViewModels/UserRoleViewModels.cs b/DepartmentPortal/Security/SecurityContract/ViewModels/UserRoleViewModels.cs index 861e1ae..70dd412 100644 --- a/DepartmentPortal/Security/SecurityContract/ViewModels/UserRoleViewModels.cs +++ b/DepartmentPortal/Security/SecurityContract/ViewModels/UserRoleViewModels.cs @@ -1,15 +1,14 @@ using CoreModels.ModelsSecurity; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentMapping; namespace SecurityContract.ViewModels { - /// - /// Список пользователей - /// - public class UserRoleListViewModel : ListViewModel { } + /// + /// Список пользователей + /// + public class UserRoleListViewModel : ListViewModel { } /// /// Элемент пользователей diff --git a/DepartmentPortal/Security/SecurityContract/ViewModels/UserViewModels.cs b/DepartmentPortal/Security/SecurityContract/ViewModels/UserViewModels.cs index d547ba3..00c03d2 100644 --- a/DepartmentPortal/Security/SecurityContract/ViewModels/UserViewModels.cs +++ b/DepartmentPortal/Security/SecurityContract/ViewModels/UserViewModels.cs @@ -1,15 +1,13 @@ using CoreModels.ModelsSecurity; -using ToolsModule.Attributes; -using ToolsModule.Enums; -using ToolsModule.ViewModels; using System; +using ToolsModule.ManagmentEntity; namespace SecurityContract.ViewModels { - /// - /// Список пользователей - /// - public class UserListViewModel : ListViewModel { } + /// + /// Список пользователей + /// + public class UserListViewModel : ListViewModel { } /// /// Элемент пользователей diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs index 0bf38f1..876e8c2 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/AccessService.cs @@ -5,7 +5,7 @@ using SecurityContract.BindingModels; using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs index 3f0c8e6..33760fe 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/EnviromentSettingService.cs @@ -5,8 +5,8 @@ using SecurityContract.BindingModels; using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs index 7f5b5f5..f14aa96 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/RoleService.cs @@ -6,9 +6,8 @@ using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs index 68fdf85..552f9b3 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserRoleService.cs @@ -5,7 +5,7 @@ using SecurityContract.BindingModels; using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System.Linq; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs index fd879f2..31c31b8 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/AbstractGenerticEntityService/UserService.cs @@ -7,9 +7,8 @@ using SecurityContract.Services.IGenericEntityService; using SecurityContract.ViewModels; using System; using System.Linq; -using ToolsModule.Enums; -using ToolsModule.Extensions; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; namespace SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs index 0c68c1e..8a6c521 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/BackupJsonContractService.cs @@ -8,10 +8,9 @@ using System.IO.Compression; using System.Linq; using System.Reflection; using System.Runtime.Serialization.Json; -using ToolsModule.Attributes; -using ToolsModule.Extensions; -using ToolsModule.Interfaces; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; +using ToolsModule.ManagmentExtension; +using ToolsModule.ManagmentSecurity; namespace SecurityDatabaseImplementation.Implementations { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs index 6e6e790..42fb468 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/Implementations/SynchronizationService.cs @@ -1,5 +1,5 @@ using SecurityContract.Services; -using ToolsModule.Models; +using ToolsModule.ManagmentEntity; namespace SecurityDatabaseImplementation.Implementations { diff --git a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs index fe53f53..c05b119 100644 --- a/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs +++ b/DepartmentPortal/Security/SecurityDatabaseImplementation/SecurityImplementationDependencyRegistration.cs @@ -2,7 +2,7 @@ using SecurityContract.Services.IGenericEntityService; using SecurityDatabaseImplementation.Implementations; using SecurityDatabaseImplementation.Implementations.AbstractGenerticEntityService; -using ToolsModule.DependencyManagment; +using ToolsModule.ManagmentDependency; namespace SecurityDatabaseImplementation { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs index 328e832..9c3c61a 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Access/ControlAccessList.cs @@ -9,8 +9,8 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs index e6c5f2b..31e4d09 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/EnviromentSetting/ControlEnviromentSettingList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs index f13936a..fdb3c22 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/Role/ControlRoleList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs index 8d7c403..2496d2f 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/User/ControlUserList.cs @@ -6,7 +6,7 @@ using ToolsDesktop.BaseControls; using ToolsDesktop.Controls; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs index 2e39716..30d885c 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/EntityControls/UserRole/ControlUserRoleList.cs @@ -7,7 +7,7 @@ using ToolsDesktop.Controls; using ToolsDesktop.Enums; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.Enums; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.EntityControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs index 2b2ff66..2b92a46 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SecurityWindowDesktopExtension.cs @@ -3,11 +3,8 @@ using SecurityWindowsDesktop.SpecialControls; using System.Collections.Generic; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.BindingModels; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; -using ToolsModule.Interfaces; -using ToolsModule.Models; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs index d9653f7..5f11473 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/BackupControl.cs @@ -6,8 +6,8 @@ using System.Xml.Linq; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.SpecialControls { diff --git a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs index 7b637cd..b14193e 100644 --- a/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs +++ b/DepartmentPortal/Security/SecurityWindowsDesktop/SpecialControls/SynchronizationControl.cs @@ -5,8 +5,8 @@ using System.Xml.Linq; using ToolsDesktop.Helpers; using ToolsDesktop.Interfaces; using ToolsDesktop.Models; -using ToolsModule.DependencyManagment; -using ToolsModule.Enums; +using ToolsModule.ManagmentDependency; +using ToolsModule.ManagmentSecurity; namespace SecurityWindowsDesktop.SpecialControls {