已修复:
实验课场地区块改为独立卡片布局,校区、教学楼和场地选择不再被嵌套表单挤压。 批量设置新增独立的“批量指定实验课场地”入口,包含场地性质、实验校区、教学楼和具体场地,并会联动筛选。 后端会保存并校验批量实验场地范围,避免跨校区/教学楼的无效设置。
This commit is contained in:
1 parent
400761beaa
commit
26a39322fd
4 files changed
+120
-40
No files matched your search
@@ -342,6 +342,7 @@ public sealed class ScheduleSettingsController(AppDbContext db, IAppCache cache)
|
|||||||
Building? building = null;
|
Building? building = null;
|
||||||
List<Classroom> allowedRooms = [];
|
List<Classroom> allowedRooms = [];
|
||||||
var experimentRoomIds = request.AllowedExperimentClassroomIds?.Distinct().ToArray() ?? [];
|
var experimentRoomIds = request.AllowedExperimentClassroomIds?.Distinct().ToArray() ?? [];
|
||||||
|
Building? experimentBuilding = null;
|
||||||
List<Classroom> allowedExperimentRooms = [];
|
List<Classroom> allowedExperimentRooms = [];
|
||||||
if (request.UpdateClassroomScope)
|
if (request.UpdateClassroomScope)
|
||||||
{
|
{
|
||||||
@@ -381,12 +382,34 @@ public sealed class ScheduleSettingsController(AppDbContext db, IAppCache cache)
|
|||||||
}
|
}
|
||||||
if (request.UpdateExperimentClassroomScope)
|
if (request.UpdateExperimentClassroomScope)
|
||||||
{
|
{
|
||||||
|
if (request.ExperimentRequiredBuildingId.HasValue)
|
||||||
|
{
|
||||||
|
experimentBuilding = await db.Buildings.AsNoTracking()
|
||||||
|
.FirstOrDefaultAsync(x => x.Id == request.ExperimentRequiredBuildingId && x.IsEnabled,
|
||||||
|
cancellationToken);
|
||||||
|
if (experimentBuilding is null)
|
||||||
|
return ValidationProblem("指定实验教学楼不存在或已停用。");
|
||||||
|
if (request.ExperimentRequiredCampusId.HasValue &&
|
||||||
|
experimentBuilding.CampusId != request.ExperimentRequiredCampusId)
|
||||||
|
return ValidationProblem("指定实验教学楼不属于所选实验校区。");
|
||||||
|
}
|
||||||
|
if (request.ExperimentRequiredCampusId.HasValue &&
|
||||||
|
!await db.Campuses.AnyAsync(x => x.Id == request.ExperimentRequiredCampusId && x.IsEnabled,
|
||||||
|
cancellationToken))
|
||||||
|
return ValidationProblem("指定实验校区不存在或已停用。");
|
||||||
allowedExperimentRooms = await db.Classrooms.AsNoTracking()
|
allowedExperimentRooms = await db.Classrooms.AsNoTracking()
|
||||||
.Where(x => x.IsEnabled)
|
.Where(x => x.IsEnabled)
|
||||||
.WhereIn(experimentRoomIds, x => x.Id)
|
.WhereIn(experimentRoomIds, x => x.Id)
|
||||||
|
.Include(x => x.Building)
|
||||||
.ToListAsync(cancellationToken);
|
.ToListAsync(cancellationToken);
|
||||||
if (allowedExperimentRooms.Count != experimentRoomIds.Length)
|
if (allowedExperimentRooms.Count != experimentRoomIds.Length)
|
||||||
return ValidationProblem("部分指定实验场地不存在或已停用。");
|
return ValidationProblem("部分指定实验场地不存在或已停用。");
|
||||||
|
if (experimentBuilding is not null &&
|
||||||
|
allowedExperimentRooms.Any(x => x.BuildingId != experimentBuilding.Id))
|
||||||
|
return ValidationProblem("指定实验场地必须位于所选实验教学楼。");
|
||||||
|
if (request.ExperimentRequiredCampusId.HasValue &&
|
||||||
|
allowedExperimentRooms.Any(x => x.Building!.CampusId != request.ExperimentRequiredCampusId))
|
||||||
|
return ValidationProblem("指定实验场地必须位于所选实验校区。");
|
||||||
}
|
}
|
||||||
|
|
||||||
var constraints = await db.TeachingTaskScheduleConstraints
|
var constraints = await db.TeachingTaskScheduleConstraints
|
||||||
@@ -457,6 +480,8 @@ public sealed class ScheduleSettingsController(AppDbContext db, IAppCache cache)
|
|||||||
constraint.AllowedExperimentVenueNatures = request.AllowedExperimentVenueNatures.Value;
|
constraint.AllowedExperimentVenueNatures = request.AllowedExperimentVenueNatures.Value;
|
||||||
if (task.Course?.PracticeHours > 0 && request.UpdateExperimentClassroomScope)
|
if (task.Course?.PracticeHours > 0 && request.UpdateExperimentClassroomScope)
|
||||||
{
|
{
|
||||||
|
constraint.ExperimentRequiredCampusId = request.ExperimentRequiredCampusId;
|
||||||
|
constraint.ExperimentRequiredBuildingId = request.ExperimentRequiredBuildingId;
|
||||||
db.TeachingTaskAllowedExperimentClassrooms.RemoveRange(
|
db.TeachingTaskAllowedExperimentClassrooms.RemoveRange(
|
||||||
constraint.AllowedExperimentClassrooms);
|
constraint.AllowedExperimentClassrooms);
|
||||||
constraint.AllowedExperimentClassrooms = allowedExperimentRooms.Select(room =>
|
constraint.AllowedExperimentClassrooms = allowedExperimentRooms.Select(room =>
|
||||||
@@ -548,4 +573,6 @@ public sealed record TeachingTaskScheduleConstraintBatchRequest(
|
|||||||
[Range(1, 30)] int? LatestPeriod,
|
[Range(1, 30)] int? LatestPeriod,
|
||||||
bool UpdateExperimentClassroomScope = false,
|
bool UpdateExperimentClassroomScope = false,
|
||||||
TeachingVenueNature? AllowedExperimentVenueNatures = null,
|
TeachingVenueNature? AllowedExperimentVenueNatures = null,
|
||||||
IReadOnlyList<Guid>? AllowedExperimentClassroomIds = null);
|
IReadOnlyList<Guid>? AllowedExperimentClassroomIds = null,
|
||||||
|
Guid? ExperimentRequiredCampusId = null,
|
||||||
|
Guid? ExperimentRequiredBuildingId = null);
|
||||||
@@ -85,13 +85,19 @@ public sealed class ScheduleSettingsControllerTests
|
|||||||
[classroom.Id],
|
[classroom.Id],
|
||||||
false,
|
false,
|
||||||
null,
|
null,
|
||||||
null),
|
null,
|
||||||
|
UpdateExperimentClassroomScope: true,
|
||||||
|
AllowedExperimentVenueNatures: TeachingVenueNature.Laboratory,
|
||||||
|
AllowedExperimentClassroomIds: [classroom.Id],
|
||||||
|
ExperimentRequiredCampusId: campus.Id,
|
||||||
|
ExperimentRequiredBuildingId: building.Id),
|
||||||
CancellationToken.None);
|
CancellationToken.None);
|
||||||
|
|
||||||
Assert.IsType<OkObjectResult>(result);
|
Assert.IsType<OkObjectResult>(result);
|
||||||
db.ChangeTracker.Clear();
|
db.ChangeTracker.Clear();
|
||||||
var constraints = await db.TeachingTaskScheduleConstraints
|
var constraints = await db.TeachingTaskScheduleConstraints
|
||||||
.Include(item => item.AllowedClassrooms)
|
.Include(item => item.AllowedClassrooms)
|
||||||
|
.Include(item => item.AllowedExperimentClassrooms)
|
||||||
.OrderBy(item => item.TeachingTaskId)
|
.OrderBy(item => item.TeachingTaskId)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
Assert.Equal(2, constraints.Count);
|
Assert.Equal(2, constraints.Count);
|
||||||
@@ -103,6 +109,11 @@ public sealed class ScheduleSettingsControllerTests
|
|||||||
Assert.Equal(
|
Assert.Equal(
|
||||||
classroom.Id,
|
classroom.Id,
|
||||||
Assert.Single(constraint.AllowedClassrooms).ClassroomId);
|
Assert.Single(constraint.AllowedClassrooms).ClassroomId);
|
||||||
|
Assert.Equal(campus.Id, constraint.ExperimentRequiredCampusId);
|
||||||
|
Assert.Equal(building.Id, constraint.ExperimentRequiredBuildingId);
|
||||||
|
Assert.Equal(
|
||||||
|
classroom.Id,
|
||||||
|
Assert.Single(constraint.AllowedExperimentClassrooms).ClassroomId);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -512,6 +512,8 @@ button { cursor: pointer; }
|
|||||||
.constraint-batch-form { margin-top: 16px; display: grid; gap: 10px; }
|
.constraint-batch-form { margin-top: 16px; display: grid; gap: 10px; }
|
||||||
.constraint-batch-form > .el-checkbox { padding: 8px 10px; background: #f7f9fb; border-left: 3px solid #ccd8e1; }
|
.constraint-batch-form > .el-checkbox { padding: 8px 10px; background: #f7f9fb; border-left: 3px solid #ccd8e1; }
|
||||||
.batch-classroom-scope { padding: 12px 14px 2px; display: grid; gap: 12px; border: 1px solid #d8e2e8; background: #fbfcfd; }
|
.batch-classroom-scope { padding: 12px 14px 2px; display: grid; gap: 12px; border: 1px solid #d8e2e8; background: #fbfcfd; }
|
||||||
|
.experiment-classroom-scope { margin-bottom: 18px; padding: 12px 14px 2px; border: 1px solid #d8e2e8; background: #fbfcfd; }
|
||||||
|
.experiment-classroom-scope__title { margin-bottom: 12px; color: #34435e; font-size: 13px; font-weight: 650; }
|
||||||
.constraint-list article { min-width: 0; padding: 13px 15px; display: grid; grid-template-columns: minmax(230px, 1fr) minmax(170px, auto) auto; align-items: center; gap: 14px; border: 1px solid var(--line); background: #fff; }
|
.constraint-list article { min-width: 0; padding: 13px 15px; display: grid; grid-template-columns: minmax(230px, 1fr) minmax(170px, auto) auto; align-items: center; gap: 14px; border: 1px solid var(--line); background: #fff; }
|
||||||
.constraint-list article > div:first-child { min-width: 0; display: grid; gap: 4px; }
|
.constraint-list article > div:first-child { min-width: 0; display: grid; gap: 4px; }
|
||||||
.constraint-list article span { color: var(--teal); font: 700 9px/1.2 Consolas, monospace; }
|
.constraint-list article span { color: var(--teal); font: 700 9px/1.2 Consolas, monospace; }
|
||||||
|
|||||||
Loaded 3 of 4 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user