Show elapsed minutes on scoreboard

DOMjudge · Aug 31, 2023 · 77d0b6b · 77d0b6b
1 parent 8b7fd31
commit 77d0b6b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -69,6 +69,7 @@ public function getFilters(): array
         return [
             new TwigFilter('printtimediff', $this->printtimediff(...)),
             new TwigFilter('printremainingminutes', $this->printremainingminutes(...)),
+            new TwigFilter('printelapsedminutes', $this->printelapsedminutes(...)),
             new TwigFilter('printtime', $this->printtime(...)),
             new TwigFilter('printHumanTimeDiff', $this->printHumanTimeDiff(...)),
             new TwigFilter('printtimeHover', $this->printtimeHover(...), ['is_safe' => ['html']]),
@@ -174,6 +175,16 @@ public function printremainingminutes(float $start, float $end): string
         }
     }
 
+    public function printelapsedminutes(float $start, float $end): string
+    {
+        $minutesElapsed = floor(($end - $start)/60);
+        if ($minutesElapsed == 1) {
+            return '1 minute ago';
+        } else {
+            return $minutesElapsed . ' minutes ago';
+        }
+    }
+
     /**
      * Print a time formatted as specified. The format is according to date().
      * @param Contest|null $contest If given, print time relative to that contest start.

diff --git a/webapp/templates/partials/scoreboard.html.twig b/webapp/templates/partials/scoreboard.html.twig
@@ -36,7 +36,9 @@
                     {{ now | printremainingminutes(current_contest.endtime) }}
                 {% else %}
                     {% if current_contest.freezeData.started %}
+                        {% set now = 'now'|date('U') %}
                         started:
+                        {{ current_contest.starttime | printelapsedminutes(now) }} at
                     {% else %}
                         starts:
                     {% endif %}