From 4d882e6d16036c99055cfb8df0bf8c25bcbb8d8c Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sun, 14 May 2017 22:21:25 +0000
Subject: [PATCH] Change alert view and add top menu
---
common.js | 99 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 23 deletions(-)
diff --git a/common.js b/common.js
index 303d150..faca5a0 100644
--- a/common.js
+++ b/common.js
@@ -4,31 +4,56 @@
'Zajezdnia Podgórze' : 'P',
};
-var script_version;
-var script_version_xhr;
-
-// Check for website updates
+/* Check for website updates */
function checkVersion() {
- if(script_version_xhr) script_version_xhr.abort();
-
- script_version_xhr = $.get(
- 'version.php'
- ).done(function(data) {
- if(!script_version) {
- script_version = data;
- return;
- }
-
- if(script_version != data) {
- fail(lang.error_new_version);
- location.reload(true);
- }
- });
+ $.get('version.php');
+ setTimeout(checkVersion, 600000);
}
-function checkVersionInit() {
- checkVersion();
- setInterval(checkVersion, 3600000);
+/* Parsing of received JSON parts */
+function parseStatus(status) {
+ switch(status.status) {
+ case 'STOPPING':
+ return lang.boarding_sign;
+ case 'PREDICTED':
+ if(status.actualRelativeTime <= 0)
+ return lang.boarding_sign;
+ if(status.actualRelativeTime >= 60)
+ return lang.time_minutes_prefix + Math.floor(status.actualRelativeTime / 60) + lang.time_minutes_suffix;
+ return lang.time_seconds_prefix + status.actualRelativeTime + lang.time_seconds_suffix;
+ case 'DEPARTED':
+ return lang.time_minutes_ago_prefix + Math.floor(-status.actualRelativeTime / 60) + lang.time_minutes_ago_suffix;
+ default:
+ return status.mixedTime;
+ }
+}
+
+function parseTime(date, time) {
+ var result = new Date(date.getFullYear(), date.getMonth(), date.getDay());
+ var time_split = time.split(':');
+ result.setHours(time_split[0]);
+ result.setMinutes(time_split[1]);
+
+ if(result.getTime() - date.getTime() > 72000000) {
+ result.setTime(result.getTime() - 86400000);
+ }
+
+ if(date.getTime() - result.getTime() > 72000000) {
+ result.setTime(result.getTime() + 86400000);
+ }
+
+ return result;
+}
+
+function parseDelay(status) {
+ if(!status.actualTime) return lang.unknown_sign;
+ if(!status.plannedTime) return lang.unknown_sign;
+
+ var now = new Date();
+ var actual = parseTime(now, status.actualTime);
+ var planned = parseTime(now, status.plannedTime);
+
+ return lang.time_minutes_prefix + ((actual.getTime() - planned.getTime()) / 1000 / 60) + lang.time_minutes_suffix;
}
// Webservice-related functions
@@ -73,9 +98,11 @@
type = 'GT8S';
low = 0;
- if(id == 313 || id == 323) {
+ if(id == 313) {
type = 'GT8C'
low = 1;
+ } else if(id == 323) {
+ low = 1;
}
} else if(401 <= id && id <= 440) {
prefix = 'HL';
@@ -142,6 +169,32 @@
}
}
+function displayVehicle(vehicleInfo) {
+ if(!vehicleInfo) return document.createTextNode('');
+
+ var span = document.createElement('span');
+ span.className = 'vehicleInfo';
+
+ var floor_type = '';
+ if(vehicleInfo.low == 0) {
+ setText(span, lang.high_floor_sign);
+ floor_type = lang.high_floor;
+ } else if(vehicleInfo.low == 1) {
+ setText(span, lang.partially_low_floor_sign);
+ floor_type = lang.partially_low_floor;
+ } else if(vehicleInfo.low == 2) {
+ setText(span, lang.low_floor_sign);
+ floor_type = lang.low_floor;
+ }
+
+ span.title = lang.tram_type_pattern
+ .replace('$num', vehicleInfo.num)
+ .replace('$type', vehicleInfo.type)
+ .replace('$floor', floor_type);
+
+ return span;
+}
+
// Element mangling
function deleteChildren(element) {
while(element.lastChild) element.removeChild(element.lastChild);
--
Gitblit v1.10.0