实验课现在直接进入普通排课流程,不再要求先到实验排课模块逐个安排。
普通“添加排课”新增“理论课 / 实验课”类型。 自动排课会分别补足理论学时和实验学时。 实验课只能安排到实验室、实训室、机房、语音室等场地。 发布课表时分别校验理论、实验学时;任一未排足都不能发布。 普通课表及 Excel 导出会标注“实验课”。 历史排课保持不变,迁移后默认识别为理论课;后续新建或修订版本时再补充实验课。
This commit is contained in:
@@ -32,40 +32,41 @@ public sealed class SchedulePublishJobProcessorTests
|
||||
Assert.Equal(SchedulePlanStatus.Draft, result.PlanStatus);
|
||||
Assert.Null(result.ActiveAcademicTermId);
|
||||
Assert.Equal("检查未通过", result.CurrentStep);
|
||||
Assert.Contains("尚未达到每周 2 个普通排课学时", result.ErrorMessage);
|
||||
Assert.Contains("理论课应安排 32 学时,当前已安排 16 学时", result.ErrorMessage);
|
||||
Assert.Null(result.PublishedAt);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Processor_excludes_practice_hours_for_existing_tasks()
|
||||
public async Task Processor_requires_experiment_hours_in_regular_schedule()
|
||||
{
|
||||
var result = await RunPublishAsync(
|
||||
weeklyHours: 2,
|
||||
scheduledHours: 1,
|
||||
practiceHours: 16);
|
||||
practiceHours: 16,
|
||||
experimentScheduledHours: 1);
|
||||
|
||||
Assert.Equal(SchedulePublishJobStatus.Succeeded, result.JobStatus);
|
||||
Assert.Equal(SchedulePlanStatus.Published, result.PlanStatus);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public async Task Processor_rejects_practice_hours_already_added_to_draft()
|
||||
public async Task Processor_rejects_missing_experiment_hours()
|
||||
{
|
||||
var result = await RunPublishAsync(
|
||||
weeklyHours: 2,
|
||||
scheduledHours: 2,
|
||||
scheduledHours: 1,
|
||||
practiceHours: 16);
|
||||
|
||||
Assert.Equal(SchedulePublishJobStatus.Failed, result.JobStatus);
|
||||
Assert.Equal(SchedulePlanStatus.Draft, result.PlanStatus);
|
||||
Assert.Contains("普通课表应为 1 学时", result.ErrorMessage);
|
||||
Assert.Contains("删除已包含的实践学时", result.ErrorMessage);
|
||||
Assert.Contains("实验课应安排 16 学时,当前已安排 0 学时", result.ErrorMessage);
|
||||
}
|
||||
|
||||
private static async Task<PublishResult> RunPublishAsync(
|
||||
int weeklyHours,
|
||||
int scheduledHours,
|
||||
int practiceHours = 0)
|
||||
int practiceHours = 0,
|
||||
int experimentScheduledHours = 0)
|
||||
{
|
||||
var databasePath = Path.Combine(
|
||||
Path.GetTempPath(),
|
||||
@@ -97,6 +98,21 @@ public sealed class SchedulePublishJobProcessorTests
|
||||
EndDate = new DateOnly(2027, 1, 15)
|
||||
};
|
||||
var college = new College { Code = "PUB", Name = "发布测试学院" };
|
||||
var campus = new Campus { Code = "PUB-CAMPUS", Name = "发布测试校区" };
|
||||
var building = new Building
|
||||
{
|
||||
Code = "PUB-BUILDING",
|
||||
Name = "实验楼",
|
||||
Campus = campus
|
||||
};
|
||||
var laboratory = new Classroom
|
||||
{
|
||||
Code = "PUB-LAB",
|
||||
Name = "发布测试实验室",
|
||||
Building = building,
|
||||
Capacity = 80,
|
||||
RoomType = "实验室"
|
||||
};
|
||||
var course = new Course
|
||||
{
|
||||
Code = "PUB-01",
|
||||
@@ -135,6 +151,21 @@ public sealed class SchedulePublishJobProcessorTests
|
||||
EndWeek = 16,
|
||||
WeekPattern = WeekPattern.All
|
||||
});
|
||||
if (experimentScheduledHours > 0)
|
||||
{
|
||||
plan.Entries.Add(new ScheduleEntry
|
||||
{
|
||||
TeachingTask = task,
|
||||
Kind = ScheduleEntryKind.Experiment,
|
||||
Classroom = laboratory,
|
||||
DayOfWeek = 2,
|
||||
StartPeriod = 1,
|
||||
PeriodCount = experimentScheduledHours,
|
||||
StartWeek = 1,
|
||||
EndWeek = 16,
|
||||
WeekPattern = WeekPattern.All
|
||||
});
|
||||
}
|
||||
var job = new SchedulePublishJob
|
||||
{
|
||||
SchedulePlan = plan,
|
||||
@@ -143,7 +174,16 @@ public sealed class SchedulePublishJobProcessorTests
|
||||
CurrentStep = "等待后台检查"
|
||||
};
|
||||
jobId = job.Id;
|
||||
db.AddRange(term, college, course, task, plan, job);
|
||||
db.AddRange(
|
||||
term,
|
||||
college,
|
||||
campus,
|
||||
building,
|
||||
laboratory,
|
||||
course,
|
||||
task,
|
||||
plan,
|
||||
job);
|
||||
db.ScheduleTimeSlots.AddRange(
|
||||
new ScheduleTimeSlot
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user