Compare commits
52 Commits
v_1.9.2
...
fix_inputs
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
326ba4a6bd | ||
|
|
a38c48dab4 | ||
|
|
da48e79a36 | ||
|
|
de5abcdfaf | ||
|
|
89e24f69b7 | ||
|
|
554b810e85 | ||
|
|
fbd1eaaae8 | ||
|
|
ce42f87227 | ||
|
|
e66f95ff50 | ||
|
|
fcd791ed65 | ||
|
|
439679bbbe | ||
|
|
9a8d6892f2 | ||
|
|
3b71f3d707 | ||
|
|
94c6a42106 | ||
|
|
0c9eb9c013 | ||
|
|
2034e8b659 | ||
|
|
e57bf4a426 | ||
|
|
3c8289d11c | ||
|
|
63de725ebd | ||
|
|
69efb93646 | ||
|
|
6f302d6527 | ||
|
|
bfc2f84f0f | ||
|
|
0660b2b6b3 | ||
|
|
3ee722f6c2 | ||
|
|
0ce58aeacc | ||
|
|
28ba380cca | ||
|
|
357449c1c6 | ||
|
|
e84eaa2562 | ||
|
|
de70522850 | ||
|
|
cf5f71d14e | ||
|
|
775a7bd27a | ||
|
|
34b47e40ab | ||
|
|
32ea581437 | ||
|
|
4106a177f8 | ||
|
|
16ccbca2af | ||
|
|
3fd9beae1e | ||
|
|
01d0ae96f9 | ||
|
|
c211817f78 | ||
|
|
9ff0b96837 | ||
|
|
7a3413b339 | ||
|
|
72ff731694 | ||
|
|
3959b208b5 | ||
|
|
7b500bf67d | ||
|
|
5c8c9db1de | ||
|
|
fa526b11a8 | ||
|
|
2dc2225263 | ||
|
|
fcf9dc9a20 | ||
|
|
203c2534eb | ||
|
|
730dd9112f | ||
|
|
54852f4383 | ||
|
|
15cbe15651 | ||
|
|
be98511957 |
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@@ -20,11 +20,11 @@ var getJSON = function(url, callback) {
|
||||
callback(xhr.status, xhr.response);
|
||||
};
|
||||
xhr.ontimeout = function () {
|
||||
log("getJSON: timeout");
|
||||
log("[db] getJSON: timeout");
|
||||
callback(0, null);
|
||||
}
|
||||
xhr.onerror = function () {
|
||||
log("getJSON: error");
|
||||
log("[db] getJSON: error");
|
||||
callback(0, null);
|
||||
}
|
||||
if (USER_ID != null) {
|
||||
@@ -76,7 +76,7 @@ function dbGetData(table, id = null) {
|
||||
if (code == 200) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
log("Something went wrong (HTTP " + code + ")");
|
||||
log("[db] Something went wrong (HTTP " + code + ")");
|
||||
fail(strings.error_network, 5000);
|
||||
resolve([]);
|
||||
}
|
||||
@@ -86,7 +86,7 @@ function dbGetData(table, id = null) {
|
||||
if (code == 200) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
log("Something went wrong (HTTP " + code + ")");
|
||||
log("[db] Something went wrong (HTTP " + code + ")");
|
||||
fail(strings.error_network, 5000);
|
||||
resolve(null);
|
||||
}
|
||||
@@ -108,7 +108,7 @@ function dbGetDataIndex(table, indexName, value) {
|
||||
if (code == 200) {
|
||||
resolve(data.data);
|
||||
} else {
|
||||
log("Something went wrong (HTTP " + code + ")");
|
||||
log("[db] Something went wrong (HTTP " + code + ")");
|
||||
fail(strings.error_network, 5000);
|
||||
resolve([]);
|
||||
}
|
||||
@@ -417,32 +417,35 @@ function dbSettingsSet(key, value) {
|
||||
}
|
||||
}
|
||||
|
||||
async function updateSyncStatus() { // TODO
|
||||
// var syncStatus = document.getElementById('syncstatus');
|
||||
// var lastSync = await dbGetData('update_times', 'last_sync');
|
||||
// lastSync = new Date(lastSync.time * 1000);
|
||||
// var now = new Date();
|
||||
// var diff = Math.round((now - lastSync) / 1000);
|
||||
// var txt = '';
|
||||
//
|
||||
// if (diff < 30) { // 30 sec
|
||||
// txt = 'jetzt';
|
||||
// } else if (diff < 3600) { // 60 min
|
||||
// diff = Math.round(diff / 60);
|
||||
// txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Minute' : 'Minuten');
|
||||
// } else if (diff < 86400) { // 24 std
|
||||
// diff = Math.round(diff / 3600);
|
||||
// txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Stunde' : 'Stunden');
|
||||
// } else {
|
||||
// diff = Math.round(diff / 86400);
|
||||
// txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Tag' : 'Tagen');
|
||||
// }
|
||||
//
|
||||
// var btn = '<a href="#" onclick="setLoading(true); sync(); return false;"><i class="fas fa-sync"></i> Sync</a>';
|
||||
// syncStatus.innerHTML = 'Zuletzt aktualisiert: ' + txt + btn;
|
||||
async function updateSyncStatus() {
|
||||
var lastSync = await dbGetData('update_times', 'last_sync');
|
||||
lastSync = new Date(lastSync.time * 1000);
|
||||
if (lastSync > 0) {
|
||||
var now = new Date();
|
||||
var diff = Math.round((now - lastSync) / 1000);
|
||||
var txt = '';
|
||||
|
||||
if (diff < 30) { // 30 sec
|
||||
txt = 'jetzt';
|
||||
} else if (diff < 3600) { // 60 min
|
||||
diff = Math.round(diff / 60);
|
||||
txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Minute' : 'Minuten');
|
||||
} else if (diff < 86400) { // 24 std
|
||||
diff = Math.round(diff / 3600);
|
||||
txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Stunde' : 'Stunden');
|
||||
} else {
|
||||
diff = Math.round(diff / 86400);
|
||||
txt = 'vor ' + diff + ' ' + (diff == 1 ? 'Tag' : 'Tagen');
|
||||
}
|
||||
} else {
|
||||
var txt = 'nie';
|
||||
}
|
||||
|
||||
$('#syncstatus').html('Zuletzt aktualisiert: ' + txt);
|
||||
}
|
||||
|
||||
async function runPageScript() {
|
||||
log('[db] running page script...')
|
||||
if (canUseLocalDB) {
|
||||
var osUpdateTimes = db.transaction('update_times').objectStore('update_times');
|
||||
osUpdateTimes.get('loggedin').onsuccess = function (event) {
|
||||
@@ -460,21 +463,21 @@ async function runPageScript() {
|
||||
dbSettingsSet('myregattas_' + BOATCLASS, plannings);
|
||||
}
|
||||
}
|
||||
if (typeof updateSyncStatusTimer == 'undefined') { // TODO
|
||||
// var syncStatus = document.getElementById('syncstatus');
|
||||
if (typeof updateSyncStatusTimer == 'undefined') {
|
||||
if (canUseLocalDB) {
|
||||
updateSyncStatusTimer = window.setInterval(updateSyncStatus, 10000);
|
||||
} else {
|
||||
// syncStatus.innerHTML = 'Keine Offline-Nutzung möglich.';
|
||||
$('#syncstatus').html('Keine Offline-Nutzung möglich.');
|
||||
$('#i-sync').parent().hide();
|
||||
updateSyncStatusTimer = null;
|
||||
}
|
||||
// syncStatus.style.display = 'block';
|
||||
}
|
||||
|
||||
if (typeof siteScript === 'function') {
|
||||
log('[db] loading site script');
|
||||
siteScript();
|
||||
} else {
|
||||
log('[db] no site script');
|
||||
hideLoader();
|
||||
}
|
||||
}
|
||||
@@ -483,6 +486,7 @@ function sync() {
|
||||
if (!canUseLocalDB) return false;
|
||||
if (syncInProgress > 0) return false;
|
||||
|
||||
return new Promise(function(resolve) {
|
||||
var now = Math.floor(Date.now() / 1000);
|
||||
|
||||
db.transaction('update_times').objectStore('update_times').getAll().onsuccess = function (event) {
|
||||
@@ -493,7 +497,7 @@ function sync() {
|
||||
|
||||
syncInProgress = 11;
|
||||
var syncOkay = true;
|
||||
log("Sync Start");
|
||||
log("[db] Sync Start");
|
||||
$('#i-sync').addClass('fa-spin');
|
||||
|
||||
var interval = window.setInterval(function () {
|
||||
@@ -503,7 +507,7 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'last_sync', time: now });
|
||||
}
|
||||
log("Sync Stop");
|
||||
log("[db] Sync Stop");
|
||||
setTimeout(function(){
|
||||
$('#i-sync').removeClass('fa-spin');
|
||||
}, 500);
|
||||
@@ -512,7 +516,9 @@ function sync() {
|
||||
onAfterSync();
|
||||
}
|
||||
removeSyncInfoToPreloader();
|
||||
showLoader();
|
||||
runPageScript();
|
||||
resolve();
|
||||
}
|
||||
}, 100);
|
||||
|
||||
@@ -538,14 +544,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'clubs', time: serverTimes['clubs'] });
|
||||
syncInProgress --;
|
||||
log('clubs synced, remaining:', syncInProgress);
|
||||
log('[db] clubs synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("clubs: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] clubs: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('clubs failed, remaining:', syncInProgress);
|
||||
log('[db] clubs failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -571,14 +577,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'boats', time: serverTimes['boats'] });
|
||||
syncInProgress --;
|
||||
log('boats synced, remaining:', syncInProgress);
|
||||
log('[db] boats synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("boats: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] boats: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('boats failed, remaining:', syncInProgress);
|
||||
log('[db] boats failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -604,14 +610,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'sailors', time: serverTimes['sailors'] });
|
||||
syncInProgress --;
|
||||
log('sailors synced, remaining:', syncInProgress);
|
||||
log('[db] sailors synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("sailors: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] sailors: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('sailors failed, remaining:', syncInProgress);
|
||||
log('[db] sailors failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -653,14 +659,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'regattas', time: serverTimes['regattas'] });
|
||||
syncInProgress --;
|
||||
log('regattas synced, remaining:', syncInProgress);
|
||||
log('[db] regattas synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("regattas: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] regattas: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('regattas failed, remaining:', syncInProgress);
|
||||
log('[db] regattas failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -686,14 +692,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'results', time: serverTimes['results'] });
|
||||
syncInProgress --;
|
||||
log('results synced, remaining:', syncInProgress);
|
||||
log('[db] results synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("results: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] results: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('results failed, remaining:', syncInProgress);
|
||||
log('[db] results failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -719,14 +725,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'plannings', time: serverTimes['plannings'] });
|
||||
syncInProgress --;
|
||||
log('plannings synced, remaining:', syncInProgress);
|
||||
log('[db] plannings synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("plannings: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] plannings: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('plannings failed, remaining:', syncInProgress);
|
||||
log('[db] plannings failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -753,14 +759,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'trim_boats', time: serverTimes['trim_boats'] });
|
||||
syncInProgress --;
|
||||
log('trim_boats synced, remaining:', syncInProgress);
|
||||
log('[db] trim_boats synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("trim_boats: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] trim_boats: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('trim_boats failed, remaining:', syncInProgress);
|
||||
log('[db] trim_boats failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -786,14 +792,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'trim_users', time: serverTimes['trim_users'] });
|
||||
syncInProgress --;
|
||||
log('trim_users synced, remaining:', syncInProgress);
|
||||
log('[db] trim_users synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("trim_users: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] trim_users: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('trim_users failed, remaining:', syncInProgress);
|
||||
log('[db] trim_users failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -819,14 +825,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'trim_trims', time: serverTimes['trim_trims'] });
|
||||
syncInProgress --;
|
||||
log('trim_trims synced, remaining:', syncInProgress);
|
||||
log('[db] trim_trims synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("trim_trims: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] trim_trims: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('trim_trims failed, remaining:', syncInProgress);
|
||||
log('[db] trim_trims failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -856,14 +862,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'news', time: serverTimes['news'] });
|
||||
syncInProgress --;
|
||||
log('news synced, remaining:', syncInProgress);
|
||||
log('[db] news synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("news: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] news: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('news failed, remaining:', syncInProgress);
|
||||
log('[db] news failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -889,14 +895,14 @@ function sync() {
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'users', time: serverTimes['users'] });
|
||||
syncInProgress --;
|
||||
log('users synced, remaining:', syncInProgress);
|
||||
log('[db] users synced, remaining:', syncInProgress);
|
||||
}
|
||||
};
|
||||
} else {
|
||||
log("users: Something went wrong (HTTP " + code + ")");
|
||||
log("[db] users: Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress --;
|
||||
log('users failed, remaining:', syncInProgress);
|
||||
log('[db] users failed, remaining:', syncInProgress);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
@@ -904,12 +910,13 @@ function sync() {
|
||||
}
|
||||
|
||||
} else {
|
||||
log("Something went wrong (HTTP " + code + ")");
|
||||
log("[db] Something went wrong (HTTP " + code + ")");
|
||||
syncOkay = false;
|
||||
syncInProgress = 0;
|
||||
}
|
||||
});
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function checkSync() {
|
||||
@@ -925,15 +932,18 @@ function checkSync() {
|
||||
}
|
||||
|
||||
function initDatabase() {
|
||||
log('[db] Initializing DB...');
|
||||
if (window.indexedDB) {
|
||||
var request = window.indexedDB.open('regatten_app_db_' + BOATCLASS, DB_VERSION);
|
||||
request.onerror = function (event) {
|
||||
log("Cannot open DB: " + event.target);
|
||||
log("[db] Cannot open DB: " + event.target);
|
||||
|
||||
if (typeof onDatabaseLoaded == 'function') onDatabaseLoaded();
|
||||
|
||||
runPageScript();
|
||||
};
|
||||
request.onsuccess = function (event) {
|
||||
log("Database loaded");
|
||||
log("[db] Database loaded");
|
||||
db = event.target.result;
|
||||
|
||||
db.onversionchange = function (event) {
|
||||
@@ -946,7 +956,7 @@ function initDatabase() {
|
||||
}
|
||||
|
||||
db.onerror = function (event) {
|
||||
log("DB Error: " + event.target);
|
||||
log("[db] DB Error: " + event.target);
|
||||
};
|
||||
|
||||
canUseLocalDB = true;
|
||||
@@ -955,11 +965,12 @@ function initDatabase() {
|
||||
|
||||
db.transaction('update_times').objectStore('update_times').get('last_sync').onsuccess = function (event) {
|
||||
var lastSync = event.target.result.time;
|
||||
if (lastSync > 0) {
|
||||
if (lastSync > 1) {
|
||||
runPageScript();
|
||||
} else {
|
||||
addSyncInfoToPreloader();
|
||||
if (lastSync < 1) addSyncInfoToPreloader();
|
||||
db.transaction('update_times', 'readwrite').objectStore('update_times').put({ table: 'loggedin', status: isLoggedIn() });
|
||||
loaderCount --;
|
||||
}
|
||||
};
|
||||
|
||||
@@ -977,10 +988,10 @@ function initDatabase() {
|
||||
var oldVersion = event.oldVersion;
|
||||
var newVersion = event.newVersion;
|
||||
|
||||
log("Datenbank Version Upgrade von " + oldVersion + " auf " + newVersion);
|
||||
log("[db] DB Version Upgrade from " + oldVersion + " to " + newVersion);
|
||||
|
||||
if ((oldVersion < 1) && (newVersion >= 1)) {
|
||||
log('to version 1');
|
||||
log('[db] to version 1');
|
||||
var osClubs = db.createObjectStore('clubs', { keyPath: 'id' });
|
||||
var osBoats = db.createObjectStore('boats', { keyPath: 'id' });
|
||||
var osSailors = db.createObjectStore('sailors', { keyPath: 'id' });
|
||||
@@ -1009,7 +1020,7 @@ function initDatabase() {
|
||||
}
|
||||
|
||||
if ((oldVersion < 2) && (newVersion >= 2)) {
|
||||
log('to version 2');
|
||||
log('[db] to version 2');
|
||||
var osUsers = db.createObjectStore('users', { keyPath: 'id' });
|
||||
osUsers.createIndex('username', 'username', { unique: true });
|
||||
var osUpdateTimes = upgradeTransaction.objectStore('update_times');
|
||||
@@ -1017,34 +1028,39 @@ function initDatabase() {
|
||||
}
|
||||
|
||||
if ((oldVersion < 3) && (newVersion >= 3)) {
|
||||
log('to version 3');
|
||||
log('[db] to version 3');
|
||||
var osYears = db.createObjectStore('years', { keyPath: 'year' });
|
||||
var osUpdateTimes = upgradeTransaction.objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'regattas', time: 0 });
|
||||
}
|
||||
|
||||
if ((oldVersion < 4) && (newVersion >= 4)) {
|
||||
log('to version 4');
|
||||
log('[db] to version 4');
|
||||
var osUpdateTimes = upgradeTransaction.objectStore('update_times');
|
||||
osUpdateTimes.add({ table: 'loggedin', status: isLoggedIn() });
|
||||
}
|
||||
|
||||
if ((oldVersion < 5) && (newVersion >= 5)) {
|
||||
log('to version 5');
|
||||
log('[db] to version 5');
|
||||
var osPushes = db.createObjectStore('settings', { keyPath: 'key' });
|
||||
}
|
||||
|
||||
if ((oldVersion < 6) && (newVersion >= 6)) {
|
||||
log('to version 6');
|
||||
log('[db] to version 6');
|
||||
var osNews = db.createObjectStore('news', { keyPath: 'id' });
|
||||
var osUpdateTimes = upgradeTransaction.objectStore('update_times');
|
||||
osUpdateTimes.add({ table: 'news', time: 0 });
|
||||
}
|
||||
|
||||
// Force resync after db update
|
||||
if (oldVersion >= 1) {
|
||||
var osUpdateTimes = upgradeTransaction.objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'last_sync', time: 0 });
|
||||
osUpdateTimes.put({ table: 'last_sync', time: 1 });
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (typeof onDatabaseLoaded == 'function') onDatabaseLoaded();
|
||||
|
||||
runPageScript();
|
||||
}
|
||||
}
|
||||
@@ -1053,7 +1069,7 @@ function resetDb() {
|
||||
if (canUseLocalDB) {
|
||||
showLoader();
|
||||
var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
osUpdateTimes.put({ table: 'last_sync', time: 0 });
|
||||
osUpdateTimes.put({ table: 'last_sync', time: 1 });
|
||||
osUpdateTimes.put({ table: 'clubs', time: 0 });
|
||||
osUpdateTimes.put({ table: 'boats', time: 0 });
|
||||
osUpdateTimes.put({ table: 'sailors', time: 0 });
|
||||
@@ -1065,7 +1081,7 @@ function resetDb() {
|
||||
osUpdateTimes.put({ table: 'trim_trims', time: 0 });
|
||||
osUpdateTimes.put({ table: 'news', time: 0 });
|
||||
osUpdateTimes.put({ table: 'users', time: 0 });
|
||||
log('DB update times reset');
|
||||
log('[db] DB update times reset');
|
||||
hideLoader();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,8 +20,6 @@ $(document).ready(function(){
|
||||
'use strict'
|
||||
|
||||
var pwaVersion = '<?php echo PWA_VERSION; ?>'; //must be identical to _manifest.json version. If not it will create update window loop
|
||||
var pwaCookie = true; // if set to false, the PWA prompt will appear even if the user selects "maybe later"
|
||||
var pwaNoCache = false; // always keep the cache clear to serve the freshest possible content
|
||||
|
||||
|
||||
$('[data-pwa-version]').data('pwa-version', pwaVersion);
|
||||
@@ -35,7 +33,7 @@ $(document).ready(function(){
|
||||
//Enabling dismiss button
|
||||
setTimeout(function(){
|
||||
$('.pwa-dismiss').on('click',function(){
|
||||
log('User Closed Add to Home / PWA Prompt')
|
||||
log('[pwa] User Closed Add to Home / PWA Prompt')
|
||||
createCookie('Sticky_pwa_rejected_install', true, 1);
|
||||
$('body').find('#menu-install-pwa-android, #menu-install-pwa-ios, .menu-hider').removeClass('menu-active');
|
||||
});
|
||||
@@ -52,10 +50,10 @@ $(document).ready(function(){
|
||||
|
||||
//Firing PWA prompts for specific versions and when not on home screen.
|
||||
if (isMobile.Android()) {
|
||||
log('Android Detected');
|
||||
log('[pwa] Android Detected');
|
||||
function showInstallPromotion(){
|
||||
if($('#menu-install-pwa-android, .add-to-home').length){
|
||||
log('Triggering PWA Menu for Android');
|
||||
log('[pwa] Triggering PWA Menu for Android');
|
||||
if (!readCookie('Sticky_pwa_rejected_install')) {
|
||||
setTimeout(function(){
|
||||
$('.add-to-home').addClass('add-to-home-visible add-to-home-android');
|
||||
@@ -80,9 +78,9 @@ $(document).ready(function(){
|
||||
deferredPrompt.userChoice
|
||||
.then((choiceResult) => {
|
||||
if (choiceResult.outcome === 'accepted') {
|
||||
log('User accepted the A2HS prompt');
|
||||
log('[pwa] User accepted the A2HS prompt');
|
||||
} else {
|
||||
log('User dismissed the A2HS prompt');
|
||||
log('[pwa] User dismissed the A2HS prompt');
|
||||
}
|
||||
deferredPrompt = null;
|
||||
});
|
||||
@@ -94,11 +92,11 @@ $(document).ready(function(){
|
||||
|
||||
if (isMobile.iOS()) {
|
||||
if(!isInWebAppiOS){
|
||||
log('iOS Detected');
|
||||
log('[pwa] iOS Detected');
|
||||
if($('#menu-install-pwa-ios, .add-to-home').length){
|
||||
if (!readCookie('Sticky_pwa_rejected_install')) {
|
||||
function triggerPwaInstallIos() {
|
||||
log('Triggering PWA / Add to Home Screen Menu for iOS');
|
||||
log('[pwa] Triggering PWA / Add to Home Screen Menu for iOS');
|
||||
setTimeout(function(){
|
||||
$('.add-to-home').addClass('add-to-home-visible add-to-home-ios');
|
||||
$('#menu-install-pwa-ios, .menu-hider').addClass('menu-active');
|
||||
@@ -115,93 +113,11 @@ $(document).ready(function(){
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
//Creating Update Modal
|
||||
function updateModal(){
|
||||
var body = $('body');
|
||||
var updateModal = $('#menu-update');
|
||||
var mt = new Date();
|
||||
var menuUpdate = mt.getHours() + ":" + mt.getMinutes() + ":" + mt.getSeconds();
|
||||
if(!updateModal.length){
|
||||
body.append('<div id="menu-update"></div>');
|
||||
setTimeout(function(){
|
||||
body.find('#menu-update').load('menu-update.html?ver='+menuUpdate);
|
||||
},250);
|
||||
}
|
||||
};
|
||||
//Update Version in 5 Seconds After New Version Detected
|
||||
function updateButton(){
|
||||
var counter = 3;
|
||||
var interval = setInterval(function() {
|
||||
counter--;
|
||||
log(counter);
|
||||
$('.page-update').html('Aktuallisierung in ... '+ counter + ' Sekunden');
|
||||
if (counter == 0) {
|
||||
clearInterval(interval);
|
||||
window.location.reload(true)
|
||||
}
|
||||
}, 1000);
|
||||
caches.delete('workbox-runtime').then(function() {
|
||||
log('Content Updated - Cache Removed!');
|
||||
});
|
||||
//localStorage.clear();
|
||||
sessionStorage.clear()
|
||||
caches.keys().then(cacheNames => {
|
||||
cacheNames.forEach(cacheName => {
|
||||
caches.delete(cacheName);
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
//Check Version
|
||||
function check_version(){
|
||||
if($('link[data-pwa-version]').length){
|
||||
function versionCheck(){
|
||||
var dt = new Date();
|
||||
var maniTimeVersion = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
|
||||
var localVersionNumber = $('link[rel="manifest"]').data('pwa-version');
|
||||
var onlineVersionJSON = "<?php echo SERVER_ADDR; ?>/manifest.json.php?ver=" + maniTimeVersion;
|
||||
var onlineVersionNumber = "Connection Offline. Waiting to Reconect";
|
||||
$.getJSON(onlineVersionJSON, function(onlineData) {onlineVersionNumber = onlineData.version;});
|
||||
setTimeout(function(){
|
||||
//console.log(' Checking PWA Content for updates...\n PWA Server Version: ' + onlineVersionNumber + '\n' + ' PWA Cached Version: ' + localVersionNumber);
|
||||
if(onlineVersionNumber != localVersionNumber && onlineVersionNumber != "Connection Offline. Waiting to Reconect"){
|
||||
updateModal();
|
||||
log('New Version of Content Available. Refreshing. On Desktop Browsers a manual refresh maybe required.')
|
||||
setTimeout(function(){
|
||||
$('body').find('#menu-update').addClass('menu-active');
|
||||
$('.menu-hider').addClass('menu-active-no-click');
|
||||
updateButton();
|
||||
},500);
|
||||
}
|
||||
if(onlineVersionNumber == localVersionNumber){/*No update required. Versions Identical*/}
|
||||
if(onlineVersionNumber === "undefined"){/*Error Checking for Updates*/}
|
||||
if(onlineVersionNumber === "Finding Online Version..."){
|
||||
$('.reloadme').addClass('disabled');
|
||||
$('body').find('#menu-update').removeClass('menu-active');
|
||||
$('.menu-hider').removeClass('menu-active-no-click');
|
||||
}
|
||||
},3000);
|
||||
}
|
||||
//Checking for new version every 60 seconds
|
||||
setInterval(function(){versionCheck()}, 50000);
|
||||
//Initial Load Version Check in 10 Second After Load
|
||||
setTimeout(function(){versionCheck();}, 10000);
|
||||
}
|
||||
}
|
||||
|
||||
if(pwaCookie == false){
|
||||
eraseCookie('Sticky_pwa_rejected_install');
|
||||
}
|
||||
|
||||
//Reload To Clear Button
|
||||
$('body').on('click', '.page-update, .reloadme', function() {
|
||||
location.reload();
|
||||
});
|
||||
|
||||
//Check for Version Change if Online If not Kill the Function
|
||||
if (navigator.onLine) {check_version();} else {function check_version(){}}
|
||||
|
||||
//Adding Offline Alerts
|
||||
var offlineAlerts = $('.offline-message');
|
||||
|
||||
@@ -224,47 +140,19 @@ $(document).ready(function(){
|
||||
setTimeout(function(){$('.online-message').removeClass('online-message-active');},2000);
|
||||
}
|
||||
|
||||
$('.simulate-offline').on('click',function(){isOffline();})
|
||||
$('.simulate-online').on('click',function(){isOnline();})
|
||||
|
||||
//Disable links to other pages if offline.
|
||||
//Warning! Enabling offline for iOS can cause issues
|
||||
//To allow offline functionality delete the next 7 lines
|
||||
function returnFalse(){
|
||||
var detectHREF = $(this).attr('href');
|
||||
if(detectHREF.match(/.html/)){
|
||||
isOffline();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
//Check if Online / Offline
|
||||
function updateOnlineStatus(event) {
|
||||
var condition = navigator.onLine ? "online" : "offline";
|
||||
isOnline();
|
||||
log( 'Connection: Online');
|
||||
$("a").off( "click", returnFalse );
|
||||
log('[pwa] Connection: Online');
|
||||
}
|
||||
function updateOfflineStatus(event) {
|
||||
isOffline();
|
||||
$("a").on( "click", returnFalse );
|
||||
log( 'Connection: Offline');
|
||||
log('[pwa] Connection: Offline');
|
||||
}
|
||||
window.addEventListener('online', updateOnlineStatus);
|
||||
window.addEventListener('offline', updateOfflineStatus);
|
||||
|
||||
|
||||
if(pwaNoCache == true){
|
||||
caches.delete('workbox-runtime').then(function() {
|
||||
});
|
||||
localStorage.clear();
|
||||
sessionStorage.clear()
|
||||
caches.keys().then(cacheNames => {
|
||||
cacheNames.forEach(cacheName => {
|
||||
caches.delete(cacheName);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
|
||||
@@ -153,7 +153,7 @@ var login = function() {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um Dich anzumelden');
|
||||
$('#menu-login').hideMenu();
|
||||
} else {
|
||||
log('Login: unbekannter Fehler', status, error);
|
||||
log('[app] Login: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
@@ -186,7 +186,7 @@ var logout = function() {
|
||||
hash: localStorage.getItem('auth_hash')
|
||||
}
|
||||
if ((auth.id === null) || (auth.hash === null)) {
|
||||
log('Not logged in');
|
||||
log('[app] Not logged in');
|
||||
logoutClearStorage();
|
||||
return;
|
||||
}
|
||||
@@ -198,13 +198,13 @@ var logout = function() {
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
log('Not logged in');
|
||||
log('[app] Not logged in');
|
||||
logoutClearStorage();
|
||||
} else if (xhr.status == 0) {
|
||||
log('Could not delete auth from server');
|
||||
log('[app] Could not delete auth from server');
|
||||
logoutClearStorage();
|
||||
} else {
|
||||
log('Logout: unbekannter Fehler', status, error);
|
||||
log('[app] Logout: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
hideLoader();
|
||||
@@ -222,12 +222,12 @@ function deleteDb() {
|
||||
showLoader();
|
||||
var request = window.indexedDB.deleteDatabase('regatten_app_db_' + BOATCLASS);
|
||||
request.onerror = function (event) {
|
||||
log('Cannot delete DB: ', event.target.errorCode);
|
||||
log('[app] Cannot delete DB: ', event.target.errorCode);
|
||||
toastError('Beim Löschen der Datenbank ist ein Fehler aufgetreten.<br>Bitte melde diesen Fehler. (Dev-Menu => Problem melden)', 5000);
|
||||
hideLoader();
|
||||
}
|
||||
request.onsuccess = function (event) {
|
||||
log('DB deleted');
|
||||
log('[app] DB deleted');
|
||||
toastInfo('Die Datenbank wurde gelöscht. Die Seite lädt in wenigen Sekunden neu und erstellt damit eine neue Datenbank.', 10000);
|
||||
hideLoader();
|
||||
setTimeout(function(){ location.reload(); }, 3000);
|
||||
@@ -241,13 +241,13 @@ function deleteCache() {
|
||||
$('#menu-developer').hideMenu();
|
||||
navigator.serviceWorker.getRegistrations().then(function (registrations) {
|
||||
for (let registration of registrations) {
|
||||
log('Unregister sW:', registration);
|
||||
log('[app] Unregister sW:', registration);
|
||||
registration.unregister();
|
||||
}
|
||||
});
|
||||
caches.keys().then((keyList) => {
|
||||
return Promise.all(keyList.map((key) => {
|
||||
log('Cache deleted:', key);
|
||||
log('[app] Cache deleted:', key);
|
||||
return caches.delete(key);
|
||||
}));
|
||||
});
|
||||
@@ -273,7 +273,7 @@ function urlB64ToUint8Array(base64String) {
|
||||
}
|
||||
|
||||
function pushesSubscribe() {
|
||||
log('Subscribing');
|
||||
log('[app] Subscribing');
|
||||
const applicationServerKey = urlB64ToUint8Array(PUSH_SERVER_KEY);
|
||||
swRegistration.pushManager.subscribe({
|
||||
userVisibleOnly: true,
|
||||
@@ -285,14 +285,14 @@ function pushesSubscribe() {
|
||||
updatePushBadge();
|
||||
})
|
||||
.catch(function(err) {
|
||||
log('Failed to subscribe the user: ', err);
|
||||
log('[app] Failed to subscribe the user: ', err);
|
||||
toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
|
||||
pushesUnSubscribe(true);
|
||||
});
|
||||
}
|
||||
|
||||
function pushesUnSubscribe(silent = false) {
|
||||
log('Unsubscribing');
|
||||
log('[app] Unsubscribing');
|
||||
swRegistration.pushManager.getSubscription()
|
||||
.then(function(subscription) {
|
||||
if (subscription) {
|
||||
@@ -304,7 +304,7 @@ function pushesUnSubscribe(silent = false) {
|
||||
}
|
||||
})
|
||||
.catch(function(error) {
|
||||
log('Error unsubscribing', error);
|
||||
log('[app] Error unsubscribing', error);
|
||||
$('#menu-pushes').hideMenu();
|
||||
if (!silent) toastError('Da ist leider etwas schief gelaufen. Bitte versuche es erneut oder wende Dich an unseren Support.', 5000);
|
||||
updatePushBadge();
|
||||
@@ -313,7 +313,7 @@ function pushesUnSubscribe(silent = false) {
|
||||
}
|
||||
|
||||
function pushesUpdateServerSubscription(subscription, enabled) {
|
||||
log('updateServer', enabled, subscription);
|
||||
log('[app] updateServer', enabled, subscription);
|
||||
$.ajax({
|
||||
url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
|
||||
type: 'POST',
|
||||
@@ -440,8 +440,12 @@ async function updateNewsBadge() {
|
||||
var initRegatten = function() {
|
||||
showLoader();
|
||||
|
||||
log('[app] Initializing DB...');
|
||||
|
||||
initDatabase();
|
||||
|
||||
log('[app] Loading app specific code...');
|
||||
|
||||
if (isLoggedIn()) {
|
||||
$('.show-loggedin').show();
|
||||
$('.show-notloggedin').hide();
|
||||
@@ -461,6 +465,7 @@ var initRegatten = function() {
|
||||
}
|
||||
|
||||
var onServiceWorkerLoaded = function() {
|
||||
log('[app] sW loaded');
|
||||
if ((swRegistration !== null) && canUseLocalDB) {
|
||||
pushesPossible = true;
|
||||
updatePushBadge();
|
||||
@@ -470,6 +475,21 @@ var onServiceWorkerLoaded = function() {
|
||||
}
|
||||
|
||||
var onDatabaseLoaded = function() {
|
||||
log('[app] DB loaded');
|
||||
if (!canUseLocalDB && !$('#menu-welcome').hasClass('menu-active')) {
|
||||
function NoDbWarningOk() {
|
||||
createCookie('regatten_nodb_banner', true, 1);
|
||||
$('#menu-nodb-warning').hideMenu();
|
||||
}
|
||||
function showNoDbWarning() {
|
||||
if (!readCookie('regatten_nodb_banner')) {
|
||||
$('#menu-nodb-warning').showMenu();
|
||||
}
|
||||
}
|
||||
$('#menu-nodb-warning-okay').click(NoDbWarningOk);
|
||||
showNoDbWarning();
|
||||
}
|
||||
|
||||
onServiceWorkerLoaded();
|
||||
initPushSettings();
|
||||
|
||||
@@ -486,13 +506,13 @@ var addConsoleOpenerToPreloader = function() {
|
||||
var preloader = document.getElementById('preloader');
|
||||
var button = document.createElement('a');
|
||||
button.href = '#';
|
||||
button.classList = 'btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight m-3';
|
||||
button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3';
|
||||
button.style.position = 'fixed';
|
||||
button.style.bottom = 0;
|
||||
button.style.left = 0;
|
||||
button.style.right = 0;
|
||||
button.innerHTML = 'Show Console';
|
||||
button.innerHTML = '</>';
|
||||
button.onclick = function(){
|
||||
alert('CONSOLE OPENED\nDir werden jetzt einige Entwickler-Informationen angezeigt. Du kannst die Console über das X oben rechts wieder schließen.');
|
||||
mobileConsole.displayConsole();
|
||||
return false;
|
||||
}
|
||||
|
||||
13
server/content/go2url.php
Normal file
13
server/content/go2url.php
Normal file
@@ -0,0 +1,13 @@
|
||||
<?php
|
||||
|
||||
$sp['title'] = 'Umleitung - Regatten.net ' . $_CLASS['name'];
|
||||
|
||||
// Title
|
||||
$content = '<h1>Umleitung</h1>';
|
||||
$content .= '<p>Wir leiten Dich in Kürze zur gewünschten Website weiter</p>';
|
||||
|
||||
$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-title']);
|
||||
|
||||
$sp['scripts'] .= $scripts->load('go2url');
|
||||
|
||||
?>
|
||||
@@ -1,21 +1,31 @@
|
||||
<?php
|
||||
|
||||
// TODO: Create site
|
||||
$sp['title'] = 'Saison-Planung bearbeiten - Regatten.net ' . $_CLASS['name'];
|
||||
$sp['backbutton'] = 'planning';
|
||||
$sp['activenav'] = 5;
|
||||
|
||||
$sp['title'] = 'Seite noch nicht unterstuuml;tzt - Regatten.net ' . $_CLASS['name'];
|
||||
$sp['backbutton'] = true;
|
||||
// Title, Inputs
|
||||
$content = "<h1>Saison-Planung bearbeiten</h1>";
|
||||
$content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']);
|
||||
|
||||
$content = $tpl->load('error', ['404', 'Seite existiert noch nicht']);
|
||||
$content .= '<p>';
|
||||
$content .= 'Du kannst die Saison-Planung momentan leider noch nicht in der App bearbeiten.<br>';
|
||||
$content .= 'Bis diese Funktion implementiert wurde, erstelle Deine Saison-Planung bitte auf <a target="_blank" href="https://regatten.net/' . BOATCLASS . '/planning_edit">unserer Website</a>.<br>';
|
||||
$content .= 'Deine Saison-Planung wird dann automatisch synchronisiert und ist dann auch in dieser App verfügbar.<br>';
|
||||
$content .= 'Wir arbeiten daran, dass Du Deine Saison-Planung bald auch in der App bearbeiten kannst.<br>';
|
||||
$content .= '</p>';
|
||||
$content .= $tpl->load('button', ['Zur Website', 'https://regatten.net/' . BOATCLASS, 'css-class' => 'mb-3']);
|
||||
$content .= $tpl->load('button', ['Zur Startseite', LINK_PRE . 'index', 'css-class' => 'mb-3']);
|
||||
$content .= $tpl->load('button', ['Kontakt', LINK_PRE . 'contact']);
|
||||
$sp['output'] .= $tpl->load('card', [$content]);
|
||||
|
||||
$sp['output'] = $tpl->load('card', [$content, 'css-class' => 'text-center pt-3']);
|
||||
// Regattas
|
||||
$content = '<p id="p-count" class="mb-0"></p>';
|
||||
$content .= $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text', 'css-class' => 'mt-2']);
|
||||
$content .= '<div id="div-regattas" class="ranking-detail-list mb-0"></div>';
|
||||
|
||||
$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas']);
|
||||
|
||||
// Menu
|
||||
$items = $tpl->load('menu/item-switch', ['In die Saison-Planung aufnehmen', 'html-id' => 'switch-planning-include', 'icon' => 'fa-check']);
|
||||
$items .= $tpl->load('menu/item-simple', ['', '#', 'html-id' => 'item-steuermann']);
|
||||
$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-edit', 'title' => 'Regatta bearbeiten', 'height' => 320]);
|
||||
|
||||
// Select sailor
|
||||
$items = $tpl->load('input', ['html-id' => 'input-edit-search', 'placeholder' => 'Suche', 'type' => 'text']);
|
||||
$sp['menus'] .= $tpl->load('menu/modal', [$items, 'html-id' => 'menu-sailor', 'height' => 500, 'width' => 350]);
|
||||
|
||||
$sp['scripts'] .= $scripts->load('planning_edit');
|
||||
|
||||
?>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<div id="menu-share" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="345" data-menu-effect="menu-over">
|
||||
<div class="menu-title mt-n1"><h1>Share the Love</h1><p class="color-highlight">Just Tap the Social Icon. We'll add the Link</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
|
||||
<div class="menu-title mt-n1"><h1>Seite Teilen</h1><p class="color-highlight">Teile diese Seite mit Deinen Freunden!</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
|
||||
<div class="content mb-0">
|
||||
<div class="divider mb-0"></div>
|
||||
<div class="list-group list-custom-small list-icon-0">
|
||||
@@ -92,11 +92,12 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="310">
|
||||
<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="260">
|
||||
<div class="menu-title"><h1>Einstellungen</h1><p class="color-highlight"> </p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
|
||||
<div class="divider divider-margins mb-n2"></div>
|
||||
<div class="content">
|
||||
<div class="list-group list-custom-small">
|
||||
<?php if (false) { /* DARK MODE DISABLED (set menu height to 310) */ ?>
|
||||
<a href="#" data-toggle-theme data-trigger-switch="switch-dark" class="pb-2">
|
||||
<i class="fa font-14 fa-moon rounded-s bg-dark1-dark color-white"></i>
|
||||
<span>Dark Mode</span>
|
||||
@@ -105,6 +106,7 @@
|
||||
<label class="custom-control-label" for="switch-dark"></label>
|
||||
</div>
|
||||
</a>
|
||||
<?php } ?>
|
||||
<a href="#" data-menu="menu-login" class="show-notloggedin">
|
||||
<i class="fa font-14 fa-sign-in-alt rounded-s bg-highlight color-white"></i>
|
||||
<span>Login</span>
|
||||
@@ -291,14 +293,17 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="menu-update">
|
||||
<div id="menu-nodb-warning" class="menu menu-box-bottom menu-box-detached rounded-m" data-height="500">
|
||||
<div class="menu-title"><h1>Warnung</h1><p class="color-highlight">Datenbank nicht unterstützt</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
|
||||
<div class="divider divider-margins mb-n2"></div>
|
||||
<div class="content bottom-0">
|
||||
<p class="text-center mt-5"><i class="fa fa-sync-alt fa-7x color-highlight fa-spin"></i></p>
|
||||
<h1 class="text-center mt-5 font-900">Update Verfügbar</h1>
|
||||
<p class="text-center">
|
||||
Eine neue Version unserer App ist verfügbar. Keine Sorge, Du musst nichts machen. Wir aktuallisieren den Inhalt in wenigen Sekunden.
|
||||
<p>
|
||||
Das Speichern der benötigten Daten wird von Deinem Gerät nicht unterstützt.<br>
|
||||
Da deshalb die Daten jedesmal direkt vom Server geladen werden müssen, kannst Du die App nicht offline nutzen.<br>
|
||||
Das Nachladen kann außerdem gerade bei großen Datenmengen (wie Ranglisten) sehr lange dauern.
|
||||
Wir empfehlen Dir daher, auf diesem Gerät unsere normale Website zu benutzen. Diese ist auch für Mobil-Geräte optimiert.
|
||||
</p>
|
||||
<a href="#" class="page-update btn btn-center-xl btn-m shadow-xl rounded-s bg-highlight font-900 text-center">Update</a>
|
||||
<p class="text-center font-10 bottom-0">Die App wird neu laden und das Update ist abgeschlossen.</p>
|
||||
<a class="btn btn-m mt-2 btn-full bg-highlight text-uppercase font-900" href="https://regatten.net/">Zur Website</a>
|
||||
<a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="<?php echo SERVER_ADDR; ?>/client/app/icons/icon-192x192.png">
|
||||
</head>
|
||||
|
||||
<body class="detect-theme" data-background="none" data-highlight="blue2">
|
||||
<body class="theme-light" data-background="none" data-highlight="blue2"><?php /* DARK MODE DISABLED: set class to "detect-theme" */ ?>
|
||||
|
||||
<div id="preloader"><div class="spinner-border color-highlight" role="status"></div></div>
|
||||
|
||||
@@ -27,7 +27,8 @@
|
||||
<?php include(__DIR__ . '/headerfooter.php'); ?>
|
||||
|
||||
<!--start of page content, add your stuff here-->
|
||||
<div class="page-content header-clear-medium">
|
||||
<div class="page-content header-clear">
|
||||
<div id="syncstatus" class="text-right mr-2 mb-1">Zuletzt aktualisiert: nie</div>
|
||||
<?php echo $sp['output']; ?>
|
||||
</div>
|
||||
<!--end of page content, off canvas elements here-->
|
||||
|
||||
12
server/scripts/go2url.js
Normal file
12
server/scripts/go2url.js
Normal file
@@ -0,0 +1,12 @@
|
||||
var siteScript = function() {
|
||||
hideLoader();
|
||||
setTimeout(function() {
|
||||
var url = findGetParameter('url');
|
||||
if (url === null) {
|
||||
$('#card-title').find('p').html('Wir konnten Dich leider nicht umleiten.<br><a href="' + LINK_PRE + 'index">Hier kommst Du zurück zur Startseite</a>');
|
||||
} else {
|
||||
showLoader();
|
||||
location.href = url;
|
||||
}
|
||||
}, 2000);
|
||||
}
|
||||
@@ -273,12 +273,9 @@ var siteScript = async function() {
|
||||
var maxDate = getToday();
|
||||
maxDate.setDate(maxDate.getDate() - 1);
|
||||
var regattas = await dbGetRegattasRange(minDate, maxDate);
|
||||
var regattaResults = [];
|
||||
for (id in regattas) {
|
||||
var entry = regattas[id];
|
||||
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
|
||||
regattaResults[entry['id']] = (results.length > 0);
|
||||
}
|
||||
regattas.sort(function(a,b){
|
||||
return b.date.localeCompare(a.date);
|
||||
});
|
||||
if (regattas.length > 0) {
|
||||
list = '';
|
||||
for (i in regattas) {
|
||||
@@ -320,7 +317,7 @@ var siteScript = async function() {
|
||||
icons.push('<i class="fas fa-book"></i>');
|
||||
if (regatta['canceled'] == '1') {
|
||||
icons.push('<i class="fas fa-times color-red2-dark"></i>');
|
||||
} else if (regattaResults[regatta['id']]) {
|
||||
} else if (regatta['results'] == '1') {
|
||||
icons.push('<i class="fas fa-poll"></i>');
|
||||
}
|
||||
list += '<div class="color-green2-dark">' + icons.join(' ') + '</div>';
|
||||
|
||||
@@ -61,8 +61,7 @@ async function onRegattaClicked(id) {
|
||||
}
|
||||
|
||||
// Results
|
||||
var results = await dbGetDataIndex('results', 'regatta', regatta['id']);
|
||||
if (results.length > 0) {
|
||||
if (regatta['results'] == '1') {
|
||||
$('#menu-item-results').show();
|
||||
$('#menu-item-results').attr('href', LINK_PRE + 'result?regatta=' + regatta['id']);
|
||||
} else {
|
||||
|
||||
@@ -18,13 +18,13 @@ async function planningSwitchChanged() {
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
console.log('authentification failed');
|
||||
log('authentification failed');
|
||||
toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
|
||||
} else if (xhr.status == 0) {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Status zu ändern');
|
||||
} else {
|
||||
console.log('Login: unbekannter Fehler', status, error);
|
||||
console.log(xhr);
|
||||
log('Login: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
$('#menu-status').hideMenu();
|
||||
@@ -35,8 +35,6 @@ async function planningSwitchChanged() {
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
console.log(id, gemeldet, bezahlt);
|
||||
hideLoader();
|
||||
}
|
||||
|
||||
async function planningEditStatus(id) {
|
||||
@@ -70,6 +68,7 @@ function selectChange() {
|
||||
|
||||
if (typeof siteScript === 'function') {
|
||||
history.replaceState(null, '', '?year=' + val);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
@@ -138,12 +137,6 @@ var siteScript = async function() {
|
||||
regattas.splice(i, 1);
|
||||
}
|
||||
}
|
||||
var regattaResults = [];
|
||||
for (id in regattas) {
|
||||
var entry = regattas[id];
|
||||
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
|
||||
regattaResults[entry['id']] = (results.length > 0);
|
||||
}
|
||||
|
||||
var years = await dbGetData('years');
|
||||
years.sort(function (a, b) {
|
||||
@@ -263,7 +256,7 @@ var siteScript = async function() {
|
||||
icons.push('<i class="fas fa-book"></i>');
|
||||
if (entry['canceled'] == '1') {
|
||||
icons.push('<i class="fas fa-times color-red2-dark"></i>');
|
||||
} else if (regattaResults[entry['id']]) {
|
||||
} else if (entry['results'] == '1') {
|
||||
icons.push('<i class="fas fa-poll"></i>');
|
||||
}
|
||||
if (entry.planning.gemeldet == '1') {
|
||||
|
||||
474
server/scripts/planning_edit.js
Normal file
474
server/scripts/planning_edit.js
Normal file
@@ -0,0 +1,474 @@
|
||||
async function planningSwitchChanged() {
|
||||
showLoader();
|
||||
var id = $('#switch-planning-include').data('regatta');
|
||||
var include = $('#switch-planning-include').prop('checked');
|
||||
var auth = {
|
||||
id: localStorage.getItem('auth_id'),
|
||||
hash: localStorage.getItem('auth_hash')
|
||||
}
|
||||
if (include) {
|
||||
// add to planning
|
||||
$.ajax({
|
||||
url: QUERY_URL + 'planning_add',
|
||||
method: 'POST',
|
||||
data: {
|
||||
auth: auth,
|
||||
regatta: id
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
log('authentification failed');
|
||||
toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
|
||||
} else if (xhr.status == 0) {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um die Änderungen zu speichern');
|
||||
} else {
|
||||
log('planning_add: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
$('#menu-edit').hideMenu();
|
||||
hideLoader();
|
||||
},
|
||||
success: async function (data, status, xhr) {
|
||||
await sync();
|
||||
planningEdit(id);
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// remove from planning
|
||||
$.ajax({
|
||||
url: QUERY_URL + 'planning_remove',
|
||||
method: 'POST',
|
||||
data: {
|
||||
auth: auth,
|
||||
regatta: id
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
log('authentification failed');
|
||||
toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
|
||||
} else if (xhr.status == 0) {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um die Änderungen zu speichern');
|
||||
} else {
|
||||
log('planning_remove: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
$('#menu-edit').hideMenu();
|
||||
hideLoader();
|
||||
},
|
||||
success: async function (data, status, xhr) {
|
||||
await sync();
|
||||
planningEdit(id);
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
var sailorIsSteuermann;
|
||||
var sailors = [];
|
||||
|
||||
async function sailorSelected(sid) {
|
||||
$('#menu-sailor').hideMenu();
|
||||
showLoader();
|
||||
var rid = $('#switch-planning-include').data('regatta');
|
||||
var action = (sailorIsSteuermann ? 'planning_set_steuermann' : 'planning_add_crew');
|
||||
// add sailor
|
||||
var auth = {
|
||||
id: localStorage.getItem('auth_id'),
|
||||
hash: localStorage.getItem('auth_hash')
|
||||
}
|
||||
$.ajax({
|
||||
url: QUERY_URL + action,
|
||||
method: 'POST',
|
||||
data: {
|
||||
auth: auth,
|
||||
regatta: rid,
|
||||
sailor: sid
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
log('authentification failed');
|
||||
toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
|
||||
} else if (xhr.status == 0) {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um die Änderungen zu speichern');
|
||||
} else {
|
||||
log(action + ': unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
hideLoader();
|
||||
},
|
||||
success: async function (data, status, xhr) {
|
||||
await sync();
|
||||
planningEdit(rid);
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
async function sailorsSearch() {
|
||||
$('.item-sailor-search').remove();
|
||||
if (sailorIsSteuermann) {
|
||||
var item = '<a class="item-sailor-search" onclick="sailorSelected(null)">';
|
||||
item += '<span style="font-style:italic;">noch unklar</span>';
|
||||
item += '<i class="fa fa-angle-right"></i>';
|
||||
item += '</a>';
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(item);
|
||||
}
|
||||
if ($('#input-edit-search').val().length >= 3) {
|
||||
sailors.forEach(function (entry) {
|
||||
if (search($('#input-edit-search').val(), entry.keywords)) {
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(entry.content);
|
||||
}
|
||||
});
|
||||
} else {
|
||||
var item = '<p class="item-sailor-search">Gib mindestens 3 Zeichen ein</p>';
|
||||
$('#menu-sailor').find('.content').find('.list-group').append(item);
|
||||
}
|
||||
}
|
||||
|
||||
async function initSailors() {
|
||||
sailors = [];
|
||||
var dbSailors = await dbGetData('sailors');
|
||||
dbSailors.sort(function(a,b){
|
||||
return a.name.localeCompare(b.name);
|
||||
});
|
||||
for (s in dbSailors) {
|
||||
var item = '<a class="item-sailor-search" onclick="sailorSelected(' + dbSailors[s].id + ')">';
|
||||
item += '<span>' + dbSailors[s].name + '</span>';
|
||||
item += '<i class="fa fa-angle-right"></i>';
|
||||
item += '</a>';
|
||||
sailors.push({
|
||||
keywords: [dbSailors[s].name],
|
||||
content: item
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
async function planningChangeCrew(sid = null) {
|
||||
if (sid !== null) {
|
||||
showLoader();
|
||||
var rid = $('#switch-planning-include').data('regatta');
|
||||
// remove sailor
|
||||
var auth = {
|
||||
id: localStorage.getItem('auth_id'),
|
||||
hash: localStorage.getItem('auth_hash')
|
||||
}
|
||||
$.ajax({
|
||||
url: QUERY_URL + 'planning_remove_crew',
|
||||
method: 'POST',
|
||||
data: {
|
||||
auth: auth,
|
||||
regatta: rid,
|
||||
sailor: sid
|
||||
},
|
||||
error: function (xhr, status, error) {
|
||||
if (xhr.status == 401) {
|
||||
log('authentification failed');
|
||||
toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
|
||||
} else if (xhr.status == 0) {
|
||||
toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um die Änderungen zu speichern');
|
||||
} else {
|
||||
log('planning_remove_crew: unbekannter Fehler', status, error);
|
||||
log(xhr);
|
||||
toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
|
||||
}
|
||||
$('#menu-edit').hideMenu();
|
||||
hideLoader();
|
||||
},
|
||||
success: async function (data, status, xhr) {
|
||||
await sync();
|
||||
planningEdit(rid);
|
||||
hideLoader();
|
||||
}
|
||||
});
|
||||
} else {
|
||||
sailorIsSteuermann = false;
|
||||
$('#input-edit-search').val('').trigger('focusin').trigger('focusout');
|
||||
sailorsSearch();
|
||||
$('#menu-edit').hideMenu();
|
||||
$('#menu-sailor').find('.menu-title').find('h1').text('Crew hinzufügen');
|
||||
$('#menu-sailor').showMenu();
|
||||
$('#input-edit-search').focus();
|
||||
}
|
||||
}
|
||||
|
||||
async function planningChangeSteuermann() {
|
||||
sailorIsSteuermann = true;
|
||||
$('#input-edit-search').val('').trigger('focusin').trigger('focusout');
|
||||
sailorsSearch();
|
||||
$('#menu-edit').hideMenu();
|
||||
$('#menu-sailor').find('.menu-title').find('h1').text('Steuermann/-frau bearbeiten');
|
||||
$('#menu-sailor').showMenu();
|
||||
$('#input-edit-search').focus();
|
||||
}
|
||||
|
||||
async function planningEdit(id) {
|
||||
var regatta = await dbGetData('regattas', id);
|
||||
|
||||
$('#menu-edit').find('.menu-title').find('p').text(regatta.name);
|
||||
|
||||
var plannings = await dbGetDataIndex('plannings', 'regatta', regatta['id']);
|
||||
var planning = null;
|
||||
if (isLoggedIn()) {
|
||||
for (i in plannings) {
|
||||
if (plannings[i]['user'] == USER_ID) {
|
||||
planning = plannings[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$('#switch-planning-include').data('regatta', id);
|
||||
if (planning !== null) {
|
||||
$('#switch-planning-include').prop('checked', true);
|
||||
$('#item-steuermann').show();
|
||||
if (planning.steuermann !== null) {
|
||||
$('#item-steuermann').find('span').text('Am Steuer: ' + (await dbGetData('sailors', planning.steuermann)).name);
|
||||
} else {
|
||||
$('#item-steuermann').find('span').html('Am Steuer: <font style="font-style:italic;">noch unklar</font>');
|
||||
}
|
||||
$('.item-crew').remove();
|
||||
var crew = planning.crew.split(',');
|
||||
for (c in crew) {
|
||||
var sailor = await dbGetData('sailors', crew[c]);
|
||||
if (sailor !== null) {
|
||||
var item = '<a class="item-crew" onclick="planningChangeCrew(' + sailor.id + ')">';
|
||||
item += '<span>' + sailor.name + '</span>';
|
||||
item += '<i class="fa fa-angle-right"></i>';
|
||||
item += '</a>';
|
||||
$('#menu-edit').find('.content').find('.list-group').append(item);
|
||||
}
|
||||
}
|
||||
var item = '<a class="item-crew" onclick="planningChangeCrew()">';
|
||||
item += '<span style="font-style:italic;">Weiteren Segler hinzufügen</span>';
|
||||
item += '<i class="fa fa-angle-right"></i>';
|
||||
item += '</a>';
|
||||
$('#menu-edit').find('.content').find('.list-group').append(item);
|
||||
} else {
|
||||
$('#switch-planning-include').prop('checked', false);
|
||||
$('#item-steuermann').hide();
|
||||
$('.item-crew').remove();
|
||||
}
|
||||
$('#menu-edit').showMenu();
|
||||
}
|
||||
|
||||
function selectChange() {
|
||||
var val = $('#select-year').val();
|
||||
|
||||
if (typeof siteScript === 'function') {
|
||||
history.replaceState(null, '', '?year=' + val);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
|
||||
function initYear() {
|
||||
var year = findGetParameter('year');
|
||||
if (year === null) year = new Date().getFullYear();
|
||||
|
||||
$('#select-year').html('<option value="' + year + '">' + year + '</option>');
|
||||
$('#select-year').val(year);
|
||||
}
|
||||
|
||||
var firstCall = true;
|
||||
var rows = [];
|
||||
var today;
|
||||
|
||||
async function drawList () {
|
||||
window.setTimeout(function () {
|
||||
var list = '';
|
||||
rows.forEach(function (entry) {
|
||||
if (entry == null) {
|
||||
list += '<div><div align="center" class="color-highlight"><b>Heute ist der ' + formatDate('d.m.Y', today) + '</b></div></div>';
|
||||
} else if (search($('#input-search').val(), entry.keywords)) {
|
||||
list += entry.content;
|
||||
}
|
||||
});
|
||||
$('#div-regattas').html(list);
|
||||
}, 0);
|
||||
}
|
||||
|
||||
var siteScript = async function() {
|
||||
if (!isLoggedIn()) {
|
||||
location.href = LINK_PRE + 'planning';
|
||||
return;
|
||||
}
|
||||
|
||||
if (firstCall) {
|
||||
firstCall = false;
|
||||
initYear();
|
||||
$('#select-year').change(selectChange);
|
||||
$('#input-search').on('input', drawList);
|
||||
$('#switch-planning-include').parent().parent().click(planningSwitchChanged);
|
||||
$('#item-steuermann').click(planningChangeSteuermann);
|
||||
$('#input-edit-search').on('input', sailorsSearch);
|
||||
initSailors();
|
||||
}
|
||||
|
||||
today = getToday();
|
||||
|
||||
var selectedYear = $('#select-year').val();
|
||||
var minDate = parseDate(selectedYear + '-01-01');
|
||||
var maxDate = parseDate(selectedYear + '-12-31');
|
||||
var regattas = await dbGetRegattasRange(minDate, maxDate);
|
||||
var plannings = await dbGetDataIndex('plannings', 'user', USER_ID);
|
||||
for (var i = regattas.length - 1; i >= 0; i --) {
|
||||
var entry = regattas[i];
|
||||
var okay = false;
|
||||
for (p in plannings) {
|
||||
if (plannings[p].regatta == entry.id) {
|
||||
regattas[i].planning = plannings[p];
|
||||
okay = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (!okay) {
|
||||
regattas[i].planning = null;
|
||||
}
|
||||
}
|
||||
|
||||
var years = await dbGetData('years');
|
||||
years.sort(function (a, b) {
|
||||
if (a['year'] > b['year']) return -1;
|
||||
if (a['year'] < b['year']) return 1;
|
||||
return 0;
|
||||
});
|
||||
var options = '';
|
||||
for (id in years) {
|
||||
var year = years[id]['year'];
|
||||
options += '<option value="' + year + '">' + year + '</option>';
|
||||
}
|
||||
$('#select-year').html(options);
|
||||
$('#select-year').val(selectedYear);
|
||||
|
||||
var count = regattas.length;
|
||||
if (count > 0) {
|
||||
if (count == 1) {
|
||||
$('#p-count').html('Es wurde 1 Regatta gefunden!');
|
||||
} else {
|
||||
$('#p-count').html('Es wurden ' + count + ' Regatten gefunden!');
|
||||
}
|
||||
$('#div-regattas').show();
|
||||
$('#input-search').parent().show();
|
||||
|
||||
var heute = false;
|
||||
|
||||
rows = [];
|
||||
|
||||
for (id in regattas) {
|
||||
var entry = regattas[id];
|
||||
var club = null;
|
||||
if (entry['club'] != null)
|
||||
club = await dbGetData('clubs', entry['club']);
|
||||
if (entry.planning !== null) {
|
||||
if (entry.planning.steuermann !== null) {
|
||||
entry.planning.steuermann = (await dbGetData('sailors', entry.planning.steuermann)).name;
|
||||
}
|
||||
var crewString = entry.planning.crew.split(',');
|
||||
entry.planning.crew = [];
|
||||
for (c in crewString) {
|
||||
var sailor = await dbGetData('sailors', crewString[c]);
|
||||
if (sailor !== null) {
|
||||
entry.planning.crew.push(sailor.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var dateFrom = entry['dateFrom'];
|
||||
var dateTo = entry['dateTo'];
|
||||
|
||||
var row = { keywords: [], content: '' };
|
||||
row.keywords.push(entry['name']);
|
||||
if (entry['number'] != null) row.keywords.push(entry['number']);
|
||||
if (club != null) row.keywords.push(club['kurz'], club['name']);
|
||||
|
||||
if (!heute && (today <= dateFrom)) {
|
||||
rows.push(null);
|
||||
heute = true;
|
||||
}
|
||||
|
||||
if (entry.planning !== null) {
|
||||
row.content += '<div onclick="planningEdit(' + entry['id'] + ');">';
|
||||
} else {
|
||||
row.content += '<div onclick="planningEdit(' + entry['id'] + ');" style="opacity:0.5;">';
|
||||
}
|
||||
|
||||
// ZEILE 1
|
||||
// Name
|
||||
row.content += '<div><b>' + (entry['canceled'] == 1 ? '<s>' : '') + entry['name'] + (entry['canceled'] == 1 ? '</s>' : '') + '</b></div>';
|
||||
|
||||
// ZEILE 2
|
||||
row.content += '<div>';
|
||||
|
||||
// Number
|
||||
row.content += '<div>' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '</div>';
|
||||
|
||||
// Special
|
||||
row.content += '<div>' + entry['special'] + '</div>';
|
||||
|
||||
// Club
|
||||
row.content += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
|
||||
|
||||
row.content += '</div>';
|
||||
|
||||
// ZEILE 3
|
||||
row.content += '<div>';
|
||||
|
||||
// Date
|
||||
if (entry['length'] < 1) {
|
||||
if (formatDate('d.m', dateFrom) == '01.01') {
|
||||
row.content += '<div><font class="color-red2-dark">Datum noch unklar</font></div>';
|
||||
} else {
|
||||
row.content += '<div>' + formatDate("d.m.Y", dateFrom) + ' - <font class="color-red2-dark">Datum nicht final</font></div>';
|
||||
}
|
||||
} else {
|
||||
row.content += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
|
||||
}
|
||||
|
||||
// RLF
|
||||
row.content += '<div>' + parseFloat(entry['rlf']).toFixed(2) + '</div>';
|
||||
|
||||
row.content += '</div>';
|
||||
|
||||
if (entry.planning !== null) {
|
||||
// ZEILE 4
|
||||
row.content += '<div></div>';
|
||||
|
||||
// ZEILE 5
|
||||
row.content += '<div>';
|
||||
row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : 'noch unklar') + '</div>';
|
||||
row.content += '</div>';
|
||||
|
||||
// ZEILE 6...
|
||||
for (var i in entry.planning.crew) {
|
||||
row.content += '<div>';
|
||||
row.content += '<div>' + entry.planning.crew[i] + '</div>';
|
||||
row.content += '</div>';
|
||||
}
|
||||
} else {
|
||||
row.content += '<div>Du planst nicht, hierhin zu fahren</div>';
|
||||
}
|
||||
|
||||
row.content += '</div>';
|
||||
|
||||
rows.push(row);
|
||||
}
|
||||
|
||||
if (!heute) {
|
||||
rows.push(null);
|
||||
}
|
||||
|
||||
drawList();
|
||||
|
||||
} else {
|
||||
$('#p-count').html('Keine Regatten gefunden!');
|
||||
$('#div-regattas').hide();
|
||||
$('#input-search').parent().hide();
|
||||
}
|
||||
|
||||
hideLoader();
|
||||
}
|
||||
@@ -10,6 +10,7 @@ function selectChange() {
|
||||
|
||||
if (typeof siteScript === 'function') {
|
||||
history.replaceState(null, '', '?year=' + val);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ function selectChange() {
|
||||
|
||||
if (typeof siteScript === 'function') {
|
||||
history.replaceState(null, '', '?year=' + val);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
@@ -83,12 +84,6 @@ var siteScript = async function() {
|
||||
regattas.splice(i, 1);
|
||||
}
|
||||
}
|
||||
var regattaResults = [];
|
||||
for (id in regattas) {
|
||||
var entry = regattas[id];
|
||||
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
|
||||
regattaResults[entry['id']] = (results.length > 0);
|
||||
}
|
||||
|
||||
var years = await dbGetData('years');
|
||||
years.sort(function (a, b) {
|
||||
@@ -194,7 +189,7 @@ var siteScript = async function() {
|
||||
|
||||
// ZEILE 5
|
||||
row.content += '<div>';
|
||||
row.content += '<div>' + entry.planning.steuermann + '</div>';
|
||||
row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : 'noch unklar') + '</div>';
|
||||
row.content += '</div>';
|
||||
|
||||
// ZEILE 6...
|
||||
@@ -205,72 +200,7 @@ var siteScript = async function() {
|
||||
}
|
||||
|
||||
row.content += '</div>';
|
||||
/*
|
||||
// ZEILE 2
|
||||
row.content += '<div>';
|
||||
|
||||
// Number
|
||||
row.content += '<div>' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '</div>';
|
||||
|
||||
// Club
|
||||
row.content += '<div>' + ((club != null) ? club['kurz'] : '') + '</div>';
|
||||
|
||||
// Special
|
||||
row.content += '<div>' + entry['special'] + '</div>';
|
||||
|
||||
// Icons
|
||||
var icons = [];
|
||||
if (entry['info'] != '')
|
||||
icons.push('<i class="fas fa-info"></i>');
|
||||
if ((entry['meldung'] != '') && (dateTo >= today) && (entry['meldungOffen'] == '1')) {
|
||||
var color = '';
|
||||
if (entry['meldungSchluss'] != null) {
|
||||
var ms = 0;
|
||||
if (entry['meldungEarly'] != null) {
|
||||
ms = parseDate(entry['meldungEarly']);
|
||||
}
|
||||
if (ms < today) {
|
||||
ms = parseDate(entry['meldungSchluss']);
|
||||
}
|
||||
var diff = Math.round((ms - today) / 86400000);
|
||||
if (ms < today) {
|
||||
color = ' color-red2-dark';
|
||||
} else if (diff < 7) {
|
||||
color = ' color-yellow2-dark';
|
||||
}
|
||||
}
|
||||
icons.push('<i class="fas fa-file-signature' + color + '"></i>');
|
||||
}
|
||||
if (entry['bericht'] != '')
|
||||
icons.push('<i class="fas fa-book"></i>');
|
||||
if (entry['canceled'] == '1') {
|
||||
icons.push('<i class="fas fa-times color-red2-dark"></i>');
|
||||
} else if (regattaResults[entry['id']]) {
|
||||
icons.push('<i class="fas fa-poll"></i>');
|
||||
}
|
||||
row.content += '<div class="color-green2-dark">' + icons.join(' ') + '</div>';
|
||||
|
||||
row.content += '</div>';
|
||||
|
||||
// ZEILE 3
|
||||
row.content += '<div>';
|
||||
|
||||
// Date
|
||||
if (entry['length'] < 1) {
|
||||
if (formatDate('d.m', dateFrom) == '01.01') {
|
||||
row.content += '<div><font class="color-red2-dark">Datum noch unklar</font></div>';
|
||||
} else {
|
||||
row.content += '<div>' + formatDate("d.m.Y", dateFrom) + ' - <font class="color-red2-dark">Datum nicht final</font></div>';
|
||||
}
|
||||
} else {
|
||||
row.content += '<div>' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '</div>';
|
||||
}
|
||||
|
||||
// RLF
|
||||
row.content += '<div>' + parseFloat(entry['rlf']).toFixed(2) + '</div>';
|
||||
|
||||
row.content += '</div></div>';
|
||||
*/
|
||||
rows.push(row);
|
||||
}
|
||||
|
||||
|
||||
@@ -175,7 +175,8 @@ async function selectChange(callSiteScript = true) {
|
||||
$('#input-jugstrict').prop('checked', jugstrict);
|
||||
|
||||
if (callSiteScript && (typeof siteScript === 'function')) {
|
||||
history.replaceState(null, '', '?type=' + type + '&year=' + year)
|
||||
history.replaceState(null, '', '?type=' + type + '&year=' + year);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
@@ -187,6 +188,7 @@ function buttonShowPressed() {
|
||||
if ($('#input-jugend').prop('checked')) chboxes += '&jugend=on'
|
||||
if ($('#input-jugstrict').prop('checked')) chboxes += '&jugstrict=on'
|
||||
history.replaceState(null, '', '?type=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val() + chboxes)
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,6 +14,7 @@ function selectChange(callSiteScript = true) {
|
||||
|
||||
if (callSiteScript && (typeof siteScript === 'function')) {
|
||||
history.replaceState(null, '', '?year=' + val);
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
@@ -21,7 +22,8 @@ function selectChange(callSiteScript = true) {
|
||||
|
||||
function buttonShowPressed() {
|
||||
if (typeof siteScript === 'function') {
|
||||
history.replaceState(null, '', '?year=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val())
|
||||
history.replaceState(null, '', '?year=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val());
|
||||
showLoader();
|
||||
siteScript();
|
||||
}
|
||||
}
|
||||
@@ -77,12 +79,6 @@ var siteScript = async function() {
|
||||
var minDate = parseDate($('#input-from').val());
|
||||
var maxDate = parseDate($('#input-to').val());
|
||||
var regattas = await dbGetRegattasRange(minDate, maxDate);
|
||||
var regattaResults = [];
|
||||
for (id in regattas) {
|
||||
var entry = regattas[id];
|
||||
var results = await dbGetDataIndex('results', 'regatta', entry['id']);
|
||||
regattaResults[entry['id']] = (results.length > 0);
|
||||
}
|
||||
|
||||
var selectedYear = $('#select-year').val();
|
||||
|
||||
@@ -194,7 +190,7 @@ var siteScript = async function() {
|
||||
icons.push('<i class="fas fa-book"></i>');
|
||||
if (entry['canceled'] == '1') {
|
||||
icons.push('<i class="fas fa-times color-red2-dark"></i>');
|
||||
} else if (regattaResults[entry['id']]) {
|
||||
} else if (entry['results'] == '1') {
|
||||
icons.push('<i class="fas fa-poll"></i>');
|
||||
}
|
||||
row.content += '<div class="color-green2-dark">' + icons.join(' ') + '</div>';
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<nav id="$$html-id;">
|
||||
<nav id="$$html-id;" class="$$css-class;">
|
||||
<ul class="pagination justify-content-center">
|
||||
<li id="$$html-id;-1" class="page-item"><a onclick="onPaginationClick(this)" class="page-link color-black bg-theme rounded-xs shadow-x1 border-0" style="cursor: pointer;">1</a></li>
|
||||
<li id="$$html-id;-2" class="page-item"><a onclick="onPaginationClick(this)" class="page-link color-black bg-theme rounded-xs shadow-x1 border-0" style="cursor: pointer;">2</a></li>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
|
||||
define('PWA_VERSION', '1.9.2');
|
||||
define('PWA_VERSION', '1.10.5h1');
|
||||
|
||||
?>
|
||||
|
||||
@@ -229,14 +229,15 @@ self.addEventListener('push', async function(event) {
|
||||
case 'meldeschluss':
|
||||
if (await dbSettingsGet('notify_channel_<?php echo BOATCLASS; ?>_meldeschluss')) {
|
||||
if (await isMyRegatta(getEntry(data, 'id', ''))) okay = true;
|
||||
// TODO: only if not already registered
|
||||
}
|
||||
break;
|
||||
default:
|
||||
console.log('Unknown channel:', data.channel);
|
||||
console.log('[sW] Unknown channel:', data.channel);
|
||||
break;
|
||||
}
|
||||
if (!okay) {
|
||||
console.log('Notification channel not subscribed');
|
||||
console.log('[sW] Notification channel not subscribed');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -255,7 +256,7 @@ self.addEventListener('push', async function(event) {
|
||||
var db = await openDb();
|
||||
if (db != null) {
|
||||
var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
var request = os.put({ table: 'last_sync', time: 0 });
|
||||
var request = os.put({ table: 'last_sync', time: 1 });
|
||||
request.onerror = function (event) {
|
||||
console.log('[sW] Error while saving data to DB:', e);
|
||||
db.close();
|
||||
@@ -267,7 +268,7 @@ self.addEventListener('push', async function(event) {
|
||||
}
|
||||
}
|
||||
|
||||
console.log('Showing notification');
|
||||
console.log('[sW] Showing notification');
|
||||
self.registration.showNotification(data.title, options);
|
||||
break;
|
||||
|
||||
@@ -276,7 +277,7 @@ self.addEventListener('push', async function(event) {
|
||||
var db = await openDb();
|
||||
if (db != null) {
|
||||
var os = db.transaction('update_times', 'readwrite').objectStore('update_times');
|
||||
var request = os.put({ table: 'last_sync', time: 0 });
|
||||
var request = os.put({ table: 'last_sync', time: 1 });
|
||||
request.onerror = function (event) {
|
||||
console.log('[sW] Error while saving data to DB:', e);
|
||||
db.close();
|
||||
@@ -310,3 +311,16 @@ self.addEventListener('notificationclick', function(event) {
|
||||
clients.openWindow(url)
|
||||
);
|
||||
});
|
||||
|
||||
self.addEventListener('pushsubscriptionchange', function(event) {
|
||||
var formData = new URLSearchParams();
|
||||
formData.append('old', JSON.stringify(event.oldSubscription));
|
||||
formData.append('new', JSON.stringify(event.newSubscription));
|
||||
event.waitUntil(
|
||||
fetch('<?php echo QUERY_URL; ?>update_subscription', {
|
||||
method: 'POST',
|
||||
cache: 'no-cache',
|
||||
body: formData
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user