zotan/oeffisearch
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

client/journey: show change duration

Browse source
This commit is contained in:
Milan Pässler 2020-02-08 00:01:48 +01:00
parent 6846f77fce
commit 14aec20be3
2 changed files with 64 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

95
client/js/journeyView.js
View file

@ -12,7 +12,7 @@ const remarksModalTemplate = (type, remarks) => html`
${remarks.map(element => html`
<tr>
<td>
<span class="remark ${type}"></span>
<span class="remark ${type}"></span>
<span>${element.text}</span>
</td>
</tr>
@ -37,38 +37,38 @@ const legTemplate = (element) => {
return html`
${element.isWalking ? html`
<p class="walk">${t('walkinfo', [parseName(element.arrival.point), element.distance])}</p>
<p class="walk">${t('walkinfo', [parseName(element.arrival.point), element.distance])}</p>
` : element.isTransfer ? html`
<p class="transfer">${t('transferinfo', [parseName(element.arrival.point)])}</p>
` : element.isChange ? html`
<p class="change">${t('changeinfo', [formatDuration(element.duration)])}</p>
` : html`
${element.isTransfer ? html`
<p class="transfer">${t('transferinfo', [parseName(element.arrival.point)])}</p>
` : html`
<table>
<thead>
<tr>
<td colspan="4">
${element.line.name} ${element.line.additionalName ? '('+element.line.additionalName+')' : ''} → ${element.direction} ${element.cancelled ? html`<b style="color:red;">${t('cancelled-ride')}</b>` : ''}
${Object.entries(remarks).map(remarksTemplate)}
</td>
<table>
<thead>
<tr>
<td colspan="4">
${element.line.name} ${element.line.additionalName ? '('+element.line.additionalName+')' : ''} → ${element.direction} ${element.cancelled ? html`<b style="color:red;">${t('cancelled-ride')}</b>` : ''}
${Object.entries(remarks).map(remarksTemplate)}
</td>
</tr>
<tr>
<th>${t('arrival')}</th>
<th>${t('departure')}</th>
<th>${t('station')}</th>
<th>${t('platform')}</th>
</tr>
</thead>
<tbody>
${element.stopovers.map(stop => html`
<tr class="stop ${stop.cancelled ? 'cancelled' : ''}" @click=${() => {location.href = "https://marudor.de/"+stop.stop.id+"?searchType=hafas"}}>
<td>${timeTemplate(stop.arrival)}</td>
<td>${timeTemplate(stop.departure)}</td>
<td>${stop.stop.name} ${ds100Names(stop.stop.id)}</td>
<td>${stopPlatformTemplate(stop)}</td>
</tr>
<tr>
<th>${t('arrival')}</th>
<th>${t('departure')}</th>
<th>${t('station')}</th>
<th>${t('platform')}</th>
</tr>
</thead>
<tbody>
${element.stopovers.map(stop => html`
<tr class="stop ${stop.cancelled ? 'cancelled' : ''}" @click=${() => {location.href = "https://marudor.de/"+stop.stop.id+"?searchType=hafas"}}>
<td>${timeTemplate(stop.arrival)}</td>
<td>${timeTemplate(stop.departure)}</td>
<td>${stop.stop.name} ${ds100Names(stop.stop.id)}</td>
<td>${stopPlatformTemplate(stop)}</td>
</tr>
`)}
</tbody>
</table>
`}
`)}
</tbody>
</table>
`}
`;
};
@ -81,7 +81,36 @@ const journeyTemplate = (data, requestId, journeyId) => {
const arrivalTime = arrival.prognosedTime ? arrival.prognosedTime : arrival.plannedTime;
const duration = arrivalTime - departureTime;
const changes = data.legs.filter(leg => !leg.isWalking).length;
const legs = [];
let changes = 0;
let lastArrival;
for (let leg of data.legs) {
if (!leg.isWalking && !leg.isTransfer) {
// add change
if (lastArrival) {
const departure = leg.departure;
const arrival = lastArrival;
const departureTime = departure.prognosedTime ? departure.prognosedTime : departure.plannedTime;
const arrivalTime = arrival.prognosedTime ? arrival.prognosedTime : arrival.plannedTime;
const duration = departureTime - arrivalTime;
legs.push({
isChange: true,
duration: duration,
});
}
changes++;
lastArrival = leg.arrival;
} else if (legs.length) {
// if this is a walking leg and it is the first one, we don't want to
// insert a 0 minutes change entry for this
lastArrival = leg.arrival;
}
legs.push(leg);
}
return html`
<div id="journeyView">
@ -108,7 +137,7 @@ const journeyTemplate = (data, requestId, journeyId) => {
</div>
<div id="connection">
${data.legs.map(legTemplate)}
${legs.map(legTemplate)}
</div>
</div>
`;

2
client/js/languages.js
View file

@ -12,6 +12,7 @@ export const languages = {
'station': 'Station',
'platform': 'Gleis',
'walkinfo': 'Laufe nach %s (ca. %s Meter)',
'changeinfo': '%s Umstiegsdauer',
'transferinfo': 'Reise nach %s',
'swap': 'Von/Nach tauschen',
'settings': 'Einstellungen',
@ -59,6 +60,7 @@ export const languages = {
'station': 'Station',
'platform': 'Platform',
'walkinfo': 'Walk to %s (apprx. %s meters)',
'changeinfo': '%s change duration',
'transferinfo': 'Travel to %s',
'swap': 'Swap from/to',
'settings': 'Settings',