Merge branch 'hotfix/state_NSC'

gitflow-hotfix-stash: state_NSC
Merge branch 'release/v_1.11.5'
2021-06-13 23:24:05 +02:00 · 2021-06-13 23:23:25 +02:00 · 2020-12-24 11:08:35 +01:00 · 2020-12-23 15:08:36 +01:00 · 2020-12-22 18:44:05 +01:00 · 2020-12-21 12:01:59 +01:00
19 changed files with 468 additions and 139 deletions
--- a/client/scripts/custom.js.php
+++ b/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() {
-			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')
-			}
-		}
+		history.pushState(null, '');
+		log('[tpl] state pushed');

 		/*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.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.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');};

 		window.onpopstate = function(event) {
-			log('[tpl] popstate event fired. location:' + document.location + ', state:' + JSON.stringify(event.state));
-			if ((event.state === null) || (event.state.menu !== 'opened')) {
+			var menuOpened = $('body').hasClass('modal-open');
+			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;
 		});

@@ -230,7 +223,7 @@ $(document).ready(function(){
 		//Disabling & Enabling Dark Transitions in Dark Mode to Speed up Performance.
 		function allowTransitions(){$('body').find('#transitions-remove').remove();}
 		function removeTransitions(){$('body').append('<style id="transitions-remove">.btn, .header, #footer-bar, .menu-box, .menu-active{transition:all 0ms ease!important;}</style>'); setTimeout(function(){allowTransitions();},10);}
-/* DARK MODE DISABLED
+
 		//Dark Mode
 		var darkSwitch = $('[data-toggle-theme-switch], [data-toggle-theme], [data-toggle-theme-switch] input, [data-toggle-theme] input');
 		$('[data-toggle-theme], [data-toggle-theme-switch]').on('click',function(){
@@ -272,10 +265,6 @@ $(document).ready(function(){
 		if($('body').hasClass('detect-theme')){setColorScheme();}
 		$('.detect-dark-mode').on('click',function(){ $('body').addClass('detect-theme'); setColorScheme(); return false;});
 		$('.disable-auto-dark-mode').on('click',function(){ $('body').removeClass('detect-theme'); $(this).remove(); return false;});
-*/
-eraseCookie('sticky_light_mode');
-eraseCookie('sticky_dark_mode');
-// END

 		log('[tpl] init other ui elements');

--- a/client/scripts/database.js
+++ b/client/scripts/database.js
@@ -191,6 +191,8 @@ function dbGetResultCalculated(regatta) {
 							case 'DNF': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Did not finish
 							case 'RET': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Retired (Aufgegeben)
 							case 'RAF': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Retired after finish
+							// Kursfehler
+							case 'NSC': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Not sailed course
 							// Disqualifizierun
 							case 'DSQ': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Disqualified
 							case 'DNE': results[id]['values'][i] = gemeldet + 1; copy[i] = -1; break; // Disqualified, not excludable (disqu. kann nach 90.3(b) nicht gestrichen werden)
@@ -397,6 +399,33 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 	});
 }

+function dbGetCurrentYear() {
+	return new Promise(async function (resolve) {
+		var date = new Date();
+		var year = date.getFullYear();
+		if (date.getMonth() == 11) {
+			year ++; // In DECEMBER show next year
+		} else {
+			// if there are no more regattas until end of the year, show next year
+			var regattas = dbGetRegattasRange(parseDate(date.getDate() + '.' + (date.getMonth() + 1) + '.' + year), parseDate('31.12.' + year));
+			if (regattas.length == 0) {
+				year ++;
+			}
+		}
+		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;
+		});
+		for (id in years) {
+			if (years[id].year < year) year = years[id].year;
+			if (years[id].year == year) break;
+		}
+		resolve(year);
+	});
+}
+
 function dbSettingsGet(key) {
 	return new Promise(function(resolve) {
 		if (canUseLocalDB) {
--- a/client/scripts/regatten.js.php
+++ b/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,28 @@ 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) {
-		pushesUpdateServerSubscription(subscription, true);
-		updatePushSwitches();
-		updatePushBadge();
+	.then(async function(subscription) {
+		log('[app] Subscription:', subscription);
+		if (await pushesUpdateServerSubscription(subscription, true)) {
+			log('[app] Subscription: Sent to server, updating UI');
+			dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
+			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 +384,22 @@ 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();
+			dbSettingsSet('notify_endpoint_' + BOATCLASS, false);
 			updatePushBadge();
 			hideLoader();
+			if (!silent) toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
 		}
 	})
 	.catch(function(error) {
@@ -378,20 +412,21 @@ function pushesUnSubscribe(silent = false) {
 }

 function pushesUpdateServerSubscription(subscription, enabled) {
-	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) {
-				toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
+	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) {
+				log('[app] Subscription sent to server');
+				resolve(true);
+			},
+			error: function (jqXHR, textStatus, errorThrown) {
+				log('[app] Error sending subscription to server');
+				resolve(false);
 			}
-			hideLoader();
-		},
-		error: function (jqXHR, textStatus, errorThrown) {
-			throw 'Cannot update server subscription';
-		}
+		});
 	});
 }

@@ -477,12 +512,29 @@ function updatePushBadge() {
 		$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('BLOCKED');
 		return;
 	}
-	swRegistration.pushManager.getSubscription().then(function(subscription) {
+	swRegistration.pushManager.getSubscription().then(async function(subscription) {
+		var dbSub = await dbSettingsGet('notify_endpoint_' + BOATCLASS);
 		var isSub = (subscription !== null);
+		log('[app] DB Subscription:', dbSub);
+		log('[app] Real Subscription:', subscription);
 		if (isSub) {
 			$('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN');
+			if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
+			else if (dbSub !== subscription.endpoint) {
+				if (navigator.onLine) {
+					log('[app] Updating subscription');
+					pushesSubscribe();
+				}
+			}
 		} else {
 			$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('AUS');
+			if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, false);
+			else if (dbSub !== false) {
+				if (navigator.onLine) {
+					log('[app] Re subscribe');
+					pushesSubscribe();
+				}
+			}
 		}
 	});
 }
@@ -566,6 +618,30 @@ var onAfterSync = function() {
 	updateNewsBadge();
 }

+function sendErrorReport() {
+	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',
+		method: 'POST',
+		data: {
+			errors: consoleOutput,
+			device: navigator.userAgent,
+			version: '<?php echo PWA_VERSION; ?>'
+		},
+		error: function (xhr, status, error) {
+			if (xhr.status == 0) {
+				alert('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Fehlerbericht zu senden');
+			} else {
+				alert('Beim Senden ist ein unbekannter Fehler aufgetreten. Bitte versuche es noch einmal');
+			}
+		},
+		success: function (data, status, xhr) {
+			alert('Wir leiten Dich jetzt zum erstellten Fehlerbericht um, sodass Du ggf. weitere Informationen ergänzen kannst.');
+			location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
+		}
+	});
+}
+
 // Add console opener to preloader
 var addConsoleOpenerToPreloader = function() {
 	addConsoleOpenerToPreloader = function(){};
@@ -580,30 +656,34 @@ var addConsoleOpenerToPreloader = function() {
 	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',
-			method: 'POST',
-			data: {
-				errors: consoleOutput,
-				device: navigator.userAgent,
-				version: '<?php echo PWA_VERSION; ?>'
-			},
-			error: function (xhr, status, error) {
-				if (xhr.status == 0) {
-					alert('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um den Fehlerbericht zu senden');
-				} else {
-					alert('Beim Senden ist ein unbekannter Fehler aufgetreten. Bitte versuche es noch einmal');
-				}
-			},
-			success: function (data, status, xhr) {
-				alert('Wir leiten Dich jetzt zum erstellten Fehlerbericht um, sodass Du ggf. weitere Informationen ergänzen kannst.');
-				location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
-			}
-		});
+		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 '';
+}
--- a/server/content/index.php
+++ b/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']);
--- a/server/content/planning.php
+++ b/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']);
--- a/server/content/planning_edit.php
+++ b/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
--- a/server/content/planning_list.php
+++ b/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
--- a/server/content/planning_view.php
+++ b/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']);
--- a/server/content/regattas.php
+++ b/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']);
--- a/server/page/menus.php
+++ b/server/page/menus.php
@@ -92,12 +92,11 @@
 	</div>
 </div>

-<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="260">
+<div id="menu-settings" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="310">
 	<div class="menu-title"><h1>Einstellungen</h1><p class="color-highlight">&nbsp;</p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
 	<div class="divider divider-margins mb-n2"></div>
 	<div class="content">
 		<div class="list-group list-custom-small">
-			<?php if (false) { /* DARK MODE DISABLED (set menu height to 310) */ ?>
 			<a href="#" data-toggle-theme data-trigger-switch="switch-dark" class="pb-2">
 				<i class="fa font-14 fa-moon rounded-s bg-dark1-dark color-white"></i>
 				<span>Dark Mode</span>
@@ -106,7 +105,6 @@
 					<label class="custom-control-label" for="switch-dark"></label>
 				</div>
 			</a>
-			<?php } ?>
 			<a href="#" data-menu="menu-login" class="show-notloggedin">
 				<i class="fa font-14 fa-sign-in-alt rounded-s bg-highlight color-white"></i>
 				<span>Login</span>
@@ -211,7 +209,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 +229,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>
--- a/server/page/wrapper.php
+++ b/server/page/wrapper.php
@@ -18,7 +18,7 @@
 		<link rel="apple-touch-icon" sizes="180x180" href="<?php echo SERVER_ADDR; ?>/client/app/icons/icon-192x192.png">
 	</head>

-	<body class="theme-light" data-background="none" data-highlight="blue2"><?php /* DARK MODE DISABLED: set class to "detect-theme" */ ?>
+	<body class="detect-theme" data-background="none" data-highlight="blue2">

 		<div id="preloader"><div class="spinner-border color-highlight" role="status"></div></div>

--- a/server/scripts/index.js
+++ b/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);
@@ -145,7 +145,7 @@ var siteScript = async function() {
 			var planning = planningsDB[i];
 			for (j in regattas) {
 				var regatta = regattas[j];
-				if (regatta.id == planning.regatta) {
+				if ((regatta.id == planning.regatta) && (regatta.length > 0)) {
 					planning.regatta = regatta;
 					plannings.push(planning);
 				}
@@ -162,8 +162,6 @@ var siteScript = async function() {
 				var planning = plannings[i];
 				var regatta = planning.regatta;

-				if (regatta['length'] < 1) continue;
-
 				var club = null;
 				if (regatta['club'] != null)
 					club = await dbGetData('clubs', regatta['club']);
@@ -191,6 +189,23 @@ var siteScript = async function() {
 				if (regatta.special.substr(0, 1) == '#') {
 					regatta.special = '* ' + regatta.special.substr(1);
 				}
+				// replace placeholders
+				var pos;
+				while ((pos = regatta.special.indexOf('$')) >= 0) {
+					var pos2 = regatta.special.indexOf('$', pos + 1);
+					if (pos2 < 0) break;
+					var key = regatta.special.substring(pos + 1, pos2);
+
+					var value = '';
+					// age class
+					if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+						value = 'U-' + value;
+					} else {
+						break;
+					}
+
+					regatta.special = regatta.special.replace('$' + key + '$', value);
+				}
 				list += '<div>' + regatta['special'] + '</div>';

 				// Icons
@@ -259,13 +274,19 @@ var siteScript = async function() {
 	var maxDate = getToday();
 	maxDate.setDate(maxDate.getDate() + 14);
 	var regattas = await dbGetRegattasRange(minDate, maxDate);
+	i = 0;
+	while (i < regattas.length) {
+		if (regattas[i].length < 1) {
+			regattas.splice(i, 1);
+		} else {
+			i ++;
+		}
+	}
 	if (regattas.length > 0) {
 		list = '';
 		for (i in regattas) {
 			var regatta = regattas[i];

-			if (regatta['length'] < 1) continue;
-
 			var club = null;
 			if (regatta['club'] != null)
 				club = await dbGetData('clubs', regatta['club']);
@@ -293,6 +314,23 @@ var siteScript = async function() {
 			if (regatta.special.substr(0, 1) == '#') {
 				regatta.special = '* ' + regatta.special.substr(1);
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = regatta.special.indexOf('$')) >= 0) {
+				var pos2 = regatta.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = regatta.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					value = 'U-' + value;
+				} else {
+					break;
+				}
+
+				regatta.special = regatta.special.replace('$' + key + '$', value);
+			}
 			list += '<div>' + regatta['special'] + '</div>';

 			// Icons
@@ -365,6 +403,14 @@ var siteScript = async function() {
 	var maxDate = getToday();
 	maxDate.setDate(maxDate.getDate() - 1);
 	var regattas = await dbGetRegattasRange(minDate, maxDate);
+	i = 0;
+	while (i < regattas.length) {
+		if (regattas[i].length < 1) {
+			regattas.splice(i, 1);
+		} else {
+			i ++;
+		}
+	}
 	regattas.sort(function(a,b){
 		return b.date.localeCompare(a.date);
 	});
@@ -373,8 +419,6 @@ var siteScript = async function() {
 		for (i in regattas) {
 			var regatta = regattas[i];

-			if (regatta['length'] < 1) continue;
-
 			var club = null;
 			if (regatta['club'] != null)
 				club = await dbGetData('clubs', regatta['club']);
@@ -402,6 +446,23 @@ var siteScript = async function() {
 			if (regatta.special.substr(0, 1) == '#') {
 				regatta.special = '* ' + regatta.special.substr(1);
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = regatta.special.indexOf('$')) >= 0) {
+				var pos2 = regatta.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = regatta.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					value = 'U-' + value;
+				} else {
+					break;
+				}
+
+				regatta.special = regatta.special.replace('$' + key + '$', value);
+			}
 			list += '<div>' + regatta['special'] + '</div>';

 			// Icons
--- a/server/scripts/onRegattaClicked.js
+++ b/server/scripts/onRegattaClicked.js
@@ -6,15 +6,38 @@ async function onRegattaClicked(id) {
 	var dateTo = parseDate(regatta['date']);
 	dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0));

+	var text = [];
 	var specialFields = await dbGetClassProp('special-fields');
 	if (specialFields === null) specialFields = {};
 	if (regatta.special.substr(0, 1) == '#') {
 		regatta.special = regatta.special.substr(1);
 		if (typeof specialFields[regatta.special] !== 'undefined') {
-			$('#menu-item-special').text(specialFields[regatta.special]);
-		} else {
-			$('#menu-item-special').text('ERROR');
+			text.push(specialFields[regatta.special]);
 		}
+	}
+	var pos;
+	while ((pos = regatta.special.indexOf('$')) >= 0) {
+		var pos2 = regatta.special.indexOf('$', pos + 1);
+		if (pos2 < 0) break;
+		var key = regatta.special.substring(pos + 1, pos2);
+
+		// age class
+		if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+			var year = parseDate(regatta.date).getFullYear();
+			year = year - value + 1;
+			text.push('Jahrgänge ' + year + ' und jünger');
+		} else {
+			break;
+		}
+
+		regatta.special = regatta.special.replace('$' + key + '$', '');
+	}
+	if (text.length > 0) {
+		text.sort();
+		for (i in text) {
+			text[i] = $('<div />').text(text[i]).html();
+		}
+		$('#menu-item-special').html(text.join('<br>'));
 		$('#menu-item-special').show();
 	} else {
 		$('#menu-item-special').hide();
@@ -68,12 +91,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();
--- a/server/scripts/planning.js
+++ b/server/scripts/planning.js
@@ -74,11 +74,15 @@ function selectChange() {
 }

 function initYear() {
-	var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function (resolve) {
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();

-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }

 var firstCall = true;
@@ -107,18 +111,21 @@ var siteScript = async function() {

 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 		$('#switch-status-gemeldet').parent().parent().click(planningSwitchChanged);
 		$('#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);
@@ -217,6 +224,23 @@ var siteScript = async function() {
 			if (entry.special.substr(0, 1) == '#') {
 				entry.special = '* ' + entry.special.substr(1);
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = entry.special.indexOf('$')) >= 0) {
+				var pos2 = entry.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = entry.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					value = 'U-' + value;
+				} else {
+					break;
+				}
+
+				entry.special = entry.special.replace('$' + key + '$', value);
+			}
 			row.content += '<div>' + entry['special'] + '</div>';

 			// Icons
--- a/server/scripts/planning_edit.js
+++ b/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();
-			planningEdit(rid);
-			hideLoader();
+			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);
 	}
 }

@@ -267,11 +291,15 @@ function selectChange() {
 }

 function initYear() {
-	var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function (resolve) {
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();

-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }

 var firstCall = true;
@@ -300,7 +328,7 @@ var siteScript = async function() {

 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 		$('#switch-planning-include').parent().parent().click(planningSwitchChanged);
@@ -411,6 +439,23 @@ var siteScript = async function() {
 			if (entry.special.substr(0, 1) == '#') {
 				entry.special = '* ' + entry.special.substr(1);
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = entry.special.indexOf('$')) >= 0) {
+				var pos2 = entry.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = entry.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					value = 'U-' + value;
+				} else {
+					break;
+				}
+
+				entry.special = entry.special.replace('$' + key + '$', value);
+			}
 			row.content += '<div>' + entry['special'] + '</div>';

 			// Club
--- a/server/scripts/planning_list.js
+++ b/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();
 	}
 }

@@ -16,11 +16,15 @@ function selectChange() {
 }

 function initYear() {
-	var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function (resolve) {
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();

-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }

 var firstCall = true;
@@ -47,7 +51,7 @@ var siteScript = async function() {

 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 	}
--- a/server/scripts/planning_view.js
+++ b/server/scripts/planning_view.js
@@ -1,19 +1,25 @@
+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();
 	}
 }

 function initYear() {
-	var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function (resolve) {
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();

-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }

 var firstCall = true;
@@ -35,7 +41,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);
@@ -58,7 +64,7 @@ var siteScript = async function() {

 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 	}
@@ -161,6 +167,23 @@ var siteScript = async function() {
 			if (entry.special.substr(0, 1) == '#') {
 				entry.special = '* ' + entry.special.substr(1);
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = entry.special.indexOf('$')) >= 0) {
+				var pos2 = entry.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = entry.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					value = 'U-' + value;
+				} else {
+					break;
+				}
+
+				entry.special = entry.special.replace('$' + key + '$', value);
+			}
 			row.content += '<div>' + entry['special'] + '</div>';

 			// Club
--- a/server/scripts/regattas.js
+++ b/server/scripts/regattas.js
@@ -29,22 +29,26 @@ function buttonShowPressed() {
 }

 function initYear() {
-	var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function (resolve) {
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();

-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').val(year);

-	if (year == "user") {
-		var from = findGetParameter('from');
-		var to = findGetParameter('to');
-		if (from === null) from = formatDate('Y-m-d')
-		if (to === null) to = formatDate('Y-m-d')
-		$('#input-from').val(from).trigger('focusin').trigger('focusout');
-		$('#input-to').val(to).trigger('focusin').trigger('focusout');
-	}
+		if (year == "user") {
+			var from = findGetParameter('from');
+			var to = findGetParameter('to');
+			if (from === null) from = formatDate('Y-m-d')
+			if (to === null) to = formatDate('Y-m-d')
+			$('#input-from').val(from).trigger('focusin').trigger('focusout');
+			$('#input-to').val(to).trigger('focusin').trigger('focusout');
+		}

-	selectChange(false);
+		selectChange(false);
+
+		resolve();
+	});
 }

 var firstCall = true;
@@ -68,7 +72,7 @@ async function drawList () {
 var siteScript = async function() {
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
@@ -158,6 +162,27 @@ var siteScript = async function() {
 					entry.special = 'ERROR';
 				}
 			}
+			// replace placeholders
+			var pos;
+			while ((pos = entry.special.indexOf('$')) >= 0) {
+				var pos2 = entry.special.indexOf('$', pos + 1);
+				if (pos2 < 0) break;
+				var key = entry.special.substring(pos + 1, pos2);
+
+				var value = '';
+				// age class
+				if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+					var year = parseDate(entry.date).getFullYear();
+					year = year - value + 1;
+					var text = 'Jahrgänge ' + year + ' und jünger';
+					value = 'U-' + value;
+					specialShown[value] = text;
+				} else {
+					break;
+				}
+
+				entry.special = entry.special.replace('$' + key + '$', value);
+			}
 			row.content += '<div>' + entry.special + '</div>';

 			// Icons
@@ -235,9 +260,12 @@ var siteScript = async function() {
 			rows.push(null);
 		}

-		if (Object.keys(specialShown).length > 0) {
+		var specialKeys = Object.keys(specialShown);
+		if (specialKeys.length > 0) {
+			specialKeys.sort();
 			var specialText = '';
-			for (key in specialShown) {
+			for (i in specialKeys) {
+				var key = specialKeys[i];
 				specialText += '* ' + key + ': ' + specialShown[key] + '<br>';
 			}
 			$('#card-special').find('p').html(specialText);
--- a/server/version.php
+++ b/server/version.php
@@ -1,5 +1,5 @@
 <?php

-	define('PWA_VERSION', '1.11.2');
+	define('PWA_VERSION', '1.11.5h1');

 ?>
Author	SHA1	Message	Date
ostertun	c8cef6ee95	Merge branch 'hotfix/state_NSC'	2021-06-13 23:24:05 +02:00
ostertun	19f561ffde	gitflow-hotfix-stash: state_NSC	2021-06-13 23:23:25 +02:00
ostertun	4dfa2d7bd5	Merge branch 'release/v_1.11.5'	2020-12-24 11:08:35 +01:00
ostertun	c983a1702f	Fix Altersklassen & no_regattas_on_index	2020-12-23 15:08:36 +01:00
ostertun	a1facbca85	Altersklassen	2020-12-22 18:44:05 +01:00
ostertun	fba8c8e958	v_1.11.5 Dark Mode	2020-12-21 12:01:59 +01:00
ostertun	8aa3e3ccb6	Merge branch 'hotfix/no_regattas_on_index'	2020-12-11 17:27:49 +01:00
ostertun	c319e568b6	Merge branch 'hotfix/no_regattas_on_index' into develop	2020-12-11 17:27:48 +01:00
ostertun	748176159d	v_1.11.4h2 no_regattas_on_index	2020-12-11 17:27:44 +01:00
ostertun	053981175b	Merge branch 'hotfix/notify_android_lost_subscription'	2020-12-09 13:53:37 +01:00
ostertun	7083b46831	Merge branch 'hotfix/notify_android_lost_subscription' into develop	2020-12-09 13:53:37 +01:00
ostertun	2c8c99b8f0	v_1.11.4h1 notify_android_lost_subscription	2020-12-09 13:53:17 +01:00
ostertun	07d01ae700	Merge branch 'release/V_1.11.4'	2020-12-07 16:48:32 +01:00
ostertun	7da31729e9	Merge branch 'release/V_1.11.4' into develop	2020-12-07 16:48:32 +01:00
ostertun	08ab714a54	Release v_1.11.4	2020-12-07 16:48:08 +01:00
ostertun	44c962b7b3	Show next year in regattas lists	2020-12-07 16:47:24 +01:00
ostertun	004280f3ea	Merge branch 'hotfix/pushsubscription_onerror'	2020-11-19 13:20:41 +01:00
ostertun	63a8d174d7	Merge branch 'hotfix/pushsubscription_onerror' into develop	2020-11-19 13:20:41 +01:00
ostertun	13f496f0a6	gitflow-hotfix-stash: pushsubscription_onerror	2020-11-19 13:20:29 +01:00
ostertun	da553a8f8d	Merge branch 'release/v_1.11.3'	2020-11-01 17:00:27 +01:00
ostertun	69ef983c07	Merge branch 'release/v_1.11.3' into develop	2020-11-01 17:00:26 +01:00
ostertun	32473901d6	Release v_1.11.3	2020-11-01 17:00:04 +01:00
ostertun	84320f3a67	Planning-edit: Show known sailors	2020-11-01 16:58:47 +01:00
ostertun	cd30ba1ce6	Menu close on back improved	2020-11-01 16:45:00 +01:00
ostertun	1fb619d4ec	Planning: keep year	2020-11-01 16:38:06 +01:00
ostertun	0fd09c22a2	Link to entryList incl count	2020-10-29 14:52:36 +01:00
ostertun	12ed412226	Merge branch 'hotfix/error_report_button'	2020-10-22 14:54:24 +02:00
ostertun	7fd1c1c6e7	Merge branch 'hotfix/error_report_button' into develop	2020-10-22 14:54:23 +02:00
ostertun	4e85d3a993	gitflow-hotfix-stash: error_report_button	2020-10-22 14:54:18 +02:00
ostertun	a2fe4c2637	Merge branch 'release/v_1.11.2' into develop	2020-10-22 11:38:43 +02:00