Remove Team.Number

Add Team.Identifier
This commit is contained in:
2025-10-03 12:47:05 -04:00
parent 05e5e69d0b
commit 6407dfca71
15 changed files with 338 additions and 43 deletions
+1 -1
View File
@@ -8,6 +8,6 @@ public class PartialTeam : Team
{
var remainingStudents = Students.Where(s => !studentsToOmit.Contains(s)).ToList();
var omittedStudents = OmittedStudents.Union(Students.Where(studentsToOmit.Contains)).Distinct().ToList();
return new PartialTeam{TeamId = TeamId, Event = Event, Students = remainingStudents, OmittedStudents = omittedStudents };
return new PartialTeam{Identifier = Identifier, Event = Event, Students = remainingStudents, OmittedStudents = omittedStudents };
}
}
+8 -14
View File
@@ -4,22 +4,16 @@ namespace Core.Entities;
public class Team
{
public int Id { get; set; }
[Display(Name = "Team Number")]
public int? Number { get; set; }
public EventDefinition Event
{
get;
set;
}
public EventDefinition Event { get; set; }
public List<Student> Students { get; set; } = [];
public Student? Captain { get; set; }
[Display(Name = "Team Id")]
public string? TeamId { get; set; }
[Display(Name = "Team Identifier")]
[StringLength(32)]
public string? Identifier { get; set; }
// public Tuple<DateTime,DateTime?>? RegionalTimeSlotObj
@@ -54,10 +48,10 @@ public class Team
var studentsToOmitList = studentsToOmit.ToList();
var omittedStudents = Students.Where(studentsToOmitList.Contains).ToList();
if (!omittedStudents.Any())
return new Team{Captain = Captain, Event = Event, Students = Students.ToList(), TeamId = TeamId, Number = Number};
return new Team{Captain = Captain, Event = Event, Students = Students.ToList(), Identifier = Identifier};
var remainingStudents = Students.Where(s => !studentsToOmitList.Contains(s)).ToList();
return new PartialTeam { Number = Number, Event = Event, Students = remainingStudents, OmittedStudents = omittedStudents};
return new PartialTeam { Event = Event, Students = remainingStudents, OmittedStudents = omittedStudents};
}
public Team Clone() => CloneWithOmittedStudents([]);
@@ -65,6 +59,6 @@ public class Team
public override string ToString()
{
return $"{Event.Name} {(Number != null ? $"(#{Number})" : "")}";
return $"{Event.Name} {(Identifier != null ? $"({Identifier})" : "")}";
}
}