signalk-race-control 0.6.0 → 0.7.0

package/README.md

@@ -87,7 +87,10 @@ and a live projected finishing order — during and after the race.
   ended up as the name.
 - **Editable finish times** — click **Now** to record a finish as it happens, type a
   specific `HH:MM:SS` into the finish-time field to correct a mistimed click, or
-  **Clear** to undo. Handles races that cross midnight.
+  **Clear** to undo. Handles races that cross midnight. **DNS** marks a boat as never
+  having started at all, distinct from **DNF** (started but didn't finish) — both show
+  up as their own status in the Excel export and rank last, and either one can be
+  undone the same way. Recording a real finish time clears either.
 - **Start timer** — once a start line is set and a start is scheduled, an expandable
   **Start timer** panel shows a countdown to the gun alongside three live numbers for
   this vessel specifically (from its own SignalK GPS/speed, not any other tracked
@@ -140,13 +143,17 @@ and a live projected finishing order — during and after the race.
   rounding.
 - **Stop / call off the race** — freezes elapsed/corrected time for everyone without
   touching boats, finish times, or the course (unlike Reset, which clears the race
-  back to not-started), and marks every boat that hadn't finished as **DNF**,
-  capturing its last known AIS position if one's available. You can also schedule a
-  call-off for a future time (mirrors Schedule Start), and mark or un-mark an
-  individual boat DNF by hand at any point, independent of the whole race. There's no
+  back to not-started), and marks every boat that hadn't finished or already been
+  marked DNS as **DNF**, capturing its last known AIS position if one's available. You
+  can also schedule a call-off for a future time (mirrors Schedule Start), and mark or
+  un-mark an individual boat DNF or DNS by hand at any point, independent of the whole
+  race. There's no
   true pause: **Resume** discards the stop, un-DNFs everyone it DNF'd, and the clock
   jumps straight back to real elapsed time — the time spent stopped isn't excluded
   from anyone's result. Recording a real finish time on a DNF'd boat clears its DNF.
+  Also happens automatically the moment every boat has either finished or been marked
+  DNF — nothing left to time, so the race calls itself off rather than sitting there
+  with an idle clock until someone remembers to click Stop.
 - **Compare to a "self" boat** — click the star next to a boat's name to mark it as
   self. Every other boat then shows, in the **vs Self** column: a live-ticking
   countdown to the moment self would tie them on corrected time if that boat has
@@ -155,10 +162,15 @@ and a live projected finishing order — during and after the race.
   both have finished. With no boat marked self, the column instead compares everyone
   against the current **leader** (tagged accordingly), so it's never just blank.
 - **Export to Excel** — a genuine `.xlsx` snapshot of the current standings (same
-  ranking, same rows as the on-screen table: rank, boat, sail number, MMSI, TCF,
-  start time, elapsed, corrected, finish time, status), with the time columns
-  rendered in your browser's own timezone rather than the server's (and with the
-  date included, for a multi-day race).
+  ranking, same rows as the on-screen table: rank, boat, sail number, MMSI, TCF, start
+  time, finish time, elapsed, corrected, status), with the time columns rendered in
+  your browser's own timezone rather than the server's (and with the date included,
+  for a multi-day race). Start/finish are real date-time cells, and Elapsed/Corrected
+  are live formulas from them (elapsed × TCF), not numbers baked in at export time —
+  correct a start or finish time directly in the spreadsheet afterward and the rest
+  recalculates. Left blank for a boat with no finish time (DNF, DNS, or still racing)
+  rather than a snapshot of elapsed-so-far that would go stale the moment the file is
+  reopened later.
 - **Download Offline Timer** — a single self-contained `.html` file, seeded with the
   current race's boats, TCF, and multi-day setting, that runs the core of race timing
   (start/stop/resume/reset, add/remove boats, edit TCF, individual start times,

package/index.js

@@ -303,6 +303,7 @@ function ensureRaceShape(race) {
   Object.values(race.boats).forEach((b) => {
     if (!b.track) b.track = [];
     if (b.dnf === undefined) b.dnf = false;
+    if (b.dns === undefined) b.dns = false;
     if (b.dnfPosition === undefined) b.dnfPosition = null;
     if (b.startTime === undefined) b.startTime = null;
     if (b.sailNumber === undefined) b.sailNumber = null;
@@ -358,30 +359,11 @@ function validateLine(line) {
   return [a, b];
 }
 
-// HH:MM:SS for a duration, or '' when there's nothing to show — matches the
-// webapp's fmtDuration, used for the Excel export's Elapsed/Corrected columns.
-function formatDurationHms(ms) {
-  if (ms == null || ms < 0 || !isFinite(ms)) return '';
-  const totalSec = Math.floor(ms / 1000);
-  const h = Math.floor(totalSec / 3600);
-  const m = Math.floor((totalSec % 3600) / 60);
-  const s = totalSec % 60;
-  const pad = (n) => String(n).padStart(2, '0');
-  return `${pad(h)}:${pad(m)}:${pad(s)}`;
-}
-
 // Renders an absolute instant as the wall-clock time it was in the
 // exporting browser's own timezone (tzOffsetMinutes = that browser's
 // Date.prototype.getTimezoneOffset()) rather than the server's timezone,
 // which may well be different — the server can be headless/UTC while the
 // person opening the spreadsheet is reading it in their own local time.
-function formatLocalTime(utcMs, tzOffsetMinutes) {
-  if (utcMs == null) return '';
-  const shifted = new Date(utcMs - tzOffsetMinutes * 60000);
-  const pad = (n) => String(n).padStart(2, '0');
-  return `${pad(shifted.getUTCHours())}:${pad(shifted.getUTCMinutes())}:${pad(shifted.getUTCSeconds())}`;
-}
-
 function formatLocalDateTime(utcMs, tzOffsetMinutes) {
   if (utcMs == null) return '';
   const shifted = new Date(utcMs - tzOffsetMinutes * 60000);
@@ -424,7 +406,8 @@ function buildOfflineTimerHtml(race, defaultTcf, vetOptions) {
       tcf: b.tcf != null ? b.tcf : defaultTcf,
       startTime: b.startTime || null,
       finishTime: b.finishTime || null,
-      dnf: !!b.dnf
+      dnf: !!b.dnf,
+      dns: !!b.dns
     })),
     storageKey: 'raceControlOffline_v1_' + race.id,
     // Lets a re-download know whether it's actually newer than whatever
@@ -638,14 +621,25 @@ tbody tr.dnf td { color: var(--muted); }
   function doStart() {
     race.startTime = Date.now();
     race.stopTime = null;
-    race.boats.forEach(function (b) { b.finishTime = null; b.startTime = null; b.dnf = false; });
+    race.boats.forEach(function (b) { b.finishTime = null; b.startTime = null; b.dnf = false; b.dns = false; });
     save();
   }
   function doStop() {
     race.stopTime = Date.now();
-    race.boats.forEach(function (b) { if (!b.finishTime && !b.dnf) b.dnf = true; });
+    race.boats.forEach(function (b) { if (!b.finishTime && !b.dnf && !b.dns) b.dnf = true; });
     save();
   }
+  // A race with at least one boat where every boat has either finished or
+  // been marked DNF/DNS has nothing left to time — call it off
+  // automatically rather than leaving the clock running until someone
+  // remembers to.
+  function isRaceComplete() {
+    if (!race.boats.length) return false;
+    return race.boats.every(function (b) { return b.finishTime || b.dnf || b.dns; });
+  }
+  function maybeAutoStop() {
+    if (race.startTime && !race.stopTime && isRaceComplete()) doStop();
+  }
   function doResume() {
     if (!race.stopTime) return;
     race.stopTime = null;
@@ -655,7 +649,7 @@ tbody tr.dnf td { color: var(--muted); }
   function doReset() {
     race.startTime = null;
     race.stopTime = null;
-    race.boats.forEach(function (b) { b.finishTime = null; b.startTime = null; b.dnf = false; });
+    race.boats.forEach(function (b) { b.finishTime = null; b.startTime = null; b.dnf = false; b.dns = false; });
     save();
   }
   function effectiveStart(boat) {
@@ -897,10 +891,10 @@ tbody tr.dnf td { color: var(--muted); }
     return race.boats
       .map(function (boat) {
         var start = effectiveStart(boat);
-        var elapsedMs = !boat.dnf && start && start <= now ? (boat.finishTime || now) - start : null;
+        var elapsedMs = !boat.dnf && !boat.dns && start && start <= now ? (boat.finishTime || now) - start : null;
         var tcf = boat.tcf != null ? boat.tcf : 1.0;
         var correctedMs = elapsedMs != null ? elapsedMs * tcf : null;
-        var rankMs = boat.dnf ? null : correctedMs;
+        var rankMs = boat.dnf || boat.dns ? null : correctedMs;
         return { boat: boat, elapsedMs: elapsedMs, correctedMs: correctedMs, rankMs: rankMs };
       })
       .sort(function (a, b) {
@@ -908,6 +902,11 @@ tbody tr.dnf td { color: var(--muted); }
         var aSelf = a.boat.id === race.selfBoatId;
         var bSelf = b.boat.id === race.selfBoatId;
         if (aSelf !== bSelf) return aSelf ? -1 : 1;
+        // DNS sits at the very end regardless of phase — it can be marked
+        // before the race even starts (a known no-show), and never really
+        // "entered" the race the way even a DNF (which did start) still did.
+        if (a.boat.dns !== b.boat.dns) return a.boat.dns ? 1 : -1;
+        if (a.boat.dns) return a.boat.name.localeCompare(b.boat.name);
         // Before the race actually starts, nobody has a corrected time to
         // rank by anyway — leave order exactly as race.boats gave it
         // (registration order) rather than reshuffling on every add/remove.
@@ -935,7 +934,7 @@ tbody tr.dnf td { color: var(--muted); }
     if (!self) return map;
     ranked.forEach(function (r) {
       if (r.boat.id === self.boat.id) { map[r.boat.id] = { type: 'self', isLeader: isLeaderFallback }; return; }
-      if (self.boat.dnf) { map[r.boat.id] = { type: 'none' }; return; }
+      if (self.boat.dnf || self.boat.dns) { map[r.boat.id] = { type: 'none' }; return; }
       if (!self.boat.finishTime && r.boat.finishTime) {
         var thresholdElapsedMs = r.correctedMs / (self.boat.tcf || 1);
         map[r.boat.id] = {
@@ -1154,6 +1153,7 @@ tbody tr.dnf td { color: var(--muted); }
           ? dateTimeInputValueToTs(finishTimeInput.value)
           : timeInputValueToTs(finishTimeInput.value);
       }
+      maybeAutoStop();
       save();
       render();
     });
@@ -1165,6 +1165,7 @@ tbody tr.dnf td { color: var(--muted); }
       var boat = findBoat(boatId);
       if (!boat) return;
       boat.finishTime = Date.now();
+      maybeAutoStop();
       save();
       render();
     });
@@ -1187,12 +1188,26 @@ tbody tr.dnf td { color: var(--muted); }
       var boat = findBoat(boatId);
       if (!boat) return;
       boat.dnf = true;
+      maybeAutoStop();
+      save();
+      render();
+    });
+    var finishDnsBtn = document.createElement('button');
+    finishDnsBtn.type = 'button';
+    finishDnsBtn.className = 'finish-dnf-btn';
+    finishDnsBtn.textContent = 'DNS';
+    finishDnsBtn.title = 'Did not start';
+    finishDnsBtn.addEventListener('click', function () {
+      var boat = findBoat(boatId);
+      if (!boat) return;
+      boat.dns = true;
+      maybeAutoStop();
       save();
       render();
     });
     var finishNormalWrap = document.createElement('div');
     finishNormalWrap.className = 'finish-cell';
-    finishNormalWrap.append(finishTimeInput, finishNowBtn, finishClearBtn, finishDnfBtn);
+    finishNormalWrap.append(finishTimeInput, finishNowBtn, finishClearBtn, finishDnfBtn, finishDnsBtn);
 
     var dnfTag = document.createElement('span');
     dnfTag.className = 'dnf-tag';
@@ -1212,8 +1227,26 @@ tbody tr.dnf td { color: var(--muted); }
     dnfWrap.className = 'finish-cell';
     dnfWrap.append(dnfTag, undoDnfBtn);
 
+    var dnsTag = document.createElement('span');
+    dnsTag.className = 'dnf-tag';
+    dnsTag.textContent = 'DNS';
+    var undoDnsBtn = document.createElement('button');
+    undoDnsBtn.type = 'button';
+    undoDnsBtn.className = 'undo-dnf-btn';
+    undoDnsBtn.textContent = 'Undo DNS';
+    undoDnsBtn.addEventListener('click', function () {
+      var boat = findBoat(boatId);
+      if (!boat) return;
+      boat.dns = false;
+      save();
+      render();
+    });
+    var dnsWrap = document.createElement('div');
+    dnsWrap.className = 'finish-cell';
+    dnsWrap.append(dnsTag, undoDnsBtn);
+
     var tdFinish = document.createElement('td');
-    tdFinish.append(finishNormalWrap, dnfWrap);
+    tdFinish.append(finishNormalWrap, dnfWrap, dnsWrap);
 
     var removeBtn = document.createElement('button');
     removeBtn.type = 'button';
@@ -1225,6 +1258,7 @@ tbody tr.dnf td { color: var(--muted); }
       // from the DOM, not just forget about it.
       race.boats = race.boats.filter(function (b) { return b.id !== boatId; });
       if (race.selfBoatId === boatId) race.selfBoatId = null;
+      maybeAutoStop();
       save();
       render();
     });
@@ -1237,7 +1271,7 @@ tbody tr.dnf td { color: var(--muted); }
       vetSelect: vetSelect, vetBadge: vetBadge, vetHandicapVersion: -1,
       startTimeInput: startTimeInput, startNowBtn: startNowBtn, startClearBtn: startClearBtn,
       tdElapsed: tdElapsed, tdCorrected: tdCorrected, tdVsSelf: tdVsSelf,
-      finishNormalWrap: finishNormalWrap, finishTimeInput: finishTimeInput, dnfWrap: dnfWrap
+      finishNormalWrap: finishNormalWrap, finishTimeInput: finishTimeInput, dnfWrap: dnfWrap, dnsWrap: dnsWrap
     };
   }
 
@@ -1267,7 +1301,7 @@ tbody tr.dnf td { color: var(--muted); }
       var row = rows[b.id];
       if (!row) { row = buildRow(b.id); rows[b.id] = row; }
       row.tr.classList.toggle('finished', !!b.finishTime);
-      row.tr.classList.toggle('dnf', !!b.dnf);
+      row.tr.classList.toggle('dnf', !!b.dnf || !!b.dns);
       row.nameSpan.textContent = b.name;
       var isSelf = b.id === race.selfBoatId;
       row.selfBtn.textContent = isSelf ? '★' : '☆';
@@ -1303,8 +1337,9 @@ tbody tr.dnf td { color: var(--muted); }
         row.tdVsSelf.textContent = fmtSigned(vs.gapMs);
         row.tdVsSelf.classList.add(vs.gapMs < 0 ? 'ahead' : 'behind');
       }
-      row.finishNormalWrap.hidden = !!b.dnf;
+      row.finishNormalWrap.hidden = !!b.dnf || !!b.dns;
       row.dnfWrap.hidden = !b.dnf;
+      row.dnsWrap.hidden = !b.dns;
       if (document.activeElement !== row.finishTimeInput) {
         row.finishTimeInput.value = race.multiDay ? tsToDateTimeInputValue(b.finishTime) : tsToTimeInputValue(b.finishTime);
       }
@@ -1348,8 +1383,8 @@ tbody tr.dnf td { color: var(--muted); }
     var fmtWhen = race.multiDay ? tsToDateTimeInputValue : tsToTimeInputValue;
     var rows = [['Rank', 'Boat', 'Sail Number', 'TCF', 'Start Time', 'Elapsed', 'Corrected', 'Finish Time', 'Status']];
     rankedList().forEach(function (r, i) {
-      var status = r.boat.dnf ? 'DNF' : r.boat.finishTime ? 'Finished' : race.startTime ? 'Racing' : 'Not started';
-      var rankLabel = r.boat.dnf ? 'DNF' : r.rankMs != null ? String(i + 1) : '';
+      var status = r.boat.dns ? 'DNS' : r.boat.dnf ? 'DNF' : r.boat.finishTime ? 'Finished' : race.startTime ? 'Racing' : 'Not started';
+      var rankLabel = r.boat.dns ? 'DNS' : r.boat.dnf ? 'DNF' : r.rankMs != null ? String(i + 1) : '';
       var start = effectiveStart(r.boat);
       rows.push([
         rankLabel, r.boat.name, r.boat.sailNumber || '', r.boat.tcf, start ? fmtWhen(start) : '', fmtDuration(r.elapsedMs), fmtDuration(r.correctedMs),
@@ -1657,7 +1692,7 @@ module.exports = function (app) {
   // there's a finish line, a live position, and a non-trivial speed.
   function estimateFinish(race, boat) {
     const start = effectiveStartTime(race, boat);
-    if (!start || start > Date.now() || boat.finishTime || boat.dnf || race.stopTime) return null;
+    if (!start || start > Date.now() || boat.finishTime || boat.dnf || boat.dns || race.stopTime) return null;
     if (!race.course || !race.course.finishLine) return null;
     const live = getLivePosition(boat.mmsi);
     if (!live || live.sogMs == null || live.sogMs < 0.25) return null;
@@ -1701,18 +1736,22 @@ module.exports = function (app) {
     return Object.values(race.boats)
       .map((boat) => {
         const start = effectiveStartTime(race, boat);
-        const elapsedMs = !boat.dnf && start && start <= now ? (boat.finishTime || now) - start : null;
+        const elapsedMs = !boat.dnf && !boat.dns && start && start <= now ? (boat.finishTime || now) - start : null;
         const tcf = boat.tcf != null ? boat.tcf : 1.0;
         const correctedMs = elapsedMs != null ? elapsedMs * tcf : null;
         const estimate = estimateFinish(race, boat);
         const roundedMarksCount = countRoundedMarks(race, boat);
-        const rankMs = boat.dnf ? null : boat.finishTime ? correctedMs : estimate ? estimate.estCorrectedMs : correctedMs;
+        const rankMs = boat.dnf || boat.dns ? null : boat.finishTime ? correctedMs : estimate ? estimate.estCorrectedMs : correctedMs;
         return { boat, elapsedMs, correctedMs, estimate, roundedMarksCount, rankMs };
       })
       .sort((a, b) => {
-        if (a.rankMs == null && b.rankMs == null) return a.boat.name.localeCompare(b.boat.name);
-        if (a.rankMs == null) return 1;
-        if (b.rankMs == null) return -1;
+        // DNS sits below everyone else, including DNF — it never even
+        // started, so it's not really "in" the race the way a DNF (which
+        // did start) still arguably is.
+        const aTier = a.boat.dns ? 2 : a.rankMs == null ? 1 : 0;
+        const bTier = b.boat.dns ? 2 : b.rankMs == null ? 1 : 0;
+        if (aTier !== bTier) return aTier - bTier;
+        if (aTier !== 0) return a.boat.name.localeCompare(b.boat.name);
         // Among still-racing boats with no AIS-based ETA to fall back on
         // (elapsed-so-far alone says nothing about how much course is
         // left), a boat recorded further around the course — manually or
@@ -1789,7 +1828,7 @@ module.exports = function (app) {
     Object.values(state.races).forEach((race) => {
       if (!race.startTime || race.stopTime) return;
       Object.values(race.boats).forEach((boat) => {
-        if (boat.finishTime || boat.dnf || !boat.mmsi) return;
+        if (boat.finishTime || boat.dnf || boat.dns || !boat.mmsi) return;
         const live = getLivePosition(boat.mmsi);
         if (!live) return;
         if (!boat.track) boat.track = [];
@@ -1820,6 +1859,7 @@ module.exports = function (app) {
       b.startTime = null;
       b.track = [];
       b.dnf = false;
+      b.dns = false;
       b.dnfPosition = null;
     });
     saveState();
@@ -1865,7 +1905,7 @@ module.exports = function (app) {
     race.stopTime = atTime;
     race.scheduledCallOff = null;
     Object.values(race.boats).forEach((boat) => {
-      if (!boat.finishTime && !boat.dnf) {
+      if (!boat.finishTime && !boat.dnf && !boat.dns) {
         boat.dnf = true;
         boat.dnfPosition = getLastKnownPosition(boat);
       }
@@ -1873,6 +1913,24 @@ module.exports = function (app) {
     saveState();
   }
 
+  // A race with at least one boat where every boat has either finished or
+  // been marked DNF/DNS has nothing left to time.
+  function isRaceComplete(race) {
+    const boats = Object.values(race.boats);
+    if (!boats.length) return false;
+    return boats.every((boat) => boat.finishTime || boat.dnf || boat.dns);
+  }
+
+  // Called after anything that could newly complete a race (a finish, a
+  // DNF, or removing the one boat still racing) — calls it off
+  // automatically rather than leaving the clock running with nothing left
+  // to time until someone remembers to click Stop.
+  function maybeAutoStop(race) {
+    if (race.startTime && !race.stopTime && isRaceComplete(race)) {
+      doStop(race, Date.now());
+    }
+  }
+
   // Re-arms (or clears) the timer that auto-calls-off a race at its
   // scheduledCallOff, mirroring armSchedule for the start.
   function armCallOffSchedule(race) {
@@ -2023,11 +2081,7 @@ module.exports = function (app) {
       const tz = isFinite(tzParsed) ? tzParsed : new Date().getTimezoneOffset();
 
       const ranked = rankedBoatList(race);
-      // A multi-day race's finish/start times can land on different
-      // calendar days, so the date is included alongside the time —
-      // otherwise just the time-of-day, matching how they're entered.
-      const fmtWhen = race.multiDay ? formatLocalDateTime : formatLocalTime;
-      const headers = ['Rank', 'Boat', 'Sail Number', 'MMSI', 'TCF', 'Start Time', 'Elapsed', 'Corrected', 'Finish Time', 'Status'];
+      const headers = ['Rank', 'Boat', 'Sail Number', 'MMSI', 'TCF', 'Start Time', 'Finish Time', 'Elapsed', 'Corrected', 'Status'];
 
       const workbook = new ExcelJS.Workbook();
       workbook.creator = 'Race Control';
@@ -2055,25 +2109,52 @@ module.exports = function (app) {
         cell.fill = { type: 'pattern', pattern: 'solid', fgColor: { argb: 'FFE2E8F0' } };
       });
 
+      // Real Excel date/time values in Start/Finish (shifted the same way
+      // formatLocalDateTime above does, to display as the exporting
+      // browser's local wall-clock rather than the server's), not just
+      // formatted text — so Elapsed and Corrected can be genuine
+      // formulas referencing those cells instead of numbers baked in at
+      // export time. Recalculates if a start/finish time is corrected
+      // directly in the spreadsheet afterward. Left blank (by leaving
+      // Finish Time blank) for a boat with no finish time — DNF, DNS, or
+      // still racing — rather than showing a snapshot of elapsed-so-far
+      // that would just sit there, wrong, once the file is reopened later.
+      const dateNumFmt = race.multiDay ? 'yyyy-mm-dd hh:mm:ss' : 'hh:mm:ss';
+      const durationNumFmt = '[h]:mm:ss';
       ranked.forEach((r, i) => {
-        const status = r.boat.dnf ? 'DNF' : r.boat.finishTime ? 'Finished' : race.startTime ? 'Racing' : 'Not started';
-        const rankLabel = r.boat.dnf ? 'DNF' : r.rankMs != null ? i + 1 : '';
+        const status = r.boat.dns
+          ? 'DNS'
+          : r.boat.dnf
+            ? 'DNF'
+            : r.boat.finishTime
+              ? 'Finished'
+              : race.startTime
+                ? 'Racing'
+                : 'Not started';
+        const rankLabel = r.boat.dns ? 'DNS' : r.boat.dnf ? 'DNF' : r.rankMs != null ? i + 1 : '';
         const start = effectiveStartTime(race, r.boat);
-        sheet.addRow([
+        const startDate = start != null ? new Date(start - tz * 60000) : null;
+        const finishDate = r.boat.finishTime != null ? new Date(r.boat.finishTime - tz * 60000) : null;
+        const rowNum = headerRow.number + 1 + i;
+        const row = sheet.addRow([
           rankLabel,
           r.boat.name,
           r.boat.sailNumber || '',
           r.boat.mmsi || '',
           r.boat.tcf,
-          start ? fmtWhen(start, tz) : '',
-          formatDurationHms(r.elapsedMs),
-          formatDurationHms(r.correctedMs),
-          r.boat.finishTime ? fmtWhen(r.boat.finishTime, tz) : '',
+          startDate,
+          finishDate,
+          { formula: `IF(OR(F${rowNum}="",G${rowNum}=""),"",G${rowNum}-F${rowNum})` },
+          { formula: `IF(H${rowNum}="","",H${rowNum}*E${rowNum})` },
           status
         ]);
+        row.getCell(6).numFmt = dateNumFmt;
+        row.getCell(7).numFmt = dateNumFmt;
+        row.getCell(8).numFmt = durationNumFmt;
+        row.getCell(9).numFmt = durationNumFmt;
       });
 
-      const widths = [7, 24, 12, 12, 8, race.multiDay ? 17 : 12, 12, 12, race.multiDay ? 17 : 12, 12];
+      const widths = [7, 24, 12, 12, 8, race.multiDay ? 17 : 12, race.multiDay ? 17 : 12, 12, 12, 12];
       widths.forEach((w, i) => {
         sheet.getColumn(i + 1).width = w;
       });
@@ -2237,6 +2318,7 @@ module.exports = function (app) {
         b.startTime = null;
         b.track = [];
         b.dnf = false;
+        b.dns = false;
         b.dnfPosition = null;
       });
       saveState();
@@ -2391,6 +2473,7 @@ module.exports = function (app) {
         startTime: null,
         track: [],
         dnf: false,
+        dns: false,
         dnfPosition: null,
         markTimes: {}
       };
@@ -2405,6 +2488,7 @@ module.exports = function (app) {
       if (!getBoat(race, req.params.boatId)) return res.status(404).json({ error: 'No such boat' });
       delete race.boats[req.params.boatId];
       if (race.selfBoatId === req.params.boatId) race.selfBoatId = null;
+      maybeAutoStop(race);
       saveState();
       res.json({ ok: true });
     });
@@ -2425,11 +2509,13 @@ module.exports = function (app) {
           return res.status(400).json({ error: 'finishTime must be an epoch-millisecond timestamp or null' });
         }
         boat.finishTime = t;
-        // A real finish supersedes a DNF (e.g. correcting a call-off that
-        // caught a boat that had actually already crossed the line).
+        // A real finish supersedes a DNF or DNS (e.g. correcting a call-off
+        // that caught a boat that had actually already crossed the line).
         boat.dnf = false;
+        boat.dns = false;
         boat.dnfPosition = null;
       }
+      maybeAutoStop(race);
       saveState();
       res.json(boat);
     });
@@ -2468,12 +2554,37 @@ module.exports = function (app) {
       const dnf = !!(req.body && req.body.dnf);
       if (dnf) {
         boat.dnf = true;
+        boat.dns = false;
         boat.finishTime = null;
         boat.dnfPosition = getLastKnownPosition(boat);
       } else {
         boat.dnf = false;
         boat.dnfPosition = null;
       }
+      maybeAutoStop(race);
+      saveState();
+      res.json(boat);
+    });
+
+    // Marks (or, with dns: false, un-marks) one boat DNS by hand — it never
+    // started the race at all, as distinct from DNF (started but didn't
+    // finish). Setting it also clears any finish time/DNF, since a boat
+    // can't be more than one of finished/DNF/DNS at once.
+    router.put('/races/:id/boats/:boatId/dns', (req, res) => {
+      const race = getRace(req.params.id);
+      if (!race) return res.status(404).json({ error: 'No such race' });
+      const boat = getBoat(race, req.params.boatId);
+      if (!boat) return res.status(404).json({ error: 'No such boat' });
+      const dns = !!(req.body && req.body.dns);
+      if (dns) {
+        boat.dns = true;
+        boat.dnf = false;
+        boat.finishTime = null;
+        boat.dnfPosition = null;
+      } else {
+        boat.dns = false;
+      }
+      maybeAutoStop(race);
       saveState();
       res.json(boat);
     });
@@ -2715,6 +2826,7 @@ module.exports = function (app) {
                 startTime: null,
                 track: [],
                 dnf: false,
+                dns: false,
                 dnfPosition: null,
                 markTimes: {}
               };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "signalk-race-control",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "SignalK plugin and webapp for tracking elapsed and handicap-corrected (Time-on-Time) race time, with a per-boat editable TCF and boat names pulled from AIS when available.",
   "main": "index.js",
   "author": "Joachim Bakke <github@heiamoss.com>",

package/public/app.js

@@ -691,6 +691,25 @@
     }
   }
 
+  // Did Not Start — distinct from DNF (started but didn't finish).
+  async function setDns(boatId, dns) {
+    if (!activeRaceId) return;
+    try {
+      const boat = await fetchJSON(
+        `${API}/races/${encodeURIComponent(activeRaceId)}/boats/${encodeURIComponent(boatId)}/dns`,
+        {
+          method: 'PUT',
+          headers: { 'Content-Type': 'application/json' },
+          body: JSON.stringify({ dns })
+        }
+      );
+      raceState.boats[boatId] = boat;
+      render();
+    } catch (e) {
+      setStatus(e.message, true);
+    }
+  }
+
   async function toggleSelf(boatId) {
     if (!activeRaceId || !raceState) return;
     const nextSelf = raceState.selfBoatId === boatId ? null : boatId;
@@ -1617,7 +1636,7 @@
         // to the bottom, same as any other boat with nothing to rank by).
         // A start time still in the future (e.g. a later pursuit-start
         // group) means this boat hasn't actually started yet either.
-        const elapsedMs = !b.dnf && start && start <= now ? (b.finishTime || now) - start : null;
+        const elapsedMs = !b.dnf && !b.dns && start && start <= now ? (b.finishTime || now) - start : null;
         const tcf = b.tcf != null ? b.tcf : 1.0;
         const correctedMs = elapsedMs != null ? elapsedMs * tcf : null;
         const estimate = b.estimate || null;
@@ -1625,7 +1644,7 @@
         // boats rank on the projected corrected time when the server could
         // estimate one (course + live position/speed available), otherwise
         // fall back to elapsed-so-far like before.
-        const rankMs = b.dnf ? null : b.finishTime ? correctedMs : estimate ? estimate.estCorrectedMs : correctedMs;
+        const rankMs = b.dnf || b.dns ? null : b.finishTime ? correctedMs : estimate ? estimate.estCorrectedMs : correctedMs;
         return {
           boatId: b.id,
           name: b.name,
@@ -1635,6 +1654,7 @@
           startTime: b.startTime,
           finishTime: b.finishTime,
           dnf: !!b.dnf,
+          dns: !!b.dns,
           dnfPosition: b.dnfPosition || null,
           markTimes: b.markTimes || {},
           roundedMarksCount: b.roundedMarksCount || 0,
@@ -1651,6 +1671,12 @@
         const aSelf = a.boatId === raceState.selfBoatId;
         const bSelf = b.boatId === raceState.selfBoatId;
         if (aSelf !== bSelf) return aSelf ? -1 : 1;
+        // DNS sits at the very end regardless of phase — it can be marked
+        // before the race even starts (a known no-show), and never really
+        // "entered" the race the way even a DNF (which did start) still
+        // did.
+        if (a.dns !== b.dns) return a.dns ? 1 : -1;
+        if (a.dns) return a.name.localeCompare(b.name);
         // Before the race actually starts, nobody has a corrected time to
         // rank by anyway — sorting by name (or anything else derived) just
         // reshuffled the rows confusingly every time a boat was added or
@@ -1699,7 +1725,7 @@
         map.set(b.boatId, { type: 'self', isLeader: isLeaderFallback });
         return;
       }
-      if (self.dnf) {
+      if (self.dnf || self.dns) {
         // Self is out of the race — no meaningful comparison to make.
         map.set(b.boatId, { type: 'none' });
         return;
@@ -1894,9 +1920,16 @@
     finishDnfBtn.textContent = 'DNF';
     finishDnfBtn.addEventListener('click', () => setDnf(boatId, true));
 
+    const finishDnsBtn = document.createElement('button');
+    finishDnsBtn.type = 'button';
+    finishDnsBtn.className = 'finish-dnf-btn';
+    finishDnsBtn.textContent = 'DNS';
+    finishDnsBtn.title = 'Did not start';
+    finishDnsBtn.addEventListener('click', () => setDns(boatId, true));
+
     const finishNormalWrap = document.createElement('div');
     finishNormalWrap.className = 'finish-cell';
-    finishNormalWrap.append(finishTimeInput, finishNowBtn, finishClearBtn, finishDnfBtn);
+    finishNormalWrap.append(finishTimeInput, finishNowBtn, finishClearBtn, finishDnfBtn, finishDnsBtn);
 
     const dnfTag = document.createElement('span');
     dnfTag.className = 'dnf-tag';
@@ -1912,8 +1945,20 @@
     dnfWrap.className = 'finish-cell';
     dnfWrap.append(dnfTag, dnfPosSpan, undoDnfBtn);
 
+    const dnsTag = document.createElement('span');
+    dnsTag.className = 'dnf-tag';
+    dnsTag.textContent = 'DNS';
+    const undoDnsBtn = document.createElement('button');
+    undoDnsBtn.type = 'button';
+    undoDnsBtn.className = 'undo-dnf-btn';
+    undoDnsBtn.textContent = 'Undo DNS';
+    undoDnsBtn.addEventListener('click', () => setDns(boatId, false));
+    const dnsWrap = document.createElement('div');
+    dnsWrap.className = 'finish-cell';
+    dnsWrap.append(dnsTag, undoDnsBtn);
+
     const tdFinish = document.createElement('td');
-    tdFinish.append(finishNormalWrap, dnfWrap);
+    tdFinish.append(finishNormalWrap, dnfWrap, dnsWrap);
 
     const removeBtn = document.createElement('button');
     removeBtn.type = 'button';
@@ -1955,8 +2000,10 @@
       finishNowBtn,
       finishClearBtn,
       finishDnfBtn,
+      finishDnsBtn,
       dnfWrap,
       dnfPosSpan,
+      dnsWrap,
       vetHandicapVersion: -1
     };
   }
@@ -2132,7 +2179,7 @@
       const row = rows.get(b.boatId);
 
       row.tr.classList.toggle('finished', !!b.finishTime);
-      row.tr.classList.toggle('dnf', !!b.dnf);
+      row.tr.classList.toggle('dnf', !!b.dnf || !!b.dns);
       row.nameSpan.textContent = b.name;
       const isSelf = b.boatId === raceState.selfBoatId;
       row.selfBtn.textContent = isSelf ? '★' : '☆';
@@ -2227,13 +2274,14 @@
         row.tdVsSelf.title = `Corrected-time gap to the ${who} (positive = ${who} ahead)`;
       }
 
-      row.finishNormalWrap.hidden = b.dnf;
+      row.finishNormalWrap.hidden = b.dnf || b.dns;
       row.dnfWrap.hidden = !b.dnf;
+      row.dnsWrap.hidden = !b.dns;
       if (b.dnf) {
         row.dnfPosSpan.textContent = b.dnfPosition
           ? `at ${b.dnfPosition.lat.toFixed(4)}°, ${b.dnfPosition.lon.toFixed(4)}°`
           : 'position unknown';
-      } else {
+      } else if (!b.dns) {
         if (document.activeElement !== row.finishTimeInput) {
           row.finishTimeInput.value = raceState.multiDay
             ? tsToDateTimeInputValue(b.finishTime)
@@ -2244,6 +2292,8 @@
         row.finishNowBtn.disabled = !canFinish;
         row.finishClearBtn.disabled = !canFinish || !b.finishTime;
         row.finishDnfBtn.disabled = !canFinish;
+        // DNS (unlike DNF) is meaningful before the race has even started —
+        // it's how a known no-show gets recorded — so it's never disabled.
       }
     });