обновил дизайн, добавил дашборд

This commit is contained in:
Zuev
2026-05-31 16:18:27 +03:00
parent e2a3553a09
commit 7926038bdc
36 changed files with 2364 additions and 1184 deletions

View File

@@ -36,6 +36,7 @@ public record RenderedLessonDto(
String activityType,
Integer lessonTypeAcademicHours,
Integer consumedLessonTypeAcademicHoursBeforeLesson,
Integer remainingLessonTypeAcademicHoursAfterLesson
Integer remainingLessonTypeAcademicHoursAfterLesson,
com.magistr.app.model.ScheduleParity ruleParity
) {
}

View File

@@ -406,7 +406,8 @@ public class ScheduleGeneratorService {
"Т",
lessonTypeAcademicHours,
consumedBeforeLesson,
remainingAfterLesson
remainingAfterLesson,
slot.getParity()
);
}

View File

@@ -136,7 +136,8 @@ public class ScheduleQueryService {
lesson.activityType(),
lesson.lessonTypeAcademicHours(),
lesson.consumedLessonTypeAcademicHoursBeforeLesson(),
lesson.remainingLessonTypeAcademicHoursAfterLesson()
lesson.remainingLessonTypeAcademicHoursAfterLesson(),
lesson.ruleParity()
);
}
@@ -273,7 +274,8 @@ public class ScheduleQueryService {
source.activityType(),
source.lessonTypeAcademicHours(),
source.consumedLessonTypeAcademicHoursBeforeLesson(),
source.remainingLessonTypeAcademicHoursAfterLesson()
source.remainingLessonTypeAcademicHoursAfterLesson(),
source.ruleParity()
);
}
}