Add category types and allow teams to be in more than one category #3043

nickygerritsen · 2025-08-01T18:50:00Z

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:

We used to only show the badges for top teams if there was more than one category. Now we show them when you have any category with the TYPE_BADGE_TOP type.
Similar for the colors, we only showed them if there was more than one color, also taking into account the 'non-color' as color. Now we display them as soon as you have one color, ignoring categories without color. We don't display the names of categories without colors anymore, since a team can be in multiple of those categories. We could change this to something smart if all categories that have a color also have a scoring type, but I'm not sure if that's worth it.

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.

webapp/migrations/Version20250620082406.php

webapp/src/Controller/API/ScoreboardController.php

Part of #2937

…egory

Fixes #2937

vmcj · 2025-11-04T20:01:12Z

webapp/src/Controller/API/TeamController.php

            ->leftJoin('t.affiliation', 'ta')
-            ->leftJoin('t.category', 'tc')
+            ->leftJoin('t.categories', 'tc')
+            ->leftJoin('t.categories', 'tcc', Join::WITH, 'BIT_AND(tcc.types, :scoring) = :scoring')


Why do we need the extra tcc, aren't you joining this to be the same category?

vmcj · 2025-11-04T20:18:29Z

webapp/src/Service/DOMJudgeService.php

            ->from(Team::class, 't')
            ->select('t')
-            ->leftJoin('t.category', 'tc')
+            ->leftJoin('t.categories', 'tc')


phpcs below

vmcj · 2025-11-04T20:31:01Z

webapp/templates/partials/scoreboard_table.html.twig


    {# 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 %}


The comment is now not in line with the code. Why do we need to print the legend with only 1 category?

vmcj · 2025-11-04T21:18:51Z

webapp/src/Service/ScoreboardService.php

            }

            if ($filter->categories) {
+                // Use a new join, since we need both the other two category joins for other logic already


I think you don't limit tcc so can re use it here,

vmcj · 2025-11-05T17:05:57Z

webapp/src/Form/Type/ContestType.php

            'multiple' => true,
            'choice_label' => fn(TeamCategory $category) => $category->getName(),
            'help' => 'List of team categories that will receive medals for this contest.',
+            'query_builder' => function(EntityRepository $er) {


Suggested change

'query_builder' => function(EntityRepository $er) {

'query_builder' => function (EntityRepository $er) {

vmcj · 2025-11-05T17:09:38Z

webapp/src/Form/Type/ExportResultsType.php

            ->select('c.sortorder, c.name')
            ->where('c.visible = 1')
+            ->andWhere('BIT_AND(c.types, :scoring) = :scoring')
+            ->setParameter('scoring', TeamCategory::TYPE_SCORING)


Probably good to add an assertion in the Unit tests for the results with a CSS only category and that we don't see it in the result.

vmcj · 2025-11-05T17:12:57Z

webapp/src/Service/ImportExportService.php

+            if (in_array(TeamCategory::TYPE_SCORING, $types, true) && $sortOrder === null) {
+                $sortOrder = 0;
+            }
+            if ($sortOrder !== null && !in_array(TeamCategory::TYPE_SCORING, $types, true)) {


Suggested change

if ($sortOrder !== null && !in_array(TeamCategory::TYPE_SCORING, $types, true)) {

if (!($sortOrder === null || in_array(TeamCategory::TYPE_SCORING, $types, true)) {

I think we always do this, so let's keep that convention.

vmcj · 2025-11-05T17:16:36Z

webapp/src/Service/ImportExportService.php

+            }
+            if (isset($groupItem['css_class']) && !in_array(TeamCategory::TYPE_CSS_CLASS, $types, true)) {
+                $types[] = TeamCategory::TYPE_CSS_CLASS;
+            }


A couple of those statements are checks if something is set and if we already have it in the array. I rather read that as just always adding it to the list and afterwards just cleaning the array with array_unique as it makes it easier to read IMO. So basically treating the array as a sorted set by always adding and making it unique in the end.

Alternative is to do something as $arr[TeamCategory::TYPE_SOMETHING] = bool and getting the keys afterwards if that's faster.

vmcj · 2025-11-05T17:20:30Z

webapp/src/Service/ImportExportService.php

     *
     * @param array<array{team: array{teamid: string|null, icpcid: string|null, label?: string|null,
-     *                                categoryid: string|null, name: string|null, display_name?: string,
+     *                                categoryids: string[]|null, name: string|null, display_name?: string,


Any (good) reason why this cant be categoryids: string[]?

vmcj · 2025-11-05T17:46:09Z

webapp/src/Utils/Scoreboard/Scoreboard.php

    }

+    /**
+     * @param int[] $limitToTeamIds


Shouldn't this also list the null?

Suggested change

* @param int[] $limitToTeamIds

* @param int[]|null $limitToTeamIds

or set it to $limitToTeamIds = []

vmcj · 2025-11-05T17:48:41Z

webapp/templates/partials/scoreboard_table.html.twig

-                            <span class="badge text-bg-warning category-best">
-                            {{ score.team.category.name }}
-                        </span>
+                        {# TODO: how to display badges on mobile scorebaord #}


Suggested change

{# TODO: how to display badges on mobile scorebaord #}

{# TODO: how to display badges on mobile scoreboard #}

vmcj · 2025-11-05T17:48:53Z

webapp/templates/partials/scoreboard_table.html.twig

-                            {{ score.team.category.name }}
-                        </span>
+                        {# TODO: how to display badges on mobile scorebaord #}
+                        {% if false %}


We can just comment this right?

vmcj · 2025-11-05T17:54:20Z

webapp/templates/partials/scoreboard_table.html.twig

-                            {{ score.team.category.name }}
-                        </span>
-                        {% endif %}
+                        {% set hasBadges = score.team.badgeCategories | length > 0 %}


Do we know the reason why we didn't display those if there is only 1 category?

vmcj reviewed Aug 4, 2025

View reviewed changes

webapp/migrations/Version20250620082406.php Outdated Show resolved Hide resolved

webapp/src/Controller/API/ScoreboardController.php Show resolved Hide resolved

nickygerritsen force-pushed the multiple-categories branch from 4b3e640 to ed306f7 Compare October 5, 2025 18:31

nickygerritsen mentioned this pull request Oct 24, 2025

Sync database schema with entities #3159

Merged

nickygerritsen force-pushed the multiple-categories branch from 55d3c52 to 80b7c0b Compare October 24, 2025 12:11

nickygerritsen added 9 commits October 25, 2025 22:16

Allow multiple categories per team

b9db578

Part of #2937

Add category types

0830619

Add configuration checker to make sure all teams are in a scoring cat…

f02529b

…egory

Filter on scoring categories for contest medals and export results

dcfb61c

Fix scoreboard filter for non scoring categories

0be77bc

Fixes #2937

Fix codestyle

f3a3721

Fix category import

9f1c9e2

Set types correctly during migration

ea01cd2

Teams now have more than one category

6953f19

nickygerritsen force-pushed the multiple-categories branch from 80b7c0b to 6953f19 Compare October 25, 2025 20:16

vmcj reviewed Nov 4, 2025

View reviewed changes

vmcj reviewed Nov 5, 2025

View reviewed changes

	'query_builder' => function(EntityRepository $er) {
	'query_builder' => function (EntityRepository $er) {

	if ($sortOrder !== null && !in_array(TeamCategory::TYPE_SCORING, $types, true)) {
	if (!($sortOrder === null \|\| in_array(TeamCategory::TYPE_SCORING, $types, true)) {

	* @param int[] $limitToTeamIds
	* @param int[]\|null $limitToTeamIds

	{# TODO: how to display badges on mobile scorebaord #}
	{# TODO: how to display badges on mobile scoreboard #}

Add category types and allow teams to be in more than one category #3043

Are you sure you want to change the base?

Add category types and allow teams to be in more than one category #3043

Uh oh!

Conversation

nickygerritsen commented Aug 1, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants