Merge branch 'hotfix/pushsubscription_onerror'

client/scripts/custom.js.php

@@ -13,6 +13,7 @@ var showConsoleButtonTimeout = setTimeout(function(){
 	$('#button-show-console').show();
 }, 10000);
 var showLoader = function() {
+	log('[tpl] showLoader called, loaderCount:', loaderCount);
 	if (loaderCount < 1) {
 		$('#preloader').removeClass('preloader-hide');
 		loaderCount = 0;
@@ -24,6 +25,7 @@ var showLoader = function() {
 	loaderCount ++;
 }
 var hideLoader = function() {
+	log('[tpl] hideLoader called, loaderCount:', loaderCount);
 	loaderCount --;
 	if (loaderCount < 1) {
 		$('#preloader').addClass('preloader-hide');
@@ -124,29 +126,22 @@ $(document).ready(function(){
 		//Adding Background for Gradient
 		if(!$('.menu-hider').length){$('#page').append('<div class="menu-hider"><div>');}
 
-		var menuOpened = function() {
+		history.pushState(null, '');
-			log('[tpl] Menu opened', history.state);
-			if ((history.state === null) || (history.state.menu !== 'opened')) {
-				history.pushState({ menu: 'opened' }, '');
 		log('[tpl] state pushed');
-			}
-		}
-		var menuClosed = function() {
-			log('[tpl] Menu closed', history.state);
-			if ((history.state !== null) && (history.state.menu === 'opened')) {
-				history.back();
-				log('[tpl] history.back')
-			}
-		}
 
 		/*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');menuOpened();};
+		$.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');menuClosed();};
+		$.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');};
 
 		window.onpopstate = function(event) {
-			log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state));
+			var menuOpened = $('body').hasClass('modal-open');
-			if ((event.state === null) || (event.state.menu !== 'opened')) {
+			log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state) + ', menuOpened:' + menuOpened);
+			if (menuOpened) {
 				$('.menu').hideMenu();
+				log('Menu hidden');
+			} else {
+				log('history.back');
+				history.back();
 			}
 		};
 
@@ -209,7 +204,6 @@ $(document).ready(function(){
 				if(menuID.hasClass('menu-box-right')){headerAndContent.css("transform", "translateX(-100%)");}
 			}
 			menuActivate();
-			menuOpened();
 		});
 
 		//Allows clicking even if menu is loaded externally.
@@ -221,7 +215,6 @@ $(document).ready(function(){
 			menuHider.css('transform','translate(0,0)');
 			$('#footer-bar').removeClass('footer-menu-hidden');
 			$('body').removeClass('modal-open');
-			menuClosed();
 			return false;
 		});
 

client/scripts/regatten.js.php

@@ -156,12 +156,14 @@ function findGetParameter(parameterName) {
 }
 
 var signup = function() {
+	log('[app] Signup');
 	var username = $('#input-signup-username').val();
 	var email = $('#input-signup-email').val();
 	var password = $('#input-signup-password').val();
 	if (username == '') { $('#input-signup-username').focus(); return; }
 	if (email == '') { $('#input-signup-email').focus(); return; }
 	if (password == '') { $('#input-signup-password').focus(); return; }
+	log('[app] Signup: All fields okay');
 	showLoader();
 	$('#input-signup-username').val('').trigger('focusin').trigger('focusout');
 	$('#input-signup-email').val('').trigger('focusin').trigger('focusout');
@@ -175,6 +177,7 @@ var signup = function() {
 			password: password
 		},
 		error: function (xhr, status, error) {
+			log('[app] Signup: error:', xhr.status, status);
 			if (xhr.status == 409) {
 				toastError('Benutzername bereits vergeben');
 				$('#input-signup-email').val(email).trigger('focusin').trigger('focusout');
@@ -189,6 +192,7 @@ var signup = function() {
 			hideLoader();
 		},
 		success: function (data, status, xhr) {
+			log('[app] Signup successful, logging in');
 			$('#input-login-username').val(username);
 			$('#input-login-password').val(password);
 			login();
@@ -197,6 +201,7 @@ var signup = function() {
 }
 
 var login = function() {
+	log('[app] Login');
 	showLoader();
 	var username = $('#input-login-username').val();
 	var password = $('#input-login-password').val();
@@ -211,6 +216,7 @@ var login = function() {
 			device: navigator.userAgent
 		},
 		error: function (xhr, status, error) {
+			log('[app] Login: error:', xhr.status, status);
 			if (xhr.status == 401) {
 				toastError('Benutzername oder Passwort falsch');
 				$('#input-login-username').val(username).trigger('focusin').trigger('focusout');
@@ -225,6 +231,7 @@ var login = function() {
 			hideLoader();
 		},
 		success: function (data, status, xhr) {
+			log('[app] Login successful');
 			localStorage.setItem('auth_id', data.id);
 			localStorage.setItem('auth_hash', data.auth);
 			localStorage.setItem('auth_user', data.user);
@@ -245,6 +252,7 @@ var logoutClearStorage = function() {
 }
 
 var logout = function() {
+	log('[app] Logout');
 	showLoader();
 	var auth = {
 		id: localStorage.getItem('auth_id'),
@@ -262,6 +270,7 @@ var logout = function() {
 			auth: auth
 		},
 		error: function (xhr, status, error) {
+			log('[app] Logout: error:', xhr.status, status);
 			if (xhr.status == 401) {
 				log('[app] Not logged in');
 				logoutClearStorage();
@@ -276,12 +285,14 @@ var logout = function() {
 			}
 		},
 		success: function (data, status, xhr) {
+			log('[app] Logout successful');
 			logoutClearStorage();
 		}
 	});
 }
 
 function deleteDb() {
+	log('[app] Deleting DB');
 	$('#menu-developer').hideMenu();
 	if (canUseLocalDB) {
 		showLoader();
@@ -298,11 +309,13 @@ function deleteDb() {
 			setTimeout(function(){ location.reload(); }, 3000);
 		}
 	} else {
+		log('[app] DB not supported');
 		toastWarn('Dein Gerät unterstützt kein lokales Speichern der Daten. Alle Daten werden direkt vom Server gezogen.<br>Entsprechend kannst Du die Datenbank auch nicht zurücksetzen.', 10000);
 	}
 }
 
 function deleteCache() {
+	log('[app] Deleting cache');
 	$('#menu-developer').hideMenu();
 	navigator.serviceWorker.getRegistrations().then(function (registrations) {
 		for (let registration of registrations) {
@@ -340,16 +353,27 @@ function urlB64ToUint8Array(base64String) {
 function pushesSubscribe() {
 	log('[app] Subscribing');
 	const applicationServerKey = urlB64ToUint8Array(PUSH_SERVER_KEY);
+	log('[app] Subscription app server key:', applicationServerKey);
 	swRegistration.pushManager.subscribe({
 		userVisibleOnly: true,
 		applicationServerKey: applicationServerKey
 	})
-	.then(function(subscription) {
+	.then(async function(subscription) {
-		pushesUpdateServerSubscription(subscription, true);
+		log('[app] Subscription:', subscription);
+		if (await pushesUpdateServerSubscription(subscription, true)) {
+			log('[app] Subscription: Sent to server, updating UI');
 			updatePushSwitches();
 			updatePushBadge();
+		} else {
+			$('#menu-pushes').hideMenu();
+			log('[app] Failed to subscribe the user due to connection error');
+			toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
+			pushesUnSubscribe(true);
+		}
+		hideLoader();
 	})
 	.catch(function(err) {
+		$('#menu-pushes').hideMenu();
 		log('[app] Failed to subscribe the user: ', err);
 		toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
 		pushesUnSubscribe(true);
@@ -359,13 +383,21 @@ function pushesSubscribe() {
 function pushesUnSubscribe(silent = false) {
 	log('[app] Unsubscribing');
 	swRegistration.pushManager.getSubscription()
-	.then(function(subscription) {
+	.then(async function(subscription) {
+		log('[app] Subscription:', subscription);
 		if (subscription) {
-			pushesUpdateServerSubscription(subscription, false);
+			if (await pushesUpdateServerSubscription(subscription, false)) {
+				log('[app] Subscription: Removed from server');
+			} else {
+				log('[app] Failed to unsubscribe the user due to connection error');
+			}
+			log('[app] Removing subscription');
 			subscription.unsubscribe();
+			log('[app] Subscription: Updating UI');
 			$('#menu-pushes').hideMenu();
 			updatePushBadge();
 			hideLoader();
+			if (!silent) toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
 		}
 	})
 	.catch(function(error) {
@@ -378,21 +410,22 @@ function pushesUnSubscribe(silent = false) {
 }
 
 function pushesUpdateServerSubscription(subscription, enabled) {
+	return new Promise(function(resolve){
 		log('[app] updateServer', enabled, subscription);
 		$.ajax({
 			url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
 			type: 'POST',
 			data: { subscription: JSON.stringify(subscription) },
 			success: function (data, textStatus, jqXHR) {
-			if (!enabled) {
+				log('[app] Subscription sent to server');
-				toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
+				resolve(true);
-			}
-			hideLoader();
 			},
 			error: function (jqXHR, textStatus, errorThrown) {
-			throw 'Cannot update server subscription';
+				log('[app] Error sending subscription to server');
+				resolve(false);
 			}
 		});
+	});
 }
 
 async function initPushSettings() {
@@ -566,20 +599,7 @@ var onAfterSync = function() {
 	updateNewsBadge();
 }
 
-// Add console opener to preloader
+function sendErrorReport() {
-var addConsoleOpenerToPreloader = function() {
-	addConsoleOpenerToPreloader = function(){};
-	var preloader = document.getElementById('preloader');
-	var button = document.createElement('a');
-	button.id = 'button-show-console';
-	button.href = '#';
-	button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3 bg-red2-dark bg-white';
-	button.style.position = 'fixed';
-	button.style.bottom = 0;
-	button.style.left = 0;
-	button.style.right = 0;
-	button.innerHTML = 'Fehlerbericht senden';
-	button.onclick = function(){
 	alert('FEHLERBERICHT\nEs wird jetzt ein Fehlerbericht an die Entwickler geschickt.\nBitte stelle sicher, dass Du mit dem Internet verbunden bist und drücke dann auf OK.');
 	$.ajax({
 		url: QUERY_URL + 'error_report',
@@ -601,9 +621,50 @@ var addConsoleOpenerToPreloader = function() {
 			location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
 		}
 	});
+}
+
+// Add console opener to preloader
+var addConsoleOpenerToPreloader = function() {
+	addConsoleOpenerToPreloader = function(){};
+	var preloader = document.getElementById('preloader');
+	var button = document.createElement('a');
+	button.id = 'button-show-console';
+	button.href = '#';
+	button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3 bg-red2-dark bg-white';
+	button.style.position = 'fixed';
+	button.style.bottom = 0;
+	button.style.left = 0;
+	button.style.right = 0;
+	button.innerHTML = 'Fehlerbericht senden';
+	button.onclick = function(){
+		sendErrorReport();
 		return false;
 	}
 	preloader.appendChild(button);
 	$(button).hide();
 }
 addConsoleOpenerToPreloader();
+
+function m2s_getLink(type, eventId) {
+	switch (type) {
+		case 'entrylist':
+			return 'https://manage2sail.com/de-DE/event/' + eventId + '#!/entries';
+	}
+	return '';
+}
+function ro_getLink(type, eventId) {
+	switch (type) {
+		case 'entrylist':
+			return 'http://www.raceoffice.org/entrylist.php?eid=' + eventId;
+	}
+	return '';
+}
+function extServiceGetLink(serviceName, type, eventId = '') {
+	switch (serviceName) {
+		case 'm2s':
+			return m2s_getLink(type, eventId);
+		case 'ro':
+			return ro_getLink(type, eventId);
+	}
+	return '';
+}

server/content/index.php

@@ -82,7 +82,8 @@
 	// Regattas Menu
 	$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
 	$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
-	$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
 	$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']);

server/content/planning.php

@@ -6,9 +6,9 @@
 
 	// Title
 	$content = '<h1>Saison-Planung</h1>';
-	$content .= $tpl->load('button', ['<i class="fas fa-list"></i>&ensp;Saison-Planungen anderer', LINK_PRE . 'planning_list', 'css-class' => 'mt-2 mb-2']);
+	$content .= $tpl->load('button', ['<i class="fas fa-list"></i>&ensp;Saison-Planungen anderer', 'html-id' => 'a-list-plannings', 'css-class' => 'mt-2 mb-2']);
 	$content .= '<p class="mb-1"><b>Hinweis:</b> Diese Seite kannst nur Du sehen.<br>Wenn Du Deine Saison-Planung teilen möchtest, <a id="a-share-planning">klicke hier</a></p>';
-	$content .= $tpl->load('button', ['<i class="fas fa-edit"></i>&ensp;bearbeiten', LINK_PRE . 'planning_edit']);
+	$content .= $tpl->load('button', ['<i class="fas fa-edit"></i>&ensp;bearbeiten', 'html-id' => 'a-edit-planning']);
 	$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']);
@@ -30,7 +30,8 @@
 	$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
 	$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
 	$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-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
 	$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']);

server/content/planning_edit.php

@@ -1,7 +1,7 @@
 <?php
 
 	$sp['title'] = 'Saison-Planung bearbeiten - Regatten.net ' . $_CLASS['name'];
-	$sp['backbutton'] = 'planning';
+	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
 
 	// Title, Inputs

server/content/planning_list.php

@@ -1,7 +1,7 @@
 <?php
 
 	$sp['title'] = 'Saison-Planungen - Regatten.net ' . $_CLASS['name'];
-	$sp['backbutton'] = 'planning';
+	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
 
 	// Title

server/content/planning_view.php

@@ -1,7 +1,7 @@
 <?php
 
 	$sp['title'] = 'Saison-Planung - Regatten.net ' . $_CLASS['name'];
-	$sp['backbutton'] = 'planning_list';
+	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
 
 	// Title
@@ -22,7 +22,8 @@
 	// Menu
 	$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
 	$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
-	$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
 	$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']);

server/content/regattas.php

@@ -26,7 +26,8 @@
 	// Menu
 	$items = '<p id="menu-item-special" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
 	$items .= '<p id="menu-item-yourplanning" class="mb-2 mt-1" style="line-height: 1.5em;"></p>';
-	$items .= $tpl->load('menu/item-icon', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Saison-Planungen', '', 'html-id' => 'menu-item-plannings', 'icon' => 'fa-calendar-alt', 'badge-id' => 'badge-regatta-plannings']);
+	$items .= $tpl->load('menu/item-icon-badge', ['Meldeliste', '', 'html-id' => 'menu-item-entrylist', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-entrylist']);
 	$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']);

server/page/menus.php

@@ -211,7 +211,7 @@
 	</div>
 </div>
 
-<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="360">
+<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="400">
 	<div class="menu-title"><h1>Entwickler-Optionen</h1><p class="color-highlight">Version <?php echo PWA_VERSION; ?></p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
 	<div class="divider divider-margins mb-n2"></div>
 	<div class="content">
@@ -231,11 +231,16 @@
 				<span>Reset Cache</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="https://github.com/ostertun/RegattenApp/issues">
+			<a href="https://github.com/ostertun/RegattenApp/issues/new">
 				<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
 				<span>Problem melden</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
+			<a href="#" onclick="sendErrorReport(); return false;" class="menu-close">
+				<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
+				<span>Fehlerbericht senden</span>
+				<i class="fa fa-angle-right"></i>
+			</a>
 			<a href="#" onclick="mobileConsole.displayConsole(); return false;" class="border-0 menu-close">
 				<i class="fa font-14 fa-terminal rounded-s bg-highlight color-white"></i>
 				<span>Console anzeigen</span>

server/scripts/index.js

@@ -51,7 +51,7 @@ var siteScript = async function() {
 	if (firstCall) {
 		firstCall = false;
 		$('#button-notifications-activate').click(function(){
-			$('#menu-pushes').showMenu();
+			pushesOpenMenu();
 		});
 		$('#a-notifications-later').click(function(){
 			createCookie('regatten_app_' + BOATCLASS + '_rejected_push', true, 1);

server/scripts/onRegattaClicked.js

@@ -68,12 +68,28 @@ async function onRegattaClicked(id) {
 
 	// Planning
 	if ((plannings.length > 0) && (dateTo >= today)) {
-		$('#menu-item-plannings').show();
+		$('#badge-regatta-plannings').text(plannings.length);
 		$('#menu-item-plannings').attr('href', LINK_PRE + 'regatta_plan?regatta=' + regatta['id']);
+		$('#menu-item-plannings').show();
 	} else {
 		$('#menu-item-plannings').hide();
 	}
 
+	// Entrylist
+	var extServiceData;
+	try {
+		extServiceData = JSON.parse(regatta.extServiceData);
+	} catch {
+		extServiceData = {};
+	}
+	if ((regatta.extService !== null) && ('entryCount' in extServiceData)) {
+		$('#badge-regatta-entrylist').text(extServiceData.entryCount);
+		$('#menu-item-entrylist').attr('href', extServiceGetLink(regatta.extService, 'entrylist', extServiceData.eventId)); // TODO
+		$('#menu-item-entrylist').show();
+	} else {
+		$('#menu-item-entrylist').hide();
+	}
+
 	// Results
 	if (regatta['results'] == '1') {
 		$('#menu-item-results').show();

server/scripts/planning.js

@@ -114,11 +114,14 @@ var siteScript = async function() {
 		$('#switch-status-bezahlt').parent().parent().click(planningSwitchChanged);
 	}
 
-	$('#a-share-planning').attr('href', LINK_PRE + 'planning_view?user=' + USER_ID);
+	var selectedYear = $('#select-year').val();
+
+	$('#a-share-planning').attr('href', LINK_PRE + 'planning_view?user=' + USER_ID + '&year=' + selectedYear);
+	$('#a-edit-planning').attr('href', LINK_PRE + 'planning_edit?year=' + selectedYear);
+	$('#a-list-plannings').attr('href', LINK_PRE + 'planning_list?year=' + selectedYear);
 
 	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);

server/scripts/planning_edit.js

@@ -69,6 +69,8 @@ async function planningSwitchChanged() {
 
 var sailorIsSteuermann;
 var sailors = [];
+var knownIds = [];
+var known = [];
 
 async function sailorSelected(sid) {
 	$('#menu-sailor').hideMenu();
@@ -103,8 +105,12 @@ async function sailorSelected(sid) {
 		},
 		success: async function (data, status, xhr) {
 			await sync();
+			if ((sid === null) || (sid in knownIds)) {
 				planningEdit(rid);
 				hideLoader();
+			} else {
+				location.reload();
+			}
 		}
 	});
 }
@@ -118,6 +124,11 @@ async function sailorsSearch() {
 		item += '</a>';
 		$('#menu-sailor').find('.content').find('.list-group').append(item);
 	}
+	if ($('#input-edit-search').val().length == 0) {
+		known.forEach(function (entry) {
+			$('#menu-sailor').find('.content').find('.list-group').append(entry);
+		});
+	}
 	if ($('#input-edit-search').val().length >= 3) {
 		sailors.forEach(function (entry) {
 			if (search($('#input-edit-search').val(), entry.keywords)) {
@@ -125,18 +136,30 @@ async function sailorsSearch() {
 			}
 		});
 	} else {
-		var item = '<p class="item-sailor-search">Gib mindestens 3 Zeichen ein</p>';
+		var item = '<p class="item-sailor-search">Zum Suchen mindestens 3 Zeichen eingeben</p>';
 		$('#menu-sailor').find('.content').find('.list-group').append(item);
 	}
 }
 
 async function initSailors() {
 	sailors = [];
+	known = [];
+	var plannings = await dbGetDataIndex('plannings', 'user', USER_ID);
+	knownIds = {};
+	for (var p in plannings) {
+		p = plannings[p];
+		if (p.steuermann !== null) knownIds[p.steuermann] = true;
+		var crew = p.crew.split(',');
+		for (var c in crew) {
+			c = crew[c];
+			if (c != '') knownIds[c] = true;
+		}
+	}
 	var dbSailors = await dbGetData('sailors');
 	dbSailors.sort(function(a,b){
 		return a.name.localeCompare(b.name);
 	});
-	for (s in dbSailors) {
+	for (var s in dbSailors) {
 		var item = '<a class="item-sailor-search" onclick="sailorSelected(' + dbSailors[s].id + ')">';
 		item += '<span>' + dbSailors[s].name + '</span>';
 		item += '<i class="fa fa-angle-right"></i>';
@@ -145,6 +168,7 @@ async function initSailors() {
 			keywords: [dbSailors[s].name],
 			content: item
 		});
+		if (dbSailors[s].id in knownIds) known.push(item);
 	}
 }
 

server/scripts/planning_list.js

@@ -1,7 +1,7 @@
 async function onUserClicked(id) {
 	var user = await dbGetData('users', id);
 	if (user !== null) {
-		location.href = LINK_PRE + 'planning_view?user=' + user.id;
+		location.href = LINK_PRE + 'planning_view?user=' + user.id + '&year=' + $('#select-year').val();
 	}
 }
 

server/scripts/planning_view.js

@@ -1,8 +1,10 @@
+var userid;
+
 function selectChange() {
 	var val = $('#select-year').val();
 
 	if (typeof siteScript === 'function') {
-		history.replaceState(null, '', '?year=' + val);
+		history.replaceState(null, '', '?user=' + userid + '&year=' + val);
 		showLoader();
 		siteScript();
 	}
@@ -35,7 +37,7 @@ async function drawList () {
 }
 
 var siteScript = async function() {
-	var userid = findGetParameter('user');
+	userid = findGetParameter('user');
 	var user = null;
 	if (userid !== null) {
 		user = await dbGetData('users', userid);

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.11.2');
+	define('PWA_VERSION', '1.11.3h1');
 
 ?>