Display more external results.

Author: meisterT

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

@@ -81,7 +81,10 @@
                 <th scope="col">score</th>
             {% endif %}
             {% if showExternalResult and not showExternalTestcases %}
-                <th scope="col">external result</th>
+                <th scope="col">ext. result</th>
+                {% if is_scoring %}
+                    <th scope="col">ext. score</th>
+                {% endif %}
             {% endif %}
             {% if not showExternalResult or not showExternalTestcases %}
                 <th scope="col" class="table-button-head-left">verified</th>
@@ -168,13 +171,15 @@
                         {{ submission | printValidJurySubmissionResult }}
                     </a>
                 </td>
-                <td class="right">
-                    {% if submission.score is not null %}
-                        {{ submission.score | number_format(2, '.', '') }}
-                    {% else %}
-                        {{ '-' }}
-                    {% endif %}
-                </td>
+                {% if is_scoring %}
+                    <td class="right">
+                        {% if submission.score is not null %}
+                            {{ submission.score | number_format(2, '.', '') }}
+                        {% else %}
+                            {{ '-' }}
+                        {% endif %}
+                    </td>
+                {% endif %}
                 {% if showExternalResult and not showExternalTestcases %}
                     {% if submission.externalJudgements.empty %}
                         {% set externalJudgement = null %}
@@ -192,6 +197,15 @@
                             {% endif %}
                         </a>
                     </td>
+                    {% if is_scoring %}
+                        <td class="{{ tdExtraClass }}">
+                            {% if externalJudgement is not null and externalJudgement.score is not null %}
+                                {{ externalJudgement.score | number_format(2, '.', '') }}
+                            {% else %}
+                                {{ '-' }}
+                            {% endif %}
+                        </td>
+                    {% endif %}
                 {% endif %}
                 {% if not showExternalResult or not showExternalTestcases %}
                     {%- set claim = false %}

webapp/templates/jury/submission.html.twig

@@ -409,7 +409,11 @@
                             {% if submission.importError %}
                                 External result: {{ externalJudgement.result | printValidJuryResult }}
                             {% else %}
-                                (external: {{ externalJudgement.result | printValidJuryResult }})
+                                (external: {{ externalJudgement.result | printValidJuryResult }}
+                                {% if submission.problem.scoringProblem %}
+                                    , score: {{ "%.2f" | format(externalJudgement.score) }}
+                                {% endif %}
+                                )
                             {% endif %}
                         {%- endif %}
                         {%- if selectedJudging is not null and judgehosts is not empty -%}