use display_name for tasks and update related logic in scoreboard templates and scripts

Author: allnes

scoreboard/html_renderer.py

@@ -27,7 +27,7 @@ def render_threads_page(
     texts: dict,
     repo_salt: str,
     threads_vmax: int,
-    thread_tasks: List[str],
+    thread_tasks: List[Any],
 ) -> str:
     env = _environment()
     template = env.get_template("threads_table.html.j2")

scoreboard/main.py

@@ -8,6 +8,7 @@
 from datetime import datetime
 from pathlib import Path
 
+from builder import load_scoreboard
 from data_loader import SCRIPT_DIR
 from html_renderer import (
     render_index_page,
@@ -18,8 +19,6 @@
 from student import Student
 from texts import TEXT
 
-from scoreboard import Scoreboard
-
 logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
 logger = logging.getLogger(__name__)
 
@@ -49,7 +48,7 @@ def main() -> None:
     output_dir = Path(args.output)
     output_dir.mkdir(parents=True, exist_ok=True)
 
-    board = Scoreboard.from_files(repo_salt=REPO_SALT)
+    board = load_scoreboard(repo_salt=REPO_SALT)
 
     css = _load_css()
     generated_at = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
@@ -67,7 +66,7 @@ def main() -> None:
         threads_vmax=int(
             (board.points_info.get("threads", {}) or {}).get("variants_max", 1)
         ),
-        thread_tasks=[t.name for t in board.thread_tasks],
+        thread_tasks=board.thread_tasks,
     )
     proc_vmaxes = [task.variants_max for task in board.process_tasks]
     processes_html = render_processes_page(
@@ -98,7 +97,7 @@ def main() -> None:
             threads_vmax=int(
                 (board.points_info.get("threads", {}) or {}).get("variants_max", 1)
             ),
-            thread_tasks=[t.name for t in board.thread_tasks],
+            thread_tasks=board.thread_tasks,
         )
         fname = f"threads_{_slugify(group)}.html"
         (output_dir / fname).write_text(html, encoding="utf-8")

scoreboard/scoreboard.py

@@ -166,8 +166,10 @@ def _build_thread_tasks(self) -> list[ThreadTask]:
         tasks: list[ThreadTask] = []
         for cfg in tasks_cfg:
             name = str(cfg.get("name"))
+            display_name = cfg.get("title") or name
             task = ThreadTask(
                 name=name,
+                display_name=display_name,
                 s_points=int(cfg.get("S", 0)),
                 a_points=int(cfg.get("A", 0)),
                 r_points=int(cfg.get("R", 0)),
@@ -187,8 +189,9 @@ def _build_process_tasks(self) -> list[ProcessTask]:
             self.deadline_shifts.get("processes_base", {}),
         )
         tasks: list[ProcessTask] = []
-        for cfg, deadline in zip(tasks_cfg, deadlines):
+        for idx, (cfg, deadline) in enumerate(zip(tasks_cfg, deadlines), start=1):
             name = str(cfg.get("name"))
+            display_name = cfg.get("title") or f"Task {idx}"
             mpi_blk = cfg.get("mpi", {})
             seq_blk = cfg.get("seq", {})
 
@@ -206,6 +209,7 @@ def _extract(block: dict | list, key: str) -> int:
 
             task = ProcessTask(
                 name=name,
+                display_name=display_name,
                 mpi_points=mpi_points,
                 seq_points=seq_points,
                 r_points=int(cfg.get("R", 0)),

scoreboard/static/variant.js

@@ -129,11 +129,19 @@
     }
   }
 
-  async function fillProcessesTable(repoSalt, vmaxes, showTaskLabels = false) {
+  async function fillProcessesTable(repoSalt, vmaxes, titles) {
     const rows = document.querySelectorAll('tr[data-last]');
     for (const tr of rows) {
       const vs = await computeProcessesVariants(studentFromDataset(tr), repoSalt, vmaxes);
-      if (vs && tr.querySelector('.variant-cell')) tr.querySelector('.variant-cell').innerHTML = vs.join('<br/>');
+      if (vs && tr.querySelector('.variant-cell')) {
+        const labels = Array.isArray(titles) && titles.length === vs.length
+          ? titles
+          : vs.map((_, idx) => `Task ${idx + 1}`);
+        const html = vs
+          .map((val, idx) => `${labels[idx]}: ${val}`)
+          .join('<br/>');
+        tr.querySelector('.variant-cell').innerHTML = html;
+      }
     }
   }
 
@@ -160,7 +168,9 @@
           const pv = await computeProcessesVariants(student, repoSalt, procVmaxes);
           if (!pv) throw new Error('Fill Last, First, Group');
           res.style.color = '#2563eb';
-          res.innerHTML = `${window.variantTexts?.processesVariantLabel || 'Processes'}: <b>${pv[0]} / ${pv[1]} / ${pv[2]}</b>`;
+          const labels = procVmaxes.map((_, idx) => `Task ${idx + 1}`);
+          const variants = pv.map((v, idx) => `${labels[idx]}=${v}`).join(' / ');
+          res.innerHTML = `${window.variantTexts?.processesVariantLabel || 'Processes'}: <b>${variants}</b>`;
         }
       } catch (e) {
         res.textContent = (window.variantTexts?.fillPrompt) || 'Fill Last, First, Group';

scoreboard/tasks.py

@@ -164,6 +164,7 @@ class ThreadTask(Task):
     def __init__(
         self,
         name: str,
+        display_name: str | None,
         s_points: int,
         a_points: int,
         r_points: int,
@@ -183,6 +184,7 @@ def __init__(
         self.s_points = s_points
         self.a_points = a_points
         self.r_points = r_points
+        self.display_name = display_name or name
 
     def calculate_score(
         self, student, submission: ThreadSubmission | None
@@ -276,6 +278,7 @@ class ProcessTask(Task):
     def __init__(
         self,
         name: str,
+        display_name: str | None,
         mpi_points: dict,
         seq_points: dict,
         r_points: int,
@@ -300,6 +303,7 @@ def __init__(
         self.seq_points = {k: int(v) for k, v in seq_points.items()}
         self.r_points = int(r_points)
         self.variants_max = int(variants_max)
+        self.display_name = display_name or name
 
     def calculate_score(
         self, student, submission: ProcessSubmission | None

scoreboard/templates/processes_table.html.j2

@@ -27,7 +27,7 @@
           {% set mpi_letters = ['S','P','A','E','D','C'] %}
           <th colspan="{{ seq_letters|length + mpi_letters|length + 1 }}" class="task-header">
             <div class="task-title">
-              <span class="task-name">Task {{ loop.index }}</span>
+              <span class="task-name">{{ task.display_name }}</span>
               {% if deadlines[loop.index0] %}<span class="deadline">{{ deadlines[loop.index0] }}</span>{% endif %}
             </div>
           </th>
@@ -81,7 +81,11 @@
     </tbody>
   </table>
   <script>
-    variantCalc.fillProcessesTable({{ repo_salt | tojson | safe }}, {{ proc_vmaxes | tojson | safe }});
+    variantCalc.fillProcessesTable(
+      {{ repo_salt | tojson | safe }},
+      {{ proc_vmaxes | tojson | safe }},
+      {{ proc_tasks | map(attribute='display_name') | list | tojson | safe }}
+    );
   </script>
   </div>
 </body>

scoreboard/templates/threads_table.html.j2

@@ -24,19 +24,19 @@
         <th rowspan="2">Name</th>
         <th rowspan="2" class="narrow">V</th>
         {% for task in thread_tasks %}
-          {% set letters = ['S','D','C','R'] if task == 'seq' else ['S','P','A','E','D','C','R'] %}
+          {% set letters = ['S','D','C','R'] if task.name == 'seq' else ['S','P','A','E','D','C','R'] %}
           <th colspan="{{ letters | length }}" class="task-header">
             <div class="task-title">
-              <span class="task-name">{{ task }}</span>
-              {% if deadlines.get(task) %}<span class="deadline">{{ deadlines.get(task) }}</span>{% endif %}
+              <span class="task-name">{{ task.display_name }}</span>
+              {% if deadlines.get(task.name) %}<span class="deadline">{{ deadlines.get(task.name) }}</span>{% endif %}
             </div>
           </th>
         {% endfor %}
         <th rowspan="2" class="narrow">Total</th>
       </tr>
       <tr>
         {% for task in thread_tasks %}
-          {% set letters = ['S','D','C','R'] if task == 'seq' else ['S','P','A','E','D','C','R'] %}
+          {% set letters = ['S','D','C','R'] if task.name == 'seq' else ['S','P','A','E','D','C','R'] %}
           {% for letter in letters %}
             <th class="narrow">{{ letter }}</th>
           {% endfor %}
@@ -49,8 +49,8 @@
           <td class="name">{{ row.name|safe }}</td>
           <td class="narrow variant-cell">—</td>
           {% for task in thread_tasks %}
-            {% set cell = row.cells[task] %}
-            {% if task == 'seq' %}
+            {% set cell = row.cells[task.name] %}
+            {% if task.name == 'seq' %}
               <td class="narrow {{ cell.solution_class }}">{{ cell.solution_points }}</td>
               <td class="narrow deadline-cell">{{ cell.deadline_penalty }}</td>
               <td class="narrow {{ cell.copy_class }}">{{ cell.copy_penalty }}</td>

scoreboard/templates/variants.html.j2

@@ -43,7 +43,11 @@
       {{ proc_vmaxes | tojson | safe }}
     );
     variantCalc.fillThreadsTable({{ repo_salt | tojson | safe }}, {{ threads_vmax | int }});
-    variantCalc.fillProcessesTable({{ repo_salt | tojson | safe }}, {{ proc_vmaxes | tojson | safe }}, true);
+    variantCalc.fillProcessesTable(
+      {{ repo_salt | tojson | safe }},
+      {{ proc_vmaxes | tojson | safe }},
+      {{ proc_tasks | map(attribute='display_name') | list | tojson | safe }}
+    );
   </script>
   </div>
 </body>