diff --git a/src/lib/components/ui/station-board/StaffServicesGrid.svelte b/src/lib/components/ui/station-board/StaffServicesGrid.svelte index e4800d9..8ba346f 100644 --- a/src/lib/components/ui/station-board/StaffServicesGrid.svelte +++ b/src/lib/components/ui/station-board/StaffServicesGrid.svelte @@ -81,7 +81,7 @@ > {#if isRightTime(service.sta, service.ata || service.eta)} RT - {:else if service.sta && service.c} CAN {:else} + {:else if service.sta && service.c} CANC {:else} {realArrival} {/if} @@ -116,15 +116,19 @@ .departure-board { width: 100%; max-width: 100%; - margin: 5px auto; + height: 100%; + max-height: 100%; + margin: 0 auto; box-sizing: border-box; - overflow: hidden; + overscroll-behavior-y: contain; + overflow-y: auto; } .header.container { position: sticky; + padding-top: 7px; top: 0; - z-index: 2; + z-index: 10; background: var(--color-bg-dark); } @@ -172,23 +176,29 @@ padding-bottom: 7px; } - .cell > div { - display: block; - width: 100%; - } - - /* Row Logic */ - .service.cancelled { + /* Cancellation Logic */ + .service.cancelled, + .service.cancelled .cell.orig, + .service.cancelled .cell.dest { color: rgb(255, 131, 131); } + .service.cancelled .cell.plt, + .service.cancelled .cell.act { + text-decoration: line-through; + opacity: 0.25; + } + .service.cancelled .cell.sch { + text-decoration: line-through; + } - /* Special Row Styles */ + /* Meta Row Styles */ .operator.row, .delay-reason.row, .cancel-reason.row { grid-template-columns: 1fr; text-align: left; font-size: 0.88rem; + font-stretch: 80%; } .cancel-reason.row { @@ -232,7 +242,7 @@ } .operator.row { - /* font-family: 'URW Gothic', sans-serif; */ + font-stretch: 110%; padding: 0; color: rgb(187, 187, 255); } @@ -320,16 +330,9 @@ text-align: center; font-stretch: 100%; } - /* Colour orig and dest values when cancelled */ - .service-row.serviceCancelled .orig-cell, - .service-row.serviceCancelled .dest-cell { - color: rgb(255, 131, 131); - } - .cell.pass { grid-column: span 2; } - .cell.sch, .cell.act { text-align: center; diff --git a/src/lib/components/ui/station-board/StaffServicesTable.svelte b/src/lib/components/ui/station-board/StaffServicesTable.svelte deleted file mode 100644 index 4fe80e9..0000000 --- a/src/lib/components/ui/station-board/StaffServicesTable.svelte +++ /dev/null @@ -1,425 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {#each services as service (getRowKey(service))} - - - - - - - - - {#if service.wtp} - - - - - {:else} - - - - - - - - - - {/if} - - - {#if service.o} - - - - {/if} - {#if service.c && service.cr?.r} - - - - {/if} - {#if service.dr?.r} - - - - {/if} - - {/each} -
ArrDep
IDOrigDestPltSchActSchAct
{service.h}{service.og.t}{service.dt.t}{service.p || '-'}Pass{formatUkTime(service.wtp)} - - {service.c - ? '-' - : delayClassFromTimePair(service.wtp, service.atp || service.etp) === 'delay-rt' - ? 'RT' - : formatUkTime(service.atp || service.etp)} - - {formatUkTime(service.sta)} - - {service.c - ? '-' - : delayClassFromTimePair(service.sta, service.ata || service.eta) === 'delay-rt' - ? 'RT' - : formatUkTime(service.ata || service.eta)} - - {formatUkTime(service.std)} - - {service.c - ? '-' - : delayClassFromTimePair(service.std, service.atd || service.etd) === 'delay-rt' - ? 'RT' - : formatUkTime(service.atd || service.etd)} - -
- {service.o} -
- {service.cr.r} - {#if service.cr.l} - {service.cr.n ? 'near' : 'at'} - {service.cr.l} - {/if} -
- {service.dr.r} - {#if service.dr.l} - {service.dr.n ? 'near' : 'at'} - {service.dr.l} - {/if} -
- - diff --git a/src/lib/components/ui/station-board/StationAlertCard.svelte b/src/lib/components/ui/station-board/StationAlertCard.svelte index 4d9e964..fd65c7b 100644 --- a/src/lib/components/ui/station-board/StationAlertCard.svelte +++ b/src/lib/components/ui/station-board/StationAlertCard.svelte @@ -45,7 +45,7 @@ border-radius: 8px; background: transparent; position: relative; - z-index: 10; + z-index: 12; margin-bottom: 0; width: 95%; max-width: 750px; diff --git a/src/routes/board/+page.svelte b/src/routes/board/+page.svelte index 31651a2..d32b3c4 100644 --- a/src/routes/board/+page.svelte +++ b/src/routes/board/+page.svelte @@ -5,7 +5,6 @@ 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'; import StaffServicesGrid from '$lib/components/ui/station-board/StaffServicesGrid.svelte'; let { data } = $props(); @@ -109,10 +108,6 @@ }); } }); - - // Wake Lock API Handling - // Load Data Invalidation Handling - // Refresh countdown logic
@@ -145,6 +140,7 @@ align-items: center; width: 100%; margin: 0 auto; + padding: 0; overflow: hidden; gap: 0; } @@ -152,6 +148,10 @@ .no-service { display: block; margin: auto; + text-align: center; + font-weight: 600; + letter-spacing: 0.15ch; + font-size: 1.4rem; max-width: 75%; font-family: 'URW Gothic', sans-serif; } @@ -230,10 +230,6 @@ font-size: 1rem; } - .live-indicator { - margin: 0.25rem auto; - } - .service-list-wrapper { flex: 1; overflow-y: auto;