Compare commits
3 Commits
ceba276ac0
...
a42a00ddf9
| Author | SHA1 | Date |
|---|---|---|
 Fred Boniface
|
a42a00ddf9 | |
|
Fred Boniface
|
f9b1dd5861 | |
|
Fred Boniface
|
62dcc5cd02 |
|
|
@ -30,6 +30,11 @@
|
||||||
- settings.js
|
- settings.js
|
||||||
- find-code.js
|
- find-code.js
|
||||||
- service-worker.js *in / not /js*
|
- service-worker.js *in / not /js*
|
||||||
|
- Notes:
|
||||||
|
- DONE - Do not put train details into DOM until requested - load into sessionStorage.
|
||||||
|
- Put any reusable code in to a suitable lib file.
|
||||||
|
- Make the board code actually readable.
|
||||||
|
- Prevent the whole page reloading when the PWA is re-opened, that just wastes API calls.
|
||||||
|
|
||||||
### Completed - Testing:
|
### Completed - Testing:
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,8 @@
|
||||||
<link rel="icon" type="image/svg+xml" href="./images/icon.svg"/>
|
<link rel="icon" type="image/svg+xml" href="./images/icon.svg"/>
|
||||||
<link rel="manifest" type="application/json" href="./manifest.json"/>
|
<link rel="manifest" type="application/json" href="./manifest.json"/>
|
||||||
<script src="./js/lib.main.js" defer></script>
|
<script src="./js/lib.main.js" defer></script>
|
||||||
<script src="./js/boards.js" defer></script>
|
<script src="./js/lib.board.js" defer></script>
|
||||||
<script src="./js/public-board.js" defer></script>
|
<script src="./js/simple-board.js" defer></script>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="loading">
|
<div id="loading">
|
||||||
|
|
|
||||||
|
|
@ -1,210 +0,0 @@
|
||||||
// Set page headers
|
|
||||||
async function setHeaders(title,time) {
|
|
||||||
var prefix = `OwlBoard - `
|
|
||||||
document.title = `${prefix}${title}`
|
|
||||||
document.getElementById("stn_name").textContent = title
|
|
||||||
document.getElementById("fetch_time").textContent = time.toLocaleTimeString()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Determine what should display in 'platform' column
|
|
||||||
async function parsePlatform(svc){
|
|
||||||
if (svc.platform != undefined) {
|
|
||||||
var platform = svc.platform;
|
|
||||||
} else {
|
|
||||||
var platform = "-";
|
|
||||||
}
|
|
||||||
if (svc.platformChanged) { // Not present in public API, ready for staff version.
|
|
||||||
var changed = "changed";
|
|
||||||
} else {
|
|
||||||
var changed = "";
|
|
||||||
}
|
|
||||||
return {num: platform, change: changed}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use different time strings to default to make better on small screens
|
|
||||||
async function parseTime(string){
|
|
||||||
switch (string) {
|
|
||||||
case "Delayed":
|
|
||||||
var output = "LATE";
|
|
||||||
var change = "changed";
|
|
||||||
break;
|
|
||||||
case "Cancelled":
|
|
||||||
var output = "CANC";
|
|
||||||
var change = "cancelled";
|
|
||||||
break;
|
|
||||||
case "On time":
|
|
||||||
var output = "RT";
|
|
||||||
var change = "";
|
|
||||||
break;
|
|
||||||
case "":
|
|
||||||
var output = "-";
|
|
||||||
var change = "";
|
|
||||||
break;
|
|
||||||
case undefined:
|
|
||||||
var output = "-";
|
|
||||||
var change = "";
|
|
||||||
break;
|
|
||||||
case "No report":
|
|
||||||
var output = "-";
|
|
||||||
var change = "";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
var output = string;
|
|
||||||
var change = "changed";
|
|
||||||
}
|
|
||||||
return {data: output, changed: change};
|
|
||||||
}
|
|
||||||
|
|
||||||
// Convert multiple Origin/Destinations to single string
|
|
||||||
async function parseName(location) {
|
|
||||||
if (Array.isArray(location)) {
|
|
||||||
var name = `${location[0]['locationName']} & ${location[1]['locationName']}`
|
|
||||||
return name;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return location.locationName;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build calling list: -- This is a string if only one callingPoint is present, needs adapting to work with that
|
|
||||||
async function buildCallLists(data) {
|
|
||||||
try {
|
|
||||||
if (data.previousCallingPoints.callingPointList.callingPoint) {
|
|
||||||
var preCallPoint = data.previousCallingPoints.callingPointList.callingPoint;
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.log(`Data not found error, ${err}`)
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if (data.subsequentCallingPoints.callingPointList.callingPoint) {
|
|
||||||
var postCallPoint = data.subsequentCallingPoints.callingPointList.callingPoint;
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.log(`Data not found error, ${err}`)
|
|
||||||
}
|
|
||||||
var procPre = "";
|
|
||||||
var procPost = "";
|
|
||||||
try {
|
|
||||||
if (preCallPoint) {
|
|
||||||
for(var i = 0; i < preCallPoint.length; i++) {
|
|
||||||
var proc = await buildPastCalls(preCallPoint[i]);
|
|
||||||
procPre = `${procPre}\n${proc}`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.log(`Error reading previous stops. ${err}`)
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
if (postCallPoint) {
|
|
||||||
for (var i = 0; i < postCallPoint.length; i++) {
|
|
||||||
var proc = await buildCalls(postCallPoint[i]);
|
|
||||||
procPost = `${procPost}\n${proc}`
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
console.log(`Error reading next stops. ${err}`)
|
|
||||||
}
|
|
||||||
var div = `
|
|
||||||
<div class="call-data" id="${data.serviceID}">
|
|
||||||
<p class="close-data" onclick="hideCalls('${data.serviceID}')">X</p>
|
|
||||||
<table class="calling-at">
|
|
||||||
<caption>Calling at:</caption>
|
|
||||||
<tr>
|
|
||||||
<th class="detail-name-head">Location</th>
|
|
||||||
<th class="time">Schedule</th>
|
|
||||||
<th class="time">Exp.</th>
|
|
||||||
</tr>
|
|
||||||
${procPost}
|
|
||||||
</table>
|
|
||||||
<table class="called-at">
|
|
||||||
<caption>Previous stops:</caption>
|
|
||||||
<tr>
|
|
||||||
<th class="detail-name-head">Location</th>
|
|
||||||
<th class="time">Schedule</th>
|
|
||||||
<th class="time">Actual</th>
|
|
||||||
</tr>
|
|
||||||
${procPre}
|
|
||||||
</table>
|
|
||||||
</div>`
|
|
||||||
document.body.insertAdjacentHTML("beforeend", div)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Display calling list: - The calling list should be built on demand.
|
|
||||||
async function showCalls(id) {
|
|
||||||
document.getElementById(id).style = "display: block;";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function hideCalls(id) {
|
|
||||||
document.getElementById(id).style = "display: none;";
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Display Alert Messages
|
|
||||||
async function displayAlerts(array) {
|
|
||||||
var counter = 0
|
|
||||||
var messages = ""
|
|
||||||
for(var i = 0; i < array.length; i++) {
|
|
||||||
// Increment counter
|
|
||||||
counter += 1;
|
|
||||||
// Reset Vars
|
|
||||||
messages += `<p>${array[i]}</p>`;
|
|
||||||
}
|
|
||||||
document.getElementById("alerts_msg").insertAdjacentHTML("beforeend", messages);
|
|
||||||
if (counter == 1) {
|
|
||||||
document.getElementById("alert_bar_note").textContent = `There is ${counter} active alert`
|
|
||||||
} else if (counter > 1) {
|
|
||||||
document.getElementById("alert_bar_note").textContent = `There are ${counter} active alerts`
|
|
||||||
|
|
||||||
}
|
|
||||||
document.getElementById("alerts").style = "display:block"
|
|
||||||
document.getElementById("alerts_bar").style = "display:block"
|
|
||||||
document.getElementById("output").style = "margin-top:95px" // Adjust margin of train table div.
|
|
||||||
}
|
|
||||||
|
|
||||||
async function inflateAlerts() {
|
|
||||||
document.getElementById("alerts_msg").style = "display:block;";
|
|
||||||
document.getElementById("alert_expand_arrow").style = "transform: rotate(180deg);";
|
|
||||||
document.getElementById("alerts_bar").setAttribute("onclick", "deflateAlerts()")
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deflateAlerts() {
|
|
||||||
document.getElementById("alerts_msg").style = "display.none;";
|
|
||||||
document.getElementById("alert_expand_arrow").style = "transform: rotate(0deg);";
|
|
||||||
document.getElementById("alerts_bar").setAttribute("onclick", "inflateAlerts()")
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
Compress buildCalls() and buildPastCalls() into a single function
|
|
||||||
that can selectively work with either data.et or data.at.
|
|
||||||
async function buildCalls(data) {
|
|
||||||
if (typeof data.et != "undefined") {
|
|
||||||
var time = await parseTime(data.et)
|
|
||||||
} else if (typeof data.at != "undefined") {
|
|
||||||
var time = await parseTime(data.at)
|
|
||||||
}
|
|
||||||
return `<tr>
|
|
||||||
<td class="detail-name detail-table-content">${data.locationName}</td>
|
|
||||||
<td class="detail-table-content">${data.st}</td>
|
|
||||||
<td class="detail-table-content ${time.changed}">${time.data}</td>
|
|
||||||
</tr>`
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
async function buildCalls(data) {
|
|
||||||
var timeEt = await parseTime(data.et)
|
|
||||||
return `<tr>
|
|
||||||
<td class="detail-name detail-table-content">${data.locationName}</td>
|
|
||||||
<td class="detail-table-content">${data.st}</td>
|
|
||||||
<td class="detail-table-content ${timeEt.changed}">${timeEt.data}</td>
|
|
||||||
</tr>`
|
|
||||||
}
|
|
||||||
|
|
||||||
async function buildPastCalls(data) {
|
|
||||||
var timeEt = await parseTime(data.at)
|
|
||||||
return `<tr>
|
|
||||||
<td class="detail-name detail-table-content">${data.locationName}</td>
|
|
||||||
<td class="detail-table-content">${data.st}</td>
|
|
||||||
<td class="detail-table-content ${timeEt.changed}">${timeEt.data}</td>
|
|
||||||
</tr>`
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,233 @@
|
||||||
|
const e = require("express");
|
||||||
|
|
||||||
|
/* Fetch Functions */
|
||||||
|
async function publicLdb(stn) {
|
||||||
|
var url = `${window.location.origin}/api/v1/ldb/${stn}`;
|
||||||
|
var resp = await fetch(url);
|
||||||
|
return await resp.json();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Set page heading */
|
||||||
|
async function setHeaders(title,time) {
|
||||||
|
var prefix = `OwlBoard - `
|
||||||
|
document.title = `${prefix}${title}`
|
||||||
|
document.getElementById("stn_name").textContent = title
|
||||||
|
document.getElementById("fetch_time").textContent = time.toLocaleTimeString()
|
||||||
|
sessionStorage.setItem("board_location", title);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Display No Trains Message */
|
||||||
|
async function displayNoTrains() {
|
||||||
|
document.getElementById('no_services').style = "display: block;";
|
||||||
|
clearLoading();
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Parse the value of `platform` to account for unknown platforms */
|
||||||
|
async function parsePlatform(svc){
|
||||||
|
if (svc.platform != undefined) {
|
||||||
|
var platform = svc.platform;
|
||||||
|
} else {
|
||||||
|
var platform = "-";
|
||||||
|
}
|
||||||
|
if (svc.platformChanged) { // Not present in public API, ready for staff version.
|
||||||
|
var changed = "changed";
|
||||||
|
} else {
|
||||||
|
var changed = "";
|
||||||
|
}
|
||||||
|
return {num: platform, change: changed}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Change value of time strings to fit well on small screens */
|
||||||
|
async function parseTime(string){
|
||||||
|
switch (string) {
|
||||||
|
case "Delayed":
|
||||||
|
var output = "LATE";
|
||||||
|
var change = "changed";
|
||||||
|
break;
|
||||||
|
case "Cancelled":
|
||||||
|
var output = "CANC";
|
||||||
|
var change = "cancelled";
|
||||||
|
break;
|
||||||
|
case "On time":
|
||||||
|
var output = "RT";
|
||||||
|
var change = "";
|
||||||
|
break;
|
||||||
|
case "":
|
||||||
|
var output = "-";
|
||||||
|
var change = "";
|
||||||
|
break;
|
||||||
|
case undefined:
|
||||||
|
var output = "-";
|
||||||
|
var change = "";
|
||||||
|
break;
|
||||||
|
case "No report":
|
||||||
|
var output = "-";
|
||||||
|
var change = "";
|
||||||
|
break;
|
||||||
|
case "undefined":
|
||||||
|
var output = false;
|
||||||
|
var change = "";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
var output = string;
|
||||||
|
var change = "changed";
|
||||||
|
}
|
||||||
|
return {data: output, changed: change};
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Convert multiple Origin/Destinations to single string */
|
||||||
|
async function parseName(location) {
|
||||||
|
if (Array.isArray(location)) {
|
||||||
|
var name = `${location[0]['locationName']} & ${location[1]['locationName']}`
|
||||||
|
return name;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return location.locationName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Display Alert Messages
|
||||||
|
async function displayAlerts(array) {
|
||||||
|
var counter = 0
|
||||||
|
var messages = ""
|
||||||
|
for(var i = 0; i < array.length; i++) {
|
||||||
|
// Increment counter
|
||||||
|
counter += 1;
|
||||||
|
// Reset Vars
|
||||||
|
messages += `<p>${array[i]}</p>`;
|
||||||
|
}
|
||||||
|
document.getElementById("alerts_msg").insertAdjacentHTML("beforeend", messages);
|
||||||
|
if (counter == 1) {
|
||||||
|
document.getElementById("alert_bar_note").textContent = `There is ${counter} active alert`
|
||||||
|
} else if (counter > 1) {
|
||||||
|
document.getElementById("alert_bar_note").textContent = `There are ${counter} active alerts`
|
||||||
|
|
||||||
|
}
|
||||||
|
document.getElementById("alerts").style = "display:block"
|
||||||
|
document.getElementById("alerts_bar").style = "display:block"
|
||||||
|
document.getElementById("output").style = "margin-top:95px" /* The margin for the train table needs to be adjusted if the alert box exists. */
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* Show/Hide alerts box */
|
||||||
|
async function inflateAlerts() {
|
||||||
|
document.getElementById("alerts_msg").style = "display:block;";
|
||||||
|
document.getElementById("alert_expand_arrow").style = "transform: rotate(180deg);";
|
||||||
|
document.getElementById("alerts_bar").setAttribute("onclick", "deflateAlerts()")
|
||||||
|
}
|
||||||
|
|
||||||
|
async function deflateAlerts() {
|
||||||
|
document.getElementById("alerts_msg").style = "display.none;";
|
||||||
|
document.getElementById("alert_expand_arrow").style = "transform: rotate(0deg);";
|
||||||
|
document.getElementById("alerts_bar").setAttribute("onclick", "inflateAlerts()")
|
||||||
|
}
|
||||||
|
|
||||||
|
/*//// SERVICE DETAIL LISTS ////*/
|
||||||
|
// Build calling list: -- This outputs calling point data to sessionStorage in the format: key{pre: [{PREVIOUS_Stops}], post: [{POST_STOPS}]}
|
||||||
|
async function buildCallLists(svc) {
|
||||||
|
var sSvcId = svc.serviceID;
|
||||||
|
var oSvcData = {
|
||||||
|
plat: svc.platform,
|
||||||
|
sta: svc.sta,
|
||||||
|
eta: svc.eta,
|
||||||
|
std: svc.std,
|
||||||
|
etd: svc.etd
|
||||||
|
};
|
||||||
|
try {
|
||||||
|
if (typeof svc.previousCallingPoints.callingPointList.callingPoint != 'undefined') {
|
||||||
|
let array = await makeArray(svc.previousCallingPoints.callingPointList.callingPoint);
|
||||||
|
oSvcData.pre = array;
|
||||||
|
}
|
||||||
|
} catch (err) { /* Log if ERR */
|
||||||
|
log(`Error reading previous calling points: ${err}`, "INFO")
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
if (typeof svc.subsequentCallingPoints.callingPointList.callingPoint != 'undefined') {
|
||||||
|
let array = await makeArray(svc.subsequentCallingPoints.callingPointList.callingPoint);
|
||||||
|
oSvcData.post = array;
|
||||||
|
}
|
||||||
|
} catch (err) { /* Log if ERR */
|
||||||
|
log(`Error reading future calling points: ${err}`, "INFO")
|
||||||
|
}
|
||||||
|
sessionStorage.setItem(sSvcId, JSON.stringify(oSvcData))
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Display calling list: - Read data from sessionStorage and write to DOM. */
|
||||||
|
async function showCalls(id) {
|
||||||
|
log(`Showing details for service ${id}`, "INFO")
|
||||||
|
var svcDetail = await JSON.parse(sessionStorage.getItem(id));
|
||||||
|
var pre = "";
|
||||||
|
var post = "";
|
||||||
|
if (typeof svcDetail.pre != 'undefined') {
|
||||||
|
for(var preCall = 0; preCall < svcDetail.pre.length; preCall++) {
|
||||||
|
pre += await singleCall(svcDetail.pre[preCall]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (typeof svcDetail.post != 'undefined') {
|
||||||
|
for(var postCall = 0; postCall < svcDetail.post.length; postCall++) {
|
||||||
|
post += await singleCall(svcDetail.post[postCall]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/* Run retreived data through parsers */
|
||||||
|
var thisStd = await parseTime(svcDetail.std);
|
||||||
|
var thisEtd = await parseTime(svcDetail.etd);
|
||||||
|
var thisSta = await parseTime(svcDetail.sta);
|
||||||
|
var thisEta = await parseTime(svcDetail.eta);
|
||||||
|
var thisPlat = await parsePlatform(svcDetail.plat);
|
||||||
|
/* Prepare data for this station */
|
||||||
|
if (thisStd.data != "undefined") {
|
||||||
|
var sTime = thisStd.data
|
||||||
|
var eTime = thisEtd.data
|
||||||
|
var change = thisEtd.changed
|
||||||
|
} else {
|
||||||
|
var sTime = thisSta.data
|
||||||
|
var eTime = thisEta.data
|
||||||
|
var change = thisEta.changed
|
||||||
|
};
|
||||||
|
|
||||||
|
let here = `<tr>
|
||||||
|
<td class="detail-name detail-table-content">${sessionStorage.getItem("board_location")}</td>
|
||||||
|
<td class="detail-table-content">${sTime}</td>
|
||||||
|
<td class="detail-table-content ${change}">${eTime}</td>
|
||||||
|
</tr> `
|
||||||
|
/* Prepare then insert DOM Data */
|
||||||
|
let dom = ` <div id="${id}" class="call-data">
|
||||||
|
<p class="close-data" onclick="hideCalls('${id}')">X</p>
|
||||||
|
<table class="called-at">
|
||||||
|
<tr>
|
||||||
|
<th class="detail-name-head">Location</th>
|
||||||
|
<th class="time">Schedule</th>
|
||||||
|
<th class="time">Act/Est</th>
|
||||||
|
</tr>
|
||||||
|
${pre}
|
||||||
|
${here}
|
||||||
|
${post}
|
||||||
|
</table>
|
||||||
|
</div>`
|
||||||
|
|
||||||
|
document.body.insertAdjacentHTML("beforeend", dom);
|
||||||
|
document.getElementById(id).style = "display: block;";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function hideCalls(id) {
|
||||||
|
let element = document.getElementById(id)
|
||||||
|
element.style = "display: none;";
|
||||||
|
element.remove();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Builds the train data information in to a table row */
|
||||||
|
async function singleCall(data) {
|
||||||
|
if (typeof data.et != "undefined") {
|
||||||
|
var time = await parseTime(data.et)
|
||||||
|
} else if (typeof data.at != "undefined") {
|
||||||
|
var time = await parseTime(data.at)
|
||||||
|
}
|
||||||
|
return `<tr>
|
||||||
|
<td class="detail-name detail-table-content">${data.locationName}</td>
|
||||||
|
<td class="detail-table-content">${data.st}</td>
|
||||||
|
<td class="detail-table-content ${time.changed}">${time.data}</td>
|
||||||
|
</tr>`
|
||||||
|
}
|
||||||
|
|
@ -16,6 +16,16 @@ async function storageAvailable(type) { // Currently not used
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Array Converter
|
||||||
|
Converts a string to a single item array */
|
||||||
|
async function makeArray(data) {
|
||||||
|
if (typeof data == "string") {
|
||||||
|
var array = [];
|
||||||
|
array.push(data);
|
||||||
|
return array;
|
||||||
|
}
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
/* Timeouts */
|
/* Timeouts */
|
||||||
/* Usage: '' */
|
/* Usage: '' */
|
||||||
|
|
|
||||||
|
|
@ -1,240 +0,0 @@
|
||||||
/* Page Init: */
|
|
||||||
init()
|
|
||||||
|
|
||||||
/* Supporting Functions */
|
|
||||||
async function init() {
|
|
||||||
setLoadingDesc(`Loading\nservices`)
|
|
||||||
var stn = await getQuery("stn");
|
|
||||||
setLoadingDesc(`Loading\n${stn.toUpperCase()}`)
|
|
||||||
log(`init: Looking up: ${stn}`);
|
|
||||||
var sv = await getQuery("sv");
|
|
||||||
log(`init: Staff Version: ${sv}`);
|
|
||||||
if (sv === 'true') {
|
|
||||||
log("init: Staff Version not supported yet.")
|
|
||||||
log("init: Unable to proceed.")
|
|
||||||
} else {
|
|
||||||
try {
|
|
||||||
var data = await publicLdb(stn)
|
|
||||||
setLoadingDesc(`${stn.toUpperCase()}\nParsing Data`)
|
|
||||||
log("init: Fetched LDB Data")
|
|
||||||
parseLdb(data)
|
|
||||||
} catch (err) {
|
|
||||||
var data = null
|
|
||||||
setLoadingDesc(`Handling\nError`)
|
|
||||||
log("init: Unable to fetch LDB data")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function publicLdb(stn) {
|
|
||||||
var url = `${window.location.origin}/api/v1/ldb/${stn}`;
|
|
||||||
var resp = await fetch(url);
|
|
||||||
return await resp.json();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function parseLdb(data) {
|
|
||||||
if (data.ERROR == "NOT_FOUND") { // Station not found
|
|
||||||
clearLoading();
|
|
||||||
document.getElementById("error_notice").style = "display: block;";
|
|
||||||
document.getElementById("err_not_found").style = "display: block;";
|
|
||||||
setHeaders("Not Found",new Date())
|
|
||||||
} else if (data == false) { // No data for station
|
|
||||||
clearLoading();
|
|
||||||
document.getElementById("error_notice").style = "display: block;";
|
|
||||||
document.getElementById("err_no_data").style = "display:block;";
|
|
||||||
setHeaders("No Data",new Date())
|
|
||||||
} else if (data == "err") { // Connection Error
|
|
||||||
clearLoading();
|
|
||||||
document.getElementById("error_notice").style = "display: block;";
|
|
||||||
document.getElementById("err_conn").style = "display: block;";
|
|
||||||
setHeaders("Connection Error",new Date())
|
|
||||||
await delay(5000);
|
|
||||||
log(`parseLdb: Waited five seconds, reloading`)
|
|
||||||
location.reload()
|
|
||||||
} else {
|
|
||||||
buildPage(data);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build and Display Functions
|
|
||||||
async function buildPage(data) {
|
|
||||||
setLoadingDesc('Loading\nTrains')
|
|
||||||
var stationName = data.GetStationBoardResult.locationName;
|
|
||||||
log(`buildPage: Data ready for ${stationName}`);
|
|
||||||
var generateTime = new Date(await data.GetStationBoardResult.generatedAt);
|
|
||||||
log(`buildPage: Data prepared at ${generateTime.toLocaleString()}`)
|
|
||||||
setHeaders(stationName, generateTime);
|
|
||||||
// Check for notices and if true pass to function
|
|
||||||
if (data.GetStationBoardResult.nrccMessages) {
|
|
||||||
setLoadingDesc('Loading\nAlerts')
|
|
||||||
displayAlerts(data.GetStationBoardResult.nrccMessages.message);
|
|
||||||
}
|
|
||||||
if (typeof data.GetStationBoardResult.trainServices == 'undefined') {
|
|
||||||
displayNoTrains()
|
|
||||||
} else {
|
|
||||||
displayTrains(data)
|
|
||||||
}
|
|
||||||
if (data.GetStationBoardResult.ferryServices) {
|
|
||||||
setLoadingDesc('Loading\nFerries')
|
|
||||||
displayFerry(data.GetStationBoardResult.ferryServices)
|
|
||||||
}
|
|
||||||
if (data.GetStationBoardResult.busServices) {
|
|
||||||
setLoadingDesc('Loading\nBusses')
|
|
||||||
displayBus(data.GetStationBoardResult.busServices)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayNoTrains() {
|
|
||||||
document.getElementById('no_services').style = "display: block;";
|
|
||||||
clearLoading();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayTrains(data) {
|
|
||||||
log(`Inserting data in DOM`)
|
|
||||||
for(var i = 0; i < data.GetStationBoardResult.trainServices.service.length; i++) {
|
|
||||||
// Reset Vars
|
|
||||||
var svc = data.GetStationBoardResult.trainServices.service[i];
|
|
||||||
displayService(svc);
|
|
||||||
buildCallLists(svc);
|
|
||||||
}
|
|
||||||
|
|
||||||
clearLoading();
|
|
||||||
document.getElementById("output").style = "display:block;";
|
|
||||||
log(`Insertion complete`)
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayFerry(ferrySvc) {
|
|
||||||
log(JSON.stringify(ferrySvc))
|
|
||||||
for(var i = 0; i < ferrySvc.service.length; i++) {
|
|
||||||
displayFerryService(ferrySvc.service[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayBus(busSvc) {
|
|
||||||
log(JSON.stringify(busSvc))
|
|
||||||
for(var i = 0; i < busSvc.service.length; i++) {
|
|
||||||
displayBusService(busSvc.service[i])
|
|
||||||
buildCallLists(busSvc.service[i])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayService(svc) {
|
|
||||||
var table = document.getElementById("output");
|
|
||||||
|
|
||||||
// Determine Time Message
|
|
||||||
var sta = await parseTime(svc.sta);
|
|
||||||
var eta = await parseTime(svc.eta);
|
|
||||||
var std = await parseTime(svc.std);
|
|
||||||
var etd = await parseTime(svc.etd);
|
|
||||||
// Determine Platform Message
|
|
||||||
//if (svc.platform != undefined){var plt = svc.platform} else {var plt = "-"};
|
|
||||||
var plt = await parsePlatform(svc);
|
|
||||||
// Define Table Row
|
|
||||||
var row = `
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${await parseName(svc.origin.location)}</td>
|
|
||||||
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${await parseName(svc.destination.location)}</td>
|
|
||||||
<td class="plat ${plt.changed}">${plt.num}</td>
|
|
||||||
<td class="time">${sta.data}</td>
|
|
||||||
<td class="time ${eta.changed}">${eta.data}</td>
|
|
||||||
<td class="time">${std.data}</td>
|
|
||||||
<td class="time ${etd.changed}">${etd.data}</td>
|
|
||||||
</tr>
|
|
||||||
</table>`
|
|
||||||
// Put Table Row
|
|
||||||
table.insertAdjacentHTML("beforeend", row)
|
|
||||||
// Display Operator
|
|
||||||
if (svc.operator) {
|
|
||||||
var opRow = `<p class="msg op">A ${svc.operator} service</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", opRow);
|
|
||||||
}
|
|
||||||
// Parse cancelReason & delayReason
|
|
||||||
if (svc.cancelReason) {
|
|
||||||
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", cancelRow);
|
|
||||||
}
|
|
||||||
if (svc.delayReason) {
|
|
||||||
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", delayRow);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayFerryService(svc) {
|
|
||||||
var table = document.getElementById("ferry");
|
|
||||||
log(JSON.stringify(svc))
|
|
||||||
// Determine Time Message
|
|
||||||
var sta = await parseTime(svc.sta);
|
|
||||||
var eta = await parseTime(svc.eta);
|
|
||||||
var std = await parseTime(svc.std);
|
|
||||||
var etd = await parseTime(svc.etd);
|
|
||||||
// Determine Platform Message
|
|
||||||
var plt = "";
|
|
||||||
// Define Table Row
|
|
||||||
var row = `
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td class="name name-item">${await parseName(svc.origin.location)}</td>
|
|
||||||
<td class="name name-item">${await parseName(svc.destination.location)}</td>
|
|
||||||
<td class="plat}">${plt}</td>
|
|
||||||
<td class="time">${sta.data}</td>
|
|
||||||
<td class="time ${eta.changed}">${eta.data}</td>
|
|
||||||
<td class="time">${std.data}</td>
|
|
||||||
<td class="time ${etd.changed}">${etd.data}</td>
|
|
||||||
</tr>
|
|
||||||
</table>`
|
|
||||||
// Put Table Row
|
|
||||||
table.insertAdjacentHTML("beforeend", row)
|
|
||||||
// Parse cancelReason & delayReason
|
|
||||||
if (svc.cancelReason) {
|
|
||||||
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", cancelRow);
|
|
||||||
}
|
|
||||||
if (svc.delayReason) {
|
|
||||||
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", delayRow);
|
|
||||||
}
|
|
||||||
document.getElementById("ferry").style = "display:block"
|
|
||||||
}
|
|
||||||
|
|
||||||
async function displayBusService(svc) {
|
|
||||||
var table = document.getElementById("bus");
|
|
||||||
log(JSON.stringify(svc))
|
|
||||||
// Determine Time Message
|
|
||||||
var sta = await parseTime(svc.sta);
|
|
||||||
var eta = await parseTime(svc.eta);
|
|
||||||
var std = await parseTime(svc.std);
|
|
||||||
var etd = await parseTime(svc.etd);
|
|
||||||
// Determine Platform Message
|
|
||||||
var plt = "";
|
|
||||||
// Define Table Row
|
|
||||||
var row = `
|
|
||||||
<table>
|
|
||||||
<tr>
|
|
||||||
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${svc.origin.location.locationName}</td>
|
|
||||||
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${svc.destination.location.locationName}</td>
|
|
||||||
<td class="plat}">${plt}</td>
|
|
||||||
<td class="time">${sta.data}</td>
|
|
||||||
<td class="time ${eta.changed}">${eta.data}</td>
|
|
||||||
<td class="time">${std.data}</td>
|
|
||||||
<td class="time ${etd.changed}">${etd.data}</td>
|
|
||||||
</tr>
|
|
||||||
</table>`
|
|
||||||
// Put Table Row
|
|
||||||
table.insertAdjacentHTML("beforeend", row)
|
|
||||||
// Display operator
|
|
||||||
if (svc.operator) {
|
|
||||||
var opRow = `<p class="msg op">A ${svc.operator} service</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", opRow);
|
|
||||||
}
|
|
||||||
// Parse cancelReason & delayReason
|
|
||||||
if (svc.cancelReason) {
|
|
||||||
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", cancelRow);
|
|
||||||
}
|
|
||||||
if (svc.delayReason) {
|
|
||||||
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
|
||||||
table.insertAdjacentHTML("beforeend", delayRow);
|
|
||||||
}
|
|
||||||
document.getElementById("bus").style = "display:block"
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,232 @@
|
||||||
|
/* Page Init: */
|
||||||
|
init()
|
||||||
|
|
||||||
|
/* Init function */
|
||||||
|
async function init() {
|
||||||
|
setLoadingDesc(`Loading\nservices`)
|
||||||
|
var stn = await getQuery("stn");
|
||||||
|
setLoadingDesc(`Loading\n${stn.toUpperCase()}`)
|
||||||
|
log(`init: Looking up: ${stn}`);
|
||||||
|
var sv = await getQuery("sv");
|
||||||
|
log(`init: Staff Version: ${sv}`);
|
||||||
|
if (sv === 'true') {
|
||||||
|
log("init: Staff Version not supported yet.")
|
||||||
|
log("init: Unable to proceed.")
|
||||||
|
} else {
|
||||||
|
try {
|
||||||
|
var data = await publicLdb(stn)
|
||||||
|
setLoadingDesc(`${stn.toUpperCase()}\nParsing Data`)
|
||||||
|
log("init: Fetched LDB Data")
|
||||||
|
parseLdb(data)
|
||||||
|
} catch (err) {
|
||||||
|
var data = null
|
||||||
|
setLoadingDesc(`Handling\nError`)
|
||||||
|
log("init: Unable to fetch LDB data")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Check for any errors in data returned from the Fetch call
|
||||||
|
If no errors, if there are none, call buildPage(). */
|
||||||
|
async function parseLdb(data) {
|
||||||
|
if (data.ERROR == "NOT_FOUND") { // Station not found
|
||||||
|
clearLoading();
|
||||||
|
document.getElementById("error_notice").style = "display: block;";
|
||||||
|
document.getElementById("err_not_found").style = "display: block;";
|
||||||
|
setHeaders("Not Found",new Date())
|
||||||
|
} else if (data == false) { // No data for station
|
||||||
|
clearLoading();
|
||||||
|
document.getElementById("error_notice").style = "display: block;";
|
||||||
|
document.getElementById("err_no_data").style = "display:block;";
|
||||||
|
setHeaders("No Data",new Date())
|
||||||
|
} else if (data == "err") { // Connection Error
|
||||||
|
clearLoading();
|
||||||
|
document.getElementById("error_notice").style = "display: block;";
|
||||||
|
document.getElementById("err_conn").style = "display: block;";
|
||||||
|
setHeaders("Connection Error",new Date())
|
||||||
|
await delay(5000);
|
||||||
|
log(`parseLdb: Waited five seconds, reloading`)
|
||||||
|
location.reload()
|
||||||
|
} else {
|
||||||
|
buildPage(data);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build and Display Functions
|
||||||
|
async function buildPage(data) {
|
||||||
|
setLoadingDesc('Loading\nTrains')
|
||||||
|
var stationName = data.GetStationBoardResult.locationName;
|
||||||
|
log(`buildPage: Data ready for ${stationName}`);
|
||||||
|
var generateTime = new Date(await data.GetStationBoardResult.generatedAt);
|
||||||
|
log(`buildPage: Data prepared at ${generateTime.toLocaleString()}`)
|
||||||
|
setHeaders(stationName, generateTime);
|
||||||
|
// Check for notices and if true pass to function
|
||||||
|
if (data.GetStationBoardResult.nrccMessages) {
|
||||||
|
setLoadingDesc('Loading\nAlerts')
|
||||||
|
displayAlerts(data.GetStationBoardResult.nrccMessages.message);
|
||||||
|
}
|
||||||
|
if (typeof data.GetStationBoardResult.trainServices == 'undefined') {
|
||||||
|
displayNoTrains()
|
||||||
|
} else {
|
||||||
|
displayTrains(data)
|
||||||
|
}
|
||||||
|
if (data.GetStationBoardResult.ferryServices) {
|
||||||
|
setLoadingDesc('Loading\nFerries')
|
||||||
|
displayFerry(data.GetStationBoardResult.ferryServices)
|
||||||
|
}
|
||||||
|
if (data.GetStationBoardResult.busServices) {
|
||||||
|
setLoadingDesc('Loading\nBusses')
|
||||||
|
displayBus(data.GetStationBoardResult.busServices)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async function displayTrains(data) {
|
||||||
|
log(`Inserting data in DOM`)
|
||||||
|
for(var i = 0; i < data.GetStationBoardResult.trainServices.service.length; i++) {
|
||||||
|
// Reset Vars
|
||||||
|
var svc = data.GetStationBoardResult.trainServices.service[i];
|
||||||
|
displayService(svc);
|
||||||
|
buildCallLists(svc);
|
||||||
|
}
|
||||||
|
|
||||||
|
clearLoading();
|
||||||
|
document.getElementById("output").style = "display:block;";
|
||||||
|
log(`Insertion complete`)
|
||||||
|
}
|
||||||
|
|
||||||
|
async function displayFerry(ferrySvc) {
|
||||||
|
log(JSON.stringify(ferrySvc))
|
||||||
|
for(var i = 0; i < ferrySvc.service.length; i++) {
|
||||||
|
displayFerryService(ferrySvc.service[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function displayBus(busSvc) {
|
||||||
|
log(JSON.stringify(busSvc))
|
||||||
|
for(var i = 0; i < busSvc.service.length; i++) {
|
||||||
|
displayBusService(busSvc.service[i])
|
||||||
|
buildCallLists(busSvc.service[i])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function displayService(svc) {
|
||||||
|
var table = document.getElementById("output");
|
||||||
|
|
||||||
|
// Determine Time Message
|
||||||
|
var sta = await parseTime(svc.sta);
|
||||||
|
var eta = await parseTime(svc.eta);
|
||||||
|
var std = await parseTime(svc.std);
|
||||||
|
var etd = await parseTime(svc.etd);
|
||||||
|
// Determine Platform Message
|
||||||
|
//if (svc.platform != undefined){var plt = svc.platform} else {var plt = "-"};
|
||||||
|
var plt = await parsePlatform(svc);
|
||||||
|
// Define Table Row
|
||||||
|
var row = `
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${await parseName(svc.origin.location)}</td>
|
||||||
|
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${await parseName(svc.destination.location)}</td>
|
||||||
|
<td class="plat ${plt.changed}">${plt.num}</td>
|
||||||
|
<td class="time">${sta.data}</td>
|
||||||
|
<td class="time ${eta.changed}">${eta.data}</td>
|
||||||
|
<td class="time">${std.data}</td>
|
||||||
|
<td class="time ${etd.changed}">${etd.data}</td>
|
||||||
|
</tr>
|
||||||
|
</table>`
|
||||||
|
// Put Table Row
|
||||||
|
table.insertAdjacentHTML("beforeend", row)
|
||||||
|
// Display Operator
|
||||||
|
if (svc.operator) {
|
||||||
|
var opRow = `<p class="msg op">A ${svc.operator} service</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", opRow);
|
||||||
|
}
|
||||||
|
// Parse cancelReason & delayReason
|
||||||
|
if (svc.cancelReason) {
|
||||||
|
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", cancelRow);
|
||||||
|
}
|
||||||
|
if (svc.delayReason) {
|
||||||
|
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", delayRow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function displayFerryService(svc) {
|
||||||
|
var table = document.getElementById("ferry");
|
||||||
|
log(JSON.stringify(svc))
|
||||||
|
// Determine Time Message
|
||||||
|
var sta = await parseTime(svc.sta);
|
||||||
|
var eta = await parseTime(svc.eta);
|
||||||
|
var std = await parseTime(svc.std);
|
||||||
|
var etd = await parseTime(svc.etd);
|
||||||
|
// Determine Platform Message
|
||||||
|
var plt = "";
|
||||||
|
// Define Table Row
|
||||||
|
var row = `
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td class="name name-item">${await parseName(svc.origin.location)}</td>
|
||||||
|
<td class="name name-item">${await parseName(svc.destination.location)}</td>
|
||||||
|
<td class="plat}">${plt}</td>
|
||||||
|
<td class="time">${sta.data}</td>
|
||||||
|
<td class="time ${eta.changed}">${eta.data}</td>
|
||||||
|
<td class="time">${std.data}</td>
|
||||||
|
<td class="time ${etd.changed}">${etd.data}</td>
|
||||||
|
</tr>
|
||||||
|
</table>`
|
||||||
|
// Put Table Row
|
||||||
|
table.insertAdjacentHTML("beforeend", row)
|
||||||
|
// Parse cancelReason & delayReason
|
||||||
|
if (svc.cancelReason) {
|
||||||
|
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", cancelRow);
|
||||||
|
}
|
||||||
|
if (svc.delayReason) {
|
||||||
|
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", delayRow);
|
||||||
|
}
|
||||||
|
document.getElementById("ferry").style = "display:block"
|
||||||
|
}
|
||||||
|
|
||||||
|
async function displayBusService(svc) {
|
||||||
|
var table = document.getElementById("bus");
|
||||||
|
log(JSON.stringify(svc))
|
||||||
|
// Determine Time Message
|
||||||
|
var sta = await parseTime(svc.sta);
|
||||||
|
var eta = await parseTime(svc.eta);
|
||||||
|
var std = await parseTime(svc.std);
|
||||||
|
var etd = await parseTime(svc.etd);
|
||||||
|
// Determine Platform Message
|
||||||
|
var plt = "";
|
||||||
|
// Define Table Row
|
||||||
|
var row = `
|
||||||
|
<table>
|
||||||
|
<tr>
|
||||||
|
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${svc.origin.location.locationName}</td>
|
||||||
|
<td class="name name-item" onclick="showCalls('${svc.serviceID}')">${svc.destination.location.locationName}</td>
|
||||||
|
<td class="plat}">${plt}</td>
|
||||||
|
<td class="time">${sta.data}</td>
|
||||||
|
<td class="time ${eta.changed}">${eta.data}</td>
|
||||||
|
<td class="time">${std.data}</td>
|
||||||
|
<td class="time ${etd.changed}">${etd.data}</td>
|
||||||
|
</tr>
|
||||||
|
</table>`
|
||||||
|
// Put Table Row
|
||||||
|
table.insertAdjacentHTML("beforeend", row)
|
||||||
|
// Display operator
|
||||||
|
if (svc.operator) {
|
||||||
|
var opRow = `<p class="msg op">A ${svc.operator} service</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", opRow);
|
||||||
|
}
|
||||||
|
// Parse cancelReason & delayReason
|
||||||
|
if (svc.cancelReason) {
|
||||||
|
var cancelRow = `<p class="msg">${svc.cancelReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", cancelRow);
|
||||||
|
}
|
||||||
|
if (svc.delayReason) {
|
||||||
|
var delayRow = `<p class="msg">${svc.delayReason}</p>`
|
||||||
|
table.insertAdjacentHTML("beforeend", delayRow);
|
||||||
|
}
|
||||||
|
document.getElementById("bus").style = "display:block"
|
||||||
|
}
|
||||||
|
|
@ -208,7 +208,7 @@ caption{
|
||||||
top: 50px;
|
top: 50px;
|
||||||
left: 0;
|
left: 0;
|
||||||
margin: 2%;
|
margin: 2%;
|
||||||
padding-top: 4px;
|
padding-top: 30px;
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
padding-bottom: 10px;
|
padding-bottom: 10px;
|
||||||
|
|
@ -219,7 +219,7 @@ caption{
|
||||||
|
|
||||||
.close-data {
|
.close-data {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 15px;
|
right: 19px;
|
||||||
top: -8px;
|
top: -8px;
|
||||||
font-weight: 900;
|
font-weight: 900;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Reference in New Issue