attendance arrays

src/lib/attendance.ts

 import fs from "node:fs/promises";
-import { FinishedTranscriptMeta, Resolution } from "./parsing";
-import { Attendance, generateAttendanceHtmlWrapper } from "./rendering";
+import { FinishedTranscriptMeta } from "./parsing";
+import { generateAttendanceHtmlWrapper } from "./rendering";
+
+export class Attendance {
+    presents: number[] = [];
+    noshows: number[] = [];
+    noshow_excuseds: number[] = [];
+
+    get present(): number {
+        return this.presents.length;
+    }
+
+    get noshow(): number {
+        return this.noshows.length;
+    }
+
+    get noshow_excused(): number {
+        return this.noshow_excuseds.length;
+    }
+
+    sum(): number {
+        return this.present + this.noshow + this.noshow_excused;
+    }
+
+    union(other: Attendance) {
+        this.presents = this.presents.concat(other.presents).sort();
+        this.noshows = this.noshows.concat(other.noshows).sort();
+        this.noshow_excuseds = this.noshow_excuseds
+            .concat(other.noshow_excuseds)
+            .sort();
+    }
+}
 
 export async function generateAttendancePage(
     outputDir: string,
@@ -49,25 +79,25 @@ function _generateAttendancePart(
 ): Map<string, Attendance> {
     const attendanceMap = new Map<string, Attendance>();
 
-    for (const { present, absent } of relevantTranscripts) {
+    for (const { present, absent, number } of relevantTranscripts) {
         present.forEach((name) =>
-            _incrementAttendance(name, attendanceMap, true),
+            _incrementAttendance(name, attendanceMap, true, number!),
         );
         absent.forEach((name) =>
-            _incrementAttendance(name, attendanceMap, false),
+            _incrementAttendance(name, attendanceMap, false, number!),
         );
     }
 
-    _mergeAttendance(attendanceMap);
+    _mergeAttendance(attendanceMap, relevantTranscripts.length);
 
     return attendanceMap;
 }
 
-function _mergeAttendance(attendanceMap: Map<string, Attendance>) {
+function _mergeAttendance(
+    attendanceMap: Map<string, Attendance>,
+    maxAttendance: number,
+) {
     const names: string[] = [...attendanceMap.keys()];
-    const maxAttendance: number = Math.max(
-        ...[...attendanceMap.values()].map(_sumAttendance),
-    );
 
     for (const shortName of names) {
         if (shortName.includes(" ")) {
@@ -83,16 +113,13 @@ function _mergeAttendance(attendanceMap: Map<string, Attendance>) {
             const longAttendance: Attendance = attendanceMap.get(
                 nameMatches[0],
             )!;
-            longAttendance.present += shortAttendance.present;
-            longAttendance.noshow += shortAttendance.noshow;
-            longAttendance.noshow_excused += shortAttendance.noshow_excused;
+            longAttendance.union(shortAttendance);
             attendanceMap.delete(shortName);
         }
     }
 
     let missingNames = [...attendanceMap.keys()].filter(
-        (name: string) =>
-            _sumAttendance(attendanceMap.get(name)!) != maxAttendance,
+        (name: string) => attendanceMap.get(name)!.sum() != maxAttendance,
     );
     for (const missingName of missingNames) {
         const missingAttendance = attendanceMap.get(missingName);
@@ -112,15 +139,12 @@ function _mergeAttendance(attendanceMap: Map<string, Attendance>) {
             const otherName = potentialMatches.pop()!;
             const otherAttendance = attendanceMap.get(otherName)!;
             if (
-                _sumAttendance(missingAttendance)
-                    + _sumAttendance(otherAttendance)
+                missingAttendance.sum() + otherAttendance.sum()
                 > maxAttendance
             ) {
                 continue;
             }
-            missingAttendance.present += otherAttendance.present;
-            missingAttendance.noshow += otherAttendance.noshow;
-            missingAttendance.noshow_excused += otherAttendance.noshow_excused;
+            missingAttendance.union(otherAttendance);
             attendanceMap.delete(otherName);
             missingNames = missingNames.filter((e) => e != otherName);
         }
@@ -131,30 +155,24 @@ function _incrementAttendance(
     name: string,
     attendanceMap: Map<string, Attendance>,
     present: boolean,
+    transscriptNumber: number,
 ) {
     const cleanName = _cleanName(name);
-    const attendance: Attendance = attendanceMap.get(cleanName) ?? {
-        present: 0,
-        noshow: 0,
-        noshow_excused: 0,
-    };
+    const attendance: Attendance =
+        attendanceMap.get(cleanName) ?? new Attendance();
 
     if (present) {
-        attendance.present += 1;
+        attendance.presents.push(transscriptNumber);
     } else {
         if (_isExcused(name)) {
-            attendance.noshow_excused += 1;
+            attendance.noshow_excuseds.push(transscriptNumber);
         } else {
-            attendance.noshow += 1;
+            attendance.noshows.push(transscriptNumber);
         }
     }
     attendanceMap.set(cleanName, attendance);
 }
 
-function _sumAttendance(attendance: Attendance): number {
-    return attendance.present + attendance.noshow_excused + attendance.noshow;
-}
-
 function _isExcused(name: string): boolean {
     return name.search(/([(\[]).*?(([eE])(ntschuldigt)?).*?([)\]])/) !== -1;
 }

src/lib/rendering.ts

 import { FinishedTranscriptMeta, Resolution, Todo } from "./parsing";
+import { Attendance } from "./attendance";
 
 export function renderContainerToAlert(context: String, title?: String) {
     return function (tokens, idx) {
@@ -535,12 +536,6 @@ ${resolution.date} ${resolution.number}: beschlossen
     return `<details><summary><small class="text-body-secondary fw-light">Hledger-Statement für die Buchhaltung</small></summary><pre><code id="reso-text-${resolution.number}">${hledgerText}</code></pre><button class="btn btn-outline-primary btn-sm" onclick="navigator.clipboard.writeText(document.getElementById(\'reso-text-${resolution.number}\').innerText)"><svg width="16" height="16" version="2.0"><use href="#clipboard-icon" /></svg> Hledger-Statement kopieren</button></details>`;
 }
 
-export interface Attendance {
-    present: number;
-    noshow: number;
-    noshow_excused: number;
-}
-
 export function generateAttendanceHtmlWrapper(
     attendanceParts: [
         Map<string, Attendance>,
@@ -689,7 +684,7 @@ export function generateAttendanceHtml(
 }
 
 function generateAttendanceRowHtml(name: string, data: Attendance): string {
-    const sum = (data.present + data.noshow + data.noshow_excused) / 100;
+    const sum = data.sum() / 100;
 
     const bar = `
       <div class="percentage-bar">