From 81b423839409feb33faedfab81198e5ec091c5c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=91=D0=B0=D0=BA=D0=B0?= =?UTF-8?q?=D0=BB=D1=8C=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 5 Jun 2025 01:44:33 +0400 Subject: [PATCH] =?UTF-8?q?=D1=87=D1=82=D0=BE-=D1=82=D0=BE=20=D0=BD=D0=B5?= =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D1=8F=D1=82=D0=BD=D0=BE=D0=B5=20=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=D0=B0=20=D1=81=20?= =?UTF-8?q?=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=BE=D0=BC=20=D0=BF=D0=BE=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BD=D1=82=D0=B8=D0=BD=D0=B3=D0=B5=D0=BD=D1=82?= =?UTF-8?q?=D1=83.=20=D0=BD=D1=83=D0=B6=D0=BD=D0=BE=20=D0=BF=D0=B5=D1=80?= =?UTF-8?q?=D0=B5=D1=81=D0=BC=D0=BE=D1=82=D1=80=D0=B5=D1=82=D1=8C=20=D1=81?= =?UTF-8?q?=D0=BC=D1=8B=D1=81=D0=9E=D0=BB=20=D1=8D=D1=82=D0=BE=D0=B3=D0=BE?= =?UTF-8?q?=20=D0=B2=D1=81=D0=B5=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogic/AcademicLeaveOrderLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/AddStudentOrderLogic.cs | 32 +++++++++++++++++++ .../ChangeSpecializationOrderLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/ContingentReportLogic.cs | 32 +++++++++++++++++++ .../Controller/BusinessLogic/DeanLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/ExpulsionOrderLogic.cs | 32 +++++++++++++++++++ .../Controller/BusinessLogic/FacultLogic.cs | 32 +++++++++++++++++++ .../Controller/BusinessLogic/GroupLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/LearningPlanLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/NextCourseOrderLogic.cs | 32 +++++++++++++++++++ .../BusinessLogic/SpecializationLogic.cs | 32 +++++++++++++++++++ .../Controller/BusinessLogic/StudentLogic.cs | 32 +++++++++++++++++++ .../Controller/BusinessLogic/UserLogic.cs | 32 +++++++++++++++++++ .../Contracts/SearchStudentModel.cs | 8 +++++ .../Controller/Controller.csproj | 3 +- .../{ => Repository}/IRepository.cs | 2 +- .../DataModels/Models/AbstractOrder.cs | 6 ++-- .../DataModels/Models/ContingentReport.cs | 9 +++--- .../DataModels/Models/Dean.cs | 6 ++-- .../DataModels/Models/Facult.cs | 8 ++--- .../DataModels/Models/Group.cs | 10 ++++-- .../DataModels/Models/LearningPlan.cs | 2 +- .../DataModels/Models/Specialization.cs | 8 ++--- .../DataModels/Models/Student.cs | 6 ++-- .../DataModels/Models/User.cs | 6 ++-- .../DataModels/Orders/AcademicLeaveOrder.cs | 6 ++-- .../DataModels/Orders/AddStudentsOrder.cs | 6 ++-- .../Orders/ChangeSpecializationOrder.cs | 6 ++-- .../DataModels/Orders/ExpulsionOrder.cs | 6 ++-- .../DataModels/Orders/NextCourseOrder.cs | 4 +-- 30 files changed, 472 insertions(+), 46 deletions(-) create mode 100644 contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/AddStudentOrderLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/ChangeSpecializationOrderLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/ContingentReportLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/ExpulsionOrderLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/GroupLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/NextCourseOrderLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/StudentLogic.cs create mode 100644 contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs create mode 100644 contingent_report_desktop/Controller/Contracts/SearchStudentModel.cs rename contingent_report_desktop/Controller/{ => Repository}/IRepository.cs (86%) diff --git a/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs new file mode 100644 index 0000000..4cec4b6 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Orders; + +namespace Controller.BusinessLogic +{ + public class AcademicLeaveOrderLogic : AbstractLogic + { + public override NextCourseOrder add(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override NextCourseOrder remove(int id) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder update(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/AddStudentOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/AddStudentOrderLogic.cs new file mode 100644 index 0000000..59ae97d --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/AddStudentOrderLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Orders; + +namespace Controller.BusinessLogic +{ + public class AddStudentOrderLogic : AbstractLogic + { + public override NextCourseOrder add(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override NextCourseOrder remove(int id) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder update(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/ChangeSpecializationOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/ChangeSpecializationOrderLogic.cs new file mode 100644 index 0000000..d0981c6 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/ChangeSpecializationOrderLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Orders; + +namespace Controller.BusinessLogic +{ + public class ChangeSpecializationOrderLogic : AbstractLogic + { + public override ChangeSpecializationOrder add(ChangeSpecializationOrder entity) + { + throw new NotImplementedException(); + } + + public override ChangeSpecializationOrder get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override ChangeSpecializationOrder remove(int id) + { + throw new NotImplementedException(); + } + + public override ChangeSpecializationOrder update(ChangeSpecializationOrder entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/ContingentReportLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/ContingentReportLogic.cs new file mode 100644 index 0000000..0ef1dae --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/ContingentReportLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class ContingentReportLogic : AbstractLogic> + { + public override ContingentReport add(ContingentReport entity) + { + throw new NotImplementedException(); + } + + public override ContingentReport get(int id) + { + throw new NotImplementedException(); + } + + public override List> getAll() + { + throw new NotImplementedException(); + } + + public override ContingentReport remove(int id) + { + throw new NotImplementedException(); + } + + public override ContingentReport update(ContingentReport entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs new file mode 100644 index 0000000..8ac8a49 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class DeanLogic : AbstractLogic + { + public override LearningPlan add(LearningPlan entity) + { + throw new NotImplementedException(); + } + + public override LearningPlan get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override LearningPlan remove(int id) + { + throw new NotImplementedException(); + } + + public override LearningPlan update(LearningPlan entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/ExpulsionOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/ExpulsionOrderLogic.cs new file mode 100644 index 0000000..7a06e26 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/ExpulsionOrderLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Orders; + +namespace Controller.BusinessLogic +{ + public class ExpulsionOrderLogic : AbstractLogic + { + public override NextCourseOrder add(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override NextCourseOrder remove(int id) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder update(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs new file mode 100644 index 0000000..f8ca222 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class FacultLogic : AbstractLogic + { + public override LearningPlan add(LearningPlan entity) + { + throw new NotImplementedException(); + } + + public override LearningPlan get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override LearningPlan remove(int id) + { + throw new NotImplementedException(); + } + + public override LearningPlan update(LearningPlan entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/GroupLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/GroupLogic.cs new file mode 100644 index 0000000..9c16a0a --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/GroupLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class GroupLogic : AbstractLogic + { + public override Group add(Group entity) + { + throw new NotImplementedException(); + } + + public override Group get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override Group remove(int id) + { + throw new NotImplementedException(); + } + + public override Group update(Group entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs new file mode 100644 index 0000000..d4b781d --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class LearningPlanLogic : AbstractLogic + { + public override LearningPlan add(LearningPlan entity) + { + throw new NotImplementedException(); + } + + public override LearningPlan get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override LearningPlan remove(int id) + { + throw new NotImplementedException(); + } + + public override LearningPlan update(LearningPlan entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/NextCourseOrderLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/NextCourseOrderLogic.cs new file mode 100644 index 0000000..39f13a1 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/NextCourseOrderLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Orders; + +namespace Controller.BusinessLogic +{ + public class NextCourseOrderLogic : AbstractLogic + { + public override NextCourseOrder add(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override NextCourseOrder remove(int id) + { + throw new NotImplementedException(); + } + + public override NextCourseOrder update(NextCourseOrder entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs new file mode 100644 index 0000000..d979ed3 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class SpecializationLogic : AbstractLogic + { + public override LearningPlan add(LearningPlan entity) + { + throw new NotImplementedException(); + } + + public override LearningPlan get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override LearningPlan remove(int id) + { + throw new NotImplementedException(); + } + + public override LearningPlan update(LearningPlan entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/StudentLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/StudentLogic.cs new file mode 100644 index 0000000..dcb2fce --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/StudentLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class StudentLogic : AbstractLogic + { + public override Student add(Student entity) + { + throw new NotImplementedException(); + } + + public override Student get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override Student remove(int id) + { + throw new NotImplementedException(); + } + + public override Student update(Student entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs b/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs new file mode 100644 index 0000000..6813bc5 --- /dev/null +++ b/contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs @@ -0,0 +1,32 @@ +using DataModels.Models; + +namespace Controller.BusinessLogic +{ + public class UserLogic : AbstractLogic + { + public override LearningPlan add(LearningPlan entity) + { + throw new NotImplementedException(); + } + + public override LearningPlan get(int id) + { + throw new NotImplementedException(); + } + + public override List getAll() + { + throw new NotImplementedException(); + } + + public override LearningPlan remove(int id) + { + throw new NotImplementedException(); + } + + public override LearningPlan update(LearningPlan entity) + { + throw new NotImplementedException(); + } + } +} diff --git a/contingent_report_desktop/Controller/Contracts/SearchStudentModel.cs b/contingent_report_desktop/Controller/Contracts/SearchStudentModel.cs new file mode 100644 index 0000000..54bae32 --- /dev/null +++ b/contingent_report_desktop/Controller/Contracts/SearchStudentModel.cs @@ -0,0 +1,8 @@ +namespace Controller.Contracts +{ + public class SearchStudentModel + { + public int Id { get; set; } + public string? FIO { get; set; } = string.Empty; + } +} diff --git a/contingent_report_desktop/Controller/Controller.csproj b/contingent_report_desktop/Controller/Controller.csproj index 898b1e2..f1b5623 100644 --- a/contingent_report_desktop/Controller/Controller.csproj +++ b/contingent_report_desktop/Controller/Controller.csproj @@ -7,8 +7,7 @@ - - + diff --git a/contingent_report_desktop/Controller/IRepository.cs b/contingent_report_desktop/Controller/Repository/IRepository.cs similarity index 86% rename from contingent_report_desktop/Controller/IRepository.cs rename to contingent_report_desktop/Controller/Repository/IRepository.cs index ba763ad..f421c5b 100644 --- a/contingent_report_desktop/Controller/IRepository.cs +++ b/contingent_report_desktop/Controller/Repository/IRepository.cs @@ -1,4 +1,4 @@ -namespace Controller +namespace Controller.Repository { public interface IRepository where T : class { diff --git a/contingent_report_desktop/DataModels/Models/AbstractOrder.cs b/contingent_report_desktop/DataModels/Models/AbstractOrder.cs index bb16c8d..dd6f68a 100644 --- a/contingent_report_desktop/DataModels/Models/AbstractOrder.cs +++ b/contingent_report_desktop/DataModels/Models/AbstractOrder.cs @@ -5,7 +5,7 @@ namespace DataModels.Models { public abstract class AbstractOrder : Model { - protected AbstractOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + protected AbstractOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) { OrderType = orderType; Reason = reason; @@ -15,7 +15,7 @@ namespace DataModels.Models Students = students; } - protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : this(orderType, reason, number, currentDean, date, students) { Id = id; @@ -25,7 +25,7 @@ namespace DataModels.Models public OrderType OrderType { get; set; } public Reason Reason { get; set; } public int Number { get; set; } - public Dean? CurrentDean { get; set; } + public LearningPlan? CurrentDean { get; set; } public DateTime Date { get; set; } = DateTime.Now; public abstract string TemplatePath { get; } diff --git a/contingent_report_desktop/DataModels/Models/ContingentReport.cs b/contingent_report_desktop/DataModels/Models/ContingentReport.cs index 38b4c86..5f47d7a 100644 --- a/contingent_report_desktop/DataModels/Models/ContingentReport.cs +++ b/contingent_report_desktop/DataModels/Models/ContingentReport.cs @@ -2,20 +2,19 @@ namespace DataModels.Models { - public class ContingentReport + public class ContingentReport where T : class { - public List? Specializations { get; set; } - public Dean? CurrentDean { get; set; } + public List? Contingent { get; set; } + public LearningPlan? CurrentDean { get; set; } public DateTime? Date { get; set; } = DateTime.Now; public string TemplatePath { get; } = string.Empty; - private int GetStudentsCount(List specializations) + private int GetStudentsCount() { return 1; } public void FillTemplate(DocX doc) { - } public void CreateDocument(string path) { diff --git a/contingent_report_desktop/DataModels/Models/Dean.cs b/contingent_report_desktop/DataModels/Models/Dean.cs index 6610b87..ad07894 100644 --- a/contingent_report_desktop/DataModels/Models/Dean.cs +++ b/contingent_report_desktop/DataModels/Models/Dean.cs @@ -1,8 +1,8 @@ namespace DataModels.Models { - public class Dean : User + public class LearningPlan : LearningPlan { - public Dean(string fIO, string email, string password, int code2FA, DateTime date2FA) + public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA) : base(fIO, email, password, code2FA, date2FA) { FIO = fIO; @@ -11,7 +11,7 @@ Code2FA = code2FA; } - public Dean(int id, string fio, string email, string password, int code2FA, DateTime date2FA) + public LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA) : base(id, fio, email, password, code2FA, date2FA) { Id = id; diff --git a/contingent_report_desktop/DataModels/Models/Facult.cs b/contingent_report_desktop/DataModels/Models/Facult.cs index f1bfef3..a5a823a 100644 --- a/contingent_report_desktop/DataModels/Models/Facult.cs +++ b/contingent_report_desktop/DataModels/Models/Facult.cs @@ -1,19 +1,19 @@ namespace DataModels.Models { - public class Facult : Model + public class LearningPlan : Model { - public Facult(string name, Dean dean) + public LearningPlan(string name, LearningPlan dean) { Name = name; Dean = dean; } - public Facult(int id, string name, Dean dean) : this(name, dean) + public LearningPlan(int id, string name, LearningPlan dean) : this(name, dean) { Id = id; } public string Name { get; set; } = string.Empty; - public Dean? Dean { get; set; } + public LearningPlan? Dean { get; set; } } } diff --git a/contingent_report_desktop/DataModels/Models/Group.cs b/contingent_report_desktop/DataModels/Models/Group.cs index 9858e73..1b0f56a 100644 --- a/contingent_report_desktop/DataModels/Models/Group.cs +++ b/contingent_report_desktop/DataModels/Models/Group.cs @@ -2,20 +2,24 @@ { public class Group : Model { + // здесь есть максимально допустимое количество студентов public string Name { get; set; } = string.Empty; public int Number { get; set; } public int Course { get; set; } - public Specialization? Specialization { get; set; } + public int MaxStudentCount { get; set; } = 30; + public LearningPlan? Specialization { get; set; } - public Group(string name, int num, int course, Specialization spec) + public Group(string name, int num, int course, LearningPlan spec) { Name = name; Number = num; Course = course; Specialization = spec; + MaxStudentCount = 30; } - public Group(int id, string name, int num, int course, Specialization spec) : this(name, num, course, spec) + public Group(int id, string name, int num, int course, LearningPlan spec) + : this(name, num, course, spec) { Id = id; } diff --git a/contingent_report_desktop/DataModels/Models/LearningPlan.cs b/contingent_report_desktop/DataModels/Models/LearningPlan.cs index cc67cfb..046ba0d 100644 --- a/contingent_report_desktop/DataModels/Models/LearningPlan.cs +++ b/contingent_report_desktop/DataModels/Models/LearningPlan.cs @@ -2,6 +2,6 @@ { public class LearningPlan { - public Specialization Specialization { get; set; } + public LearningPlan Specialization { get; set; } } } diff --git a/contingent_report_desktop/DataModels/Models/Specialization.cs b/contingent_report_desktop/DataModels/Models/Specialization.cs index a682ef8..d2ec4ba 100644 --- a/contingent_report_desktop/DataModels/Models/Specialization.cs +++ b/contingent_report_desktop/DataModels/Models/Specialization.cs @@ -1,18 +1,18 @@ namespace DataModels.Models { - public class Specialization : Model + public class LearningPlan : Model { public string Name { get; set; } = string.Empty; public string Code { get; set; } = string.Empty; - public Facult? Facult { get; set; } - public Specialization(Facult facult, string name, string code) + public LearningPlan? Facult { get; set; } + public LearningPlan(LearningPlan facult, string name, string code) { Facult = facult; Name = name; Code = code; } - public Specialization(Facult facult, string name, string code, int id) : this(facult, name, code ) + public LearningPlan(LearningPlan facult, string name, string code, int id) : this(facult, name, code ) { Id = id; } diff --git a/contingent_report_desktop/DataModels/Models/Student.cs b/contingent_report_desktop/DataModels/Models/Student.cs index 601206d..0cd82df 100644 --- a/contingent_report_desktop/DataModels/Models/Student.cs +++ b/contingent_report_desktop/DataModels/Models/Student.cs @@ -1,9 +1,9 @@  namespace DataModels.Models { - public class Student : User + public class Student : LearningPlan { - public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, Specialization spec, Group group) + public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, LearningPlan spec, Group group) : base(fIO, email, password, code2FA, date2FA) { FIO = fIO; @@ -21,7 +21,7 @@ namespace DataModels.Models Id = id; } - public Specialization? Specialization { get; set; } + public LearningPlan? Specialization { get; set; } public Group? Group { get; set; } } diff --git a/contingent_report_desktop/DataModels/Models/User.cs b/contingent_report_desktop/DataModels/Models/User.cs index 2e2e603..424f8ae 100644 --- a/contingent_report_desktop/DataModels/Models/User.cs +++ b/contingent_report_desktop/DataModels/Models/User.cs @@ -1,8 +1,8 @@ namespace DataModels.Models { - public class User : Model + public class LearningPlan : Model { - public User(string fIO, string email, string password, int code2FA, DateTime date2FA) + public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA) { FIO = fIO; Email = email; @@ -11,7 +11,7 @@ Date2FA = date2FA; } - public User(int id, string fio, string email, string password, int code2FA, DateTime date2FA) + public LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA) : this(fio, email, password, code2FA, date2FA) { Id = id; diff --git a/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs b/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs index ab02a54..e8ff29f 100644 --- a/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs +++ b/contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs @@ -4,17 +4,17 @@ using Xceed.Words.NET; namespace DataModels.Orders { - public class AcademicLeaveOrder : AbstractOrder + public class NextCourseOrder : AbstractOrder { public DateTime? DateStart { get; set; } public DateTime? DateEnd { get; set; } - public AcademicLeaveOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(orderType, reason, number, currentDean, date, students) { } - public AcademicLeaveOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(id, orderType, reason, number, currentDean, date, students) { Id = id; diff --git a/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs b/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs index 6deb1cc..54acc2f 100644 --- a/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs +++ b/contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs @@ -4,14 +4,14 @@ using Xceed.Words.NET; namespace DataModels.Orders { - public class AddStudentsOrder : AbstractOrder + public class NextCourseOrder : AbstractOrder { - public AddStudentsOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(orderType, reason, number, currentDean, date, students) { } - public AddStudentsOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(id, orderType, reason, number, currentDean, date, students) { Id = id; diff --git a/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs b/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs index ddc72a3..4c7ab9b 100644 --- a/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs +++ b/contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs @@ -6,18 +6,18 @@ namespace DataModels.Orders { public class ChangeSpecializationOrder : AbstractOrder { - public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(orderType, reason, number, currentDean, date, students) { } - public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, + public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(id, orderType, reason, number, currentDean, date, students) { Id = id; } - public Specialization? NewSpec { get; set; } + public LearningPlan? NewSpec { get; set; } public override string TemplatePath => throw new NotImplementedException(); diff --git a/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs b/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs index 87e9d6b..54acc2f 100644 --- a/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs +++ b/contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs @@ -4,14 +4,14 @@ using Xceed.Words.NET; namespace DataModels.Orders { - public class ExpulsionOrder : AbstractOrder + public class NextCourseOrder : AbstractOrder { - public ExpulsionOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(orderType, reason, number, currentDean, date, students) { } - public ExpulsionOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(id, orderType, reason, number, currentDean, date, students) { Id = id; diff --git a/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs b/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs index cb658a8..54acc2f 100644 --- a/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs +++ b/contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs @@ -6,12 +6,12 @@ namespace DataModels.Orders { public class NextCourseOrder : AbstractOrder { - public NextCourseOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(orderType, reason, number, currentDean, date, students) { } - public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List students) + public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List students) : base(id, orderType, reason, number, currentDean, date, students) { Id = id;