Add progress bar to rejudging.

meisterT · Nov 25, 2024 · 5011ed0 · 5011ed0
1 parent 0d0cd3f
commit 5011ed0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/webapp/src/Controller/Jury/RejudgingController.php b/webapp/src/Controller/Jury/RejudgingController.php
@@ -239,7 +239,9 @@ public function viewAction(
         if (!$rejudging) {
             throw new NotFoundHttpException(sprintf('Rejudging with ID %s not found', $rejudgingId));
         }
-        $todo = $this->rejudgingService->calculateTodo($rejudging)['todo'];
+        $todoAndDone = $this->rejudgingService->calculateTodo($rejudging);
+        $todo = $todoAndDone['todo'];
+        $done = $todoAndDone['done'];
 
         $verdicts = $this->dj->getVerdicts(['final', 'error']);
         $verdicts[''] = 'JE'; /* happens for aborted judgings */
@@ -389,6 +391,7 @@ public function viewAction(
         $data = [
             'rejudging' => $rejudging,
             'todo' => $todo,
+            'done' => $done,
             'verdicts' => $verdicts,
             'used' => $used,
             'verdictTable' => $verdictTable,

diff --git a/webapp/templates/jury/rejudging.html.twig b/webapp/templates/jury/rejudging.html.twig
@@ -78,7 +78,14 @@
                 </tr>
                 <tr {% if todo <= 0 %}class="d-none"{% endif %}>
                     <th>Queued</th>
-                    <td><span data-todo>{{ todo }}</span> unfinished judgings</td>
+                    <td>
+                        <span data-todo>{{ todo }}</span> unfinished judgings (out of {{ todo + done }})
+                        <br/>
+                        {% set percent = (done / (todo + done)) * 100 | number_format %}
+                        <div class="progress" style="height: 15px;">
+                            <div class="progress-bar" role="progressbar" style="width: {{ percent }}%;" aria-valuenow="{{ percent }}" aria-valuemin="0" aria-valuemax="100"></div>
+                        </div>
+                    </td>
                 </tr>
                 {% if repetitions %}
                     <tr>