Add tag to submissions in the controller

In the controller we already have all information which we need for the
tag, so we do not need a bunch of comparisons to figure out the correct
tag.

This also enables us to reuse the tag for the diff part of the title.

Author: Kevinjil

webapp/src/Controller/Jury/SubmissionController.php

@@ -839,10 +839,18 @@ public function sourceAction(
             return $response;
         }
 
+        /** @var array{
+         *      submitid: int,
+         *      tag?: string
+         * } otherSubmissions
+         */
         $otherSubmissions = [];
         $originalSubmission = $submission->getOriginalSubmission();
         if ($originalSubmission) {
-            $otherSubmissions[] = $originalSubmission;
+            $otherSubmissions[] = [
+                'submitid' => $originalSubmission->getSubmitid(),
+                'tag'      => 'original',
+            ];
             /** @var Submission $oldSubmission */
             $oldSubmission = $this->em->createQueryBuilder()
                 ->from(Submission::class, 's')
@@ -879,10 +887,13 @@ public function sourceAction(
                 ->getOneOrNullResult();
         }
         if ($oldSubmission !== null) {
-            $otherSubmissions[] = $oldSubmission;
+            $otherSubmissions[] = [
+                'submitid' => $oldSubmission->getSubmitid(),
+                'tag'      => 'previous',
+            ];;
         }
 
-        $files_query = array_map(fn($s) => $s->getSubmitid(), $otherSubmissions);
+        $files_query = array_map(fn($s) => $s['submitid'], $otherSubmissions);
         $files_query[] = $submission->getSubmitid();
         /** @var SubmissionFile[] $oldFiles */
         $oldFiles = $this->em->createQueryBuilder()

webapp/templates/jury/partials/submission_diff.html.twig

@@ -31,14 +31,8 @@
                     <select class="diff-select btn btn-secondary btn-sm form-select-sm text-start" aria-label="Submission to diff against">
                         <option value="" data-tag="no-diff">No diff</option>
                         {%- for other in otherSubmissions %}
-                        {%- set tag = "" %}
-                        {%- if originalSubmission and originalSubmission.submitid == other.submitid %}
-                            {%- set tag = "original" %}
-                        {%- elseif oldSubmission and oldSubmission.submitid == other.submitid %}
-                            {%- set tag = "previous" %}
-                        {%- endif %}
-                        <option value="{{ other.submitid }}" {%- if tag %} data-tag="{{ tag }}" {%- endif %}>
-                            s{{ other.submitid }} {%- if tag %} ({{ tag }}) {%- endif %}
+                        <option value="{{ other.submitid }}" {%- if other.tag %} data-tag="{{ other.tag }}" {%- endif %}>
+                            s{{ other.submitid }} {%- if other.tag %} ({{ other.tag }}) {%- endif %}
                         </option>
                         {%- endfor %}
                     </select>