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

webapp/src/Controller/API/TeamController.php

webapp/src/Service/DOMJudgeService.php

webapp/templates/partials/scoreboard_table.html.twig

webapp/src/Service/ScoreboardService.php

webapp/src/Form/Type/ContestType.php

webapp/src/Form/Type/ExportResultsType.php

webapp/src/Service/ImportExportService.php

webapp/src/Utils/Scoreboard/Scoreboard.php

webapp/templates/partials/scoreboard_table.html.twig

Part of #2937

…egory

Fixes #2937

meisterT · 2025-12-01T17:48:30Z

webapp/migrations/Version20250801124024.php

+            SQL);
+
+        // Now update the types for existing categories based on whether the color is set
+        $this->addSql('UPDATE team_category SET types = 7 WHERE color IS NOT NULL');


nit: add a comment what 7 and 5 mean?

meisterT · 2025-12-01T17:50:20Z

webapp/src/Entity/TeamCategory.php

+     * @var array<int, string>
+     */
+    public const TYPES_TO_HUMAN_STRING = [
+        self::TYPE_SCORING => 'Scoring',


What does Scoring mean?

That it's used for the scoreboard, i.e. that is what makes sort order required / useful. Each team can be in at most one scoring category as to only have one order on the scoreboard

can be in at most one, or does have to be exactly one?

I will double check, I thought at most (and if 0 they won't appear on the scoreboard)

won't appear on the scoreboard could be super confusing

Do you suggest to make it 'exactly 1'?

webapp/src/Service/ScoreboardService.php

vmcj reviewed Aug 4, 2025

View reviewed changes

webapp/migrations/Version20250620082406.php 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 2 times, most recently 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

nickygerritsen force-pushed the multiple-categories branch from 6953f19 to eb673ff Compare November 27, 2025 13:58

nickygerritsen added 19 commits November 30, 2025 09:51

Allow multiple categories per team

42bf59d

Part of #2937

Add category types

ebb4324

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

cbd39a1

…egory

Filter on scoring categories for contest medals and export results

fbb0652

Fix scoreboard filter for non scoring categories

c6a40eb

Fixes #2937

Fix codestyle

baed787

Fix category import

c3fd679

Set types correctly during migration

21d2229

Teams now have more than one category

34a05ea

Be explicit about why we need two joins on team categories in the API

9cbc180

Fix code style

42f1f4e

Remove obsolete comment

98ecd2c

Improve conditional logic

f5028fa

Simplify logic for creating types set in import

6364a52

Add test that non scoring categories don't appear at export

e7ab8d6

Category IDs are never null when importing

849f945

Fix typo

dd70bd0

Display badges on mobile scorebaord

6a96b44

Update dockblock

4c7001d

nickygerritsen force-pushed the multiple-categories branch from eb673ff to 4c7001d Compare November 30, 2025 08:52

meisterT reviewed Dec 1, 2025

View reviewed changes

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!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants