From 05dadff455f3a3cf02239d016d00cab761d96457 Mon Sep 17 00:00:00 2001 From: Polianin Nikita Date: Sun, 19 May 2024 11:49:03 +0300 Subject: [PATCH] feat: add specific week --- Domain/Schedule/Lesson.cs | 4 ++-- Domain/Schedule/LessonAssociation.cs | 2 ++ Domain/Schedule/SpecificWeek.cs | 10 ++++++++++ Domain/Schedule/TypeOfOccupation.cs | 3 +-- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 Domain/Schedule/SpecificWeek.cs diff --git a/Domain/Schedule/Lesson.cs b/Domain/Schedule/Lesson.cs index 3ff5e52..e854d3e 100644 --- a/Domain/Schedule/Lesson.cs +++ b/Domain/Schedule/Lesson.cs @@ -9,13 +9,13 @@ public class Lesson public bool IsEven { get; set; } public DayOfWeek DayOfWeek { get; set; } public int PairNumber { get; set; } + public bool? IsExcludedWeeks { get; set; } public int GroupId { get; set; } public Group? Group { get; set; } - public int TypeOfOccupationId { get; set; } - public TypeOfOccupation? TypeOfOccupation { get; set; } public int DisciplineId { get; set; } public Discipline? Discipline { get; set; } public List? LessonAssociations { get; set; } + public List? SpecificWeeks { get; set; } } \ No newline at end of file diff --git a/Domain/Schedule/LessonAssociation.cs b/Domain/Schedule/LessonAssociation.cs index 89b5651..e101bdd 100644 --- a/Domain/Schedule/LessonAssociation.cs +++ b/Domain/Schedule/LessonAssociation.cs @@ -5,6 +5,8 @@ public class LessonAssociation public int Id { get; set; } public string? LinkToMeet { get; set; } + public int TypeOfOccupationId { get; set; } + public TypeOfOccupation? TypeOfOccupation { get; set; } public int LessonId { get; set; } public Lesson? Lesson { get; set; } public int? ProfessorId { get; set; } diff --git a/Domain/Schedule/SpecificWeek.cs b/Domain/Schedule/SpecificWeek.cs new file mode 100644 index 0000000..b0adf31 --- /dev/null +++ b/Domain/Schedule/SpecificWeek.cs @@ -0,0 +1,10 @@ +namespace Mirea.Api.DataAccess.Domain.Schedule; + +public class SpecificWeek +{ + public int Id { get; set; } + public int WeekNumber { get; set; } + + public int LessonId { get; set; } + public Lesson? Lesson { get; set; } +} \ No newline at end of file diff --git a/Domain/Schedule/TypeOfOccupation.cs b/Domain/Schedule/TypeOfOccupation.cs index a2152a8..4a52a4a 100644 --- a/Domain/Schedule/TypeOfOccupation.cs +++ b/Domain/Schedule/TypeOfOccupation.cs @@ -6,7 +6,6 @@ public class TypeOfOccupation { public int Id { get; set; } public required string ShortName { get; set; } - public string? FullName { get; set; } - public List? Lessons { get; set; } + public List? Lessons { get; set; } } \ No newline at end of file