@@ -129,6 +139,7 @@
const RESULTS_BASE = '{{ results_base_url }}';
const DEFAULT_MIN_CONN = {{ default_min_connection }};
const DEFAULT_MAX_CONN = {{ default_max_connection }};
+ const DEFAULT_MIN_CONN_IN = {{ default_inbound_min_connection }};
let TRIP_FARES = {{ trip_fares_json | safe }};
let ADVANCE_FARES = {{ advance_fares_json | safe }};
let WALKON_API_URLS = {{ walkon_api_urls_json | safe }};
@@ -141,6 +152,8 @@
let currentEsClasses = {{ es_classes_json | safe }};
const SECTION_DIRECTIONS = {{ section_directions_json | safe }};
let advanceLoadingSections = {};
+ let walkonLoadingSections = {};
+ let selectedRowKeys = {};
function updateAdvanceLoadingStatus() {
var loading = Object.keys(advanceLoadingSections).some(function(sectionId) {
@@ -156,6 +169,11 @@
var params = [];
if (min !== DEFAULT_MIN_CONN) params.push('min_connection=' + min);
if (max !== DEFAULT_MAX_CONN) params.push('max_connection=' + max);
+ var minInEl = document.getElementById('min_conn_in_select');
+ if (minInEl) {
+ var minIn = parseInt(minInEl.value);
+ if (minIn !== DEFAULT_MIN_CONN_IN) params.push('min_connection_in=' + minIn);
+ }
var sectionIds = Object.keys(currentNrClasses);
if (sectionIds.length === 1) {
var nrCls = currentNrClasses[sectionIds[0]];
@@ -172,6 +190,12 @@
if (esC !== 'standard') params.push('es_class' + suffix + '=' + esC);
});
}
+ for (var _sid in selectedRowKeys) {
+ var _sel = selectedRowKeys[_sid];
+ if (!_sel || !SECTION_DIRECTIONS[_sid]) continue;
+ var _pname = SECTION_DIRECTIONS[_sid] === 'outbound' ? 'out' : 'ret';
+ params.push(_pname + '=' + encodeURIComponent(_sel.slice(_sid.length + 1)));
+ }
return params.length ? RESULTS_BASE + '?' + params.join('&') : RESULTS_BASE;
}
@@ -205,7 +229,7 @@
function fareHtml(fare) {
return '
' + fmtPrice(fare.price) + ' '
+ (fare.ticket ? '
' + fare.ticket + ' ' : '')
- + (fare.seats != null ? '
' + fare.seats + ' at this price ' : '');
+ + (fare.seats != null ? '
' + fare.seats + ' at this price ' : '');
}
function mergeAdvanceFares(sectionId, fares) {
@@ -376,17 +400,19 @@
var esStdEl = tr.querySelector('.es-standard');
var esPlusEl = tr.querySelector('.es-plus');
if (esStdEl) {
- esStdEl.innerHTML = row.es_standard ? fareHtml(row.es_standard) : '
\u2013 ';
+ esStdEl.innerHTML = '
Std ' + (row.es_standard ? fareHtml(row.es_standard) : '
\u2013 ');
esStdEl.classList.toggle('fare-inactive', esClass !== 'standard');
}
if (esPlusEl) {
- esPlusEl.innerHTML = row.es_plus ? fareHtml(row.es_plus) : '
\u2013 ';
+ esPlusEl.innerHTML = '
SP ' + (row.es_plus ? fareHtml(row.es_plus) : '
\u2013 ');
esPlusEl.classList.toggle('fare-inactive', esClass !== 'plus');
}
var totalSpan = tr.querySelector('.total-price');
if (totalSpan) {
- if (key in totals) {
+ if (key.indexOf(':unreachable:') !== -1) {
+ totalSpan.innerHTML = '
No rail connection ';
+ } else if (key in totals) {
var total = totals[key];
var html = '
' + fmtPrice(total);
if (minTotal !== null && maxTotal !== null) {
@@ -395,42 +421,153 @@
}
html += ' ';
totalSpan.innerHTML = html;
+ } else if (!nrFare && walkonLoadingSections[row.section]) {
+ totalSpan.innerHTML = '';
+ } else if (!nrFare) {
+ totalSpan.innerHTML = '
NR fare not available ';
} else {
- var missing = !nrFare ? 'No NR fare' : 'No Eurostar fare';
- totalSpan.innerHTML = '
' + missing + ' ';
+ totalSpan.innerHTML = '
No Eurostar price ';
}
}
});
+ updateSelectionBar();
}
function loadWalkonFares() {
var urls = WALKON_API_URLS;
- var pending = Object.keys(urls).length;
- if (!pending) return;
- function done() {
+ var ids = Object.keys(urls);
+ if (!ids.length) return;
+ /* outbound first, then inbound */
+ ids.sort(function(a, b) {
+ return (SECTION_DIRECTIONS[a] === 'outbound' ? 0 : 1) -
+ (SECTION_DIRECTIONS[b] === 'outbound' ? 0 : 1);
+ });
+ ids.forEach(function(sid) { walkonLoadingSections[sid] = true; });
+ var pending = ids.length;
+ function done(id) {
+ walkonLoadingSections[id] = false;
if (--pending === 0) {
var el = document.getElementById('walkon-loading');
if (el) el.style.display = 'none';
}
}
- for (var sectionId in urls) {
- (function(id, url) {
- fetch(url).then(function(r) { return r.json(); }).then(function(fares) {
- mergeWalkonFares(id, fares);
- updateDisplay();
- done();
- }).catch(done);
- })(sectionId, urls[sectionId]);
+ /* sequential: each fetch starts only after the previous one finishes */
+ ids.reduce(function(chain, id) {
+ return chain.then(function() {
+ return fetch(urls[id])
+ .then(function(r) { return r.json(); })
+ .then(function(fares) { mergeWalkonFares(id, fares); done(id); updateDisplay(); })
+ .catch(function() { done(id); updateDisplay(); });
+ });
+ }, Promise.resolve());
+ }
+
+ function initSelectionFromUrl() {
+ var params = new URLSearchParams(window.location.search);
+ for (var sid in SECTION_DIRECTIONS) {
+ var dir = SECTION_DIRECTIONS[sid];
+ var val = params.get(dir === 'outbound' ? 'out' : 'ret');
+ if (val) {
+ var rowKey = sid + ':' + val;
+ if (TRIP_FARES[rowKey]) selectedRowKeys[sid] = rowKey;
+ }
+ }
+ }
+
+ function selectRow(tr) {
+ var key = tr.getAttribute('data-row-key');
+ if (!key || key.indexOf(':unreachable:') !== -1) return;
+ var row = TRIP_FARES[key];
+ if (!row) return;
+ selectedRowKeys[row.section] = (selectedRowKeys[row.section] === key) ? null : key;
+ updateRowHighlights();
+ updateSelectionBar();
+ history.replaceState(null, '', buildUrl());
+ }
+
+ function clearSelection() {
+ selectedRowKeys = {};
+ updateRowHighlights();
+ updateSelectionBar();
+ history.replaceState(null, '', buildUrl());
+ }
+
+ function updateRowHighlights() {
+ document.querySelectorAll('tr[data-row-key]').forEach(function(tr) {
+ var key = tr.getAttribute('data-row-key');
+ var row = TRIP_FARES[key];
+ if (!row) return;
+ tr.classList.toggle('row-selected', selectedRowKeys[row.section] === key);
+ });
+ }
+
+ function updateSelectionBar() {
+ var bar = document.getElementById('selection-bar');
+ if (!bar) return;
+ var allSids = Object.keys(SECTION_DIRECTIONS);
+ var activeSids = allSids.filter(function(sid) { return selectedRowKeys[sid]; });
+ if (activeSids.length === 0) { bar.style.display = 'none'; return; }
+ bar.style.display = 'block';
+
+ var totalNr = 0, totalEs = 0, totalCircle = 0, allPrices = true;
+ var parts = [];
+ activeSids.forEach(function(sid) {
+ var rowKey = selectedRowKeys[sid];
+ var row = TRIP_FARES[rowKey];
+ if (!row) return;
+ var nrFare = currentNrFare(row);
+ var esClass = currentEsClasses[sid] || 'standard';
+ var esFare = esClass === 'standard' ? row.es_standard : row.es_plus;
+ if (nrFare) totalNr += nrFare.price; else allPrices = false;
+ if (esFare) totalEs += esFare.price; else allPrices = false;
+ totalCircle += row.circle_fare || 0;
+ var kp = rowKey.split(':');
+ // outbound key: section:NRdep:ESdep — show NR dep (Bristol)
+ // inbound key: section:NRdep:ESdep — show ES dep (destination, CET)
+ var depTime = SECTION_DIRECTIONS[sid] === 'outbound'
+ ? kp[1] + ':' + kp[2]
+ : kp[3] + ':' + kp[4];
+ parts.push((SECTION_DIRECTIONS[sid] === 'outbound' ? 'Out ' : 'Ret ') + depTime);
+ });
+
+ var descEl = document.getElementById('sel-desc');
+ if (descEl) descEl.textContent = parts.join(' · ');
+
+ var hintEl = document.getElementById('sel-hint');
+ if (hintEl) {
+ if (allSids.length > 1 && activeSids.length < allSids.length) {
+ var missingDir = SECTION_DIRECTIONS[allSids.filter(function(s) { return !selectedRowKeys[s]; })[0]];
+ hintEl.textContent = 'Select a ' + (missingDir === 'outbound' ? 'outbound' : 'return') + ' journey to see combined total';
+ hintEl.style.display = '';
+ } else {
+ hintEl.style.display = 'none';
+ }
+ }
+
+ var grandTotal = totalNr + totalEs + totalCircle;
+ var nrEl = document.getElementById('sel-nr');
+ var esEl = document.getElementById('sel-es');
+ var grandEl = document.getElementById('sel-grand');
+ if (nrEl) nrEl.innerHTML = 'NR
' + (allPrices ? fmtPrice(totalNr) : '–') + ' ';
+ if (esEl) esEl.innerHTML = 'Eurostar
' + (allPrices ? fmtPrice(totalEs) : '–') + ' ';
+ if (grandEl) {
+ var label = (activeSids.length === allSids.length && allSids.length > 1) ? 'Grand total' : 'Total';
+ var priceHtml = allPrices
+ ? '
' + fmtPrice(grandTotal) + ' '
+ : '
– ';
+ grandEl.innerHTML = label + ' ' + priceHtml;
}
}
function initialiseResultsPage() {
+ initSelectionFromUrl();
var needsAdvance = Object.keys(currentNrClasses).some(function(sid) {
var c = currentNrClasses[sid];
return c === 'advance_std' || c === 'advance_1st';
});
if (needsAdvance) loadMissingAdvanceFares();
updateDisplay();
+ updateRowHighlights();
loadWalkonFares();
startTimetableRefresh();
}
@@ -548,15 +685,15 @@
{% if section.direction == 'inbound' %}
- Eurostar{{ destination }} → St Pancras
- TransferSt Pancras → Paddington
+ Eurostar{{ destination }} → St Pancras
+ TransferSt Pancras → Paddington
National RailPaddington → {{ departure_station_name }}
{% else %}
- National Rail{{ departure_station_name }} → Paddington
- TransferPaddington → St Pancras
+ National Rail{{ departure_station_name }} → Paddington
+ TransferPaddington → St Pancras
EurostarSt Pancras → {{ destination }}
{% endif %}
- Total
+ Totalclick row to select
@@ -577,8 +714,10 @@
{% else %}
{% set row_class = '' %}
{% endif %}
-
+
{% if row.row_type == 'trip' %}
{% if section.direction == 'inbound' %}
@@ -591,8 +730,9 @@
{%- if row.train_number %}{{ row.train_number }}{% endif %}
{% endif %}
- {% if row.eurostar_price is not none %}£{{ "%.2f"|format(row.eurostar_price) }} {% endif %}
- {% if row.eurostar_plus_price is not none %}£{{ "%.2f"|format(row.eurostar_plus_price) }} {% endif %}
+ Std {% if row.eurostar_price is not none %} £{{ "%.2f"|format(row.eurostar_price) }} {% endif %}SP {% if row.eurostar_plus_price is not none %} £{{ "%.2f"|format(row.eurostar_plus_price) }} {% endif %}then {{ row.connection_duration }} to station{% if row.connection_minutes < 45 %} ⚠️{% endif %}
{{ row.connection_duration }}{% if row.connection_minutes < 45 %} ⚠️ {% endif %}
@@ -612,7 +752,7 @@
{{ row.depart_paddington }} → {{ row.arrive_uk_station }}
({{ row.gwr_duration }})
{% if row.headcode or row.arrive_platform %}
- {{ row.headcode }}{% if row.headcode and row.arrive_platform %} · {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}
+ {{ row.headcode }}{% if row.headcode and row.arrive_platform %} · {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}
{% endif %}
{% if row.ticket_price is not none %}£{{ "%.2f"|format(row.ticket_price) }} {% endif %}
{{ row.depart_bristol }} → {{ row.arrive_paddington }}
({{ row.gwr_duration }})
{% if row.headcode or row.arrive_platform %}
- {{ row.headcode }}{% if row.headcode and row.arrive_platform %} · {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}
+ {{ row.headcode }}{% if row.headcode and row.arrive_platform %} · {% endif %}{% if row.arrive_platform %}Plat {{ row.arrive_platform }}{% endif %}
{% endif %}
{% if row.ticket_price is not none %}£{{ "%.2f"|format(row.ticket_price) }} {% endif %}
then {{ row.connection_duration }} to Eurostar{% if row.connection_minutes < 80 %} ⚠️{% endif %}
{{ row.connection_duration }}{% if row.connection_minutes < 80 %} ⚠️ {% endif %}
@@ -649,8 +790,8 @@
{%- if row.train_number %}{{ row.train_number }}{% endif %}
{% endif %}
- {% if row.eurostar_price is not none %}£{{ "%.2f"|format(row.eurostar_price) }} {% endif %}
- {% if row.eurostar_plus_price is not none %}£{{ "%.2f"|format(row.eurostar_plus_price) }} {% endif %}
+ Std {% if row.eurostar_price is not none %} £{{ "%.2f"|format(row.eurostar_price) }} {% endif %}SP {% if row.eurostar_plus_price is not none %} £{{ "%.2f"|format(row.eurostar_plus_price) }} {% endif %}
{% endif %}
@@ -665,7 +806,7 @@
{% else %}
- Too early
+ Too early
—
@@ -676,8 +817,10 @@
{{ row.depart_st_pancras }} → {{ row.arrive_destination }}
{% if row.train_number %}{{ row.train_number }} {% endif %}
{% endif %}
+
- No connection
+
{% endfor %}
@@ -718,4 +861,19 @@
{% endif %}
+
+
+
+
+
+ Clear
+
+
+