Compare commits

...

1 Commits

8 changed files with 157 additions and 13 deletions

7
package-lock.json generated
View File

@@ -8,6 +8,7 @@
"name": "web-pwa", "name": "web-pwa",
"version": "0.0.1", "version": "0.0.1",
"dependencies": { "dependencies": {
"@owlboard/api-schema-types": "^3.0.3-alpha18",
"@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101", "@owlboard/owlboard-ts": "^3.0.0-dev.20260509t2101",
"@tabler/icons-svelte": "^3.40.0" "@tabler/icons-svelte": "^3.40.0"
}, },
@@ -801,9 +802,9 @@
} }
}, },
"node_modules/@owlboard/api-schema-types": { "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" "license": "MIT"
}, },
"node_modules/@owlboard/owlboard-ts": { "node_modules/@owlboard/owlboard-ts": {

View File

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

View File

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

View File

@@ -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>

View File

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

View File

@@ -1,4 +1,7 @@
import type { ApiTrainsTrainDetails } from '@owlboard/owlboard-ts'; 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 * Converts ISO/JSON time to UK-formatted HH:MM string, with optional (default off) seconds
* Ensures Europe/London timezone irrespective of browser timezone. * Ensures Europe/London timezone irrespective of browser timezone.
@@ -49,20 +52,39 @@ export function formatUkDateTime(
.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: * Calculates a 'delay' value, in the formats:
* RT, 1E, 7L, etc. * RT, 1E, 7L, etc.
* @param 'Schedule Location' object * @param 'Schedule Location' or 'Board Service' object
* @returns Delay string for departure boards * @returns Delay string for departure boards
*/ */
export function calculateDelay(loc: ApiTrainsTrainDetails.ServiceLocation): { export function calculateDelay(loc: DelayInput): {
val: string; val: string;
type: string; type: string;
} { } {
const pairs = [ 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); const match = pairs.find((p) => p.actual && p.sched);

View File

@@ -1,9 +1,10 @@
<script lang="ts"> <script lang="ts">
import { onMount, untrack } from 'svelte'; import { onMount, untrack } from 'svelte';
import { quickLinks } from '$lib/quick-links.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 { formatUkDateTime, formatUkTime } from '$lib/utils/time';
import StaffServicesTable from '$lib/components/ui/station-board/StaffServicesTable.svelte';
let { data } = $props(); let { data } = $props();
let now = $state(new Date()); let now = $state(new Date());
@@ -42,6 +43,9 @@
<span class="time-loaded">Updated: {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> <span class="time-now">{formatUkTime(now, true)}</span>
</div> </div>
{#if data.boardData.data.s?.length}
<StaffServicesTable services={data.boardData.data.s} />
{/if}
<pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre> <pre class="json-dump">{JSON.stringify(data.boardData.data.s, null, 2)}</pre>
</section> </section>