ns.potapov/piaps-course-work-university
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

поправила откуда не возьмись какую-то проблему

Browse Source
This commit is contained in:
Елена Бакальская
2025-06-06 23:53:45 +04:00
parent 81b4238394
commit 42636941e8
20 changed files with 71 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
contingent_report_desktop/Controller/BusinessLogic/AcademicLeaveOrderLogic.cs
View File

@@ -2,31 +2,8 @@
namespace Controller.BusinessLogic
{
public class AcademicLeaveOrderLogic : AbstractLogic<NextCourseOrder>
public class AcademicLeaveOrderLogic
{
public override NextCourseOrder add(NextCourseOrder entity)
{
throw new NotImplementedException();
}
public override NextCourseOrder get(int id)
{
throw new NotImplementedException();
}
public override List<NextCourseOrder> getAll()
{
throw new NotImplementedException();
}
public override NextCourseOrder remove(int id)
{
throw new NotImplementedException();
}
public override NextCourseOrder update(NextCourseOrder entity)
{
throw new NotImplementedException();
}
}
}

12
contingent_report_desktop/Controller/BusinessLogic/DeanLogic.cs
View File

@@ -2,29 +2,29 @@
namespace Controller.BusinessLogic
{
public class DeanLogic : AbstractLogic<LearningPlan>
public class DeanLogic : AbstractLogic<User>
{
public override LearningPlan add(LearningPlan entity)
public override User add(User entity)
{
throw new NotImplementedException();
}
public override LearningPlan get(int id)
public override User get(int id)
{
throw new NotImplementedException();
}
public override List<LearningPlan> getAll()
public override List<User> getAll()
{
throw new NotImplementedException();
}
public override LearningPlan remove(int id)
public override User remove(int id)
{
throw new NotImplementedException();
}
public override LearningPlan update(LearningPlan entity)
public override User update(User entity)
{
throw new NotImplementedException();
}

12
contingent_report_desktop/Controller/BusinessLogic/FacultLogic.cs
View File

@@ -2,29 +2,29 @@
namespace Controller.BusinessLogic
{
public class FacultLogic : AbstractLogic<LearningPlan>
public class FacultLogic : AbstractLogic<User>
{
public override LearningPlan add(LearningPlan entity)
public override User add(User entity)
{
throw new NotImplementedException();
}
public override LearningPlan get(int id)
public override User get(int id)
{
throw new NotImplementedException();
}
public override List<LearningPlan> getAll()
public override List<User> getAll()
{
throw new NotImplementedException();
}
public override LearningPlan remove(int id)
public override User remove(int id)
{
throw new NotImplementedException();
}
public override LearningPlan update(LearningPlan entity)
public override User update(User entity)
{
throw new NotImplementedException();
}

12
contingent_report_desktop/Controller/BusinessLogic/LearningPlanLogic.cs
View File

@@ -2,29 +2,29 @@
namespace Controller.BusinessLogic
{
public class LearningPlanLogic : AbstractLogic<LearningPlan>
public class LearningPlanLogic : AbstractLogic<User>
{
public override LearningPlan add(LearningPlan entity)
public override User add(User entity)
{
throw new NotImplementedException();
}
public override LearningPlan get(int id)
public override User get(int id)
{
throw new NotImplementedException();
}
public override List<LearningPlan> getAll()
public override List<User> getAll()
{
throw new NotImplementedException();
}
public override LearningPlan remove(int id)
public override User remove(int id)
{
throw new NotImplementedException();
}
public override LearningPlan update(LearningPlan entity)
public override User update(User entity)
{
throw new NotImplementedException();
}

12
contingent_report_desktop/Controller/BusinessLogic/SpecializationLogic.cs
View File

@@ -2,29 +2,29 @@
namespace Controller.BusinessLogic
{
public class SpecializationLogic : AbstractLogic<LearningPlan>
public class SpecializationLogic : AbstractLogic<User>
{
public override LearningPlan add(LearningPlan entity)
public override User add(User entity)
{
throw new NotImplementedException();
}
public override LearningPlan get(int id)
public override User get(int id)
{
throw new NotImplementedException();
}
public override List<LearningPlan> getAll()
public override List<User> getAll()
{
throw new NotImplementedException();
}
public override LearningPlan remove(int id)
public override User remove(int id)
{
throw new NotImplementedException();
}
public override LearningPlan update(LearningPlan entity)
public override User update(User entity)
{
throw new NotImplementedException();
}

12
contingent_report_desktop/Controller/BusinessLogic/UserLogic.cs
View File

@@ -2,29 +2,29 @@
namespace Controller.BusinessLogic
{
public class UserLogic : AbstractLogic<LearningPlan>
public class UserLogic : AbstractLogic<User>
{
public override LearningPlan add(LearningPlan entity)
public override User add(User entity)
{
throw new NotImplementedException();
}
public override LearningPlan get(int id)
public override User get(int id)
{
throw new NotImplementedException();
}
public override List<LearningPlan> getAll()
public override List<User> getAll()
{
throw new NotImplementedException();
}
public override LearningPlan remove(int id)
public override User remove(int id)
{
throw new NotImplementedException();
}
public override LearningPlan update(LearningPlan entity)
public override User update(User entity)
{
throw new NotImplementedException();
}

8
contingent_report_desktop/DataModels/Models/AbstractOrder.cs
View File

@@ -5,7 +5,7 @@ namespace DataModels.Models
{
public abstract class AbstractOrder : Model
{
protected AbstractOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
protected AbstractOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
{
OrderType = orderType;
Reason = reason;
@@ -15,7 +15,7 @@ namespace DataModels.Models
Students = students;
}
protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
protected AbstractOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> 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 LearningPlan? CurrentDean { get; set; }
public Dean? CurrentDean { get; set; }
public DateTime Date { get; set; } = DateTime.Now;
public abstract string TemplatePath { get; }
@@ -36,7 +36,5 @@ namespace DataModels.Models
FillTemplate(doc);
doc.SaveAs(path);
}
}
}

2
contingent_report_desktop/DataModels/Models/ContingentReport.cs
View File

@@ -5,7 +5,7 @@ namespace DataModels.Models
public class ContingentReport<T> where T : class
{
public List<T?>? Contingent { get; set; }
public LearningPlan? CurrentDean { get; set; }
public Dean? CurrentDean { get; set; }
public DateTime? Date { get; set; } = DateTime.Now;
public string TemplatePath { get; } = string.Empty;

6
contingent_report_desktop/DataModels/Models/Dean.cs
View File

@@ -1,8 +1,8 @@
namespace DataModels.Models
{
public class LearningPlan : LearningPlan
public class Dean : User
{
public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA)
public Dean(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 LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
public Dean(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
: base(id, fio, email, password, code2FA, date2FA)
{
Id = id;

8
contingent_report_desktop/DataModels/Models/Facult.cs
View File

@@ -1,19 +1,19 @@
namespace DataModels.Models
{
public class LearningPlan : Model
public class Facult : Model
{
public LearningPlan(string name, LearningPlan dean)
public Facult(string name, Dean dean)
{
Name = name;
Dean = dean;
}
public LearningPlan(int id, string name, LearningPlan dean) : this(name, dean)
public Facult(int id, string name, Dean dean) : this(name, dean)
{
Id = id;
}
public string Name { get; set; } = string.Empty;
public LearningPlan? Dean { get; set; }
public Dean? Dean { get; set; }
}
}

6
contingent_report_desktop/DataModels/Models/Group.cs
View File

@@ -7,9 +7,9 @@
public int Number { get; set; }
public int Course { get; set; }
public int MaxStudentCount { get; set; } = 30;
public LearningPlan? Specialization { get; set; }
public Specialization? Specialization { get; set; }
public Group(string name, int num, int course, LearningPlan spec)
public Group(string name, int num, int course, Specialization spec)
{
Name = name;
Number = num;
@@ -18,7 +18,7 @@
MaxStudentCount = 30;
}
public Group(int id, string name, int num, int course, LearningPlan spec)
public Group(int id, string name, int num, int course, Specialization spec)
: this(name, num, course, spec)
{
Id = id;

2
contingent_report_desktop/DataModels/Models/LearningPlan.cs
View File

@@ -2,6 +2,6 @@
{
public class LearningPlan
{
public LearningPlan Specialization { get; set; }
public Specialization? Specialization { get; set; }
}
}

8
contingent_report_desktop/DataModels/Models/Specialization.cs
View File

@@ -1,18 +1,18 @@
namespace DataModels.Models
{
public class LearningPlan : Model
public class Specialization : Model
{
public string Name { get; set; } = string.Empty;
public string Code { get; set; } = string.Empty;
public LearningPlan? Facult { get; set; }
public LearningPlan(LearningPlan facult, string name, string code)
public Facult? Facult { get; set; }
public Specialization(Facult facult, string name, string code)
{
Facult = facult;
Name = name;
Code = code;
}
public LearningPlan(LearningPlan facult, string name, string code, int id) : this(facult, name, code )
public Specialization(Facult facult, string name, string code, int id) : this(facult, name, code )
{
Id = id;
}

6
contingent_report_desktop/DataModels/Models/Student.cs
View File

@@ -1,9 +1,9 @@

namespace DataModels.Models
{
public class Student : LearningPlan
public class Student : User
{
public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, LearningPlan spec, Group group)
public Student(string fIO, string email, string password, int code2FA, DateTime date2FA, Specialization spec, Group group)
: base(fIO, email, password, code2FA, date2FA)
{
FIO = fIO;
@@ -21,7 +21,7 @@ namespace DataModels.Models
Id = id;
}
public LearningPlan? Specialization { get; set; }
public Specialization? Specialization { get; set; }
public Group? Group { get; set; }
}

6
contingent_report_desktop/DataModels/Models/User.cs
View File

@@ -1,8 +1,8 @@
namespace DataModels.Models
{
public class LearningPlan : Model
public class User : Model
{
public LearningPlan(string fIO, string email, string password, int code2FA, DateTime date2FA)
public User(string fIO, string email, string password, int code2FA, DateTime date2FA)
{
FIO = fIO;
Email = email;
@@ -11,7 +11,7 @@
Date2FA = date2FA;
}
public LearningPlan(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
public User(int id, string fio, string email, string password, int code2FA, DateTime date2FA)
: this(fio, email, password, code2FA, date2FA)
{
Id = id;

6
contingent_report_desktop/DataModels/Orders/AcademicLeaveOrder.cs
View File

@@ -4,17 +4,17 @@ using Xceed.Words.NET;
namespace DataModels.Orders
{
public class NextCourseOrder : AbstractOrder
public class AcademicLeaveOrder : AbstractOrder
{
public DateTime? DateStart { get; set; }
public DateTime? DateEnd { get; set; }
public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public AcademicLeaveOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(orderType, reason, number, currentDean, date, students)
{
}
public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public AcademicLeaveOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(id, orderType, reason, number, currentDean, date, students)
{
Id = id;

6
contingent_report_desktop/DataModels/Orders/AddStudentsOrder.cs
View File

@@ -4,14 +4,14 @@ using Xceed.Words.NET;
namespace DataModels.Orders
{
public class NextCourseOrder : AbstractOrder
public class AddStudentsOrder : AbstractOrder
{
public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public AddStudentsOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(orderType, reason, number, currentDean, date, students)
{
}
public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public AddStudentsOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(id, orderType, reason, number, currentDean, date, students)
{
Id = id;

6
contingent_report_desktop/DataModels/Orders/ChangeSpecializationOrder.cs
View File

@@ -6,18 +6,18 @@ namespace DataModels.Orders
{
public class ChangeSpecializationOrder : AbstractOrder
{
public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public ChangeSpecializationOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(orderType, reason, number, currentDean, date, students)
{
}
public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date,
public ChangeSpecializationOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date,
List<Student> students) : base(id, orderType, reason, number, currentDean, date, students)
{
Id = id;
}
public LearningPlan? NewSpec { get; set; }
public Specialization? NewSpec { get; set; }
public override string TemplatePath => throw new NotImplementedException();

6
contingent_report_desktop/DataModels/Orders/ExpulsionOrder.cs
View File

@@ -4,14 +4,14 @@ using Xceed.Words.NET;
namespace DataModels.Orders
{
public class NextCourseOrder : AbstractOrder
public class ExpulsionOrder : AbstractOrder
{
public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public ExpulsionOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(orderType, reason, number, currentDean, date, students)
{
}
public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public ExpulsionOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(id, orderType, reason, number, currentDean, date, students)
{
Id = id;

4
contingent_report_desktop/DataModels/Orders/NextCourseOrder.cs
View File

@@ -6,12 +6,12 @@ namespace DataModels.Orders
{
public class NextCourseOrder : AbstractOrder
{
public NextCourseOrder(OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public NextCourseOrder(OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(orderType, reason, number, currentDean, date, students)
{
}
public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, LearningPlan? currentDean, DateTime date, List<Student> students)
public NextCourseOrder(int id, OrderType orderType, Reason reason, int number, Dean? currentDean, DateTime date, List<Student> students)
: base(id, orderType, reason, number, currentDean, date, students)
{
Id = id;