Add category types and allow teams to be in more than one category #3043
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
vmcj
reviewed
Aug 4, 2025
nickygerritsen
force-pushed
the
multiple-categories
branch
from
4b3e640 to
ed306f7
Compare
nickygerritsen
force-pushed
the
multiple-categories
branch
from
55d3c52 to
80b7c0b
Compare
nickygerritsen
force-pushed
the
multiple-categories
branch
from
80b7c0b to
6953f19
Compare
vmcj
reviewed
Nov 4, 2025
| ->leftJoin('t.affiliation', 'ta') | ||
| ->leftJoin('t.category', 'tc') | ||
| ->leftJoin('t.categories', 'tc') | ||
| ->leftJoin('t.categories', 'tcc', Join::WITH, 'BIT_AND(tcc.types, :scoring) = :scoring') |
There was a problem hiding this comment.
Why do we need the extra tcc, aren't you joining this to be the same category?
| ->from(Team::class, 't') | ||
| ->select('t') | ||
| ->leftJoin('t.category', 'tc') | ||
| ->leftJoin('t.categories', 'tc') |
| {# only print legend when there's more than one category #} | ||
| {% if limitToTeamIds is null and usedCategories | length > 1 and hasDifferentCategoryColors %} | ||
| {% if limitToTeamIds is null and colorCategories | length > 0 and hasDifferentCategoryColors %} |
There was a problem hiding this comment.
The comment is now not in line with the code. Why do we need to print the legend with only 1 category?
| } | ||
|
|
||
| if ($filter->categories) { | ||
| // Use a new join, since we need both the other two category joins for other logic already |
There was a problem hiding this comment.
I think you don't limit tcc so can re use it here,
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #2937
I added validation to make sure each team is in at most one scoring category and a config checker to make sure they are in at least one (since this is not an error but still weird).
There are some minor changes to the scoreboard compared to before:
TYPE_BADGE_TOPtype.I decided that filtering on the scoreboard should be possible with all category types, since I think this makes sense (i.e. one can filter on all teams that advanced to finals before or all teams that didn't).
I also decided that we can have categories without any type. The above mentioned example is a good use case: all teams NOT advancing to finals from EUC could be put in that category, so you can filter on it.
The PR is quite big, since it's quite a lot of changes. I split some of the work up in separate commits, but plan to squash before merging.