Extend data in the schedule box

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/TrainService.svelte

@@ -1,11 +1,12 @@
 <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);
@@ -45,6 +46,51 @@
 	}
 
 	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">
@@ -66,8 +112,9 @@
 			<div class="location-summary" class:can-all={service.ct}>
 				{service.dt}
 			</div>
-			<!-- Add arrow icon to signify drop-down -->
-			<!-- ADD LOADING STATE -->
+			<div class="arrow" class:expanded={isExpanded}>
+				<IconChevronDownFilled color={'var(--color-title)'} size={25} />
+			</div>
 		</div>
 	</button>
 	{#if isExpanded && details}
@@ -84,7 +131,6 @@
 						{#if details.header.cl}
 							{details.header.cn ? ' near ' : ' at '}
 							<TiplocConverter code={details.header.cl} />
-							<!-- CONSIDER WRAPPING IN A COMPONENT THAT CONVERTS TO THE LOCATION NAME RATHER THAN TIPLOC -->
 						{/if}
 					</span>
 				{/if}
@@ -99,9 +145,14 @@
 						{/if}
 					</span>
 				{/if}
-				<div class="pis-detail">
-					<!-- PIS Data Here -->
-				</div>
+				{#if details.pis}
+					<div class="pis-detail">
+						{details.pis.code}
+					</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">
@@ -118,32 +169,51 @@
 							<th>Act</th>
 							<th>Sch</th>
 							<th>Act</th>
+							<th></th>
 						</tr>
 					</thead>
-					<tbody>
-						{#each details.locations as loc}
+					{#each details.locations as loc}
+					<tbody class="location-group">
+						
 							<tr class:pass-loc={loc.r === 'PASS'} class:can-loc={loc.can}>
-								<td class="tpl-cell">{loc.t}</td>
-								<td class="plat-cell">{loc.p}</td>
+								<td class="tpl-cell" class:tpl-stop={loc.r != 'PASS'}>
+									{loc.t}
+								</td>
+								<td class="plat-cell cell-divider-right" class:plat-change={loc.pc}>{loc.p}</td>
 								{#if loc.r == 'PASS'}
-									<td class="time-cell" colspan="2">Pass</td>
+									<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
 									>
 								{:else}
 									<td class="time-cell">{formatUkTime(loc.pta || loc.wta || '--')}</td>
-									<td class="time-cell {estClass(loc.ata, loc.eta)}"
+									<td class="time-cell cell-divider-right {estClass(loc.ata, loc.eta)}"
 										>{formatUkTime(loc.ata || loc.eta || '--')}</td
 									>
 									<td class="time-cell">{formatUkTime(loc.ptd || loc.wtd || '--')}</td>
-									<td class="time-cell {estClass(loc.atd, loc.etd)}"
+									<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>
-						{/each}
-					</tbody>
+							{#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}
+									</div>
+								</td>
+							</tr>
+							{/if}
+						
+					</tbody>{/each}
 				</table>
 			</div>
 		</div>
@@ -151,27 +221,41 @@
 </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 {
-		filter: invert();
+	.train-service:active {
+		filter: brightness(1.2);
 	}
 
+	@media (hover: hover) {
+		.train-service:hover {
+			filter: brightness(1.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;
@@ -180,6 +264,198 @@
 		gap: 0.5rem;
 	}
 
+	.operator-summary {
+		flex-shrink: 0;
+	}
+
+	.main-text-summary {
+		display: flex;
+		flex-grow: 1;
+		align-items: center;
+		gap: 0.5rem;
+	}
+
+	.time-summary {
+		font-size: 0.75rem;
+		font-weight: 700;
+		color: var(--color-brand);
+	}
+
+	.location-summary {
+		text-transform: uppercase;
+		font-weight: 500;
+		font-size: 0.75rem;
+		letter-spacing: 0.02em;
+		color: var(--color-title);
+	}
+
+	.to-summary {
+		font-size: 0.8rem;
+		font-style: oblique;
+		text-transform: lowercase;
+	}
+
+	.arrow {
+		padding: 0;
+		margin: 0 0 0 auto;
+		height: 25px;
+		transition: all 0.9s;
+	}
+
+	.expanded {
+		transform: rotateX(180deg);
+	}
+
+	.can-all {
+		color: red;
+	}
+
+	/*
+		Box Extention
+	*/
+	.box-ext {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+	}
+
+	.detail-head {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		gap: 0.5rem;
+		text-align: center;
+		width: 100%;
+	}
+
+	.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: var(--cancel-red);
+	}
+
+	.delay-reason {
+		color: rgb(255, 119, 0);
+	}
+
+	/*
+		Schedule Table
+	*/
+
+	.color-key,
+	.color-key p {
+		text-align: center;
+		width: 100%;
+		padding: 0 0 0.2rem 0;
+		margin: 0;
+	}
+
+	.schedule-table-container {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		padding-bottom: 0.1rem;
+	}
+
+	.schedule-table {
+		width: 95%;
+		border-collapse: collapse;
+		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;
+	}
+
+	.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: var(--color-title);
+		text-align: left;
+	}
+
+	.tpl-stop {
+		color: var(--location-yellow);
+	}
+
+	.plat-change {
+		animation: fast-pulse 2s ease-out infinite;
+	}
+
+	.pass-loc td {
+		color: var(--color-title);
+		font-style: oblique;
+		opacity: 0.5;
+	}
+
+	.can-loc {
+		text-decoration: line-through;
+	}
+
+	.est {
+		color: var(--location-yellow);
+		font-style: oblique;
+	}
+
+	td.delay-late {
+		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;
@@ -207,135 +483,52 @@
 		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);
 		}
 	}
-
-	.operator-summary {
-		flex-shrink: 0;
-	}
-
-	.main-text-summary {
-		display: flex;
-		flex-grow: 1;
-		align-items: center;
-		gap: 0.5rem;
-	}
-
-	.time-summary {
-		font-size: 1.1rem;
-		font-weight: 700;
-		color: var(--color-brand);
-	}
-
-	.location-summary {
-		text-transform: uppercase;
-		font-weight: 500;
-		font-size: 1.1rem;
-		letter-spacing: 0.02em;
-		color: var(--color-title);
-	}
-
-	.to-summary {
-		font-size: 0.8rem;
-		font-style: oblique;
-		text-transform: lowercase;
-	}
-
-	.can-all {
-		color: red;
-	}
-
-	.box-ext {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		width: 100%;
-	}
-
-	.detail-head {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		gap: 0.5rem;
-		text-align: center;
-		width: 100%;
-	}
-
-	.cancel-reason,
-	.delay-reason {
-		display: block;
-		padding: 4px 8px;
-		width: 95%;
-	}
-
-	.cancel-reason {
-		color: rgb(255, 0, 0);
-		font-weight: 500;
-		animation: cancel-pulse 2s ease-in-out infinite;
-	}
-
-	.delay-reason {
-		color: rgb(255, 119, 0);
-		font-weight: 500;
-		animation: cancel-pulse 2s ease-in-out infinite;
-	}
-
-	@keyframes cancel-pulse {
-		0% {
-			opacity: 1;
-			text-shadow: 0 0 0px rgb(255, 0, 0);
-		}
-		50% {
-			opacity: 0.8;
-			text-shadow: 0 0 5px rgba(255, 0, 0, 0.2);
-		}
-		100% {
-			opacity: 1;
-			text-shadow: 0 0 0px rgb(255, 0, 0);
-		}
-	}
-
-	.schedule-table-container {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 100%;
-	}
-
-	.schedule-table {
-		width: 95%;
-		max-width: 375px;
-		padding-bottom: 1rem;
-	}
-
-	th,
-	td {
-		text-align: center;
-	}
-
-	.tpl-cell {
-		color: yellow;
-	}
-
-	.pass-loc {
-		color: var(--color-title);
-		opacity: 0.75;
-	}
-
-	.can-loc {
-		text-decoration: line-through;
-	}
-
-	.est {
-		font-style: oblique;
-		opacity: 0.5;
-	}
-
-	.act {
-		color: yellow;
-	}
 </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/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/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' };
+	}
+}