实验课现在直接进入普通排课流程,不再要求先到实验排课模块逐个安排。
普通“添加排课”新增“理论课 / 实验课”类型。 自动排课会分别补足理论学时和实验学时。 实验课只能安排到实验室、实训室、机房、语音室等场地。 发布课表时分别校验理论、实验学时;任一未排足都不能发布。 普通课表及 Excel 导出会标注“实验课”。 历史排课保持不变,迁移后默认识别为理论课;后续新建或修订版本时再补充实验课。
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
using Jiaowu.Api.Domain.Academic;
|
||||
using Jiaowu.Api.Infrastructure.Persistence;
|
||||
using Jiaowu.Api.Infrastructure.Scheduling;
|
||||
using Jiaowu.Api.Infrastructure.Teaching;
|
||||
using Microsoft.Data.Sqlite;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.Logging.Abstractions;
|
||||
@@ -157,6 +158,21 @@ public sealed class AutomaticScheduleGeneratorTests
|
||||
EndDate = new DateOnly(2027, 1, 15)
|
||||
};
|
||||
var college = new College { Code = "LAB", Name = "实验学院" };
|
||||
var campus = new Campus { Code = "LAB-CAMPUS", Name = "实验校区" };
|
||||
var building = new Building
|
||||
{
|
||||
Code = "LAB-BUILDING",
|
||||
Name = "实验楼",
|
||||
Campus = campus
|
||||
};
|
||||
var laboratory = new Classroom
|
||||
{
|
||||
Code = "LAB-101",
|
||||
Name = "实验室 101",
|
||||
Building = building,
|
||||
Capacity = 40,
|
||||
RoomType = "实验室"
|
||||
};
|
||||
var course = new Course
|
||||
{
|
||||
Code = "LAB-01",
|
||||
@@ -185,7 +201,7 @@ public sealed class AutomaticScheduleGeneratorTests
|
||||
Name = "实验学时拆分测试",
|
||||
Version = "V1"
|
||||
};
|
||||
db.AddRange(term, college, course, task, plan);
|
||||
db.AddRange(term, college, campus, building, laboratory, course, task, plan);
|
||||
db.ScheduleTimeSlots.AddRange(
|
||||
new ScheduleTimeSlot
|
||||
{
|
||||
@@ -203,22 +219,22 @@ public sealed class AutomaticScheduleGeneratorTests
|
||||
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(2, result.CreatedEntries);
|
||||
Assert.Equal(1, result.CompletedTasks);
|
||||
Assert.Equal(
|
||||
1,
|
||||
(await db.ScheduleEntries.SingleAsync()).PeriodCount);
|
||||
var entries = await db.ScheduleEntries.OrderBy(x => x.Kind).ToListAsync();
|
||||
Assert.Equal(2, entries.Count);
|
||||
Assert.Contains(entries, x =>
|
||||
x.Kind == ScheduleEntryKind.Lecture &&
|
||||
TeachingTaskHours.ScheduledHours(x) == 16);
|
||||
Assert.Contains(entries, x =>
|
||||
x.Kind == ScheduleEntryKind.Experiment &&
|
||||
x.ClassroomId == laboratory.Id &&
|
||||
TeachingTaskHours.ScheduledHours(x) == 16);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
||||
Reference in New Issue
Block a user