实验视图
This commit is contained in:
@@ -94,13 +94,18 @@ public sealed class ExperimentGradesController(
|
||||
.ToListAsync(cancellationToken);
|
||||
var projects = await source
|
||||
.Where(x => taskIds.Contains(x.TeachingTaskId))
|
||||
.OrderBy(x => x.Code)
|
||||
.OrderBy(x => x.ScheduleWeek ?? int.MaxValue)
|
||||
.ThenBy(x => x.ScheduleEntry == null ? int.MaxValue : x.ScheduleEntry.DayOfWeek)
|
||||
.ThenBy(x => x.ScheduleEntry == null ? int.MaxValue : x.ScheduleEntry.StartPeriod)
|
||||
.ThenBy(x => x.StartDate)
|
||||
.ThenBy(x => x.Code)
|
||||
.Select(x => new
|
||||
{
|
||||
x.Id,
|
||||
x.Code,
|
||||
x.Name,
|
||||
x.ArrangementMode,
|
||||
x.ScheduleWeek,
|
||||
ProjectStatus = x.Status,
|
||||
x.TeachingTaskId,
|
||||
x.TeachingTask!.TaskNumber,
|
||||
@@ -113,6 +118,14 @@ public sealed class ExperimentGradesController(
|
||||
TeacherNames = x.TeachingTask.Teachers
|
||||
.OrderByDescending(item => item.IsPrimary)
|
||||
.Select(item => item.Teacher!.Name),
|
||||
ScheduleEntry = x.ScheduleEntry == null
|
||||
? null
|
||||
: new
|
||||
{
|
||||
x.ScheduleEntry.DayOfWeek,
|
||||
x.ScheduleEntry.StartPeriod,
|
||||
x.ScheduleEntry.PeriodCount
|
||||
},
|
||||
Sheet = x.GradeSheet == null
|
||||
? null
|
||||
: new
|
||||
@@ -356,6 +369,15 @@ public sealed class ExperimentGradesController(
|
||||
ProjectCode = x.ExperimentProject!.Code,
|
||||
ProjectName = x.ExperimentProject.Name,
|
||||
x.ExperimentProject.ArrangementMode,
|
||||
x.ExperimentProject.ScheduleWeek,
|
||||
ScheduleEntry = x.ExperimentProject.ScheduleEntry == null
|
||||
? null
|
||||
: new
|
||||
{
|
||||
x.ExperimentProject.ScheduleEntry.DayOfWeek,
|
||||
x.ExperimentProject.ScheduleEntry.StartPeriod,
|
||||
x.ExperimentProject.ScheduleEntry.PeriodCount
|
||||
},
|
||||
x.ExperimentProject.TeachingTaskId,
|
||||
x.ExperimentProject.TeachingTask!.TaskNumber,
|
||||
TaskName = x.ExperimentProject.TeachingTask.Name,
|
||||
|
||||
Reference in New Issue
Block a user