eegov/DepartmentProject
1
1
Fork 0
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kotcheshir73 2022-03-20 10:10:44 +04:00
parent 4fa2dc1779
commit 9c76b680b7
301 changed files with 494 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DepartmentPortal/Common/CoreDatabase/AbstractGenerticEntityService.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlan.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecord.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/AcademicPlanRecordTimeNormHour.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/Classroom.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/Discipline.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/DisciplineBlock.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/EducationDirection.cs
View File

@ -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
{

8
DepartmentPortal/Common/CoreDatabase/Models/Department/Employee.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/EmployeePost.cs
View File

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

8
DepartmentPortal/Common/CoreDatabase/Models/Department/Lecturer.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicDegree.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerAcademicRank.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/LecturerPost.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/Order.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/OrderStudentRecord.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistory.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/OrderSyncHistoryRecord.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/Post.cs
View File

@ -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
{

8
DepartmentPortal/Common/CoreDatabase/Models/Department/Student.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/StudentGroup.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Department/TimeNorm.cs
View File

@ -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
{

12
DepartmentPortal/Common/CoreDatabase/Models/IdEntity.cs
View File

@ -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
{
/// <summary>
/// Тип Id для всеъ сущностей
/// </summary>
[DataContract]
/// <summary>
/// Тип Id для всеъ сущностей
/// </summary>
[DataContract]
public class IdEntity
{
[DataMember]

3
DepartmentPortal/Common/CoreDatabase/Models/Security/Access.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Security/EnviromentSetting.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreDatabase/Models/Security/Role.cs
View File

@ -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
{

9
DepartmentPortal/Common/CoreDatabase/Models/Security/User.cs
View File

@ -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<User>, IUserModel
{
[DataMember]

2
DepartmentPortal/Common/CoreDatabase/Models/Security/UserRole.cs
View File

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

4
DepartmentPortal/Common/CoreDatabase/SecurityManager.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IAcademicPlanRecordTimeNormHourModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IClassroomModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineBlockModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IDisciplineModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IEducationDirectionModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeeModel.cs
View File

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

5
DepartmentPortal/Common/CoreModels/ModelsDepartment/IEmployeePostModel.cs
View File

@ -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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicDegreeModel.cs
View File

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

4
DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerAcademicRankModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsDepartment/ILecturerPostModel.cs
View File

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

4
DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderStudentRecordModel.cs
View File

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

6
DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryModel.cs
View File

@ -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
{

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IOrderSyncHistoryRecordModel.cs
View File

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

4
DepartmentPortal/Common/CoreModels/ModelsDepartment/IPostModel.cs
View File

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

4
DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentGroupModel.cs
View File

@ -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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/IStudentModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsDepartment/ITimeNormModel.cs
View File

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

4
DepartmentPortal/Common/CoreModels/ModelsSecurity/IAccessModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsSecurity/IEnviromentSettingModel.cs
View File

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

2
DepartmentPortal/Common/CoreModels/ModelsSecurity/IRoleModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserModel.cs
View File

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

3
DepartmentPortal/Common/CoreModels/ModelsSecurity/IUserRoleModel.cs
View File

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

2
DepartmentPortal/Common/ToolsDesktop/BaseControls/AbstractBaseControl.cs
View File

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

2
DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlDateTime.cs
View File

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

2
DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlString.cs
View File

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

2
DepartmentPortal/Common/ToolsDesktop/BaseControls/BaseControlText.cs
View File

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

2
DepartmentPortal/Common/ToolsDesktop/BusinessLogics/DesktopLoader.cs
View File

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

6
DepartmentPortal/Common/ToolsDesktop/Interfaces/IControl.cs
View File

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

12
DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityElement.cs
View File

@ -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
{

11
DepartmentPortal/Common/ToolsDesktop/MainControls/GenericControlEntityList.cs
View File

@ -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
{

8
DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityElement.cs
View File

@ -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
{

8
DepartmentPortal/Common/ToolsDesktop/MainControls/MainControlViewEntityList.cs
View File

@ -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
{

4
DepartmentPortal/Common/ToolsModule/DependencyManagment/DependencyManager.cs → DepartmentPortal/Common/ToolsModule/ManagmentDependency/DependencyManager.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyManager.cs → DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyManager.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/DependencyManagment/IDependencyRegistration.cs → DepartmentPortal/Common/ToolsModule/ManagmentDependency/IDependencyRegistration.cs
View File

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

26
DepartmentPortal/Common/ToolsModule/DependencyManagment/ServiceProviderLoader.cs → DepartmentPortal/Common/ToolsModule/ManagmentDependency/ServiceProviderLoader.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/DependencyManagment/UnityContainerManager.cs → DepartmentPortal/Common/ToolsModule/ManagmentDependency/UnityContainerManager.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Enums/ControlType.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ControlType.cs
View File

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

19
DepartmentPortal/Common/ToolsModule/BusinessLogics/CoreBusinessLogic.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/CoreBusinessLogic.cs
View File

@ -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
{
/// <summary>
/// Основа всех бизнес-логик
/// </summary>
public class CoreBusinessLogic
/// <summary>
/// Основа всех бизнес-логик
/// </summary>
public class CoreBusinessLogic
{
/// <summary>
/// Менеджер безопасности

14
DepartmentPortal/Common/ToolsModule/ViewModels/ElementViewModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ElementViewModel.cs
View File

@ -1,12 +1,12 @@
using ToolsModule.Attributes;
using System;
using System;
using ToolsModule.ManagmentMapping;
namespace ToolsModule.ViewModels
namespace ToolsModule.ManagmentEntity
{
/// <summary>
/// Возвращаемая запись
/// </summary>
public class ElementViewModel
/// <summary>
/// Возвращаемая запись
/// </summary>
public class ElementViewModel
{
[ViewModelControlListProperty("Идентификатор", IsHide = true)]
[MapConfiguration("Id")]

2
DepartmentPortal/Common/ToolsModule/Attributes/EntityDependencyAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDependencyAttribute.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Attributes/EntityDescriptionAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/EntityDescriptionAttribute.cs
View File

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

9
DepartmentPortal/Common/ToolsModule/BusinessLogics/GenericBusinessLogic.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/GenericBusinessLogic.cs
View File

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

3
DepartmentPortal/Common/ToolsModule/BindingModels/GetBindingModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/GetBindingModel.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Interfaces/IErrors.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/IErrors.cs
View File

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

5
DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityLogic.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityLogic.cs
View File

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

5
DepartmentPortal/Common/ToolsModule/Interfaces/IGenericEntityService.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/IGenericEntityService.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/ViewModels/ListViewModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ListViewModel.cs
View File

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

5
DepartmentPortal/Common/ToolsModule/Models/OperationResultModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/OperationResultModel.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Enums/ResultServiceStatusCode.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ResultServiceStatusCode.cs
View File

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

3
DepartmentPortal/Common/ToolsModule/BindingModels/SetBindingModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/SetBindingModel.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementClassAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementClassAttribute.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementDependenceEntityAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementDependenceEntityAttribute.cs
View File

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

15
DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlElementPropertyAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlElementPropertyAttribute.cs
View File

@ -1,13 +1,12 @@
using ToolsModule.Enums;
using System;
using System;
namespace ToolsModule.Attributes
namespace ToolsModule.ManagmentEntity
{
/// <summary>
/// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента,
/// применяется к классам ElementViewModel)
/// </summary>
[AttributeUsage(AttributeTargets.Property)]
/// <summary>
/// Настройка отображения свойства класса при выводе объекта класса (требуется для автоматизации вывода элемента,
/// применяется к классам ElementViewModel)
/// </summary>
[AttributeUsage(AttributeTargets.Property)]
public class ViewModelControlElementPropertyAttribute : Attribute
{
/// <summary>

2
DepartmentPortal/Common/ToolsModule/Attributes/ViewModelControlListPropertyAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentEntity/ViewModelControlListPropertyAttribute.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Extensions/StringExtension.cs → DepartmentPortal/Common/ToolsModule/ManagmentExtension/StringExtension.cs
View File

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

17
DepartmentPortal/Common/ToolsModule/Attributes/MapConfigurationAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentMapping/MapConfigurationAttribute.cs
View File

@ -1,15 +1,14 @@
using System;
using System.Collections.Generic;
namespace ToolsModule.Attributes
namespace ToolsModule.ManagmentMapping
{
/// <summary>
/// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса
/// (требуется для заполнения свойств объекта значениями одного класса значениями свойств объектов другого класса,
/// применяется при создании класса-описывающего сущность в хранилище из класса SetBindingModel
/// и из класса-описывающего сущность в хранилище в класс ElementViewModel)
/// </summary>
[AttributeUsage(AttributeTargets.Property)]
/// <summary>
/// Настройка для полей сущности правил маппинга в классе, который требуется заполнять данными из другого класса
/// (требуется для заполнения свойств объекта значениями одного класса значениями свойств объектов другого класса,
/// применяется при создании класса-описывающего сущность в хранилище из класса SetBindingModel
/// и из класса-описывающего сущность в хранилище в класс ElementViewModel)
/// </summary>
[AttributeUsage(AttributeTargets.Property)]
public class MapConfigurationAttribute : Attribute
{
/// <summary>

6
DepartmentPortal/Common/ToolsModule/BusinessLogics/Mapper.cs → DepartmentPortal/Common/ToolsModule/ManagmentMapping/Mapper.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/BindingModels/AccessBindingModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessBindingModel.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Enums/AccessOperation.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessOperation.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Enums/AccessType.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/AccessType.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Attributes/CheckRigthForMapAttribute.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/CheckRigthForMapAttribute.cs
View File

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

2
DepartmentPortal/Common/ToolsModule/Interfaces/IEntitySecurityExtenstion.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/IEntitySecurityExtenstion.cs
View File

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

13
DepartmentPortal/Common/ToolsModule/Interfaces/ISecurityManager.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/ISecurityManager.cs
View File

@ -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
{
/// <summary>
/// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя
/// </summary>
public interface ISecurityManager
/// <summary>
/// Интерфейс для аутентификации пользователя и проверки доступа к операциям для пользователя
/// </summary>
public interface ISecurityManager
{
/// <summary>
/// Аутентифицированный пользователь

13
DepartmentPortal/Common/ToolsModule/Models/SecurityManagerCheckAccessModel.cs → DepartmentPortal/Common/ToolsModule/ManagmentSecurity/SecurityManagerCheckAccessModel.cs
View File

@ -1,12 +1,9 @@
using ToolsModule.BindingModels;
using ToolsModule.Enums;
namespace ToolsModule.Models
namespace ToolsModule.ManagmentSecurity
{
/// <summary>
/// Данные для проверки доступа
/// </summary>
public class SecurityManagerCheckAccessModel
/// <summary>
/// Данные для проверки доступа
/// </summary>
public class SecurityManagerCheckAccessModel
{
/// <summary>
/// Данные по пользователю

4
DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanBusinessLogic.cs
View File

@ -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
{

4
DepartmentPortal/Department/DepartmentBusinessLogic/BusinessLogics/GenericBusinessLogic/AcademicPlanRecordBusinessLogic.cs
View File

@ -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
{

Some files were not shown because too many files have changed in this diff Show More