Merge branch 'codex/shiyan' into master
# Conflicts: # web/package-lock.json
This commit is contained in:
@@ -6,6 +6,9 @@ public sealed class ExperimentProject : EntityBase
|
||||
{
|
||||
public Guid TeachingTaskId { get; set; }
|
||||
public TeachingTask? TeachingTask { get; set; }
|
||||
// 集中安排的项目复用已发布课表中的实验课,不再维护一份重复的场次。
|
||||
public Guid? ScheduleEntryId { get; set; }
|
||||
public ScheduleEntry? ScheduleEntry { get; set; }
|
||||
public required string Code { get; set; }
|
||||
public required string Name { get; set; }
|
||||
public ExperimentArrangementMode ArrangementMode { get; set; }
|
||||
|
||||
@@ -46,9 +46,35 @@ public sealed class Classroom : CatalogEntity
|
||||
public Building? Building { get; set; }
|
||||
public int Capacity { get; set; }
|
||||
public string RoomType { get; set; } = "普通教室";
|
||||
public TeachingVenueNature TeachingVenueNature { get; set; } =
|
||||
TeachingVenueNature.GeneralClassroom;
|
||||
public string? Equipment { get; set; }
|
||||
}
|
||||
|
||||
[Flags]
|
||||
public enum TeachingVenueNature
|
||||
{
|
||||
GeneralClassroom = 1,
|
||||
Laboratory = 2,
|
||||
TrainingRoom = 4,
|
||||
ComputerLab = 8,
|
||||
LanguageLab = 16,
|
||||
SportsVenue = 32,
|
||||
ArtsVenue = 64
|
||||
}
|
||||
|
||||
public static class TeachingVenueNatureRules
|
||||
{
|
||||
public const TeachingVenueNature ExperimentTeaching =
|
||||
TeachingVenueNature.Laboratory |
|
||||
TeachingVenueNature.TrainingRoom |
|
||||
TeachingVenueNature.ComputerLab |
|
||||
TeachingVenueNature.LanguageLab;
|
||||
|
||||
public static bool SupportsExperiment(TeachingVenueNature value) =>
|
||||
(value & ExperimentTeaching) != 0;
|
||||
}
|
||||
|
||||
public sealed class AcademicTerm : CatalogEntity
|
||||
{
|
||||
public required string AcademicYear { get; set; }
|
||||
|
||||
@@ -55,6 +55,7 @@ public sealed class TeachingTaskScheduleConstraint : EntityBase
|
||||
public string? AllowedDayOfWeeks { get; set; }
|
||||
public int? EarliestPeriod { get; set; }
|
||||
public int? LatestPeriod { get; set; }
|
||||
public TeachingVenueNature AllowedExperimentVenueNatures { get; set; }
|
||||
public ICollection<TeachingTaskAllowedClassroom> AllowedClassrooms { get; set; } = [];
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user