已改成“普通排课与实验学时分离”:
普通课表学时 = 总学时 − 实践学时。 自动排课、手工排课、课表发布都会阻止把实践学时重复排入。 全部为实践学时的课程应设为“非排时课程”,再由实验管理安排。 教学任务和排课页面会显示“常规 / 实践学时”。 已有教学任务即使仍保存旧周学时,排课时也会按拆分后的课程学时计算。 无需数据库迁移。
This commit is contained in:
@@ -136,6 +136,91 @@ public sealed class AutomaticScheduleGeneratorTests
|
||||
Assert.Empty(await db.ScheduleEntries.ToListAsync());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Generator_excludes_practice_hours_from_regular_schedule()
|
||||
{
|
||||
await using var connection = new SqliteConnection("Data Source=:memory:");
|
||||
await connection.OpenAsync();
|
||||
var options = new DbContextOptionsBuilder<AppDbContext>()
|
||||
.UseSqlite(connection)
|
||||
.Options;
|
||||
await using var db = new AppDbContext(options);
|
||||
await db.Database.EnsureCreatedAsync();
|
||||
|
||||
var term = new AcademicTerm
|
||||
{
|
||||
Code = "2026-LAB",
|
||||
Name = "2026 实验学时测试",
|
||||
AcademicYear = "2026-2027",
|
||||
Season = TermSeason.Autumn,
|
||||
StartDate = new DateOnly(2026, 9, 1),
|
||||
EndDate = new DateOnly(2027, 1, 15)
|
||||
};
|
||||
var college = new College { Code = "LAB", Name = "实验学院" };
|
||||
var course = new Course
|
||||
{
|
||||
Code = "LAB-01",
|
||||
Name = "实验混合课程",
|
||||
College = college,
|
||||
Credits = 2,
|
||||
TotalHours = 32,
|
||||
LectureHours = 16,
|
||||
PracticeHours = 16
|
||||
};
|
||||
var task = new TeachingTask
|
||||
{
|
||||
TaskNumber = "TASK-LAB",
|
||||
Name = "实验混合教学班",
|
||||
AcademicTerm = term,
|
||||
Course = course,
|
||||
Capacity = 30,
|
||||
StartWeek = 1,
|
||||
EndWeek = 16,
|
||||
WeeklyHours = 2,
|
||||
Status = TeachingTaskStatus.Published
|
||||
};
|
||||
var plan = new SchedulePlan
|
||||
{
|
||||
AcademicTerm = term,
|
||||
Name = "实验学时拆分测试",
|
||||
Version = "V1"
|
||||
};
|
||||
db.AddRange(term, college, course, task, plan);
|
||||
db.ScheduleTimeSlots.AddRange(
|
||||
new ScheduleTimeSlot
|
||||
{
|
||||
AcademicTerm = term,
|
||||
PeriodNumber = 1,
|
||||
Name = "第 1 节",
|
||||
StartsAt = new TimeOnly(8, 0),
|
||||
EndsAt = new TimeOnly(8, 45)
|
||||
},
|
||||
new ScheduleTimeSlot
|
||||
{
|
||||
AcademicTerm = term,
|
||||
PeriodNumber = 2,
|
||||
Name = "第 2 节",
|
||||
StartsAt = new TimeOnly(8, 55),
|
||||
EndsAt = new TimeOnly(9, 40)
|
||||
});
|
||||
db.TeachingTaskScheduleConstraints.Add(
|
||||
new TeachingTaskScheduleConstraint
|
||||
{
|
||||
TeachingTask = task,
|
||||
RequiresClassroom = false
|
||||
});
|
||||
await db.SaveChangesAsync();
|
||||
|
||||
var result = await new AutomaticScheduleGenerator(db)
|
||||
.GenerateAsync(plan, CancellationToken.None);
|
||||
|
||||
Assert.Equal(1, result.CreatedEntries);
|
||||
Assert.Equal(1, result.CompletedTasks);
|
||||
Assert.Equal(
|
||||
1,
|
||||
(await db.ScheduleEntries.SingleAsync()).PeriodCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Generator_schedules_roomless_course_within_allowed_time()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user