Fix PIS Display

Adjust the hover and active styles of the 'TrainService' expandable cards.

package-lock.json

@@ -8,7 +8,7 @@
 			"name": "web-pwa",
 			"version": "0.0.1",
 			"dependencies": {
-				"@owlboard/owlboard-ts": "^3.0.0-dev.20260503T0051",
+				"@owlboard/owlboard-ts": "^3.0.0-dev.20260503t0947",
 				"@tabler/icons-svelte": "^3.40.0"
 			},
 			"devDependencies": {
@@ -786,12 +786,12 @@
 			"license": "MIT"
 		},
 		"node_modules/@owlboard/owlboard-ts": {
-			"version": "3.0.0-dev.20260503T0051",
+			"version": "3.0.0-dev.20260503t0947",
-			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fowlboard-ts/-/3.0.0-dev.20260503T0051/owlboard-ts-3.0.0-dev.20260503t0051.tgz",
+			"resolved": "https://git.fjla.uk/api/packages/OwlBoard/npm/%40owlboard%2Fowlboard-ts/-/3.0.0-dev.20260503t0947/owlboard-ts-3.0.0-dev.20260503t0947.tgz",
-			"integrity": "sha512-YPW89izHnbQLX2rfLaPM1t8x77ajGW61Up/m4NDkEjRyMV1z/mAGj40wj7yfkwoXr8AEgVWlqfpWeR5JDxqrBQ==",
+			"integrity": "sha512-t6wcsq53ZM9hKphn9QClN4fUjIF53RbQ/oOh1pRQ6vpxhGVuh3xf46wPR8h67lLh0UWUEolYyDCA4TTz3a56fw==",
 			"license": "GPL-3.0",
 			"dependencies": {
-				"@owlboard/api-schema-types": "^3.0.3-alpha8",
+				"@owlboard/api-schema-types": "^3.0.3-alpha10",
 				"install": "^0.13.0",
 				"latlon-geohash": "^2.0.0",
 				"npm": "^11.13.0"
@@ -1827,6 +1827,7 @@
 			"version": "4.3.0",
 			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
 			"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"color-convert": "^2.0.1"
@@ -1877,12 +1878,14 @@
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
 			"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/brace-expansion": {
 			"version": "1.1.13",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.13.tgz",
 			"integrity": "sha512-9ZLprWS6EENmhEOpjCYW2c8VkmOvckIJZfkr7rBW6dObmfgJ/L1GpSYW5Hpo9lDz4D1+n0Ckz8rU7FwHDQiG/w==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"balanced-match": "^1.0.0",
@@ -1913,6 +1916,7 @@
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
 			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"ansi-styles": "^4.1.0",
@@ -1954,6 +1958,7 @@
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
 			"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"color-name": "~1.1.4"
@@ -1966,12 +1971,14 @@
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
 			"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/concat-map": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
 			"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/cookie": {
@@ -2515,6 +2522,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
 			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=8"
@@ -2602,6 +2610,7 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
 			"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+			"dev": true,
 			"license": "ISC"
 		},
 		"node_modules/js-yaml": {
@@ -2737,6 +2746,7 @@
 			"version": "3.1.5",
 			"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz",
 			"integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==",
+			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"brace-expansion": "^1.1.7"
@@ -2769,6 +2779,7 @@
 			"version": "2.1.3",
 			"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
 			"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/nanoid": {
@@ -5006,6 +5017,7 @@
 			"version": "7.7.4",
 			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz",
 			"integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==",
+			"dev": true,
 			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
@@ -5107,6 +5119,7 @@
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
 			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"has-flag": "^4.0.0"
@@ -5547,6 +5560,7 @@
 			"version": "2.0.2",
 			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
 			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
 			"license": "ISC",
 			"dependencies": {
 				"isexe": "^2.0.0"

package.json

@@ -41,7 +41,7 @@
 		"vitest-browser-svelte": "^2.0.2"
 	},
 	"dependencies": {
-		"@owlboard/owlboard-ts": "^3.0.0-dev.20260503T0051",
+		"@owlboard/owlboard-ts": "^3.0.0-dev.20260503t0947",
 		"@tabler/icons-svelte": "^3.40.0"
 	}
 }

src/lib/components/ui/Button.svelte

@@ -39,7 +39,7 @@
 		align-items: center;
 		justify-content: center;
 		min-height: 48px;
-		min-width: 98px;
+		min-width: 48px;
 		appearance: none;
 		background: transparent;
 		border: none;
@@ -55,7 +55,7 @@
 		width: fit-content;
 		flex-shrink: 0;
 		padding: 0 1.2rem;
-		min-width: 90px;
+		min-width: 40px;
 		height: 36px;
 		border-radius: 20px;
 		border: none;

src/lib/components/ui/Textbox.svelte

@@ -2,6 +2,8 @@
 	import { fade } from 'svelte/transition';
 	import type { HTMLInputAttributes } from 'svelte/elements';
 
+	import { IconChevronRightFilled } from '@tabler/icons-svelte';
+
 	interface Props extends HTMLInputAttributes {
 		value?: string;
 		label?: string;
@@ -9,6 +11,7 @@
 		type?: 'text' | 'password' | 'email' | 'number' | 'search' | 'tel' | 'url';
 		error?: string;
 		uppercase?: boolean;
+		onsubmit?: (val: string) => void | Promise<void>;
 		[key: string]: any;
 	}
 
@@ -19,10 +22,18 @@
 		type = 'text',
 		error = '',
 		uppercase = false,
+		onsubmit,
 		...rest
 	}: Props = $props();
 
 	let isFocussed = $state(false);
+
+	const handleSubmit = (e: Event) => {
+		e.preventDefault();
+		if (onsubmit && value) {
+			onsubmit(value);
+		}
+	};
 </script>
 
 <div class="input-wrapper" class:focussed={isFocussed} class:has-error={!!error}>
@@ -30,6 +41,7 @@
 		<label for="adaptive-input">{label}</label>
 	{/if}
 
+	<form onsubmit={handleSubmit} class="input-container">
 		<input
 			id="adaptive-input"
 			class:all-caps={uppercase}
@@ -41,6 +53,19 @@
 			{...rest}
 		/>
 
+		{#if onsubmit}
+			<button
+				type="submit"
+				class="submit-icon"
+				transition:fade
+				disabled={!value}
+				aria-label="Submit"
+			>
+				<IconChevronRightFilled />
+			</button>
+		{/if}
+	</form>
+
 	{#if error}
 		<span class="error-message" transition:fade>{error}</span>
 	{/if}
@@ -50,11 +75,22 @@
 	.input-wrapper {
 		display: flex;
 		flex-direction: column;
-		gap: 8px;
+		gap: 0.4rem;
 		width: 100%;
 		font-family: 'URW Gothic', sans-serif;
 	}
 
+	.input-container {
+		position: relative;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		background-color: var(--color-title);
+		border-radius: 5000px;
+		transition: all 0.2s;
+		overflow: hidden;
+	}
+
 	label {
 		font-size: 0.9rem;
 		font-weight: 400;
@@ -62,17 +98,46 @@
 	}
 
 	input {
+		width: 100%;
+		background: transparent;
 		min-height: 40px;
-		padding: 0 16px;
+		height: 100%;
-		background-color: var(--color-title);
+		line-height: normal;
-		border: 2px solid transparent;
+		padding: 0 48px;
-		border-radius: 20px;
+		border: none;
 		color: var(--color-bg-dark);
 		font-size: 1.2rem;
 		transition: all 0.2s ease-in-out;
 		outline: none;
 		text-align: center;
-		box-shadow: var(--shadow-std);
+	}
+
+	.submit-icon {
+		position: absolute;
+		background: transparent;
+		right: 0;
+		border: none;
+		color: var(--color-bg-dark);
+		cursor: pointer;
+		width: 48px;
+		height: 48px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		opacity: 0.75;
+		transition:
+			opacity 0.2s,
+			transform 0.2s;
+	}
+
+	.submit-icon:hover:not(:disabled) {
+		opacity: 1;
+		transform: translateX(2px);
+	}
+
+	.submit-icon:disabled {
+		opacity: 0.5;
+		cursor: not-allowed;
 	}
 
 	.all-caps {

src/lib/components/ui/TiplocConverter.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+	import { LOCATIONS } from '$lib/locations-object.svelte';
+
+	let { code } = $props<{ code: string | null | undefined }>();
+
+	const location = $derived(LOCATIONS.getName(code));
+	const displayName = $derived(location?.n ?? code ?? '');
+</script>
+
+{displayName}

src/lib/components/ui/TrainService.svelte

@@ -1,16 +1,17 @@
 <script lang="ts">
-	import type { ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
+	import type { ApiPisObject, ApiTrainsTrainByHeadcode } from '@owlboard/owlboard-ts';
 	import { OwlClient, ApiError, ValidationError } from '$lib/owlClient';
 	import { slide } from 'svelte/transition';
 	import { quintOut } from 'svelte/easing';
-	import { formatUkTime } from '$lib/utils/time';
+	import { formatUkTime, calculateDelay } from '$lib/utils/time';
 	import TocStyle from '$lib/components/ui/TocStyle.svelte';
-
+	import TiplocConverter from '$lib/components/ui/TiplocConverter.svelte';
+	import { IconChevronDownFilled } from '@tabler/icons-svelte';
 	let { service }: { service: ApiTrainsTrainByHeadcode.TrainByHeadcodeResponse } = $props();
 	let isExpanded = $state(false);
 	let loadingDetails = $state(false);
 	let loadingDetailsError = $state(false);
-	let loadingDetailsErrorMsg = $state("");
+	let loadingDetailsErrorMsg = $state('');
 	let details = $state(null);
 
 	const toggleExpand = async (rid: string) => {
@@ -19,11 +20,6 @@
 			return;
 		}
 
-		if (details) {
-			isExpanded = true;
-			return;
-		}
-
 		loadingDetails = true;
 		try {
 			const result = await OwlClient.trains.getByRid(service.r);
@@ -49,11 +45,59 @@
 		loadingDetails = false;
 	}
 
-	const estClass = (act, est) => (!act && est) ? 'est' : 'act';
+	const estClass = (act, est) => (!act && est ? 'est' : 'act');
+
+	const activityMap: Record<string, string> = {
+		'-D': 'Vehicles detatched',
+		'-T': 'Vehicles attached & detached',
+		'-U': 'Vehicles attached',
+		AE: 'Assist locomotive attached',
+		C: 'Traincrew change only',
+		D: 'Set down only',
+		E: 'Stops for examination',
+		K: 'Passenger count point',
+		KC: 'Ticket collection point',
+		KE: 'Ticket examination point',
+		KF: 'First class ticket examination point',
+		KS: 'Selective ticket examination point',
+		L: 'Locomotive changed',
+		N: 'Unadvertised stop',
+		OP: 'Operational stop only',
+		OR: 'Locomotive attached on rear',
+		R: 'Request stop only',
+		RM: 'Train changes direction',
+		RR: 'Locomotive run round',
+		S: 'Staff only stop',
+		TW: 'Stops for token/staff/tablet only',
+		U: 'Pick up only',
+		W: 'Watering coaches',
+		X: 'Passes another train'
+	};
+
+	const activityRegex = new RegExp(
+		Object.keys(activityMap)
+			.sort((a, b) => b.length - a.length) // Longest codes first
+			.map((key) => key.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&')) // Escape special chars
+			.join('|'),
+		'g'
+	);
+
+	const getRelevantActivities = (act: string) => {
+		if (!act) return [];
+
+		// Find all matches in the string
+		const matches = act.match(activityRegex) || [];
+
+		// Map to labels and remove duplicates
+		return [...new Set(matches)].map((code) => activityMap[code]);
+	};
 </script>
 
-<div class="train-service">
+<div class="train-service" class:isExpanded>
 	<button class="summary" onclick={toggleExpand} type="button" aria-expanded={isExpanded}>
+		{#if loadingDetails}
+			<div class="loading-state"><div class="loading-spinner"></div></div>
+		{/if}
 		<div class="operator-summary">
 			<TocStyle toc={service.o} />
 		</div>
@@ -61,15 +105,16 @@
 			<div class="time-summary">
 				{OriginDepartureSummary}
 			</div>
-			<div class="location-summary">
+			<div class="location-summary" class:can-all={service.ct}>
 				{service.ot}
 			</div>
-			<div class="location-summary to-summary">to</div>
+			<div class="location-summary to-summary" class:can-all={service.ct}>to</div>
-			<div class="location-summary">
+			<div class="location-summary" class:can-all={service.ct}>
 				{service.dt}
 			</div>
-			<!-- Add arrow icon to signify drop-down -->
+			<div class="arrow" class:expanded={isExpanded}>
-			<!-- ADD LOADING STATE -->
+				<IconChevronDownFilled color={'var(--color-title)'} size={25} />
+			</div>
 		</div>
 	</button>
 	{#if isExpanded && details}
@@ -77,12 +122,15 @@
 			<!-- Here goes the data formatting! -->
 			<div class="detail-head">
 				<!-- Cancellation Section -->
+				{#if service.ct}
+					<span class="cancel-reason"> Cancelled throughout </span>
+				{/if}
 				{#if details.header.cr}
 					<span class="cancel-reason">
 						{details.header.cr}
 						{#if details.header.cl}
 							{details.header.cn ? ' near ' : ' at '}
-							{details.header.cl}
+							<TiplocConverter code={details.header.cl} />
 						{/if}
 					</span>
 				{/if}
@@ -97,9 +145,22 @@
 						{/if}
 					</span>
 				{/if}
+				{#if details.pis}
 					<div class="pis-detail">
-					<!-- PIS Data Here -->
+						<span class="pis-code">PIS: {details.pis.code}</span>
+						{#if details.pis.skip?.skip > 0}
+							<span class="pis-skip">
+								(skip {details.pis.skip.position === 'head' ? 'first' : 'last'}
+								{details.pis.skip.skip}
+								{details.pis.skip.skip === 1 ? 'stop' : 'stops'}
+								)
+							</span>
+						{/if}
 					</div>
+				{/if}
+			</div>
+			<div class="color-key">
+				<p class="tpl-stop">Times in yellow are estimates</p>
 			</div>
 			<div class="schedule-table-container">
 				<table class="schedule-table">
@@ -116,26 +177,49 @@
 							<th>Act</th>
 							<th>Sch</th>
 							<th>Act</th>
+							<th></th>
 						</tr>
 					</thead>
-					<tbody>
 					{#each details.locations as loc}
-							<tr class:pass-loc={loc.r === "PASS"} class:can-loc={loc.can}>
+						<tbody class="location-group">
-								<td class="tpl-cell">{loc.t}</td>
+							<tr class:pass-loc={loc.r === 'PASS'} class:can-loc={loc.can}>
-								<td class="plat-cell">{loc.p}</td>
+								<td class="tpl-cell" class:tpl-stop={loc.r != 'PASS'}>
-								{#if loc.r == "PASS"}
+									{loc.t}
-									<td class="time-cell" colspan="2">Pass</td>
+								</td>
+								<td class="plat-cell cell-divider-right" class:plat-change={loc.pc}>{loc.p}</td>
+								{#if loc.r == 'PASS'}
+									<td class="time-cell cell-divider-right" colspan="2">Pass</td>
 									<td class="time-cell">{formatUkTime(loc.wtp)}</td>
-									<td class="time-cell {estClass(loc.atp, loc.etp)}">{formatUkTime(loc.atp || loc.etp || "--")}</td>
+									<td class="time-cell {estClass(loc.atp, loc.etp)}"
+										>{formatUkTime(loc.atp || loc.etp || '--')}</td
+									>
 								{:else}
-								<td class="time-cell">{formatUkTime(loc.pta || loc.wta || "--")}</td>
+									<td class="time-cell">{formatUkTime(loc.pta || loc.wta || '--')}</td>
-								<td class="time-cell {estClass(loc.ata, loc.eta)}">{formatUkTime(loc.ata || loc.eta || "--")}</td>
+									<td class="time-cell cell-divider-right {estClass(loc.ata, loc.eta)}"
-								<td class="time-cell">{formatUkTime(loc.ptd || loc.wtd || "--")}</td>
+										>{formatUkTime(loc.ata || loc.eta || '--')}</td
-								<td class="time-cell {estClass(loc.atd, loc.etd)}">{formatUkTime(loc.atd || loc.etd || "--")}</td>
+									>
+									<td class="time-cell">{formatUkTime(loc.ptd || loc.wtd || '--')}</td>
+									<td class="time-cell cell-divider-right {estClass(loc.atd, loc.etd)}"
+										>{formatUkTime(loc.atd || loc.etd || '--')}</td
+									>
+								{/if}
+								{#if loc}
+									{@const delay = calculateDelay(loc)}
+									<td class="delay-{delay.type}">{delay.val}</td>
 								{/if}
 							</tr>
+							{#if loc.act && getRelevantActivities(loc.act).length > 0}
+								<tr class="activity-row">
+									<td colspan="7">
+										<div class="activity-container">
+											{#each getRelevantActivities(loc.act) as note}
+												<span class="activity-tag">{note}</span>
 											{/each}
-					</tbody>
+										</div>
+									</td>
+								</tr>
+							{/if}
+						</tbody>{/each}
 				</table>
 			</div>
 		</div>
@@ -143,26 +227,49 @@
 </div>
 
 <style>
+	/* 
+		Main container
+	*/
 	.train-service {
 		background-color: var(--color-accent);
 		width: 100%;
-		border-radius: 4px;
+		max-width: 460px;
+		border-radius: 12px;
 		box-shadow: var(--shadow-std);
-		overflow: hidden;
+		overflow: visible;
 		font-family: 'URW Gothic', sans-serif;
 		transition: 0.2s all;
 		filter: brightness(1.1);
+		-webkit-tap-highlight-color: transparent;
 	}
 
-	.summary:hover {
+	.train-service:active {
-		filter:invert();
+		filter: brightness(1.2);
 	}
 
+	.train-service:active .arrow {
+		filter: brightness(0.2);
+	}
+
+	@media (hover: hover) {
+		.train-service:not(.isExpanded):hover {
+			filter: brightness(1.2);
+		}
+
+		.summary:hover .arrow {
+			filter: brightness(0.2);
+		}
+	}
+
+	/* 
+		Summary Header
+	*/
 	.summary {
+		position: relative;
 		display: flex;
 		align-items: center;
 		width: 100%;
-		padding: 0.75rem;
+		padding: 0 1rem;
 		min-height: 48px;
 		border: none;
 		background: transparent;
@@ -183,7 +290,7 @@
 	}
 
 	.time-summary {
-		font-size: 1.1rem;
+		font-size: 0.75rem;
 		font-weight: 700;
 		color: var(--color-brand);
 	}
@@ -191,7 +298,7 @@
 	.location-summary {
 		text-transform: uppercase;
 		font-weight: 500;
-		font-size: 1.1rem;
+		font-size: 0.75rem;
 		letter-spacing: 0.02em;
 		color: var(--color-title);
 	}
@@ -202,6 +309,47 @@
 		text-transform: lowercase;
 	}
 
+	.arrow {
+		padding: 0;
+		margin: 0 0 0 auto;
+		height: 25px;
+		transition: all 0.3s;
+	}
+
+	.expanded {
+		transform: rotateX(180deg);
+	}
+
+	.can-all {
+		color: red;
+	}
+
+	/*
+		PIS Data
+	*/
+	.pis-detail {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		gap: 0.2rem;
+		padding: 8px 0;
+		width: 100%;
+	}
+	.pis-code {
+		font-weight: 600;
+		font-size: 1.1rem;
+		letter-spacing: 0.05em;
+	}
+
+	.pis-skip {
+		font-size: 0.85rem;
+		opacity: 0.75;
+		font-style: oblique;
+	}
+
+	/*
+		Box Extention
+	*/
 	.box-ext {
 		display: flex;
 		flex-direction: column;
@@ -219,37 +367,34 @@
 		width: 100%;
 	}
 
-	.cancel-reason, .delay-reason {
+	.cancel-reason,
+	.delay-reason {
 		display: block;
 		padding: 4px 8px;
 		width: 95%;
+		font-size: 1rem;
+		font-weight: 500;
+		animation: cancel-pulse 2s ease-in-out infinite;
 	}
 
 	.cancel-reason {
-		color:rgb(255, 0, 0);
+		color: var(--cancel-red);
-		font-weight: 500;
-		animation: cancel-pulse 2s ease-in-out infinite;
 	}
 
 	.delay-reason {
-		color:rgb(255, 119, 0);
+		color: rgb(255, 119, 0);
-		font-weight: 500;
-		animation: cancel-pulse 2s ease-in-out infinite;
 	}
 
-	@keyframes cancel-pulse {
+	/*
-		0% {
+		Schedule Table
-			opacity: 1;
+	*/
-			text-shadow: 0 0 0px rgb(255, 0, 0);
+
-		}
+	.color-key,
-		50% {
+	.color-key p {
-			opacity: 0.8;
+		text-align: center;
-			text-shadow: 0 0 5px rgba(255,0,0,0.2)
+		width: 100%;
-		}
+		padding: 0 0 0.2rem 0;
-		100% {
+		margin: 0;
-			opacity: 1;
-			text-shadow: 0 0 0px rgb(255, 0, 0);
-		}
 	}
 
 	.schedule-table-container {
@@ -257,25 +402,71 @@
 		justify-content: center;
 		align-items: center;
 		width: 100%;
+		padding-bottom: 0.1rem;
 	}
 
 	.schedule-table {
 		width: 95%;
-		max-width: 375px;
+		border-collapse: collapse;
-		padding-bottom: 1rem;
+		font-family: 'URW Gothic', 'Inter', sans-serif;
+		font-variant-numeric: tabular-nums;
+		font-size: 0.8rem;
+		letter-spacing: -0.02ch;
+		transition: all 0.5s;
+		font-weight: 500;
 	}
 
-	th, td {
+	.location-group:nth-of-type(even) {
+		background-color: rgba(255, 255, 255, 0.04);
+	}
+	.cell-divider-right {
+		border-right: 1px solid rgba(255, 255, 255, 0.1);
+	}
+
+	th,
+	td {
 		text-align: center;
+		padding: 6px 4px;
+	}
+
+	.activity-row td {
+		padding: 0 0 10px 0;
+		text-align: left;
+		font-size: 0.75rem;
+		letter-spacing: 0.01em;
+	}
+
+	.activity-container {
+		display: flex;
+		flex-wrap: wrap;
+		gap: 6px;
+		padding: 0 12px;
+	}
+
+	.activity-tag {
+		background: rgba(255, 255, 255, 0.1);
+		border: 1px solid rgba(255, 255, 255, 0.05);
+		padding: 2px 6px;
+		border-radius: 4px;
 	}
 
 	.tpl-cell {
-		color: yellow;
+		color: var(--color-title);
+		text-align: left;
 	}
 
-	.pass-loc {
+	.tpl-stop {
+		color: var(--location-yellow);
+	}
+
+	.plat-change {
+		animation: fast-pulse 2s ease-out infinite;
+	}
+
+	.pass-loc td {
 		color: var(--color-title);
-		opacity: 0.75;
+		font-style: oblique;
+		opacity: 0.5;
 	}
 
 	.can-loc {
@@ -283,11 +474,98 @@
 	}
 
 	.est {
+		color: var(--location-yellow);
 		font-style: oblique;
-		opacity: 0.5;
 	}
 
-	.act {
+	td.delay-late {
-		color: yellow;
+		color: var(--delay-orange);
+		font-weight: 600;
+		animation: pulse 2s ease-out infinite;
+	}
+
+	td.delay-early {
+		color: var(--early-blue);
+		font-weight: 600;
+		animation: pulse 2s ease-out infinite;
+	}
+
+	/* 
+		Loading State
+	*/
+	.loading-state {
+		position: absolute;
+		top: 0;
+		left: 0;
+		z-index: 2;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background-color: rgba(0, 0, 0, 0.2);
+		backdrop-filter: blur(5px);
+		width: 100%;
+		height: 100%;
+		font-family: 'URW Gothic', sans-serif;
+		font-size: 1rem;
+		color: var(--color-title);
+	}
+
+	.loading-spinner {
+		width: 16px;
+		height: 16px;
+		border: 2px solid rgba(0, 0, 0, 0.1);
+		border-top-color: #fff;
+		border-radius: 50%;
+		animation: load-spin 0.8s linear infinite;
+		z-index: 3;
+	}
+
+	/*
+		Responsivity
+	*/
+	@media (min-width: 330px) {
+		.time-summary,
+		.location-summary {
+			font-size: 0.9rem;
+		}
+		.activity-row td {
+			font-size: 0.8rem;
+		}
+	}
+
+	@media (min-width: 340px) {
+		.schedule-table {
+			font-size: 0.9rem;
+		}
+	}
+
+	@media (min-width: 360px) {
+		.time-summary {
+			font-size: 1.1rem;
+		}
+		.location-summary {
+			font-size: 1rem;
+		}
+		.schedule-table {
+			font-size: 0.99rem;
+		}
+		.activity-row td {
+			font-size: 0.9rem;
+		}
+	}
+
+	@media (min-width: 420px) {
+		.schedule-table {
+			font-size: 1.1rem;
+		}
+	}
+
+	/*
+		KEYFRAMES
+	*/
+	@keyframes load-spin {
+		to {
+			transform: rotate(360deg);
+		}
 	}
 </style>

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

@@ -52,7 +52,7 @@
 	.card {
 		background: var(--color-accent);
 		position: relative;
-		border-radius: 20px;
+		border-radius: 12px;
 		overflow: visible;
 		width: 95%;
 		max-width: 600px;

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

@@ -6,8 +6,7 @@
 
 	let headcode = $state('');
 
-	function handleSearch(e: SubmitEvent) {
+	function handleSearch(headcode: string) {
-		e.preventDefault();
 		if (!headcode.trim()) return;
 
 		const searchParams = new URLSearchParams();
@@ -18,10 +17,14 @@
 </script>
 
 <BaseCard header={'Search Train & PIS'}>
-	<form onsubmit={handleSearch} class="card-content">
+	<div class="card-content">
-		<Textbox placeholder="Enter Headcode" bind:value={headcode} maxLength={4} />
+		<Textbox
-		<Button type="submit" disabled={!headcode}>Search</Button>
+			placeholder="Enter Headcode"
-	</form>
+			bind:value={headcode}
+			maxLength={4}
+			onsubmit={handleSearch}
+		/>
+	</div>
 </BaseCard>
 
 <style>
@@ -29,7 +32,7 @@
 		text-align: center;
 		width: 90%;
 		margin: auto;
-		padding: 10px 0 0 0;
+		padding: 10px 0 0.5rem 0;
 		display: flex;
 		flex-direction: column;
 		gap: 0.75rem;

src/lib/global.css

@@ -44,6 +44,91 @@
 	font-display: swap;
 }
 
+/* 100: Thin */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Thin.woff2') format('woff2');
+	font-weight: 100;
+	font-style: normal;
+	font-display: swap;
+}
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ThinItalic.woff2') format('woff2');
+	font-weight: 100;
+	font-style: italic;
+	font-display: swap;
+}
+
+/* 200: ExtraLight */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ExtraLight.woff2') format('woff2');
+	font-weight: 200;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 300: Light */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Light.woff2') format('woff2');
+	font-weight: 300;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 400: Regular / Italic */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Regular.woff2') format('woff2');
+	font-weight: 400;
+	font-style: normal;
+	font-display: swap;
+}
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Italic.woff2') format('woff2');
+	font-weight: 400;
+	font-style: italic;
+	font-display: swap;
+}
+
+/* 500: Medium */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Medium.woff2') format('woff2');
+	font-weight: 500;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 600: SemiBold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-SemiBold.woff2') format('woff2');
+	font-weight: 600;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 700: Bold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-Bold.woff2') format('woff2');
+	font-weight: 700;
+	font-style: normal;
+	font-display: swap;
+}
+
+/* 800: ExtraBold */
+@font-face {
+	font-family: 'JetBrains Mono';
+	src: url('/type/jetbrains-mono/JetBrainsMono-ExtraBold.woff2') format('woff2');
+	font-weight: 800;
+	font-style: normal;
+	font-display: swap;
+}
 :root {
 	/* Brand Colours */
 	--color-brand: #4fd1d1;
@@ -58,6 +143,35 @@
 	--shadow-small: 0 4px 6px var(--color-shadow);
 	--shadow-up: 0 -4px 12px var(--color-shadow);
 	--shadow-right: 4px 0 12px var(--color-shadow);
+
+	/* Functional Colours */
+	--location-yellow: #edff22;
+	--delay-orange: #ff914d;
+	--cancel-red: #c60000;
+	--early-blue: #5ec1ff;
+}
+
+/* Pulse Animations */
+@keyframes pulse {
+	0%,
+	100% {
+		opacity: 1;
+	}
+	50% {
+		opacity: 0.3;
+	}
+}
+
+@keyframes fast-pulse {
+	0%,
+	50%,
+	100% {
+		opacity: 1;
+	}
+	25%,
+	75% {
+		opacity: 0;
+	}
 }
 
 body {

src/lib/locations-object.svelte.ts

@@ -28,6 +28,20 @@ class LocationStore {
 			return loc.t === query || loc.c === query;
 		});
 	}
+
+	getName(code: string | number | null | undefined): ApiLocationFilter.LocationFilterObject | null {
+		try {
+			if (!code) return null;
+
+			const query = String(code).toUpperCase().trim();
+
+			const match = this.data.find((loc) => loc.t === query || loc.c === query);
+			return match ?? null;
+		} catch (e) {
+			console.error('Error finding location object: ', e);
+			return null;
+		}
+	}
 }
 
 export const LOCATIONS = new LocationStore();

src/lib/quick-links.svelte.ts

@@ -4,7 +4,7 @@ export interface QuickLink {
 	lastAccessed: number;
 }
 
-const RETURNED_LENGTH: number = 9;
+const RETURNED_LENGTH: number = 6;
 const MAX_SCORE: number = 50;
 const MAX_ENTRIES: number = RETURNED_LENGTH * 4;
 

src/lib/utils/time.ts

@@ -1,3 +1,4 @@
+import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts';
 /**
  * Converts ISO/JSON time to UK-formatted HH:MM string.
  * Ensures Europe/London timezone irrespective of browser timezone.
@@ -15,3 +16,35 @@ export function formatUkTime(dateStr: string | Date | undefined): string {
 		timeZone: 'Europe/London'
 	});
 }
+
+/**
+ * Calculates a 'delay' value, in the formats:
+ * RT, 1E, 7L, etc.
+ * @param 'Schedule Location' object
+ * @returns Delay string for departure boards
+ */
+export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): {
+	val: string;
+	type: string;
+} {
+	const pairs = [
+		{ actual: loc.atd, sched: loc.ptd ?? loc.wtd },
+		{ actual: loc.ata, sched: loc.pta ?? loc.wta },
+		{ actual: loc.atp, sched: loc.wtp }
+	];
+
+	const match = pairs.find((p) => p.actual && p.sched);
+
+	if (!match || !match.actual || !match.sched) return { val: '', type: 'none' };
+
+	const diffMinutes = Math.round((Date.parse(match.actual) - Date.parse(match.sched)) / 60000);
+
+	if (diffMinutes === 0) return { val: 'RT', type: 'ontime' };
+
+	const absDiff = Math.abs(diffMinutes);
+	if (diffMinutes > 0) {
+		return { val: `${absDiff}L`, type: 'late' };
+	} else {
+		return { val: `${absDiff}E`, type: 'early' };
+	}
+}

src/routes/trains/+page.svelte

@@ -4,6 +4,9 @@
 	let { data } = $props();
 </script>
 
+<h6 style="text-align:center;width=100%;margin:auto;padding-top:1rem;font-size:1rem;">
+	DateSelector
+</h6>
 {#if data.results.length === 0}
 	<NoResults message={'No trains found on this date with this headcode.'} />
 {:else}