Make scoreboard type explicit.

First step of #2525.
DOMjudge · Mar 2, 2025 · f7604bf · f7604bf
1 parent fb1948a
commit f7604bf
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 14 deletions.
diff --git a/webapp/migrations/Version20250302132831.php b/webapp/migrations/Version20250302132831.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version20250302132831 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add explicit scoring type.';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // this up() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE contest ADD scoreboard_type VARCHAR(255) DEFAULT \'pass-fail\' NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        // this down() migration is auto-generated, please modify it to your needs
+        $this->addSql('ALTER TABLE contest DROP scoreboard_type');
+    }
+
+    public function isTransactional(): bool
+    {
+        return false;
+    }
+}
diff --git a/webapp/src/Controller/Jury/ContestController.php b/webapp/src/Controller/Jury/ContestController.php
@@ -81,14 +81,15 @@ public function indexAction(Request $request): Response
             ->getQuery()->getResult();
 
         $table_fields = [
-            'cid'          => ['title' => 'CID', 'sort' => true],
-            'externalid'   => ['title' => "external ID", 'sort' => true],
-            'shortname'    => ['title' => 'shortname', 'sort' => true],
-            'name'         => ['title' => 'name', 'sort' => true],
-            'activatetime' => ['title' => 'activate', 'sort' => true],
-            'starttime'    => ['title' => 'start', 'sort' => true,
-                               'default_sort' => true, 'default_sort_order' => 'desc'],
-            'endtime'      => ['title' => 'end', 'sort' => true],
+            'cid'             => ['title' => 'CID', 'sort' => true],
+            'externalid'      => ['title' => "external ID", 'sort' => true],
+            'shortname'       => ['title' => 'shortname', 'sort' => true],
+            'name'            => ['title' => 'name', 'sort' => true],
+            'scoreboard_type' => ['title' => 'scoreboard type', 'sort' => true],
+            'activatetime'    => ['title' => 'activate', 'sort' => true],
+            'starttime'       => ['title' => 'start', 'sort' => true,
+                                  'default_sort' => true, 'default_sort_order' => 'desc'],
+            'endtime'         => ['title' => 'end', 'sort' => true],
         ];
 
         $currentContests = $this->dj->getCurrentContests();
@@ -137,7 +138,9 @@ public function indexAction(Request $request): Response
             $contestactions = [];
             // Get whatever fields we can from the contest object itself
             foreach ($table_fields as $k => $v) {
-                if ($propertyAccessor->isReadable($contest, $k)) {
+                if ($k == 'scoreboard_type') {
+                    $contestdata[$k] = ['value' => $contest->getScoreboardType()->value];
+                } elseif ($propertyAccessor->isReadable($contest, $k)) {
                     $contestdata[$k] = ['value' => $propertyAccessor->getValue($contest, $k)];
                 }
             }

diff --git a/webapp/src/Entity/Contest.php b/webapp/src/Entity/Contest.php
@@ -43,11 +43,6 @@
     exp: 'object.getName()',
     options: [new Serializer\Type('string')]
 )]
-#[Serializer\VirtualProperty(
-    name: 'scoreboard_type',
-    exp: '"pass-fail"',
-    options: [new Serializer\Type('string')]
-)]
 #[UniqueEntity(fields: 'shortname')]
 #[UniqueEntity(fields: 'externalid')]
 class Contest extends BaseApiEntity implements
@@ -161,6 +156,18 @@ class Contest extends BaseApiEntity implements
     #[Serializer\Exclude]
     private ?int $b = 0;
 
+    #[ORM\Column(type: 'string', enumType: ScoreboardType::class, options: ['default' => 'pass-fail'])]
+    #[Serializer\Exclude]
+    private ScoreboardType $scoreboardType = ScoreboardType::PASS_FAIL;
+
+    #[Serializer\VirtualProperty]
+    #[Serializer\SerializedName('scoreboard_type')]
+    #[Serializer\Type('string')]
+    public function getScoreboardTypeString(): string
+    {
+        return $this->scoreboardType->value;
+    }
+
     #[ORM\Column(
         options: ['default' => 0]
     )]
@@ -861,6 +868,17 @@ public function getPublic(): bool
         return $this->public;
     }
 
+    public function setScoreboardType(ScoreboardType $scoreboardType): Contest
+    {
+        $this->scoreboardType = $scoreboardType;
+        return $this;
+    }
+
+    public function getScoreboardType(): ScoreboardType
+    {
+        return $this->scoreboardType;
+    }
+
     public function setOpenToAllTeams(bool $openToAllTeams): Contest
     {
         $this->openToAllTeams = $openToAllTeams;

diff --git a/webapp/src/Entity/ScoreboardType.php b/webapp/src/Entity/ScoreboardType.php
@@ -0,0 +1,9 @@
+<?php declare(strict_types=1);
+
+namespace App\Entity;
+
+enum ScoreboardType: string
+{
+    case PASS_FAIL = 'pass-fail';
+    case SCORING = 'scoring';
+}
diff --git a/webapp/templates/jury/contest.html.twig b/webapp/templates/jury/contest.html.twig
@@ -52,6 +52,11 @@
                     <td>{{ contest.shortname }}</td>
                     <td></td>
                 </tr>
+                <tr>
+                    <th>Scoreboard type</th>
+                    <td>{{ contest.scoreboardType.value }}</td>
+                    <td></td>
+                </tr>
                 {% for type, data in contest.dataForJuryInterface %}
                     <tr>
                         <td class="{{ data.class|default('') }}"><b>{{ data.label }}:</b></td>