From 3fd9beae1ed9b09223cbf6ee65d2c4b664f6be8d Mon Sep 17 00:00:00 2001 From: ostertun Date: Tue, 6 Oct 2020 00:21:23 +0200 Subject: [PATCH] Add last sync info --- client/scripts/database.js | 54 +++++++++++++++++++------------------- server/page/wrapper.php | 3 ++- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/client/scripts/database.js b/client/scripts/database.js index 40345cc..37139bb 100644 --- a/client/scripts/database.js +++ b/client/scripts/database.js @@ -417,29 +417,31 @@ 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 = ' Sync'; -// 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() { @@ -460,16 +462,14 @@ 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') { diff --git a/server/page/wrapper.php b/server/page/wrapper.php index 352537b..4fa655e 100644 --- a/server/page/wrapper.php +++ b/server/page/wrapper.php @@ -27,7 +27,8 @@ -
+
+
Zuletzt aktualisiert: nie