From 3db5ae1723566b22f8d8c1149e6c39eecd10d45f Mon Sep 17 00:00:00 2001 From: ostertun Date: Fri, 2 Oct 2020 14:24:00 +0200 Subject: [PATCH 01/11] RA-#21 News: mark unread and add pagination --- server/content/news.php | 20 ++++++++++------ server/scripts/news.js | 52 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 61 insertions(+), 11 deletions(-) diff --git a/server/content/news.php b/server/content/news.php index 41f9efa..b561202 100644 --- a/server/content/news.php +++ b/server/content/news.php @@ -1,22 +1,28 @@ Neuigkeiten"; $content .= '

Aktuelles der letzten zwölf Monate

'; - + $sp['output'] .= $tpl->load('card', [$content]); - + + $sp['output'] .= '
'; + + // Pagination + $sp['output'] .= $tpl->load('pagination', ['html-id' => 'pagination']); + // Menu $sp['menus'] .= $tpl->load('menu/modal', ['html-id' => 'menu-news', 'title' => 'Details']); - + + $sp['scripts'] .= $scripts->load('pagination', ['pageChange', 'page', 'pageCount', 'pagination']); $cardTemplate = $tpl->load('card', ['%CONTENT%', 'html-id' => '%ID%', 'css-class' => 'card-news']); $cardTemplate = str_replace("\n", '', $cardTemplate); $cardTemplate = str_replace("\r", '', $cardTemplate); $sp['scripts'] .= ""; $sp['scripts'] .= $scripts->load('news'); - -?> \ No newline at end of file + +?> diff --git a/server/scripts/news.js b/server/scripts/news.js index 6b55da4..ddece8e 100644 --- a/server/scripts/news.js +++ b/server/scripts/news.js @@ -1,3 +1,9 @@ +var firstCall = true; +var rows = []; +var page = 1; +var pageCount = 0; +const showCount = 10; + async function onNewsClicked(id) { var newsEntry = await dbGetData('news', id); if (newsEntry == null) return; @@ -11,23 +17,50 @@ async function onNewsClicked(id) { $('#menu-news').showMenu(); } +function pageChange() { + $('h1')[0].scrollIntoView({ behavior: "smooth" }); + drawList(); +} + function addCard(newsEntry) { - var content = '

' + newsEntry.title + '

'; + var badge = ''; + if (newsEntry.unread) { + badge += 'NEW '; + } + var content = '

' + badge + newsEntry.title + '

'; content += '

' + formatDate('d.m.Y', newsEntry.date) + '

'; content += '

' + newsEntry.description.replace('\n', '
') + '

'; if (newsEntry.html != '') { content += 'Mehr lesen'; } - $('.page-content').append(cardTemplate.replace('%ID%', 'card-news-' + newsEntry.id).replace('%CONTENT%', content)); + $('#news-entries').append(cardTemplate.replace('%ID%', 'card-news-' + newsEntry.id).replace('%CONTENT%', content)); +} + +async function drawList() { + $('.card-news').remove(); + if (rows.length > 0) { + var offset = (page - 1) * showCount; + var count = (page == pageCount ? (rows.length % showCount) : showCount); + if (count == 0) count = showCount; + + for (i = 0; i < count; i ++) { + addCard(rows[i + offset]); + } + } } var siteScript = async function() { - $('.card-news').remove(); + if (firstCall) { + firstCall = false; + initPagination(); + } + rows = []; var news = await dbGetData('news'); news.sort(function (a,b) { return b.date.localeCompare(a.date); }); + var newsRead = await dbSettingsGet('news_read_' + BOATCLASS); var now = new Date(); var lastYear = new Date(); lastYear.setFullYear(lastYear.getFullYear() - 1); @@ -36,8 +69,19 @@ var siteScript = async function() { newsEntry.date = new Date(Date.parse(newsEntry.date)); if (newsEntry.date > now) continue; if (newsEntry.date < lastYear) break; - addCard(newsEntry); + newsEntry.unread = (newsEntry.date > newsRead); + rows.push(newsEntry); } + pageCount = Math.ceil(rows.length / showCount); + if ((page < 1) || (page > pageCount)) { + if (page < 1) { + page = 1; + } else { + page = pageCount; + } + } + drawPagination(); + drawList(); dbSettingsSet('news_read_' + BOATCLASS, now); updateNewsBadge(); hideLoader(); From c2a482bba126ffd0d9cfe8aa71ec6076cc9904d2 Mon Sep 17 00:00:00 2001 From: ostertun Date: Fri, 2 Oct 2020 17:19:59 +0200 Subject: [PATCH 02/11] Fix RA-#10 background color of mobileConsole --- client/scripts/mobileconsole.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/scripts/mobileconsole.js b/client/scripts/mobileconsole.js index d6532e2..f5d21fc 100644 --- a/client/scripts/mobileconsole.js +++ b/client/scripts/mobileconsole.js @@ -335,7 +335,7 @@ var mobileConsole = (function () { var elements = { lines: [], acItems: [], - base: createElem('div', 'base', { + base: createElem('div', 'base page-bg', { boxSizing: 'border-box', position: 'fixed', resize: 'none', From ae9bf02c491850d0992b5d50f5a79be80b52ac45 Mon Sep 17 00:00:00 2001 From: ostertun Date: Fri, 2 Oct 2020 17:42:33 +0200 Subject: [PATCH 03/11] RA-#13 Dont show install promt when welcome banner active --- client/scripts/pwa.js.php | 125 +++++++++++++++++++++----------------- 1 file changed, 69 insertions(+), 56 deletions(-) diff --git a/client/scripts/pwa.js.php b/client/scripts/pwa.js.php index 35667bd..f407660 100644 --- a/client/scripts/pwa.js.php +++ b/client/scripts/pwa.js.php @@ -1,10 +1,10 @@ //Loading the Service Worker var swRegistration = null; @@ -16,31 +16,31 @@ if ('serviceWorker' in navigator) { } -$(document).ready(function(){ - 'use strict' - +$(document).ready(function(){ + 'use strict' + var pwaVersion = ''; //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); - + //Creating Cookie System for PWA Hide function createCookie(e, t, n) {if (n) {var o = new Date;o.setTime(o.getTime() + n * 365 * 24 * 3600 * 1e3);var r = "; expires=" + o.toGMTString()} else var r = "";document.cookie = e + "=" + t + r + "; path=/"} function readCookie(e) {for (var t = e + "=", n = document.cookie.split(";"), o = 0; o < n.length; o++) {for (var r = n[o];" " == r.charAt(0);) r = r.substring(1, r.length);if (0 == r.indexOf(t)) return r.substring(t.length, r.length)}return null} function eraseCookie(e) {createCookie(e, "", -1)} - + //Enabling dismiss button setTimeout(function(){ $('.pwa-dismiss').on('click',function(){ console.log('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'); + $('body').find('#menu-install-pwa-android, #menu-install-pwa-ios, .menu-hider').removeClass('menu-active'); }); },1500); - + //Detecting Mobile Operating Systems var isMobile = { Android: function() {return navigator.userAgent.match(/Android/i);}, @@ -49,8 +49,8 @@ $(document).ready(function(){ }; var isInWebAppiOS = (window.navigator.standalone == true); var isInWebAppChrome = (window.matchMedia('(display-mode: standalone)').matches); - - //Firing PWA prompts for specific versions and when not on home screen. + + //Firing PWA prompts for specific versions and when not on home screen. if (isMobile.Android()) { console.log('Android Detected'); function showInstallPromotion(){ @@ -60,7 +60,7 @@ $(document).ready(function(){ setTimeout(function(){ $('.add-to-home').addClass('add-to-home-visible add-to-home-android'); $('#menu-install-pwa-android, .menu-hider').addClass('menu-active') - },4500); + },3000); } } else { console.log('The div #menu-install-pwa-android was not found. Please add this div to show the install window') @@ -70,7 +70,12 @@ $(document).ready(function(){ window.addEventListener('beforeinstallprompt', (e) => { e.preventDefault(); deferredPrompt = e; - showInstallPromotion(); + var welcomActive = $('#menu-welcome').hasClass('menu-active'); + if (welcomActive) { + $('#menu-welcome-a-okay').click(showInstallPromotion); + } else { + showInstallPromotion(); + } }); $('.pwa-install').on('click',function(e){ deferredPrompt.prompt(); @@ -87,26 +92,34 @@ $(document).ready(function(){ window.addEventListener('appinstalled', (evt) => { $('#menu-install-pwa-android, .menu-hider').removeClass('menu-active') }); - } - + } + if (isMobile.iOS()) { if(!isInWebAppiOS){ console.log('iOS Detected'); if($('#menu-install-pwa-ios, .add-to-home').length){ if (!readCookie('Sticky_pwa_rejected_install')) { - console.log('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'); - },4500); + function triggerPwaInstallIos() { + console.log('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'); + },3000); + } + var welcomActive = $('#menu-welcome').hasClass('menu-active'); + if (welcomActive) { + $('#menu-welcome-a-okay').click(triggerPwaInstallIos); + } else { + triggerPwaInstallIos(); + } }; } else { console.log('The div #menu-install-pwa-ios was not found. Please add this div to show the install window') } } - } + } + - //Creating Update Modal function updateModal(){ var body = $('body'); @@ -116,7 +129,7 @@ $(document).ready(function(){ if(!updateModal.length){ body.append(''); setTimeout(function(){ - body.find('#menu-update').load('menu-update.html?ver='+menuUpdate); + body.find('#menu-update').load('menu-update.html?ver='+menuUpdate); },250); } }; @@ -132,8 +145,8 @@ $(document).ready(function(){ window.location.reload(true) } }, 1000); - caches.delete('workbox-runtime').then(function() { - console.log('Content Updated - Cache Removed!'); + caches.delete('workbox-runtime').then(function() { + console.log('Content Updated - Cache Removed!'); }); //localStorage.clear(); sessionStorage.clear() @@ -143,17 +156,17 @@ $(document).ready(function(){ }); }); }; - - //Check Version + + //Check Version function check_version(){ if($('link[data-pwa-version]').length){ - function versionCheck(){ + function versionCheck(){ var dt = new Date(); var maniTimeVersion = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds(); var localVersionNumber = $('link[rel="manifest"]').data('pwa-version'); var onlineVersionJSON = "/manifest.json.php?ver=" + maniTimeVersion; var onlineVersionNumber = "Connection Offline. Waiting to Reconect"; - $.getJSON(onlineVersionJSON, function(onlineData) {onlineVersionNumber = onlineData.version;}); + $.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"){ @@ -161,16 +174,16 @@ $(document).ready(function(){ console.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'); + $('.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 == localVersionNumber){/*No update required. Versions Identical*/} + if(onlineVersionNumber === "undefined"){/*Error Checking for Updates*/} if(onlineVersionNumber === "Finding Online Version..."){ - $('.reloadme').addClass('disabled'); + $('.reloadme').addClass('disabled'); $('body').find('#menu-update').removeClass('menu-active'); - $('.menu-hider').removeClass('menu-active-no-click'); + $('.menu-hider').removeClass('menu-active-no-click'); } },3000); } @@ -184,15 +197,15 @@ $(document).ready(function(){ if(pwaCookie == false){ eraseCookie('Sticky_pwa_rejected_install'); } - - //Reload To Clear Button + + //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'); @@ -200,24 +213,24 @@ $(document).ready(function(){ $('body').append('

' + strings['inetMsgOffline'] + '

'); $('body').append('

' + strings['inetMsgOnline'] + '

'); } - + //Offline Function Show function isOffline(){ $('.offline-message').addClass('offline-message-active'); $('.online-message').removeClass('online-message-active'); setTimeout(function(){$('.offline-message').removeClass('offline-message-active');},2000); } - + //Online Function Show function isOnline(){ $('.online-message').addClass('online-message-active'); $('.offline-message').removeClass('offline-message-active'); 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 @@ -226,9 +239,9 @@ $(document).ready(function(){ if(detectHREF.match(/.html/)){ isOffline(); return false; - } - } - + } + } + //Check if Online / Offline function updateOnlineStatus(event) { var condition = navigator.onLine ? "online" : "offline"; @@ -243,10 +256,10 @@ $(document).ready(function(){ } window.addEventListener('online', updateOnlineStatus); window.addEventListener('offline', updateOfflineStatus); - - + + if(pwaNoCache == true){ - caches.delete('workbox-runtime').then(function() { + caches.delete('workbox-runtime').then(function() { }); localStorage.clear(); sessionStorage.clear() @@ -256,6 +269,6 @@ $(document).ready(function(){ }); }); } - - -}); \ No newline at end of file + + +}); From 760c05286e603556847f0cd4b94d1f792ba2b490 Mon Sep 17 00:00:00 2001 From: ostertun Date: Fri, 2 Oct 2020 19:26:03 +0200 Subject: [PATCH 04/11] RA-#22 Added planning incl setState --- client/styles/regatten.css | 2 +- server/content/planning.php | 64 +++-- server/scripts/onRegattaClicked.js | 41 ++-- server/scripts/planning.js | 312 +++++++++++++++++++++++++ server/templates/menu/item-switch.html | 8 + 5 files changed, 395 insertions(+), 32 deletions(-) create mode 100644 server/scripts/planning.js create mode 100644 server/templates/menu/item-switch.html diff --git a/client/styles/regatten.css b/client/styles/regatten.css index 4f22174..951cde7 100644 --- a/client/styles/regatten.css +++ b/client/styles/regatten.css @@ -194,4 +194,4 @@ blockquote { -ms-animation: fa-blink .75s linear infinite; -o-animation: fa-blink .75s linear infinite; animation: fa-blink .75s linear infinite; -} \ No newline at end of file +} diff --git a/server/content/planning.php b/server/content/planning.php index 85a23df..657f3db 100644 --- a/server/content/planning.php +++ b/server/content/planning.php @@ -1,19 +1,47 @@ load('error', ['404', 'Seite existiert noch nicht']); - $content .= '

'; - $content .= 'Die gesuchte Seite ist leider noch nicht verfügbar.
'; - $content .= 'Wir arbeiten daran, sie schnellstmöglich zur Verfügung zu stellen.
'; - $content .= 'Wie wäre es mit der Homepage?'; - $content .= '

'; - $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, 'css-class' => 'text-center pt-3']); - -?> \ No newline at end of file + + $sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name']; + $sp['backbutton'] = 'index'; + $sp['activenav'] = 5; + + // Title + $content = '

Saison-Planung

'; + $content .= '

Hinweis: Diese Seite kannst nur Du sehen.
Wenn Du Deine Saison-Planung teilen möchtest, klicke hier

'; + $content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']); + + $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-loggedin']); + + // Not loggedin + $content = '

Saison-Planung

'; + $content .= '

Um Deine Saison-Planung zu sehen, musst Du angemeldet sein.
Melde Dich hier an oder registriere Dich jetzt kostenlos.

'; + + $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-notloggedin']); + + // Regattas + $content = '

'; + $content .= $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text', 'css-class' => 'mt-2']); + $content .= '
'; + + $sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas', 'css-class' => 'show-loggedin']); + + // Menu + $items = ''; + $items .= $tpl->load('menu/item-icon', ['Status bearbeiten', '#', 'html-id' => 'menu-item-status', 'icon' => 'fa-edit']); + $items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']); + $items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']); + $items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']); + $items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']); + $items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']); + $items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']); + $items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']); + $sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]); + + // Menu Edit status + $items = $tpl->load('menu/item-switch', ['Gemeldet', 'html-id' => 'switch-status-gemeldet', 'icon' => 'fa-file-signature']); + $items .= $tpl->load('menu/item-switch', ['Bezahlt', 'html-id' => 'switch-status-bezahlt', 'icon' => 'fa-euro-sign', 'css-class' => 'border-0']); + $sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-status', 'title' => 'Status bearbeiten', 'height' => 220]); + + $sp['scripts'] .= $scripts->load('onRegattaClicked'); + $sp['scripts'] .= $scripts->load('planning'); + +?> diff --git a/server/scripts/onRegattaClicked.js b/server/scripts/onRegattaClicked.js index 0c7dd64..af713a4 100644 --- a/server/scripts/onRegattaClicked.js +++ b/server/scripts/onRegattaClicked.js @@ -1,11 +1,11 @@ async function onRegattaClicked(id) { var regatta = await dbGetData('regattas', id); - + $('#menu-regatta').find('.menu-title').find('p').text(regatta.name); - + var dateTo = parseDate(regatta['date']); dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0)); - + var plannings = await dbGetDataIndex('plannings', 'regatta', regatta['id']); var planning = null; if (isLoggedIn()) { @@ -16,7 +16,7 @@ async function onRegattaClicked(id) { } } } - + // Your Planning if (planning != null) { $('#menu-item-yourplanning').show(); @@ -32,11 +32,26 @@ async function onRegattaClicked(id) { crew.push(sailor.name); } } + var status = ''; + if (planning.gemeldet == '1') status = 'gemeldet'; + if (planning.bezahlt == '1') { + if (status != '') status += ' und '; + status += 'bezahlt'; + } + if (status != '') crew.push('' + status + ''); $('#menu-item-yourplanning').html(crew.join('
')); } else { $('#menu-item-yourplanning').hide(); } - + + // Planning: Edit Status + if ((planning != null) && (typeof planningEditStatus === 'function')) { + $('#menu-item-status').show(); + $('#menu-item-status').attr('onclick', 'planningEditStatus(' + regatta['id'] + ')'); + } else { + $('#menu-item-status').hide(); + } + // Planning if ((plannings.length > 0) && (dateTo >= today)) { $('#menu-item-plannings').show(); @@ -44,7 +59,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-plannings').hide(); } - + // Results var results = await dbGetDataIndex('results', 'regatta', regatta['id']); if (results.length > 0) { @@ -53,7 +68,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-results').hide(); } - + // Bericht if (regatta['bericht'] != '') { $('#menu-item-bericht').show(); @@ -62,7 +77,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-bericht').hide(); } - + // Info if (regatta['info'] != '') { $('#menu-item-info').show(); @@ -71,7 +86,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-info').hide(); } - + // Meldung if ((regatta['meldung'] != '') && (dateTo >= today)) { $('#menu-item-meldung').show(); @@ -129,7 +144,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-meldung').hide(); } - + // off. results if (regatta['oresults'] != '') { $('#menu-item-oresults').show(); @@ -138,7 +153,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-oresults').hide(); } - + // club website var clubwebsite = ''; if (regatta['club'] != null) { @@ -151,7 +166,7 @@ async function onRegattaClicked(id) { } else { $('#menu-item-clubwebsite').hide(); } - + $('#menu-regatta').showMenu(); $('#menu-regatta').scrollTop(0); -} \ No newline at end of file +} diff --git a/server/scripts/planning.js b/server/scripts/planning.js new file mode 100644 index 0000000..a109b34 --- /dev/null +++ b/server/scripts/planning.js @@ -0,0 +1,312 @@ +async function planningSwitchChanged() { + showLoader(); + var id = $('#switch-status-gemeldet').data('regatta'); + var gemeldet = $('#switch-status-gemeldet').prop('checked'); + var bezahlt = $('#switch-status-bezahlt').prop('checked'); + var auth = { + id: localStorage.getItem('auth_id'), + hash: localStorage.getItem('auth_hash') + } + $.ajax({ + url: QUERY_URL + 'planning_set_state', + method: 'POST', + data: { + auth: auth, + regatta: id, + gemeldet: gemeldet, + bezahlt: bezahlt + }, + error: function (xhr, status, error) { + if (xhr.status == 401) { + console.log('authentification failed'); + toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.'); + } else if (xhr.status == 0) { + toastError('Du bist momentan offline.
Stelle eine Internetverbindung her, um den Status zu ändern'); + } else { + console.log('Login: unbekannter Fehler', status, error); + console.log(xhr); + toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000); + } + $('#menu-status').hideMenu(); + hideLoader(); + }, + success: function (data, status, xhr) { + sync(); + hideLoader(); + } + }); + console.log(id, gemeldet, bezahlt); + hideLoader(); +} + +async function planningEditStatus(id) { + $('#menu-regatta').hideMenu(); + + var regatta = await dbGetData('regattas', id); + + $('#menu-status').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; + } + } + } + + if (planning !== null) { + $('#switch-status-gemeldet').data('regatta', id); + $('#switch-status-gemeldet').prop('checked', planning.gemeldet == '1'); + $('#switch-status-bezahlt').prop('checked', planning.bezahlt == '1'); + $('#menu-status').showMenu(); + } +} + +function selectChange() { + var val = $('#select-year').val(); + + if (typeof siteScript === 'function') { + history.replaceState(null, '', '?year=' + val); + siteScript(); + } +} + +function initYear() { + var year = findGetParameter('year'); + if (year === null) year = new Date().getFullYear(); + + $('#select-year').html(''); + $('#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 += '
Heute ist der ' + formatDate('d.m.Y', today) + '
'; + } else if (search($('#input-search').val(), entry.keywords)) { + list += entry.content; + } + }); + $('#div-regattas').html(list); + }, 0); +} + +var siteScript = async function() { + if (!isLoggedIn()) { + hideLoader(); + return; + } + + if (firstCall) { + firstCall = false; + initYear(); + $('#select-year').change(selectChange); + $('#input-search').on('input', drawList); + $('#switch-status-gemeldet').parent().parent().click(planningSwitchChanged); + $('#switch-status-bezahlt').parent().parent().click(planningSwitchChanged); + } + + 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.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) { + 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 += ''; + } + $('#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.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 (entry.planning.steuermann != null) row.keywords.push(entry.planning.steuermann); + for (c in entry.planning.crew) row.keywords.push(entry.planning.crew[c]); + + if (!heute && (today <= dateFrom)) { + rows.push(null); + heute = true; + } + + row.content += '
'; + + // ZEILE 1 + // Name + row.content += '
' + (entry['canceled'] == 1 ? '' : '') + entry['name'] + (entry['canceled'] == 1 ? '' : '') + '
'; + + // ZEILE 2 + row.content += '
'; + + // Number + row.content += '
' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '
'; + + // Club + row.content += '
' + ((club != null) ? club['kurz'] : '') + '
'; + + // Special + row.content += '
' + entry['special'] + '
'; + + // Icons + var icons = []; + if ((entry['meldung'] != '') && (dateTo >= today) && (entry['meldungOffen'] == '1') && (entry.planning.gemeldet != '1')) { + var color = ''; + var planning = null; + if (isLoggedIn()) { + var plannings = await dbGetDataIndex('plannings', 'regatta', entry['id']); + for (id in plannings) { + if (plannings[id]['user'] == USER_ID) { + planning = plannings[id]; + break; + } + } + } + if (entry['meldungSchluss'] != null) { + if ((planning == null) || (planning['gemeldet'] == '0')) { + 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'; + } + } + } + if ((planning != null) && (planning['gemeldet'] == '0')) { + color += ' fa-blink'; + } + icons.push(''); + } + if (entry['bericht'] != '') + icons.push(''); + if (entry['canceled'] == '1') { + icons.push(''); + } else if (regattaResults[entry['id']]) { + icons.push(''); + } + if (entry.planning.gemeldet == '1') { + icons.push(''); + } + if (entry.planning.bezahlt == '1') { + icons.push(''); + } + row.content += '
' + icons.join(' ') + '
'; + + row.content += '
'; + + // ZEILE 3 + row.content += '
'; + + // Date + if (entry['length'] < 1) { + if (formatDate('d.m', dateFrom) == '01.01') { + row.content += '
Datum noch unklar
'; + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - Datum nicht final
'; + } + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '
'; + } + + // RLF + row.content += '
' + parseFloat(entry['rlf']).toFixed(2) + '
'; + + row.content += '
'; + + rows.push(row); + } + + if (!heute) { + rows.push(null); + } + + drawList(); + + } else { + $('#p-count').html('Du hast noch keine Regatten in Deiner Saison-Planung!'); + $('#div-regattas').hide(); + $('#input-search').parent().hide(); + } + + hideLoader(); +} diff --git a/server/templates/menu/item-switch.html b/server/templates/menu/item-switch.html new file mode 100644 index 0000000..5a9d966 --- /dev/null +++ b/server/templates/menu/item-switch.html @@ -0,0 +1,8 @@ + + + $$0; +
+ + +
+ From eaa08ba3015fcf14006deba8524ddbe64e3ea451 Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 11:53:54 +0200 Subject: [PATCH 05/11] Custom log function => log current time --- client/scripts/custom.js.php | 274 ++++++++++++++++---------------- client/scripts/database.js | 82 +++++----- client/scripts/mobileconsole.js | 47 +++++- client/scripts/pwa.js.php | 28 ++-- client/scripts/regatten.js.php | 45 ++++-- server/scripts/boats.js | 52 +++--- server/scripts/contact.js | 4 +- server/scripts/sailors.js | 52 +++--- 8 files changed, 313 insertions(+), 271 deletions(-) diff --git a/client/scripts/custom.js.php b/client/scripts/custom.js.php index 51efae7..308f4a4 100644 --- a/client/scripts/custom.js.php +++ b/client/scripts/custom.js.php @@ -1,9 +1,9 @@ var loaderCount = 2; @@ -29,17 +29,17 @@ $(window).on('load',function(){ $(document).ready(function(){ 'use strict' - + var isAJAX = false; //Enables or disable AJAX page transitions and loading. var isDevelopment = false; // Enables development mode. Clean cache & Stops BG & Highlights from changing defaults. - + function init_template(){ - + //ADD YOUR CUSTOM JAVASCRIPT CODES HERE! //Do not put inside HTML files. //The init_template() function will be triggered when pages open. - - + + //Generating Dynamic Styles to decrease CSS size and execute faster loading times. var colorsArray = [ //colors must be in HEX format. @@ -93,24 +93,24 @@ $(document).ready(function(){ ["skype","#12A5F4"], ["instagram","#e1306c"] ]; - - + + //Back Button Scroll Stop //if ('scrollRestoration' in history) {history.scrollRestoration = 'manual';} - + //Disable Page Jump on Empty Links. $('a').on('click', function(){var attrs = $(this).attr('href'); if(attrs === '#'){return false;}}); - + //Adding Background for Gradient if(!$('.menu-hider').length){$('#page').append('
');} - + /*Menu Extender Function*/ $.fn.showMenu = function() {$(this).addClass('menu-active'); $('#footer-bar').addClass('footer-menu-hidden');setTimeout(function(){$('.menu-hider').addClass('menu-active');},250);$('body').addClass('modal-open')}; $.fn.hideMenu = function() {$(this).removeClass('menu-active'); $('#footer-bar').removeClass('footer-menu-hidden');$('.menu-hider').removeClass('menu-active menu-active-clear');$('body').removeClass('modal-open')}; - + //Add your programatically triggered menus here - - + + //Menu Required Variables var menu = $('.menu'), body = $('body'), @@ -123,21 +123,21 @@ $(document).ready(function(){ pageContent = $('.page-content'), headerAndContent = $('.header, .page-content, #footer-bar'), menuDeployer = $('a[data-menu]'); - + //Menu System menu.each(function(){ var menuHeight = $(this).data('menu-height'); var menuWidth = $(this).data('menu-width'); var menuActive = $(this).data('menu-active'); - if($(this).hasClass('menu-box-right')){$(this).css("width",menuWidth);} - if($(this).hasClass('menu-box-left')){$(this).css("width",menuWidth);} - if($(this).hasClass('menu-box-bottom')){$(this).css("height",menuHeight);} - if($(this).hasClass('menu-box-top')){$(this).css("height",menuHeight);} + if($(this).hasClass('menu-box-right')){$(this).css("width",menuWidth);} + if($(this).hasClass('menu-box-left')){$(this).css("width",menuWidth);} + if($(this).hasClass('menu-box-bottom')){$(this).css("height",menuHeight);} + if($(this).hasClass('menu-box-top')){$(this).css("height",menuHeight);} if($(this).hasClass('menu-box-modal')){$(this).css({"height":menuHeight, "width":menuWidth});} - }); + }); //Menu Deploy Click - menuDeployer.on('click',function(){ + menuDeployer.on('click',function(){ menu.removeClass('menu-active'); menuHider.addClass('menu-active'); @@ -147,23 +147,23 @@ $(document).ready(function(){ var menuWidth = menuID.data('menu-width'); var menuHeight = menuID.data('menu-height'); $('body').addClass('modal-open'); - if(menuID.hasClass('menu-header-clear')){menuHider.addClass('menu-active-clear');} - function menuActivate(){menuID = 'menu-active' ? menuID.addClass('menu-active') : menuID.removeClass('menu-active');} + if(menuID.hasClass('menu-header-clear')){menuHider.addClass('menu-active-clear');} + function menuActivate(){menuID = 'menu-active' ? menuID.addClass('menu-active') : menuID.removeClass('menu-active');} if(menuID.hasClass('menu-box-bottom')){$('#footer-bar').addClass('footer-menu-hidden');} if(menuEffect === "menu-parallax"){ - if(menuID.hasClass('menu-box-bottom')){headerAndContent.css("transform", "translateY("+(menuHeight/5)*(-1)+"px)");} - if(menuID.hasClass('menu-box-top')){headerAndContent.css("transform", "translateY("+(menuHeight/5)+"px)");} - if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX("+(menuWidth/5)+"px)");} + if(menuID.hasClass('menu-box-bottom')){headerAndContent.css("transform", "translateY("+(menuHeight/5)*(-1)+"px)");} + if(menuID.hasClass('menu-box-top')){headerAndContent.css("transform", "translateY("+(menuHeight/5)+"px)");} + if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX("+(menuWidth/5)+"px)");} if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX("+(menuWidth/5)*(-1)+"px)");} - } + } if(menuEffect === "menu-push"){ - if(menuID.hasClass('menu-box-bottom')){headerAndContent.css("transform", "translateY("+(menuHeight)*(-1)+"px)");} - if(menuID.hasClass('menu-box-top')){headerAndContent.css("transform", "translateY("+(menuHeight)+"px)");} - if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX("+(menuWidth)+"px)");} + if(menuID.hasClass('menu-box-bottom')){headerAndContent.css("transform", "translateY("+(menuHeight)*(-1)+"px)");} + if(menuID.hasClass('menu-box-top')){headerAndContent.css("transform", "translateY("+(menuHeight)+"px)");} + if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX("+(menuWidth)+"px)");} if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX("+(menuWidth)*(-1)+"px)");} - } + } if(menuEffect === "menu-push-full"){ - if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX(100%)");} + if(menuID.hasClass('menu-box-left')){headerAndContent.css("transform", "translateX(100%)");} if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX(-100%)");} } menuActivate(); @@ -204,13 +204,13 @@ $(document).ready(function(){ setTimeout(function(){ if($('body').hasClass('detect-theme')){$('body').removeClass('detect-theme');} if($('body').hasClass('theme-light')){ - eraseCookie('sticky_dark_mode'); - darkSwitch.prop('checked', false); + eraseCookie('sticky_dark_mode'); + darkSwitch.prop('checked', false); createCookie('sticky_light_mode', true, 1); } if($('body').hasClass('theme-dark')){ - eraseCookie('sticky_light_mode'); - darkSwitch.prop('checked', true); + eraseCookie('sticky_light_mode'); + darkSwitch.prop('checked', true); createCookie('sticky_dark_mode', true, 1); } },150); @@ -222,7 +222,7 @@ $(document).ready(function(){ //Auto Dark Mode function activateDarkMode(){$('body').removeClass('theme-light').addClass('theme-dark'); $('#dark-mode-detected').removeClass('disabled'); eraseCookie('sticky_light_mode'); createCookie('sticky_dark_mode', true, 1);} function activateLightMode(){$('body').removeClass('theme-dark').addClass('theme-light'); $('#dark-mode-detected').removeClass('disabled'); eraseCookie('sticky_dark_mode'); createCookie('sticky_light_mode', true, 1);} - function activateNoPreference(){$('#manual-mode-detected').removeClass('disabled');} + function activateNoPreference(){$('#manual-mode-detected').removeClass('disabled');} function setColorScheme() { const isDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches @@ -244,19 +244,19 @@ $(document).ready(function(){ $('.footer-bar-2 .active-nav, .footer-bar-4 .active-nav, .footer-bar-5 .active-nav').append('') } } - + //Back Button in Header var backButton = $('.back-button, [data-back-button]'); backButton.on('click', function() { window.history.go(-1); //return false; }); - - //Copyright Year + + //Copyright Year var copyrightYear = $('.copyright-year, #copyright-year'); var dteNow = new Date(); var intYear = dteNow.getFullYear(); copyrightYear.html(intYear); - + //Back to top Badge var backToTop = $('.back-to-top, [data-back-to-top], .back-to-top-badge, .back-to-top-icon'), backToTopBadge = $('.back-to-top-badge, .back-to-top-icon'); @@ -293,7 +293,7 @@ $(document).ready(function(){ show_back_to_top_badge(); show_scroll_ad(); $('.header-auto-show').addClass('header-active'); - } + } if (footer_reached == true){ hide_back_to_top_badge(); hide_scroll_ad(); @@ -333,10 +333,10 @@ $(document).ready(function(){ if(tab.length){activate_tabs()} //Text Resizer - $(".text-size-increase").click(function() {$(".text-size-changer *").css("font-size","+=1");}); + $(".text-size-increase").click(function() {$(".text-size-changer *").css("font-size","+=1");}); $(".text-size-decrease").click(function() {$(".text-size-changer *").css("font-size","-=1");}); $(".text-size-default").click(function() {$(".text-size-changer *").css("font-size", "");}); - + //Search Menu Functions function search_menu(){ $('[data-search]').on('keyup', function() { @@ -387,15 +387,15 @@ $(document).ready(function(){ //Owl Carousel Sliders setTimeout(function(){ - $('.user-slider').owlCarousel({loop:false, margin:20, nav:false, lazyLoad:true, items:1, autoplay: false, dots:false, autoplayTimeout:4000}); - $('.single-slider').owlCarousel({loop:true, margin:20, nav:false, lazyLoad:true, items:1, autoplay: true, autoplayTimeout:4000}); - $('.cover-slider').owlCarousel({loop:true, margin:0, nav:false, lazyLoad:true, items:1, autoplay: true, autoplayTimeout:6000}); - $('.double-slider').owlCarousel({loop:true, margin:20, nav:false, lazyLoad:false, items:2, autoplay: true, autoplayTimeout:4000}); - $('.task-slider').owlCarousel({loop:true, margin:20, nav:false, stagePadding:50, lazyLoad:true, items:2, autoplay: false, autoplayTimeout:4000}); - $('.next-slide, .next-slide-arrow, .next-slide-text, .cover-next').on('click',function(){$(this).parent().find('.owl-carousel').trigger('next.owl.carousel');}); - $('.prev-slide, .prev-slide-arrow, .prev-slide-text, .cover-prev').on('click',function(){$(this).parent().find('.owl-carousel').trigger('prev.owl.carousel');}); - $('.next-slide-user').on('click',function(){$(this).closest('.owl-carousel').trigger('next.owl.carousel');}); - $('.prev-slide-user').on('click',function(){$(this).closest('.owl-carousel').trigger('prev.owl.carousel');}); + $('.user-slider').owlCarousel({loop:false, margin:20, nav:false, lazyLoad:true, items:1, autoplay: false, dots:false, autoplayTimeout:4000}); + $('.single-slider').owlCarousel({loop:true, margin:20, nav:false, lazyLoad:true, items:1, autoplay: true, autoplayTimeout:4000}); + $('.cover-slider').owlCarousel({loop:true, margin:0, nav:false, lazyLoad:true, items:1, autoplay: true, autoplayTimeout:6000}); + $('.double-slider').owlCarousel({loop:true, margin:20, nav:false, lazyLoad:false, items:2, autoplay: true, autoplayTimeout:4000}); + $('.task-slider').owlCarousel({loop:true, margin:20, nav:false, stagePadding:50, lazyLoad:true, items:2, autoplay: false, autoplayTimeout:4000}); + $('.next-slide, .next-slide-arrow, .next-slide-text, .cover-next').on('click',function(){$(this).parent().find('.owl-carousel').trigger('next.owl.carousel');}); + $('.prev-slide, .prev-slide-arrow, .prev-slide-text, .cover-prev').on('click',function(){$(this).parent().find('.owl-carousel').trigger('prev.owl.carousel');}); + $('.next-slide-user').on('click',function(){$(this).closest('.owl-carousel').trigger('next.owl.carousel');}); + $('.prev-slide-user').on('click',function(){$(this).closest('.owl-carousel').trigger('prev.owl.carousel');}); },10); setTimeout(function(){ $('.owl-prev, .owl-next').addClass('bg-highlight'); @@ -428,20 +428,20 @@ $(document).ready(function(){ //Toast, Snackbars and Notifications $('[data-toast]').on('click',function(){ - $('.toast, .snackbar-toast, .notification').toast('hide'); - $('#'+$(this).data('toast')).toast('show'); + $('.toast, .snackbar-toast, .notification').toast('hide'); + $('#'+$(this).data('toast')).toast('show'); return false; }); $('[data-dismiss]').on('click',function(){ var thisData = $(this).data('dismiss'); $('#'+thisData).toast('hide'); }); - + //Tooltips $(function () { $('[data-toggle="tooltip"]').tooltip() }) - + //Cancel Collapse Jump on Click if($('[data-toggle="collapse"]').length){ $('[data-toggle="collapse"]').on('click',function(e){ @@ -467,10 +467,10 @@ $(document).ready(function(){ $('#'+thisID).prop('checked', false); } else { $('#'+thisID).prop('checked', true); - } + } }) - //Working Hours + //Working Hours var businessHours = $('.business-hours'); function activate_business_hours(){ if(businessHours.length){ @@ -501,7 +501,7 @@ $(document).ready(function(){ }, openClass:"bg-green1-dark is-business-opened", closedClass:"bg-red2-dark is-business-closed" - }); + }); if(businessHours.hasClass('is-business-opened')){ $('.show-business-opened').removeClass('disabled'); $('.show-business-closed').addClass('disabled'); @@ -540,7 +540,7 @@ $(document).ready(function(){ })(document, window.navigator, "standalone") } ath(); - + //Add to Home Banners $('.simulate-android-badge').on('click',function(){$('.add-to-home').removeClass('add-to-home-ios').addClass('add-to-home-visible add-to-home-android');}); $('.simulate-iphone-badge').on('click',function(){$('.add-to-home').removeClass('add-to-home-android').addClass('add-to-home-visible add-to-home-ios');}); @@ -549,16 +549,16 @@ $(document).ready(function(){ $('.simulate-ios-banner').on('click',function(){$('#menu-install-pwa-ios, .menu-hider').addClass('menu-active')}) //Extending Card Features - function card_extender(){ + function card_extender(){ /*Set Page Content to Min 100vh*/ if($('.is-on-homescreen').length){ var windowHeight = screen.height; $('.page-content, #page').css('min-height', windowHeight); - } + } if(!$('.is-on-homescreen').length){ var windowHeight = window.innerHeight $('.page-content, #page').css('min-height', windowHeight); - } + } $('[data-card-height]').each(function(){ var cardHeight = $(this).data('card-height'); @@ -567,8 +567,8 @@ $(document).ready(function(){ $(this).css('height', cardHeight); if(cardHeight == "cover"){ if(header.length && menuFooter.length){ - $(this).css('height', windowHeight -headerHeight - footerHeight) - $('.map-full, .map-full iframe').css('height', windowHeight - headerHeight - footerHeight +14) + $(this).css('height', windowHeight -headerHeight - footerHeight) + $('.map-full, .map-full iframe').css('height', windowHeight - headerHeight - footerHeight +14) } else { $(this).css('height', windowHeight) $('.map-full, .map-full iframe').css('height', windowHeight) @@ -581,20 +581,20 @@ $(document).ready(function(){ $(window).resize(function(){ card_extender(); }); - + //Show Map $('.show-map, .hide-map').on('click',function(){ $('.map-full .caption').toggleClass('deactivate-map'); $('.map-but-1, .map-but-2').toggleClass('deactivate-map'); $('.map-full .hide-map').toggleClass('activate-map'); - }); + }); //Card Hovers - $('.card-scale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-scale-image');}); - $('.card-grayscale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-grayscale-image');}); - $('.card-rotate').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-rotate-image');}); - $('.card-blur').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-blur-image');}); + $('.card-scale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-scale-image');}); + $('.card-grayscale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-grayscale-image');}); + $('.card-rotate').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-rotate-image');}); + $('.card-blur').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('card-blur-image');}); $('.card-hide').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('.card-center, .card-bottom, .card-top, .card-overlay').toggleClass('card-hide-image');}); @@ -605,7 +605,7 @@ $(document).ready(function(){ var readingSeconds = readingWords % 60 $('.reading-progress-words').append(readingWords); $('.reading-progress-time').append(readingMinutes + ':' + readingSeconds); - }); + }); //Timed Ads if($('[data-auto-show-ad]').length){ @@ -614,7 +614,7 @@ $(document).ready(function(){ $('[data-auto-show-ad]').trigger('click'); },time*1000); } - $('[data-timed-ad]').on('click', function(){ + $('[data-timed-ad]').on('click', function(){ var counter = $(this).data('timed-ad'); var adwin = $('#'+$(this).data('menu')); menuHider.addClass('no-click'); @@ -686,10 +686,10 @@ $(document).ready(function(){ }) //Caption Hovers - $('.caption-scale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-scale-image');}); - $('.caption-grayscale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-grayscale-image');}); - $('.caption-rotate').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-rotate-image');}); - $('.caption-blur').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-blur-image');}); + $('.caption-scale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-scale-image');}); + $('.caption-grayscale').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-grayscale-image');}); + $('.caption-rotate').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-rotate-image');}); + $('.caption-blur').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('img').toggleClass('caption-blur-image');}); $('.caption-hide').unbind().bind('mouseenter mouseleave touchstart touchend',function(){$(this).find('.caption-center, .caption-bottom, .caption-top, .caption-overlay').toggleClass('caption-hide-image');}); //File Upload @@ -733,8 +733,8 @@ $(document).ready(function(){ //Age Verification var checkAge = $('.check-age'); function activate_age_checker(){ - console.log('active'); - $(".check-age").on('click',function(){ + log('active'); + $(".check-age").on('click',function(){ var dateBirghtDay = $("#date-birth-day").val(); var dateBirthMonth = $("#date-birth-month").val(); var dateBirthYear = $("#date-birth-year").val(); @@ -747,7 +747,7 @@ $(document).ready(function(){ setDate.setFullYear(mydate.getFullYear() + age, dateBirthMonth-1, dateBirghtDay); if ((currdate - setDate) > 0){ - console.log("above 18"); + log("above 18"); $('#menu-age').removeClass('menu-active') $('#menu-age-okay').addClass('menu-active'); }else{ @@ -756,7 +756,7 @@ $(document).ready(function(){ } return true; }); - } + } if(checkAge.length){activate_age_checker();} @@ -816,11 +816,11 @@ $(document).ready(function(){ var spanValue = $(this).parent().find('span').text(); if($(this).val() != spanValue && $(this).val() != ""){ $(this).parent().find('span').addClass('input-style-1-active').removeClass('input-style-1-inactive'); - } + } if($(this).val() === ""){ $(this).parent().find('span').removeClass('input-style-1-inactive input-style-1-active'); } - }); + }); $('.input-required input, .input-required select, .input-required textarea').on('focusout',function(){ var spanValue = $(this).parent().find('span').text(); if($(this).val() === ""){ @@ -833,17 +833,17 @@ $(document).ready(function(){ if(getValue === "default"){ $(this).parent().find('em').html(invalidIcon) $(this).parent().find('span').removeClass('input-style-1-inactive input-style-1-active'); - } + } if(getValue != "default"){ $(this).parent().find('em').html(validIcon) - } + } }); - $('.input-required input[type="email"]').on('focusout',function(){if (emailValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); + $('.input-required input[type="email"]').on('focusout',function(){if (emailValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); $('.input-required input[type="tel"]').on('focusout',function(){if (phoneValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); - $('.input-required input[type="password"]').on('focusout',function(){if (passwordValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); - $('.input-required input[type="url"]').on('focusout',function(){if (urlValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); - $('.input-required input[type="name"]').on('focusout',function(){if (nameValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); - $('.input-required textarea').on('focusout',function(){if (textareaValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); + $('.input-required input[type="password"]').on('focusout',function(){if (passwordValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); + $('.input-required input[type="url"]').on('focusout',function(){if (urlValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); + $('.input-required input[type="name"]').on('focusout',function(){if (nameValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); + $('.input-required textarea').on('focusout',function(){if (textareaValidator.test($(this).val())){$(this).parent().find('em').html(validIcon);}else{if($(this).val() === ""){$(this).parent().find('em').html("(required)");}else{$(this).parent().find('em').html(invalidIcon);}}}); //Set Today Date to Date Inputs Date.prototype.toDateInputValue = (function() { @@ -880,7 +880,7 @@ $(document).ready(function(){ $('.online-message').addClass('online-message-active'); $('.offline-message').removeClass('offline-message-active'); setTimeout(function(){$('.online-message').removeClass('online-message-active');},2000); - } + } $('.simulate-offline').on('click',function(){isOffline();}) $('.simulate-online').on('click',function(){isOnline();}) @@ -889,11 +889,11 @@ $(document).ready(function(){ function updateOnlineStatus(event) { var condition = navigator.onLine ? "online" : "offline"; isOnline(); - console.log( 'Connection: Online'); + log( 'Connection: Online'); } function updateOfflineStatus(event) { isOffline(); - console.log( 'Connection: Offline'); + log( 'Connection: Offline'); } window.addEventListener('online', updateOnlineStatus); window.addEventListener('offline', updateOfflineStatus); @@ -901,14 +901,14 @@ $(document).ready(function(){ //QR Generator var generateQR = $('.generate-qr-result, .generate-qr-auto'); function activate_qr_generator(){ - //QR Code Generator + //QR Code Generator var qr_auto_link = window.location.href; var qr_api_address = 'https://api.qrserver.com/v1/create-qr-code/?size=200x200&data='; $('.generate-qr-auto').attr('src', qr_api_address+qr_auto_link) $('.generate-qr-button').on('click',function(){ if($(this).parent().find('.fa').hasClass('fa-exclamation-triangle')){ - console.log('Invalid URL'); + log('Invalid URL'); } else { var get_qr_url = $('.generate-qr-input').val(); if(!get_qr_url == ''){ @@ -960,10 +960,10 @@ $(document).ready(function(){ }); //Filterable - if($('.gallery-filter').length > 0){$('.gallery-filter').filterizr(); $('.gallery-filter-active').addClass('color-highlight');} + if($('.gallery-filter').length > 0){$('.gallery-filter').filterizr(); $('.gallery-filter-active').addClass('color-highlight');} $('.gallery-filter-controls li').on('click',function(){ - $('.gallery-filter-controls li').removeClass('gallery-filter-active color-highlight'); - $(this).addClass('gallery-filter-active color-highlight'); + $('.gallery-filter-controls li').removeClass('gallery-filter-active color-highlight'); + $(this).addClass('gallery-filter-active color-highlight'); }); //Gallery Views // Added in 2.0 @@ -982,7 +982,7 @@ $(document).ready(function(){ galleryViewControls.removeClass('color-highlight'); $(this).addClass('color-highlight'); galleryViews.removeClass().addClass('gallery-views gallery-view-2'); - }); + }); galleryView3.on('click',function(){ galleryViewControls.removeClass('color-highlight'); $(this).addClass('color-highlight'); @@ -1064,7 +1064,7 @@ $(document).ready(function(){ }) }); - + //Charts if($('.chart').length > 0){ var loadJS = function(url, implementationCode, location){ @@ -1075,7 +1075,7 @@ $(document).ready(function(){ location.appendChild(scriptTag); }; var call_charts_to_page = function(){ - + var walletChart = $('#wallet-chart'); var pieChart = $('#pie-chart'); var doughnutChart = $('#doughnut-chart'); @@ -1100,9 +1100,9 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, tooltips:{enabled:true}, animation:{duration:1500} } - }); + }); } - + if(pieChart.length){ var pieDemoChart = new Chart(pieChart, { type: 'pie', @@ -1119,7 +1119,7 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, tooltips:{enabled:true}, animation:{duration:1500} } - }); + }); } if(doughnutChart.length){ @@ -1138,7 +1138,7 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, tooltips:{enabled:true}, animation:{duration:1500}, layout:{ padding: {bottom: 30}} } - }); + }); } if(polarChart.length){ @@ -1157,7 +1157,7 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, tooltips:{enabled:true}, animation:{duration:1500}, layout:{ padding: {bottom: 30}} } - }); + }); } if (verticalChart.length){ @@ -1182,7 +1182,7 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, title: {display: false} } - }); + }); } if(horizontalChart.length){ @@ -1206,7 +1206,7 @@ $(document).ready(function(){ legend: {display: true, position:'bottom', labels:{fontSize:13, padding:15,boxWidth:12},}, title: {display: false} } - }); + }); } if(lineChart.length){ @@ -1214,11 +1214,11 @@ $(document).ready(function(){ type: 'line', data: { labels: [2000,2005,2010,2015,2010], - datasets: [{ + datasets: [{ data: [500,400,300,200,300], label: "Desktop Web", borderColor: "#D8334A" - }, { + }, { data: [0,100,300,400,500], label: "Mobile Web", borderColor: "#4A89DC" @@ -1234,11 +1234,11 @@ $(document).ready(function(){ } } loadJS('/client/scripts/charts.js', call_charts_to_page, document.body); - } + } + - //Local Error Message - if (window.location.protocol === "file:"){$('a').on('mouseover',function(){console.log("You are seeing these errors because your file is on your local computer. For real life simulations please use a Live Server or a Local Server such as AMPPS or WAMPP or simulate a Live Preview using a Code Editor like http://brackets.io (it's 100% free) - PWA functions and AJAX Page Transitions will only work in these scenarios.");});} + if (window.location.protocol === "file:"){$('a').on('mouseover',function(){log("You are seeing these errors because your file is on your local computer. For real life simulations please use a Live Server or a Local Server such as AMPPS or WAMPP or simulate a Live Preview using a Code Editor like http://brackets.io (it's 100% free) - PWA functions and AJAX Page Transitions will only work in these scenarios.");});} //Style Generator @@ -1248,21 +1248,21 @@ $(document).ready(function(){ //HEX to RGBA Converter function HEXtoRGBA(hex){ var c; - if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){ + if(/^#([A-Fa-f0-9]{3}){1,2}$/.test(hex)){ c= hex.substring(1).split(''); if(c.length== 3){c= [c[0], c[0], c[1], c[1], c[2], c[2]];} c= '0x'+c.join(''); return 'rgba('+[(c>>16)&255, (c>>8)&255, c&255].join(',')+',0.3)'; } } - + function highlight_colors(){ var bodyColor = readCookie('sticky-color-scheme') if(bodyColor == undefined){var bodyColor = $('body').data('highlight');} - + var bodyBackground = readCookie('sticky-bg-scheme') if(bodyBackground == undefined){var bodyBackground = $('body').data('background');} - + var data = colorsArray.map(colorsArray => colorsArray[0]); if (data.indexOf(bodyColor) > -1) { var highlightLocated = data.indexOf(bodyColor) @@ -1282,7 +1282,7 @@ $(document).ready(function(){ $('.generated-background').append(bodyBG); } } - } + } highlight_colors(); //Change Highlight @@ -1306,7 +1306,7 @@ $(document).ready(function(){ $('body').append('') $('.generated-highlight').append(highlightColor, highlightBg, highlightNav, highlightBorder); } - }); + }); //Change Background $('[data-change-background]').on('click',function(changeColor){ @@ -1322,15 +1322,15 @@ $(document).ready(function(){ }); if (!generatedStyles.length){ - $('body').append(''); + $('body').append(''); $('.generated-styles').append('/*Generated using JS for lower CSS file Size, Easier Editing & Faster Loading*/'); - colorsArray.forEach(function (colorValue) {$('.generated-styles').append('.bg-'+colorValue[0]+'-light{ background-color: '+colorValue[1]+'!important; color:#FFFFFF!important;} .bg-'+colorValue[0]+'-light i, .bg-'+colorValue[0]+'-dark i{color:#FFFFFF;} .bg-'+colorValue[0]+'-dark{ background-color: '+colorValue[2]+'!important; color:#FFFFFF!important;} .border-'+colorValue[0]+'-light{ border-color:'+colorValue[1]+'!important;} .border-'+colorValue[0]+'-dark{ border-color:'+colorValue[2]+'!important;} .color-'+colorValue[0]+'-light{ color: '+colorValue[1]+'!important;} .color-'+colorValue[0]+'-dark{ color: '+colorValue[2]+'!important;}');}); - colorsArray.forEach(function (colorFadeValue) {$('.generated-styles').append('.bg-fade-'+colorFadeValue[0]+'-light{ background-color: '+ HEXtoRGBA(colorFadeValue[1]) + '!important; color:#FFFFFF;} .bg-fade-'+colorFadeValue[0]+'-light i, .bg-'+colorFadeValue[0]+'-dark i{color:#FFFFFF;} .bg-fade-'+colorFadeValue[0]+'-dark{ background-color: '+HEXtoRGBA(colorFadeValue[2])+'!important; color:#FFFFFF;} .border-fade-'+colorFadeValue[0]+'-light{ border-color:'+HEXtoRGBA(colorFadeValue[1])+'!important;} .border-fade-'+colorFadeValue[0]+'-dark{ border-color:'+HEXtoRGBA(colorFadeValue[2])+'!important;} .color-fade-'+colorFadeValue[0]+'-light{ color: '+HEXtoRGBA(colorFadeValue[1])+'!important;} .color-fade-'+colorFadeValue[0]+'-dark{ color: '+HEXtoRGBA(colorFadeValue[2])+'!important;}');}); - colorsArray.forEach(function (gradientValue) {$('.generated-styles').append('.bg-gradient-'+gradientValue[0]+'{background-image: linear-gradient(to bottom, '+gradientValue[1]+' 0, '+gradientValue[2]+' 100%)}')}); + colorsArray.forEach(function (colorValue) {$('.generated-styles').append('.bg-'+colorValue[0]+'-light{ background-color: '+colorValue[1]+'!important; color:#FFFFFF!important;} .bg-'+colorValue[0]+'-light i, .bg-'+colorValue[0]+'-dark i{color:#FFFFFF;} .bg-'+colorValue[0]+'-dark{ background-color: '+colorValue[2]+'!important; color:#FFFFFF!important;} .border-'+colorValue[0]+'-light{ border-color:'+colorValue[1]+'!important;} .border-'+colorValue[0]+'-dark{ border-color:'+colorValue[2]+'!important;} .color-'+colorValue[0]+'-light{ color: '+colorValue[1]+'!important;} .color-'+colorValue[0]+'-dark{ color: '+colorValue[2]+'!important;}');}); + colorsArray.forEach(function (colorFadeValue) {$('.generated-styles').append('.bg-fade-'+colorFadeValue[0]+'-light{ background-color: '+ HEXtoRGBA(colorFadeValue[1]) + '!important; color:#FFFFFF;} .bg-fade-'+colorFadeValue[0]+'-light i, .bg-'+colorFadeValue[0]+'-dark i{color:#FFFFFF;} .bg-fade-'+colorFadeValue[0]+'-dark{ background-color: '+HEXtoRGBA(colorFadeValue[2])+'!important; color:#FFFFFF;} .border-fade-'+colorFadeValue[0]+'-light{ border-color:'+HEXtoRGBA(colorFadeValue[1])+'!important;} .border-fade-'+colorFadeValue[0]+'-dark{ border-color:'+HEXtoRGBA(colorFadeValue[2])+'!important;} .color-fade-'+colorFadeValue[0]+'-light{ color: '+HEXtoRGBA(colorFadeValue[1])+'!important;} .color-fade-'+colorFadeValue[0]+'-dark{ color: '+HEXtoRGBA(colorFadeValue[2])+'!important;}');}); + colorsArray.forEach(function (gradientValue) {$('.generated-styles').append('.bg-gradient-'+gradientValue[0]+'{background-image: linear-gradient(to bottom, '+gradientValue[1]+' 0, '+gradientValue[2]+' 100%)}')}); socialColorArray.forEach(function (socialColorValue) {$('.generated-styles').append('.bg-'+socialColorValue[0]+'{background-color:'+socialColorValue[1]+'!important; color:#FFFFFF;} .color-'+socialColorValue[0]+'{color:'+socialColorValue[1]+'!important;}')}); - colorsArray.forEach(function (gradientBodyValue) {$('.generated-styles').append('.body-'+gradientBodyValue[0]+'{background-image: linear-gradient(to bottom, '+gradientBodyValue[1]+' 0, '+gradientBodyValue[3]+' 100%)}')}); + colorsArray.forEach(function (gradientBodyValue) {$('.generated-styles').append('.body-'+gradientBodyValue[0]+'{background-image: linear-gradient(to bottom, '+gradientBodyValue[1]+' 0, '+gradientBodyValue[3]+' 100%)}')}); } - + function welcomeOk() { createCookie('sticky_welcome_banner', true, 1); $('#menu-welcome').hideMenu(); @@ -1344,16 +1344,16 @@ $(document).ready(function(){ } $('#menu-welcome-a-okay').click(welcomeOk); showWelcome(); - + initRegatten(); - + hideLoader(); - + } //Activating all the plugins setTimeout(init_template, 0); - - //Activate AJAX Transitions + + //Activate AJAX Transitions if(isAJAX === true){ $(function(){ 'use strict'; @@ -1361,7 +1361,7 @@ $(document).ready(function(){ prefetch: true, prefetchOn: 'mouseover', cacheLength: 100, - scroll: true, + scroll: true, blacklist: '.default-link', forms: 'contactForm', onStart: { @@ -1378,7 +1378,7 @@ $(document).ready(function(){ render: function ($container, $newContent) { $container.removeClass('is-exiting');// Remove your CSS animation reversing class $container.html($newContent);// Inject the new content - setTimeout(init_template, 0)//Timeout required to properly initiate all JS Functions. + setTimeout(init_template, 0)//Timeout required to properly initiate all JS Functions. $('#preloader').removeClass('preloader-hide'); } }, @@ -1406,5 +1406,5 @@ $(document).ready(function(){ caches.delete(cacheName); }); }); - } -}); \ No newline at end of file + } +}); diff --git a/client/scripts/database.js b/client/scripts/database.js index 5d4b45a..b8488b3 100644 --- a/client/scripts/database.js +++ b/client/scripts/database.js @@ -20,11 +20,11 @@ var getJSON = function(url, callback) { callback(xhr.status, xhr.response); }; xhr.ontimeout = function () { - console.log("getJSON: timeout"); + log("getJSON: timeout"); callback(0, null); } xhr.onerror = function () { - console.log("getJSON: error"); + log("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 { - console.log("Something went wrong (HTTP " + code + ")"); + log("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 { - console.log("Something went wrong (HTTP " + code + ")"); + log("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 { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); fail(strings.error_network, 5000); resolve([]); } @@ -493,7 +493,7 @@ function sync() { syncInProgress = 11; var syncOkay = true; - console.log("Sync Start"); + log("Sync Start"); $('#i-sync').addClass('fa-spin'); var interval = window.setInterval(function () { @@ -503,7 +503,7 @@ function sync() { var osUpdateTimes = db.transaction('update_times', 'readwrite').objectStore('update_times'); osUpdateTimes.put({ table: 'last_sync', time: now }); } - console.log("Sync Stop"); + log("Sync Stop"); setTimeout(function(){ $('#i-sync').removeClass('fa-spin'); }, 500); @@ -523,7 +523,7 @@ function sync() { getJSON(QUERY_URL + 'get_clubs?changed-after=' + localTimes['clubs'], function (code, data) { if (code == 200) { var os = db.transaction('clubs', 'readwrite').objectStore('clubs'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -541,7 +541,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -555,7 +555,7 @@ function sync() { getJSON(QUERY_URL + 'get_boats?changed-after=' + localTimes['boats'], function (code, data) { if (code == 200) { var os = db.transaction('boats', 'readwrite').objectStore('boats'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -573,7 +573,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -587,7 +587,7 @@ function sync() { getJSON(QUERY_URL + 'get_sailors?changed-after=' + localTimes['sailors'], function (code, data) { if (code == 200) { var os = db.transaction('sailors', 'readwrite').objectStore('sailors'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -605,7 +605,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -619,7 +619,7 @@ function sync() { getJSON(QUERY_URL + 'get_regattas?changed-after=' + localTimes['regattas'], function (code, data) { if (code == 200) { var os = db.transaction('regattas', 'readwrite').objectStore('regattas'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -653,7 +653,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -667,7 +667,7 @@ function sync() { getJSON(QUERY_URL + 'get_results?changed-after=' + localTimes['results'], function (code, data) { if (code == 200) { var os = db.transaction('results', 'readwrite').objectStore('results'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -685,7 +685,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -699,7 +699,7 @@ function sync() { getJSON(QUERY_URL + 'get_plannings?changed-after=' + localTimes['plannings'], function (code, data) { if (code == 200) { var os = db.transaction('plannings', 'readwrite').objectStore('plannings'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -717,7 +717,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -732,7 +732,7 @@ function sync() { getJSON(QUERY_URL + 'get_trim_boats?changed-after=' + localTimes['trim_boats'], function (code, data) { if (code == 200) { var os = db.transaction('trim_boats', 'readwrite').objectStore('trim_boats'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -750,7 +750,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -764,7 +764,7 @@ function sync() { getJSON(QUERY_URL + 'get_trim_users?changed-after=' + localTimes['trim_users'], function (code, data) { if (code == 200) { var os = db.transaction('trim_users', 'readwrite').objectStore('trim_users'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -782,7 +782,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -796,7 +796,7 @@ function sync() { getJSON(QUERY_URL + 'get_trim_trims?changed-after=' + localTimes['trim_trims'], function (code, data) { if (code == 200) { var os = db.transaction('trim_trims', 'readwrite').objectStore('trim_trims'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -814,7 +814,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -832,7 +832,7 @@ function sync() { getJSON(QUERY_URL + 'get_news?changed-after=' + localTimes['news'], function (code, data) { if (code == 200) { var os = db.transaction('news', 'readwrite').objectStore('news'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -850,7 +850,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -864,7 +864,7 @@ function sync() { getJSON(QUERY_URL + 'get_users?changed-after=' + localTimes['users'], function (code, data) { if (code == 200) { var os = db.transaction('users', 'readwrite').objectStore('users'); - console.log(data); + log(data); data.data.forEach(function (entry) { os.put(entry); }); @@ -882,7 +882,7 @@ function sync() { } }; } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress --; } @@ -892,7 +892,7 @@ function sync() { } } else { - console.log("Something went wrong (HTTP " + code + ")"); + log("Something went wrong (HTTP " + code + ")"); syncOkay = false; syncInProgress = 0; } @@ -916,12 +916,12 @@ function initDatabase() { if (window.indexedDB) { var request = window.indexedDB.open('regatten_app_db_' + BOATCLASS, DB_VERSION); request.onerror = function (event) { - console.log("Cannot open DB: " + event.target.errorCode); + log("Cannot open DB: " + event.target.errorCode); runPageScript(); }; request.onsuccess = function (event) { - console.log("Database loaded"); + log("Database loaded"); db = event.target.result; db.onversionchange = function (event) { @@ -934,7 +934,7 @@ function initDatabase() { } db.onerror = function (event) { - console.log("DB Error: " + event.target.errorCode); + log("DB Error: " + event.target.errorCode); }; canUseLocalDB = true; @@ -964,10 +964,10 @@ function initDatabase() { var oldVersion = event.oldVersion; var newVersion = event.newVersion; - console.log("Datenbank Version Upgrade von " + oldVersion + " auf " + newVersion); + log("Datenbank Version Upgrade von " + oldVersion + " auf " + newVersion); if ((oldVersion < 1) && (newVersion >= 1)) { - console.log('to version 1'); + log('to version 1'); var osClubs = db.createObjectStore('clubs', { keyPath: 'id' }); var osBoats = db.createObjectStore('boats', { keyPath: 'id' }); var osSailors = db.createObjectStore('sailors', { keyPath: 'id' }); @@ -996,7 +996,7 @@ function initDatabase() { } if ((oldVersion < 2) && (newVersion >= 2)) { - console.log('to version 2'); + log('to version 2'); var osUsers = db.createObjectStore('users', { keyPath: 'id' }); osUsers.createIndex('username', 'username', { unique: true }); var osUpdateTimes = upgradeTransaction.objectStore('update_times'); @@ -1004,25 +1004,25 @@ function initDatabase() { } if ((oldVersion < 3) && (newVersion >= 3)) { - console.log('to version 3'); + log('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)) { - console.log('to version 4'); + log('to version 4'); var osUpdateTimes = upgradeTransaction.objectStore('update_times'); osUpdateTimes.add({ table: 'loggedin', status: isLoggedIn() }); } if ((oldVersion < 5) && (newVersion >= 5)) { - console.log('to version 5'); + log('to version 5'); var osPushes = db.createObjectStore('settings', { keyPath: 'key' }); } if ((oldVersion < 6) && (newVersion >= 6)) { - console.log('to version 6'); + log('to version 6'); var osNews = db.createObjectStore('news', { keyPath: 'id' }); var osUpdateTimes = upgradeTransaction.objectStore('update_times'); osUpdateTimes.add({ table: 'news', time: 0 }); @@ -1052,7 +1052,7 @@ function resetDb() { osUpdateTimes.put({ table: 'trim_trims', time: 0 }); osUpdateTimes.put({ table: 'news', time: 0 }); osUpdateTimes.put({ table: 'users', time: 0 }); - console.log('DB update times reset'); + log('DB update times reset'); hideLoader(); } } diff --git a/client/scripts/mobileconsole.js b/client/scripts/mobileconsole.js index f5d21fc..b60f15f 100644 --- a/client/scripts/mobileconsole.js +++ b/client/scripts/mobileconsole.js @@ -1038,7 +1038,7 @@ var mobileConsole = (function () { function isRepeat(message, method) { return (history.output.prevMsg === message && history.output.prevMethod === method) && (typeof message !== 'object') && (method !== 'trace') && (method !== 'group') && (method !== 'groupCollapsed') && (method !== 'groupEnd'); } - function newConsole() { + function newConsole2() { try { //get arguments, set vars var method = arguments[0], className, isHTMLElement, @@ -1195,11 +1195,7 @@ var mobileConsole = (function () { } //scroll consoleElement.toggleScroll(); - //========================================================== - //make sure we still call the original method, if applicable (not window.onerror) - if (typeof arguments[1].original === 'function') { - arguments[1].original.apply(console, arguments[1].originalArguments); - } + } catch (e) { //not logging. why? throw error if (options.browserinfo.isMobile) { alert(e); } @@ -1211,6 +1207,37 @@ var mobileConsole = (function () { } } + function newConsole() { + if (typeof arguments[1].newMessage === 'object') { + var args = arguments[1].newMessage.slice(); + var argString = []; + for (var i in args) { + if (typeof args[i] === 'object') { + if (argString.length > 0) { + arguments[1].newMessage = argString.join(' '); + newConsole2(...arguments); + argString = []; + } + arguments[1].newMessage = args[i]; + newConsole2(...arguments); + } else { + argString.push(args[i]); + } + } + if (argString.length > 0) { + arguments[1].newMessage = argString.join(' '); + newConsole2(...arguments); + argString = []; + } + } else { + newConsole2(...arguments); + } + //========================================================== + //make sure we still call the original method, if applicable (not window.onerror) + if (typeof arguments[1].original === 'function') { + arguments[1].original.apply(console, arguments[1].originalArguments); + } + } function interceptConsole(method) { var original = console ? console[method] : missingMethod(), i, stackTraceOrig; if (!console) { console = {}; } //create empty console if we have no console (IE?) @@ -1218,7 +1245,7 @@ var mobileConsole = (function () { var args = Array.prototype.slice.call(arguments); args.original = original; args.originalArguments = arguments; - args.newMessage = (method === 'assert') ? [args[0], args[1]] : args[0]; + //args.newMessage = (method === 'assert') ? [args[0], args[1]] : args[0]; //create an Error and get its stack trace and format it try { throw new Error(); } catch (e) { stackTraceOrig = e.stack; } args.newStackTrace = formatStackTrace(args.newStackTrace, stackTraceOrig); @@ -1241,6 +1268,12 @@ var mobileConsole = (function () { return; } //Handle the new console logging + args.newMessage = []; + var i = 0; + while (typeof args[i] !== 'undefined') { + args.newMessage.push(args[i]); + i ++; + } newConsole(method, args); }; } diff --git a/client/scripts/pwa.js.php b/client/scripts/pwa.js.php index f407660..681fae8 100644 --- a/client/scripts/pwa.js.php +++ b/client/scripts/pwa.js.php @@ -35,7 +35,7 @@ $(document).ready(function(){ //Enabling dismiss button setTimeout(function(){ $('.pwa-dismiss').on('click',function(){ - console.log('User Closed Add to Home / PWA Prompt') + log('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,18 +52,16 @@ $(document).ready(function(){ //Firing PWA prompts for specific versions and when not on home screen. if (isMobile.Android()) { - console.log('Android Detected'); + log('Android Detected'); function showInstallPromotion(){ if($('#menu-install-pwa-android, .add-to-home').length){ - console.log('Triggering PWA Menu for Android'); + log('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'); $('#menu-install-pwa-android, .menu-hider').addClass('menu-active') },3000); } - } else { - console.log('The div #menu-install-pwa-android was not found. Please add this div to show the install window') } } let deferredPrompt; @@ -82,9 +80,9 @@ $(document).ready(function(){ deferredPrompt.userChoice .then((choiceResult) => { if (choiceResult.outcome === 'accepted') { - console.log('User accepted the A2HS prompt'); + log('User accepted the A2HS prompt'); } else { - console.log('User dismissed the A2HS prompt'); + log('User dismissed the A2HS prompt'); } deferredPrompt = null; }); @@ -96,11 +94,11 @@ $(document).ready(function(){ if (isMobile.iOS()) { if(!isInWebAppiOS){ - console.log('iOS Detected'); + log('iOS Detected'); if($('#menu-install-pwa-ios, .add-to-home').length){ if (!readCookie('Sticky_pwa_rejected_install')) { function triggerPwaInstallIos() { - console.log('Triggering PWA / Add to Home Screen Menu for iOS'); + log('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'); @@ -113,8 +111,6 @@ $(document).ready(function(){ triggerPwaInstallIos(); } }; - } else { - console.log('The div #menu-install-pwa-ios was not found. Please add this div to show the install window') } } } @@ -138,7 +134,7 @@ $(document).ready(function(){ var counter = 3; var interval = setInterval(function() { counter--; - console.log(counter); + log(counter); $('.page-update').html('Aktuallisierung in ... '+ counter + ' Sekunden'); if (counter == 0) { clearInterval(interval); @@ -146,7 +142,7 @@ $(document).ready(function(){ } }, 1000); caches.delete('workbox-runtime').then(function() { - console.log('Content Updated - Cache Removed!'); + log('Content Updated - Cache Removed!'); }); //localStorage.clear(); sessionStorage.clear() @@ -171,7 +167,7 @@ $(document).ready(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(); - console.log('New Version of Content Available. Refreshing. On Desktop Browsers a manual refresh maybe required.') + 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'); @@ -246,13 +242,13 @@ $(document).ready(function(){ function updateOnlineStatus(event) { var condition = navigator.onLine ? "online" : "offline"; isOnline(); - console.log( 'Connection: Online'); + log( 'Connection: Online'); $("a").off( "click", returnFalse ); } function updateOfflineStatus(event) { isOffline(); $("a").on( "click", returnFalse ); - console.log( 'Connection: Offline'); + log( 'Connection: Offline'); } window.addEventListener('online', updateOnlineStatus); window.addEventListener('offline', updateOfflineStatus); diff --git a/client/scripts/regatten.js.php b/client/scripts/regatten.js.php index 6bee92b..c53b6f7 100644 --- a/client/scripts/regatten.js.php +++ b/client/scripts/regatten.js.php @@ -13,6 +13,19 @@ const YOUTH_AGE = ''; const YOUTH_GERMAN_NAME = ''; const PUSH_SERVER_KEY = ''; +function log() { + var now = new Date(); + var hour = now.getHours().toString(); + var min = now.getMinutes().toString(); + var sec = now.getSeconds().toString(); + var millis = now.getMilliseconds().toString(); + hour = (hour.length < 2 ? '0' + hour : hour); + min = (min.length < 2 ? '0' + min : min); + sec = (sec.length < 2 ? '0' + sec : sec); + while (millis.length < 3) millis = '0' + millis; + console.log('[' + hour + ':' + min + ':' + sec + '.' + millis + ']', ...arguments); +} + var randomId = function() { return '_' + Math.random().toString(36).substr(2, 9); } var badges = { @@ -140,8 +153,8 @@ var login = function() { toastError('Du bist momentan offline.
Stelle eine Internetverbindung her, um Dich anzumelden'); $('#menu-login').hideMenu(); } 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); } hideLoader(); @@ -173,7 +186,7 @@ var logout = function() { hash: localStorage.getItem('auth_hash') } if ((auth.id === null) || (auth.hash === null)) { - console.log('Not logged in'); + log('Not logged in'); logoutClearStorage(); return; } @@ -185,14 +198,14 @@ var logout = function() { }, error: function (xhr, status, error) { if (xhr.status == 401) { - console.log('Not logged in'); + log('Not logged in'); logoutClearStorage(); } else if (xhr.status == 0) { - console.log('Could not delete auth from server'); + log('Could not delete auth from server'); logoutClearStorage(); } else { - console.log('Logout: unbekannter Fehler', status, error); - console.log(xhr); + log('Logout: unbekannter Fehler', status, error); + log(xhr); toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000); hideLoader(); } @@ -209,12 +222,12 @@ function deleteDb() { showLoader(); var request = window.indexedDB.deleteDatabase('regatten_app_db_' + BOATCLASS); request.onerror = function (event) { - console.log('Cannot delete DB: ', event.target.errorCode); + log('Cannot delete DB: ', event.target.errorCode); toastError('Beim Löschen der Datenbank ist ein Fehler aufgetreten.
Bitte melde diesen Fehler. (Dev-Menu => Problem melden)', 5000); hideLoader(); } request.onsuccess = function (event) { - console.log('DB deleted'); + log('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); @@ -228,13 +241,13 @@ function deleteCache() { $('#menu-developer').hideMenu(); navigator.serviceWorker.getRegistrations().then(function (registrations) { for (let registration of registrations) { - console.log('Unregister sW:', registration); + log('Unregister sW:', registration); registration.unregister(); } }); caches.keys().then((keyList) => { return Promise.all(keyList.map((key) => { - console.log('Cache deleted:', key); + log('Cache deleted:', key); return caches.delete(key); })); }); @@ -260,7 +273,7 @@ function urlB64ToUint8Array(base64String) { } function pushesSubscribe() { - console.log('Subscribing'); + log('Subscribing'); const applicationServerKey = urlB64ToUint8Array(PUSH_SERVER_KEY); swRegistration.pushManager.subscribe({ userVisibleOnly: true, @@ -272,14 +285,14 @@ function pushesSubscribe() { updatePushBadge(); }) .catch(function(err) { - console.log('Failed to subscribe the user: ', err); + log('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) { - console.log('Unsubscribing'); + log('Unsubscribing'); swRegistration.pushManager.getSubscription() .then(function(subscription) { if (subscription) { @@ -291,7 +304,7 @@ function pushesUnSubscribe(silent = false) { } }) .catch(function(error) { - console.log('Error unsubscribing', error); + log('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(); @@ -300,7 +313,7 @@ function pushesUnSubscribe(silent = false) { } function pushesUpdateServerSubscription(subscription, enabled) { - console.log('updateServer', enabled, subscription); + log('updateServer', enabled, subscription); $.ajax({ url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription', type: 'POST', diff --git a/server/scripts/boats.js b/server/scripts/boats.js index 3482952..22ddf1d 100644 --- a/server/scripts/boats.js +++ b/server/scripts/boats.js @@ -21,8 +21,8 @@ async function onEditBoatnameClick() { if (xhr.status == 0) { toastError('Du bist momentan offline.
Stelle eine Internetverbindung her, um den Bootsnamen zu bearbeiten'); } else { - console.log('EditBoatname: unbekannter Fehler', status, error); - console.log(xhr); + log('EditBoatname: unbekannter Fehler', status, error); + log(xhr); toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000); } hideLoader(); @@ -47,9 +47,9 @@ async function onEditBoatnameClick() { async function onListClicked(id) { var boat = await dbGetData('boats', id); - + $('#menu-boat').find('.menu-title').find('p').text(boat.sailnumber); - + // Edit Boatname $('#button-editboatname').attr('data-boat-id', boat.id); $('#menu-editboatname').find('.menu-title').find('p').text(boat.sailnumber); @@ -63,7 +63,7 @@ async function onListClicked(id) { $('#input-editboatname').val(boat.name); } $('#input-editboatname').trigger('focusin').trigger('focusout'); - + // club website var clubwebsite = ''; if (boat['club'] != null) { @@ -76,7 +76,7 @@ async function onListClicked(id) { } else { $('#menu-item-clubwebsite').hide(); } - + $('#menu-boat').showMenu(); $('#menu-boat').scrollTop(0); } @@ -89,19 +89,19 @@ function pageChange() { async function drawList() { window.setTimeout(function () { var list = ''; - + if (displayed.length > 0) { var offset = (page - 1) * showCount; var count = (page == pageCount ? (displayed.length % showCount) : showCount); if (count == 0) count = showCount; - + for (i = 0; i < count; i ++) { list += displayed[i + offset]; } } else { list = '
Keine Ergebnisse, die der Suche entsprechen
'; } - + $('#div-list').html(list); }, 0); } @@ -135,9 +135,9 @@ var siteScript = async function() { $('#menu-item-boatname').click(function(){ $('#menu-boat').hideMenu(); $('#menu-editboatname').showMenu(); }); $('#button-editboatname').click(onEditBoatnameClick); } - + var results = await dbGetData('boats'); - + var count = results.length; if (count > 0) { if (count == 1) { @@ -147,51 +147,51 @@ var siteScript = async function() { } $('#div-list').show(); $('#input-search').parent().show(); - + results.sort(function (a, b) { return a.sailnumber.localeCompare(b.sailnumber); }); - + rows = []; - + for (id in results) { var entry = results[id]; var club = null; if (entry['club'] != null) club = await dbGetData('clubs', entry['club']); - + var row = { keywords: [], content: '' }; row.keywords.push(entry['sailnumber']); if (entry['name'] != '') row.keywords.push(entry['name']); if (club != null) row.keywords.push(club['kurz'], club['name']); - + row.content += '
'; - + // ZEILE 1 // Sailnumber row.content += '
' + entry['sailnumber'] + '
'; - + // ZEILE 2 row.content += '
'; - + // Name row.content += '
' + entry['name'] + '
'; - + // Club row.content += '
' + ((club != null) ? club['kurz'] : '') + '
'; - + row.content += '
'; - + rows.push(row); } - + reSearch(); - + } else { $('#p-count').html('Keine Boote gefunden!'); $('#div-list').hide(); $('#input-search').parent().hide(); } - + hideLoader(); -} \ No newline at end of file +} diff --git a/server/scripts/contact.js b/server/scripts/contact.js index 0ae07df..689b4b5 100644 --- a/server/scripts/contact.js +++ b/server/scripts/contact.js @@ -23,8 +23,8 @@ function sendMessage() { if (xhr.status == 0) { toastError('Du bist momentan offline.
Stelle eine Internetverbindung her, um eine Nachricht zu versenden'); } else { - console.log('Contact: unbekannter Fehler', status, error); - console.log(xhr); + log('Contact: unbekannter Fehler', status, error); + log(xhr); toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000); } hideLoader(); diff --git a/server/scripts/sailors.js b/server/scripts/sailors.js index c1d28ac..d3da25b 100644 --- a/server/scripts/sailors.js +++ b/server/scripts/sailors.js @@ -21,8 +21,8 @@ async function onEditYearClick() { if (xhr.status == 0) { toastError('Du bist momentan offline.
Stelle eine Internetverbindung her, um den Jahrgang zu bearbeiten'); } else { - console.log('EditYear: unbekannter Fehler', status, error); - console.log(xhr); + log('EditYear: unbekannter Fehler', status, error); + log(xhr); toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000); } hideLoader(); @@ -47,9 +47,9 @@ async function onEditYearClick() { async function onListClicked(id) { var sailor = await dbGetData('sailors', id); - + $('#menu-sailor').find('.menu-title').find('p').text(sailor.name); - + // Edit Year $('#button-edityear').attr('data-sailor-id', sailor.id); $('#menu-edityear').find('.menu-title').find('p').text(sailor.name); @@ -63,7 +63,7 @@ async function onListClicked(id) { $('#input-edityear').val(sailor.year); } $('#input-edityear').trigger('focusin').trigger('focusout'); - + // club website var clubwebsite = ''; if (sailor['club'] != null) { @@ -76,7 +76,7 @@ async function onListClicked(id) { } else { $('#menu-item-clubwebsite').hide(); } - + $('#menu-sailor').showMenu(); $('#menu-sailor').scrollTop(0); } @@ -89,19 +89,19 @@ function pageChange() { async function drawList() { window.setTimeout(function () { var list = ''; - + if (displayed.length > 0) { var offset = (page - 1) * showCount; var count = (page == pageCount ? (displayed.length % showCount) : showCount); if (count == 0) count = showCount; - + for (i = 0; i < count; i ++) { list += displayed[i + offset]; } } else { list = '
Keine Ergebnisse, die der Suche entsprechen
'; } - + $('#div-list').html(list); }, 0); } @@ -135,9 +135,9 @@ var siteScript = async function() { $('#menu-item-year').click(function(){ $('#menu-sailor').hideMenu(); $('#menu-edityear').showMenu(); }); $('#button-edityear').click(onEditYearClick); } - + var results = await dbGetData('sailors'); - + var count = results.length; if (count > 0) { if (count == 1) { @@ -147,51 +147,51 @@ var siteScript = async function() { } $('#div-list').show(); $('#input-search').parent().show(); - + results.sort(function (a, b) { return a.name.localeCompare(b.name); }); - + rows = []; - + for (id in results) { var entry = results[id]; var club = null; if (entry['club'] != null) club = await dbGetData('clubs', entry['club']); - + var row = { keywords: [], content: '' }; row.keywords.push(entry['name']); if (entry['year'] != null) row.keywords.push(entry['year']); if (club != null) row.keywords.push(club['kurz'], club['name']); - + row.content += '
'; - + // ZEILE 1 // Name row.content += '
' + entry['name'] + '
'; - + // ZEILE 2 row.content += '
'; - + // Year row.content += '
' + ((entry['year'] != null) ? (entry['year']) : '') + '
'; - + // Club row.content += '
' + ((club != null) ? club['kurz'] : '') + '
'; - + row.content += '
'; - + rows.push(row); } - + reSearch(); - + } else { $('#p-count').html('Keine Segler gefunden!'); $('#div-list').hide(); $('#input-search').parent().hide(); } - + hideLoader(); -} \ No newline at end of file +} From 26d9d83ba25df803213c4bb5db634d88750cb04d Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 12:26:33 +0200 Subject: [PATCH 06/11] Added planning_view --- server/content/planning_view.php | 52 ++++-- server/scripts/planning_view.js | 281 +++++++++++++++++++++++++++++++ 2 files changed, 315 insertions(+), 18 deletions(-) create mode 100644 server/scripts/planning_view.js diff --git a/server/content/planning_view.php b/server/content/planning_view.php index 85a23df..be4bf34 100644 --- a/server/content/planning_view.php +++ b/server/content/planning_view.php @@ -1,19 +1,35 @@ load('error', ['404', 'Seite existiert noch nicht']); - $content .= '

'; - $content .= 'Die gesuchte Seite ist leider noch nicht verfügbar.
'; - $content .= 'Wir arbeiten daran, sie schnellstmöglich zur Verfügung zu stellen.
'; - $content .= 'Wie wäre es mit der Homepage?'; - $content .= '

'; - $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, 'css-class' => 'text-center pt-3']); - -?> \ No newline at end of file + + $sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name']; + $sp['backbutton'] = 'planning_list'; + $sp['activenav'] = 5; + + // Title + $content = '

Saison-Planung

'; + $content .= '

'; + $content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']); + + $sp['output'] .= $tpl->load('card', [$content]); + + // Regattas + $content = '

'; + $content .= $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text', 'css-class' => 'mt-2']); + $content .= '
'; + + $sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas', 'css-class' => 'show-loggedin']); + + // Menu + $items = ''; + $items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']); + $items .= $tpl->load('menu/item-icon', ['Ergebnisse', '', 'html-id' => 'menu-item-results', 'icon' => 'fa-poll']); + $items .= $tpl->load('menu/item-icon', ['Bericht', '', 'html-id' => 'menu-item-bericht', 'icon' => 'fa-book']); + $items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']); + $items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']); + $items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']); + $items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']); + $sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]); + + $sp['scripts'] .= $scripts->load('onRegattaClicked'); + $sp['scripts'] .= $scripts->load('planning_view'); + +?> diff --git a/server/scripts/planning_view.js b/server/scripts/planning_view.js new file mode 100644 index 0000000..c0cc616 --- /dev/null +++ b/server/scripts/planning_view.js @@ -0,0 +1,281 @@ +function selectChange() { + var val = $('#select-year').val(); + + if (typeof siteScript === 'function') { + history.replaceState(null, '', '?year=' + val); + siteScript(); + } +} + +function initYear() { + var year = findGetParameter('year'); + if (year === null) year = new Date().getFullYear(); + + $('#select-year').html(''); + $('#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 += '
Heute ist der ' + formatDate('d.m.Y', today) + '
'; + } else if (search($('#input-search').val(), entry.keywords)) { + list += entry.content; + } + }); + $('#div-regattas').html(list); + }, 0); +} + +var siteScript = async function() { + var userid = findGetParameter('user'); + var user = null; + if (userid !== null) { + user = await dbGetData('users', userid); + } + if (user === null) { + location.href = LINK_PRE + 'planning_list'; + return; + } + + $('#p-username').text(user.username); + + if (firstCall) { + firstCall = false; + initYear(); + $('#select-year').change(selectChange); + $('#input-search').on('input', drawList); + } + + 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.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) { + 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 += ''; + } + $('#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.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 (entry.planning.steuermann != null) row.keywords.push(entry.planning.steuermann); + for (c in entry.planning.crew) row.keywords.push(entry.planning.crew[c]); + + if (!heute && (today <= dateFrom)) { + rows.push(null); + heute = true; + } + + row.content += '
'; + + // ZEILE 1 + // Name + row.content += '
' + (entry['canceled'] == 1 ? '' : '') + entry['name'] + (entry['canceled'] == 1 ? '' : '') + '
'; + + // ZEILE 2 + row.content += '
'; + + // Number + row.content += '
' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '
'; + + // Special + row.content += '
' + entry['special'] + '
'; + + // Club + row.content += '
' + ((club != null) ? club['kurz'] : '') + '
'; + + row.content += '
'; + + // ZEILE 3 + row.content += '
'; + + // Date + if (entry['length'] < 1) { + if (formatDate('d.m', dateFrom) == '01.01') { + row.content += '
Datum noch unklar
'; + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - Datum nicht final
'; + } + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '
'; + } + + // RLF + row.content += '
' + parseFloat(entry['rlf']).toFixed(2) + '
'; + + row.content += '
'; + + // ZEILE 4 + row.content += '
'; + + // ZEILE 5 + row.content += '
'; + row.content += '
' + entry.planning.steuermann + '
'; + row.content += '
'; + + // ZEILE 6... + for (var i in entry.planning.crew) { + row.content += '
'; + row.content += '
' + entry.planning.crew[i] + '
'; + row.content += '
'; + } + + row.content += '
'; +/* + // ZEILE 2 + row.content += '
'; + + // Number + row.content += '
' + ((entry['number'] != null) ? ('# ' + entry['number']) : '') + '
'; + + // Club + row.content += '
' + ((club != null) ? club['kurz'] : '') + '
'; + + // Special + row.content += '
' + entry['special'] + '
'; + + // Icons + var icons = []; + if (entry['info'] != '') + icons.push(''); + 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(''); + } + if (entry['bericht'] != '') + icons.push(''); + if (entry['canceled'] == '1') { + icons.push(''); + } else if (regattaResults[entry['id']]) { + icons.push(''); + } + row.content += '
' + icons.join(' ') + '
'; + + row.content += '
'; + + // ZEILE 3 + row.content += '
'; + + // Date + if (entry['length'] < 1) { + if (formatDate('d.m', dateFrom) == '01.01') { + row.content += '
Datum noch unklar
'; + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - Datum nicht final
'; + } + } else { + row.content += '
' + formatDate("d.m.Y", dateFrom) + ' - ' + formatDate("d.m.Y", dateTo) + '
'; + } + + // RLF + row.content += '
' + parseFloat(entry['rlf']).toFixed(2) + '
'; + + row.content += '
'; +*/ + rows.push(row); + } + + if (!heute) { + rows.push(null); + } + + drawList(); + + } else { + $('#p-count').html(user.username + ' hat noch keine Regatten in seiner/ihrer Saison-Planung!'); + $('#div-regattas').hide(); + $('#input-search').parent().hide(); + } + + hideLoader(); +} From 138071769c3e3465159043486109a62050422b1c Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 12:57:17 +0200 Subject: [PATCH 07/11] Added planning_list --- server/content/planning_list.php | 44 ++++++---- server/content/planning_view.php | 2 +- server/scripts/planning_list.js | 146 +++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+), 19 deletions(-) create mode 100644 server/scripts/planning_list.js diff --git a/server/content/planning_list.php b/server/content/planning_list.php index 85a23df..4b814ba 100644 --- a/server/content/planning_list.php +++ b/server/content/planning_list.php @@ -1,19 +1,27 @@ load('error', ['404', 'Seite existiert noch nicht']); - $content .= '

'; - $content .= 'Die gesuchte Seite ist leider noch nicht verfügbar.
'; - $content .= 'Wir arbeiten daran, sie schnellstmöglich zur Verfügung zu stellen.
'; - $content .= 'Wie wäre es mit der Homepage?'; - $content .= '

'; - $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, 'css-class' => 'text-center pt-3']); - -?> \ No newline at end of file + + $sp['title'] = 'Saison-Planungen - Regatten.net ' . $_CLASS['name']; + $sp['backbutton'] = 'planning'; + $sp['activenav'] = 5; + + // Title + $content = '

Saison-Planungen

'; + $content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']); + + $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-loggedin']); + + // Not loggedin + $content = '

Saison-Planungen

'; + $content .= '

Um die Saison-Planungen anderer zu sehen, musst Du angemeldet sein.
Melde Dich hier an oder registriere Dich jetzt kostenlos.

'; + + $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-notloggedin']); + + // Regattas + $content = $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text']); + $content .= '
'; + + $sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas', 'css-class' => 'show-loggedin']); + + $sp['scripts'] .= $scripts->load('planning_list'); + +?> diff --git a/server/content/planning_view.php b/server/content/planning_view.php index be4bf34..cf37f0c 100644 --- a/server/content/planning_view.php +++ b/server/content/planning_view.php @@ -16,7 +16,7 @@ $content .= $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text', 'css-class' => 'mt-2']); $content .= '
'; - $sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas', 'css-class' => 'show-loggedin']); + $sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-regattas']); // Menu $items = ''; diff --git a/server/scripts/planning_list.js b/server/scripts/planning_list.js new file mode 100644 index 0000000..0cda710 --- /dev/null +++ b/server/scripts/planning_list.js @@ -0,0 +1,146 @@ +async function onUserClicked(id) { + var user = await dbGetData('users', id); + if (user !== null) { + location.href = LINK_PRE + 'planning_view?user=' + user.id; + } +} + +function selectChange() { + var val = $('#select-year').val(); + + if (typeof siteScript === 'function') { + history.replaceState(null, '', '?year=' + val); + siteScript(); + } +} + +function initYear() { + var year = findGetParameter('year'); + if (year === null) year = new Date().getFullYear(); + + $('#select-year').html(''); + $('#select-year').val(year); +} + +var firstCall = true; +var rows = []; +var today; + +async function drawList () { + window.setTimeout(function () { + var list = ''; + rows.forEach(function (entry) { + if (search($('#input-search').val(), entry.keywords)) { + list += entry.content; + } + }); + $('#div-users').html(list); + }, 0); +} + +var siteScript = async function() { + if (!isLoggedIn()) { + hideLoader(); + return; + } + + if (firstCall) { + firstCall = false; + initYear(); + $('#select-year').change(selectChange); + $('#input-search').on('input', drawList); + } + + 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 = {}; + for (var i in regattas) { + var entry = regattas[i]; + var planning = await dbGetDataIndex('plannings', 'regatta', entry.id); + for (p in planning) { + if (!(planning[p].user in plannings)) { + plannings[planning[p].user] = { + user: await dbGetData('users', planning[p].user), + regattas: [], + sailors: {} + }; + } + plannings[planning[p].user].regattas.push(entry); + var sailor = null; + if (planning[p].steuermann !== null) sailor = await dbGetData('sailors', planning[p].steuermann); + if (sailor !== null) { + if (!(sailor.id in plannings[planning[p].user].sailors)) plannings[planning[p].user].sailors[sailor.id] = sailor.name; + } + var crew = planning[p].crew.split(','); + for (i in crew) { + sailor = await dbGetData('sailors', crew[i]); + if (sailor !== null) { + if (!(sailor.id in plannings[planning[p].user].sailors)) plannings[planning[p].user].sailors[sailor.id] = sailor.name; + } + } + } + } + plannings = Object.values(plannings); + plannings.sort(function(a,b){ + return a.user.username.localeCompare(b.user.username); + }); + + 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 += ''; + } + $('#select-year').html(options); + $('#select-year').val(selectedYear); + + var count = plannings.length; + if (count > 0) { + $('#input-search').parent().show(); + + rows = []; + + for (id in plannings) { + var entry = plannings[id]; + + var row = { keywords: [], content: '' }; + row.keywords.push(entry.user.username); + for (i in entry.sailors) { + row.keywords.push(entry.sailors[i]); + } + + row.content += '
'; + + // ZEILE 1 + row.content += '
'; + + // ZEILE 2 + row.content += '
'; + + // Name + row.content += '
' + entry.user.username + '
'; + + // Count of regattas + row.content += '
' + entry.regattas.length + ' Regatten
'; + + row.content += '
'; + + rows.push(row); + } + + drawList(); + + } else { + $('#div-users').html('Es hat noch niemand eine Saison-Planung erstellt'); + $('#input-search').parent().hide(); + } + + hideLoader(); +} From 5e926f3e75471842093979d6d10fd1cb2b0b5632 Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 13:09:24 +0200 Subject: [PATCH 08/11] Add share button on own planning --- server/content/planning_view.php | 3 ++- server/page/menus.php | 10 +++++----- server/scripts/planning.js | 2 ++ server/scripts/planning_view.js | 9 +++++++++ 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/server/content/planning_view.php b/server/content/planning_view.php index cf37f0c..ba8b855 100644 --- a/server/content/planning_view.php +++ b/server/content/planning_view.php @@ -6,7 +6,8 @@ // Title $content = '

Saison-Planung

'; - $content .= '

'; + $content .= '

'; + $content .= $tpl->load('button', [' Teilen', '#', 'html-id' => 'button-share']); $content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']); $sp['output'] .= $tpl->load('card', [$content]); diff --git a/server/page/menus.php b/server/page/menus.php index ff88dde..7ef3608 100644 --- a/server/page/menus.php +++ b/server/page/menus.php @@ -3,27 +3,27 @@
- + Facebook - + Twitter - + LinkedIn - + WhatsApp - + Email diff --git a/server/scripts/planning.js b/server/scripts/planning.js index a109b34..e6a0e3e 100644 --- a/server/scripts/planning.js +++ b/server/scripts/planning.js @@ -115,6 +115,8 @@ var siteScript = async function() { $('#switch-status-bezahlt').parent().parent().click(planningSwitchChanged); } + $('#a-share-planning').attr('href', LINK_PRE + 'planning_view?user=' + USER_ID); + today = getToday(); var selectedYear = $('#select-year').val(); diff --git a/server/scripts/planning_view.js b/server/scripts/planning_view.js index c0cc616..e1f770b 100644 --- a/server/scripts/planning_view.js +++ b/server/scripts/planning_view.js @@ -46,6 +46,15 @@ var siteScript = async function() { $('#p-username').text(user.username); + if (isLoggedIn() && (userid == USER_ID)) { + $('#button-share').show(); + $('#button-share').click(function(){ + $('#menu-share').showMenu(); + }); + } else { + $('#button-share').hide(); + } + if (firstCall) { firstCall = false; initYear(); From 754cb6f77d873b622804e416aa5caa96dd38d747 Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 13:37:31 +0200 Subject: [PATCH 09/11] Added edit button to planning --- server/content/planning.php | 3 ++- server/content/planning_edit.php | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/server/content/planning.php b/server/content/planning.php index 657f3db..0b479cc 100644 --- a/server/content/planning.php +++ b/server/content/planning.php @@ -6,7 +6,8 @@ // Title $content = '

Saison-Planung

'; - $content .= '

Hinweis: Diese Seite kannst nur Du sehen.
Wenn Du Deine Saison-Planung teilen möchtest, klicke hier

'; + $content .= '

Hinweis: Diese Seite kannst nur Du sehen.
Wenn Du Deine Saison-Planung teilen möchtest, klicke hier

'; + $content .= $tpl->load('button', [' bearbeiten', LINK_PRE . 'planning_edit']); $content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']); $sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-loggedin']); diff --git a/server/content/planning_edit.php b/server/content/planning_edit.php index 85a23df..ef7d037 100644 --- a/server/content/planning_edit.php +++ b/server/content/planning_edit.php @@ -1,19 +1,21 @@ load('error', ['404', 'Seite existiert noch nicht']); $content .= '

'; - $content .= 'Die gesuchte Seite ist leider noch nicht verfügbar.
'; - $content .= 'Wir arbeiten daran, sie schnellstmöglich zur Verfügung zu stellen.
'; - $content .= 'Wie wäre es mit der Homepage?'; + $content .= 'Du kannst die Saison-Planung momentan leider noch nicht in der App bearbeiten.
'; + $content .= 'Bis diese Funktion implementiert wurde, erstelle Deine Saison-Planung bitte auf unserer Website.
'; + $content .= 'Deine Saison-Planung wird dann automatisch synchronisiert und ist dann auch in dieser App verfügbar.
'; + $content .= 'Wir arbeiten daran, dass Du Deine Saison-Planung bald auch in der App bearbeiten kannst.
'; $content .= '

'; + $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, 'css-class' => 'text-center pt-3']); - -?> \ No newline at end of file + +?> From c9a90eb77c9d422664c9379c1b8456a80ac362a2 Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 13:56:47 +0200 Subject: [PATCH 10/11] RA-#22 Show info on preloader while first sync --- client/scripts/database.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/client/scripts/database.js b/client/scripts/database.js index b8488b3..b801fdf 100644 --- a/client/scripts/database.js +++ b/client/scripts/database.js @@ -511,6 +511,7 @@ function sync() { if (typeof onAfterSync === 'function') { onAfterSync(); } + removeSyncInfoToPreloader(); runPageScript(); } }, 100); @@ -946,6 +947,7 @@ function initDatabase() { if (lastSync > 0) { runPageScript(); } else { + addSyncInfoToPreloader(); db.transaction('update_times', 'readwrite').objectStore('update_times').put({ table: 'loggedin', status: isLoggedIn() }); } }; @@ -1056,3 +1058,20 @@ function resetDb() { hideLoader(); } } + +function addSyncInfoToPreloader() { + var preloader = document.getElementById('preloader'); + var div = document.createElement('div'); + div.id = 'preloader-sync-info'; + div.classList = 'rounded-s shadow-m bg-highlight m-3 p-3'; + div.style.position = 'fixed'; + div.style.top = 0; + div.style.left = 0; + div.style.right = 0; + div.innerHTML = '

Datenbank SYNC

Um Dir alle nötigen Informationen anzeigen zu können, müssen wir die Datenbank synchronisieren.
Dies kann einen Moment dauern. Bitte habe etwas Geduld. Beim nächsten Öffnen geht es schneller.

'; + preloader.appendChild(div); +} + +function removeSyncInfoToPreloader() { + $('#preloader-sync-info').remove(); +} From 65608cdd5aa28ec85f9faa23f918b99607203e79 Mon Sep 17 00:00:00 2001 From: ostertun Date: Mon, 5 Oct 2020 13:58:26 +0200 Subject: [PATCH 11/11] Release v_1.9 --- server/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/version.php b/server/version.php index 18d77de..6416c61 100644 --- a/server/version.php +++ b/server/version.php @@ -1,5 +1,5 @@