обновил дизайн, добавил дашборд
This commit is contained in:
@@ -36,6 +36,7 @@ public record RenderedLessonDto(
|
||||
String activityType,
|
||||
Integer lessonTypeAcademicHours,
|
||||
Integer consumedLessonTypeAcademicHoursBeforeLesson,
|
||||
Integer remainingLessonTypeAcademicHoursAfterLesson
|
||||
Integer remainingLessonTypeAcademicHoursAfterLesson,
|
||||
com.magistr.app.model.ScheduleParity ruleParity
|
||||
) {
|
||||
}
|
||||
|
||||
@@ -406,7 +406,8 @@ public class ScheduleGeneratorService {
|
||||
"Т",
|
||||
lessonTypeAcademicHours,
|
||||
consumedBeforeLesson,
|
||||
remainingAfterLesson
|
||||
remainingAfterLesson,
|
||||
slot.getParity()
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@@ -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()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user