display optscore on UI

Author: as6325400

webapp/src/Twig/TwigExtension.php

@@ -114,6 +114,7 @@ public function getFilters(): array
             new TwigFilter('entityIdBadge', $this->entityIdBadge(...), ['is_safe' => ['html']]),
             new TwigFilter('medalType', $this->awards->medalType(...)),
             new TwigFilter('numTableActions', $this->numTableActions(...)),
+            new TwigFilter('formatOptScore', $this->formatOptScore(...)),
         ];
     }
 
@@ -1222,4 +1223,28 @@ protected function numTableActions(array $tableData): int
         }
         return $maxNumActions;
     }
+
+    /**
+     * Format the given optScore:
+     * - If it's an integer, display without decimal places
+     * - Otherwise, display up to the specified number of decimal places
+     *
+     * @param float|null $optScore     The value to format (nullable)
+     * @param int        $maxDecimals  Maximum number of decimal places to show (default = 3)
+     * @return string                  Formatted string representation of the score
+     */
+    protected function formatOptScore(?float $optScore, int $maxDecimals = 3): string
+    {
+        if ($optScore === null) {
+            return '-';
+        }
+
+        // If the value is an integer, format without decimal places
+        if ($optScore == floor($optScore)) {
+            return number_format($optScore, 0, '.', '');
+        }
+
+        // Otherwise, format with specified decimal precision
+        return number_format($optScore, $maxDecimals, '.', '');
+    }
 }

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

@@ -6,10 +6,12 @@
                 <span id="graphs" style="font-weight: bold;">testcase CPU times
                     <span style="font-weight: normal;">
                             {%- if selectedJudging.result != 'compiler-error' -%}
-                                | max:
-                                {{ selectedJudging.maxRuntime | number_format(3, '.', '') }}s
-                                | sum: {{ selectedJudging.sumRuntime | number_format(3, '.', '') }}s
-                            {% endif %}
+                                | max: {{ selectedJudging.maxRuntime | number_format(3, '.', '') }}s
+                                | sum: {{ selectedJudging.sumRuntime | number_format(3, '.', '') }}s&nbsp
+                                {%- if selectedJudging.SumOptScore is not null -%}
+                                    | <span>opt score:</span> {{ selectedJudging.SumOptScore | formatOptScore }}
+                                {%- endif %}
+                            {%- endif %}
                     </span>
                 </span>
             </div>

webapp/templates/team/partials/submission.html.twig

@@ -45,6 +45,11 @@
                             Max. Runtime: <b>{{ "%0.3f s" | format(judging.getMaxRuntime()) }}</b>
                         </div>
                     {% endif %}
+                    {% if judging.result == 'correct' and judging.submission.contest.getOptScoreAsScoreTiebreaker() %}
+                        <div class="p-2">
+                            Opt. Score: <b>{{ judging.SumOptScore  | formatOptScore }}</b>
+                        </div>
+                    {% endif %}
                 </div>
             {% endif %}
         </div>

webapp/templates/team/partials/submission_list.html.twig

@@ -14,6 +14,9 @@
             {% if contest.getRuntimeAsScoreTiebreaker() %}
                 <th scope="col">runtime</th>
             {% endif %}
+            {% if contest.getOptScoreAsScoreTiebreaker() %}
+                <th scope="col">optscore</th>
+            {% endif %}
             {% if allowDownload %}
                 <th scope="col"></th>
             {% endif %}
@@ -79,6 +82,17 @@
                     </a>
                 </td>
         {% endif %}
+        {% if contest.getOptScoreAsScoreTiebreaker() %}
+                <td>
+                    <a data-ajax-modal data-ajax-modal-after="markSeen" {% if link %}href="{{ link }}"{% endif %}>
+                        {% if link and submission.getResult()=='correct' %}
+                            {{ submission.judgings.first.SumOptScore | formatOptScore }}
+                        {% else %}
+                            -
+                        {% endif %}
+                    </a>
+                </td>
+        {% endif %}
         {% if allowDownload %}
                 <td>
                     <a title="Download submission ZIP" aria-label="download submission zip" class="btn btn-light" href="{{ path('team_submission_download', {'submitId': submission.submitid}) }}">