Add initial departure board table 'skeleton', very basic at present

package-lock.json

@@ -8,6 +8,7 @@
 			"name": "web-pwa",
 			"version": "0.0.1",
 			"dependencies": {
+				"@owlboard/api-schema-types": "^3.0.3-alpha18",
 				"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
 				"@tabler/icons-svelte": "^3.40.0"
 			},
@@ -801,9 +802,9 @@
 			}
 		},
 		"node_modules/@owlboard/api-schema-types": {
-			"version": "3.0.3-alpha17",
+			"version": "3.0.3-alpha18",
-			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.3-alpha17/api-schema-types-3.0.3-alpha17.tgz",
+			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fapi-schema-types/-/3.0.3-alpha18/api-schema-types-3.0.3-alpha18.tgz",
-			"integrity": "sha512-9jtsajZIq/1W9w1XPSIQSH/rcH2mfnS+3XoQpe81Yor2pOVl5+iyHZ9wAlJLrLEVKVVs3k4lkjcM5l6KgWgd9w==",
+			"integrity": "sha512-k9X83i8ljatuiKQWNxgixid8tneM0i0G5NP1Wo1N2O0SF0PBMs3gxkEMWwKMuc+htiGCeRLqvIZqrm//Bgeo/w==",
 			"license": "MIT"
 		},
 		"node_modules/@owlboard/owlboard-ts": {

package.json

@@ -41,6 +41,7 @@
 		"vitest-browser-svelte": "^2.0.2"
 	},
 	"dependencies": {
+		"@owlboard/api-schema-types": "^3.0.3-alpha18",
 		"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
 		"@tabler/icons-svelte": "^3.40.0"
 	}

src/lib/components/ui/TrainService.svelte

@@ -7,6 +7,7 @@
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
 	import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
 	import { IconChevronDownFilled } from '@tabler/icons-svelte';
+	import { estClass } from '$lib/utils/time';
 	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
 	let isExpanded = $state(false);
 	let loadingDetails = $state(false);
@@ -45,8 +46,6 @@
 		loadingDetails = false;
 	}
 
-	const estClass = (act, est) => (!act && est ? 'est' : 'act');
-
 	const activityMap: Record<string, string> = {
 		'-D': 'Vehicles detatched',
 		'-T': 'Vehicles attached & detached',

src/lib/components/ui/cards/StationAlertCard.svelte

@@ -1,137 +0,0 @@
-<script lang="ts">
-	import { slide } from 'svelte/transition';
-	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
-	import { IconAlertOctagonFilled, IconChevronDownFilled } from '@tabler/icons-svelte';
-
-	let { messages = [] }: { messages: ApiStationsBoard.BoardMsgs[] } = $props();
-	let isOpen = $state(false);
-</script>
-
-{#if messages.length > 0}
-	<aside class="alert-card">
-		<button onclick={() => (isOpen = !isOpen)} class="trigger" class:active={isOpen}>
-			<span class="warning-icon">
-                <IconAlertOctagonFilled />
-            </span>
-			<span class="summary">
-				{messages.length}
-				{messages.length === 1 ? 'active alert' : 'active alerts'}
-			</span>
-			<span class="chevron" class:rotated={isOpen}><IconChevronDownFilled /></span>
-		</button>
-
-    {#if isOpen}
-        <div transition:slide={{ duration: 450 }} class="content">
-            {#each messages as msg}
-                <div class="message-item">
-                    <p class="message-text">
-                        {msg.t}
-                        {#if msg.l && msg.lt}
-                            <a href={msg.l} target="_blank" rel="noopener noreferrer" class="alert-link">
-                                {msg.lt}
-                            </a>
-                        {/if}
-                    </p>
-                </div>
-            {/each}
-        </div>
-    {/if}
-    </aside>
-{/if}
-
-<style>
-    .alert-card {
-        margin: 1rem 0;
-        border-radius: 8px;
-        background: transparent;
-        position: relative;
-        z-index: 10;
-        width: 95%;
-        max-width: 750px;
-    }
-
-    .trigger {
-        width: 100%;
-        display: flex;
-        border-radius: 8px;
-        align-items: center;
-        padding: 0.4rem 1rem;
-        background: var(--alert-orange);
-        color: white;
-        border: none;
-        cursor: pointer;
-        text-align: left;
-        position: relative;
-        z-index: 2;
-        height: 46px;
-        transition: all 0.65s 0.2s;
-    }
-
-    .trigger.active {
-        border-radius: 8px 8px 0 0;
-        transition: all 0.1s 0s;
-    }
-
-    .warning-icon {
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-        margin-left: 0;
-        margin-top: 0;
-        margin-bottom: 0;
-        margin-right: 1rem;
-        padding: 0;
-    }
-
-    .summary {
-        flex: 1;
-        font-family: 'URW Gothic', sans-serif;
-        letter-spacing: 0.05em;
-        font-weight: 600;
-        font-size: 1rem;
-    }
-
-    .chevron {
-        transition: transform  0.5s ease;
-        display: inline-flex;
-        justify-content: center;
-    }
-
-    .chevron.rotated {
-        transform: rotateX(180deg);
-    }
-
-    .content {
-        padding: 1rem;
-        position: absolute;
-        top: 46px;
-        border-radius: 0 0 8px 8px;
-        left: 0;
-        right: 0;
-        background: var(--alert-orange);
-        filter: brightness(1.2);
-        color: var(--color-title);
-        font-family: 'URW Gothic', sans-serif;
-        font-size: 1.0rem;
-        font-weight: 600;
-        line-height: 1.2;
-        z-index: 1;
-    }
-
-    .message-item {
-        margin: 10px;
-        padding-bottom: 0.75rem;
-    }
-
-    .message-item p {
-        margin: 0;
-    }
-
-    .message-item a {
-        color: #f2ff00;
-    }
-
-    .message-item:last-child {
-        padding-bottom: 0;
-    }
-</style>

src/lib/components/ui/station-board/StaffServicesTable.svelte

@@ -0,0 +1,117 @@
+<script lang="ts">
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+    import { formatUkTime, estClass, calculateDelay } from '$lib/utils/time';
+
+	let { services }: { services: ApiStationsBoard.BoardService[] } = $props();
+
+	const getRowKey = (s: ApiStationsBoard.BoardService) =>
+		`${s.r}${s.sta ?? ''}${s.std ?? ''}${s.wtp ?? ''}`;
+</script>
+
+<div class="table-container">
+	<table class="departure-board">
+		<thead>
+            <tr>
+                <th colspan="4" aria-hidden="true"></th>
+                <th scope="colgroup" colspan="2" class="upper-head"><abbr title="Arrival">Arr</abbr></th>
+                <th scope="colgroup" colspan="2" class="upper-head"><abbr title="Departure">Dep</abbr></th>
+                <th aria-hidden="true"></th>
+            </tr>
+			<tr>
+				<th scope="col"><abbr title="Headcode">ID</abbr></th>
+				<th scope="col"><abbr title="Origin">Orig</abbr></th>
+				<th scope="col"><abbr title="Destination">Dest</abbr></th>
+				<th scope="col"><abbr title="Platform">Plt</abbr></th>
+				<th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+				<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+                <th scope="col"><abbr title="Scheduled">Sch</abbr></th>
+				<th scope="col"><abbr title="Actual/Expected">Act</abbr></th>
+                <th scope="col"><abbr title="+/- Time">+/-</abbr></th>
+			</tr>
+		</thead>
+
+        {#each services as service (getRowKey(service))}
+            <tbody>
+                <tr class="service-row" class:serviceCancelled={service.c}>
+                    <td class="id-cell">{service.h}</td>
+                    <td class="orig-cell">{service.og.t}</td>
+                    <td class="dest-cell">{service.dt.t}</td>
+                    <td class="plt-cell" class:platSup={service.ps} class:platChange={service.pc}>{service.p}</td>
+
+                    <!-- Handle different display for a passing train -->
+                    {#if service.wtp}
+                      <td colspan="2">Pass</td>
+                      <td class="time-cell">{formatUkTime(service.wtp)}</td>
+                      <td class="time-cell {estClass(service.atp, service.etp)}">{formatUkTime(service.atp || service.etp)}</td>
+                    {:else}
+                      <td class="time-cell">{formatUkTime(service.sta)}</td>
+                      <td class="time-cell {estClass(service.ata, service.eta)}">{formatUkTime(service.ata || service.eta)}</td>
+                      <td class="time-cell">{formatUkTime(service.std)}</td>
+                      <td class="time-cell {estClass(service.atd, service.etd)}">{formatUkTime(service.atd || service.etd)}</td>
+                    {/if}
+
+                        {#if service}
+                            {@const delay = calculateDelay(service)}
+							<td class="delay-cell delay-{delay.type}">{delay.val}</td>
+                        {/if}
+                </tr>
+
+                {#if service.c && service.cr?.r}
+                <tr>
+                    <td colspan="9">{service.cr.r}</td>
+                </tr>
+                {/if}
+            </tbody>
+        {/each}
+
+	</table>
+</div>
+
+<style>
+    .table-container {
+        width: 100%;
+    }
+    .departure-board {
+        width: 100%;
+        margin: 0 auto;
+        font-family: 'URW Gothic', sans-serif;
+        font-variant-numeric: tabular-nums;
+    }
+    .serviceCancelled {
+        text-decoration: line-through;
+    }
+    .id-cell{
+        font-family:'Courier New', Courier, monospace;
+        text-align: center;
+    }
+    .orig-cell, .dest-cell {
+        color: var(--location-yellow);
+    }
+    .orig-cell {
+        text-align: left;
+    }
+    .dest-cell {
+        text-align: right;
+    }
+    .plt-cell {
+        text-align: center;
+    }
+    .platChange {
+        animation: 2s fast-pulse ease-in-out infinite;
+    }
+    .platSup {
+        filter: opacity(0.5);
+    }
+    .time-cell {
+        text-align: center;
+    }
+    .delay-cell {
+        text-align: center;
+    }
+    .delay-late {
+        color: var(--delay-orange);
+    }
+    .delay-early {
+        color: var(--early-blue);
+    }
+</style>

src/lib/components/ui/station-board/StationAlertCard.svelte

@@ -0,0 +1,138 @@
+<script lang="ts">
+	import { slide } from 'svelte/transition';
+	import type { ApiStationsBoard } from '@owlboard/owlboard-ts';
+	import { IconAlertOctagonFilled, IconChevronDownFilled } from '@tabler/icons-svelte';
+
+	let { messages = [] }: { messages: ApiStationsBoard.BoardMsgs[] } = $props();
+	let isOpen = $state(false);
+</script>
+
+{#if messages.length > 0}
+	<aside class="alert-card">
+		<button onclick={() => (isOpen = !isOpen)} class="trigger" class:active={isOpen}>
+			<span class="warning-icon">
+				<IconAlertOctagonFilled />
+			</span>
+			<span class="summary">
+				{messages.length}
+				{messages.length === 1 ? 'active alert' : 'active alerts'}
+			</span>
+			<span class="chevron" class:rotated={isOpen}><IconChevronDownFilled /></span>
+		</button>
+
+		{#if isOpen}
+			<div transition:slide={{ duration: 450 }} class="content">
+				{#each messages as msg}
+					<div class="message-item">
+						<p class="message-text">
+							{msg.t}
+							{#if msg.l && msg.lt}
+								<a href={msg.l} target="_blank" rel="noopener noreferrer" class="alert-link">
+									{msg.lt}
+								</a>
+							{/if}
+						</p>
+					</div>
+				{/each}
+			</div>
+		{/if}
+	</aside>
+{/if}
+
+<style>
+	.alert-card {
+		margin: 1rem 0;
+		border-radius: 8px;
+		background: transparent;
+		position: relative;
+		z-index: 10;
+		margin-bottom: 0;
+		width: 95%;
+		max-width: 750px;
+	}
+
+	.trigger {
+		width: 100%;
+		display: flex;
+		border-radius: 8px;
+		align-items: center;
+		padding: 0.4rem 1rem;
+		background: var(--alert-orange);
+		color: white;
+		border: none;
+		cursor: pointer;
+		text-align: left;
+		position: relative;
+		z-index: 2;
+		height: 46px;
+		transition: all 0.65s 0.2s;
+	}
+
+	.trigger.active {
+		border-radius: 8px 8px 0 0;
+		transition: all 0.1s 0s;
+	}
+
+	.warning-icon {
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-left: 0;
+		margin-top: 0;
+		margin-bottom: 0;
+		margin-right: 1rem;
+		padding: 0;
+	}
+
+	.summary {
+		flex: 1;
+		font-family: 'URW Gothic', sans-serif;
+		letter-spacing: 0.05em;
+		font-weight: 600;
+		font-size: 1rem;
+	}
+
+	.chevron {
+		transition: transform 0.5s ease;
+		display: inline-flex;
+		justify-content: center;
+	}
+
+	.chevron.rotated {
+		transform: rotateX(180deg);
+	}
+
+	.content {
+		padding: 1rem;
+		position: absolute;
+		top: 46px;
+		border-radius: 0 0 8px 8px;
+		left: 0;
+		right: 0;
+		background: var(--alert-orange);
+		filter: brightness(1.2);
+		color: var(--color-title);
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 1rem;
+		font-weight: 600;
+		line-height: 1.2;
+		z-index: 1;
+	}
+
+	.message-item {
+		margin: 10px;
+		padding-bottom: 0.75rem;
+	}
+
+	.message-item p {
+		margin: 0;
+	}
+
+	.message-item a {
+		color: #f2ff00;
+	}
+
+	.message-item:last-child {
+		padding-bottom: 0;
+	}
+</style>

src/lib/global.css

@@ -171,7 +171,7 @@
 	}
 	25%,
 	75% {
-		opacity: 0;
+		opacity: 0.25;
 	}
 }
 

src/lib/utils/time.ts

@@ -1,15 +1,21 @@
 import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
+
+export const estClass = (act: any, est: any) => (!act && est ? 'est' : 'act');
+
 /**
  * Converts ISO/JSON time to UK-formatted HH:MM string, with optional (default off) seconds
  * Ensures Europe/London timezone irrespective of browser timezone.
  */
-export function formatUkTime(dateStr: string | Date | undefined, includeSeconds: boolean = false): string {
+export function formatUkTime(
+	dateStr: string | Date | undefined,
+	includeSeconds: boolean = false
+): string {
 	if (!dateStr) return '--:--';
 	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
 
 	if (isNaN(date.getTime())) return '--:--';
 
-return date.toLocaleTimeString('en-GB', {
+	return date.toLocaleTimeString('en-GB', {
 		hour: '2-digit',
 		minute: '2-digit',
 		...(includeSeconds && { second: '2-digit' }),
@@ -22,14 +28,18 @@ return date.toLocaleTimeString('en-GB', {
  * Converts ISO/JSON time to UK-formatted DD/MM/YY HH:MM:SS string.
  * Ensures Europe/London timezone irrespective of browser timezone.
  */
-export function formatUkDateTime(dateStr: string | Date | undefined, includeSeconds: boolean = false): string {
+export function formatUkDateTime(
+	dateStr: string | Date | undefined,
+	includeSeconds: boolean = false
+): string {
 	if (!dateStr) return '--/--/-- --:--:--';
 
 	const date = typeof dateStr === 'string' ? new Date(dateStr) : dateStr;
 
 	if (isNaN(date.getTime())) return '--/--/-- --:--:--';
 
-    return date.toLocaleString('en-GB', {
+	return date
+		.toLocaleString('en-GB', {
 			day: '2-digit',
 			month: '2-digit',
 			year: '2-digit',
@@ -38,23 +48,43 @@ export function formatUkDateTime(dateStr: string | Date | undefined, includeSeco
 			...(includeSeconds && { second: '2-digit' }),
 			hour12: false,
 			timeZone: 'Europe/London'
-    }).replace(',', '');
+		})
+		.replace(',', '');
+}
+
+/**
+ * Specific type that can handle the TrainDetails.ServiceLocation and the ApiStationsBoard.BoardService types for delay calculation
+ */
+interface DelayInput {
+    // Board types
+    sta?: string | null; std?: string | null; 
+    eta?: string | null; etd?: string | null;
+    ata?: string | null; atd?: string | null;
+    
+    // Journey types
+    pta?: string | null; ptd?: string | null; 
+    wta?: string | null; wtd?: string | null;
+    atp?: string | null; wtp?: string | null;
+	etp?: string | null;
 }
 
 /**
  * Calculates a 'delay' value, in the formats:
  * RT, 1E, 7L, etc.
- * @param 'Schedule Location' object
+ * @param 'Schedule Location' or 'Board Service' object
  * @returns Delay string for departure boards
  */
-export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {
+export function calculateDelay(loc: DelayInput): {
 	val: string;
 	type: string;
 } {
 	const pairs = [
-		{ actual: loc.atd, sched: loc.ptd ?? loc.wtd },
+        // Departure check (Board: atd/etd vs std | Journey: atd vs ptd/wtd)
-		{ actual: loc.ata, sched: loc.pta ?? loc.wta },
+        { actual: loc.atd || loc.etd, sched: loc.std || loc.ptd || loc.wtd },
-		{ actual: loc.atp, sched: loc.wtp }
+        // Arrival check (Board: ata/eta vs sta | Journey: ata vs pta/wta)
+        { actual: loc.ata || loc.eta, sched: loc.sta || loc.pta || loc.wta },
+        // Passing check
+        { actual: loc.atp || loc.etp, sched: loc.wtp }
     ];
 
 	const match = pairs.find((p) => p.actual && p.sched);

src/routes/board/+page.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
 	import { onMount, untrack } from 'svelte';
 	import { quickLinks } from '$lib/quick-links.svelte';
-	import StationAlertCard from '$lib/components/ui/cards/StationAlertCard.svelte';
+	import StationAlertCard from '$lib/components/ui/station-board/StationAlertCard.svelte';
 
 	import { formatUkDateTime, formatUkTime } from '$lib/utils/time';
+	import StaffServicesTable from '$lib/components/ui/station-board/StaffServicesTable.svelte';
 	let { data } = $props();
 	let now = $state(new Date());
 
@@ -13,7 +14,7 @@
 		}, 1000);
 
 		return () => clearInterval(interval);
-	})
+	});
 
 	// Update 'QuickLinks'
 	$effect(() => {
@@ -33,70 +34,69 @@
 	// Load Data Invalidation Handling
 	// Refresh countdown logic
 </script>
-<section class="board-wrapper">
-{#if data.boardData.data.m?.length}
 
+<section class="board-wrapper">
+	{#if data.boardData.data.m?.length}
 		<StationAlertCard messages={data.boardData.data.m} />
+	{/if}
 	<div class="time-data">
-		<span class="time-loaded">Fetched: {formatUkDateTime(data.boardData.producedAt, true)}</span>
+		<span class="time-loaded">Updated: {formatUkDateTime(data.boardData.producedAt, true)}</span>
 		<span class="time-now">{formatUkTime(now, true)}</span>
 	</div>
-
+	{#if data.boardData.data.s?.length}
-{/if}
+	<StaffServicesTable services={data.boardData.data.s} />
+	{/if}
+	<pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre>
 </section>
 
-<section class="section-t">Live boards are not yet fully implemented on the server</section>
-
-<pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre>
-
 <style>
-.board-wrapper {
+	.board-wrapper {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 		width: 100%;
 		margin: 0 auto;
 		gap: 0;
-}
+	}
 
-.time-data {
+	.time-data {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
 		width: 90%;
 		max-width: 700px;
-	margin: 0 auto;
+		margin: 10px auto;
 		font-family: 'URW Gothic', sans-serif;
-}
-
-.time-loaded, .time-now {
-	font-variant-numeric: tabular-nums;
-}
-
-.time-loaded {
-	font-size: 0.9rem;
-}
-
-.time-now {
-	font-weight: 600;
-	font-size: 1rem;
-}
-	.section-t {
-		font-family: 'URW Gothic', sans-serif;
-		text-align: center;
-		font-size: 2rem;
-		width: 90%;
-		margin: auto;
-		padding-top: 25px;
-		max-width: 500px;
 	}
 
+	.time-loaded,
+	.time-now {
+		font-variant-numeric: tabular-nums;
+	}
+
+	.time-loaded {
+		font-size: 0.9rem;
+	}
+
+	.time-now {
+		font-weight: 600;
+		font-size: 1rem;
+	}
+	pre {
+		max-width: 100%;
+		white-space: pre-wrap;
+		word-wrap: break-word;
+		box-sizing: border-box;
+		overflow-x: auto;
+	}
 	.json-dump {
 		background: #222;
 		color: #0f0;
 		padding: 1rem;
 		border-radius: 4px;
 		font-size: 0.9rem;
+		max-height: 500px;
 		width: 95%;
-		margin: 1rem auto;	}
+		margin: 1rem auto;
+	}
 </style>