Merge branch 'hotfix/rank_quali'

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' }, '');
+		history.pushState(null, '');
 		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.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');
 

client/scripts/database.js

@@ -1,4 +1,4 @@
-const DB_VERSION = 7;
+const DB_VERSION = 8;
 
 const USER_ID = localStorage.getItem('auth_user');
 const USER_NAME = localStorage.getItem('auth_username');
@@ -145,9 +145,9 @@ var compareResultsRaceCount;
 function compareResults (a, b) {
 	if (a['netto'] != b['netto']) return (a['netto'] < b['netto']) ? -1 : 1;
 	var tempA = [...a['values']];
-	tempA.sort();
+	tempA.sort(function(a,b){return a-b;});
 	var tempB = [...b['values']];
-	tempB.sort();
+	tempB.sort(function(a,b){return a-b;});
 	for (var i = 0; i < compareResultsRaceCount; i ++) {
 		if (tempA[i] != tempB[i]) return (tempA[i] < tempB[i]) ? -1 : 1;
 	}
@@ -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)
@@ -256,10 +258,13 @@ function dbGetResultCalculated(regatta) {
 	});
 }
 
-function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
+function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = false) {
 	return new Promise(async function(resolve) {
 		var rankNoResults = [];
 
+		// TODO: remove / Abwärtskompatibilität
+		//if (maxAge === true) maxAge = await dbGetClassProp('youth-age');
+
 		var sailors = await dbGetData('sailors');
 		var regattas = await dbGetRegattasRange(minDate, maxDate);
 
@@ -275,10 +280,14 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 
 		for (var i in regattas) {
 			var regatta = regattas[i];
+			var date = parseDate(regatta.date);
 
 			// regatta has to be min. 2 days to be ranking regatta
 			if (regatta.length < 2) continue;
 
+			// regatta has to have rlf
+			if (regatta.rlf == 0) continue;
+
 			var results = await dbGetDataIndex('results', 'regatta', regatta.id);
 			if (results.length <= 0) {
 				if (regatta.dateTo <= getToday()) {
@@ -328,7 +337,20 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				if (result.rlp == 0) continue;
 
 				// check if crew is youth
-				// TODO: not used
+				if ((maxAge != false) && ageCrew) {
+					var crew = result.crew.split(',');
+					var okay = true;
+					for (var c in crew) {
+						if ((c == '') || !(c in sailorIds)) continue;
+						var sailor = sailors[sailorIds[c]];
+						if (((sailor.year != null) && (sailor.year < (formatDate('Y', date) - maxAge))) ||
+							((sailor.year == null) && (ageStrict))) {
+								okay = false;
+								break;
+						}
+					}
+					if (!okay) continue;
+				}
 
 				sailors[sailorIds[result.steuermann]].regattas[regatta.id] = {
 					regatta: regatta.id,
@@ -350,9 +372,9 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 		for (var i = sailors.length - 1; i >= 0; i --) {
 			if (sailors[i].german == '0') {
 				sailors.splice(i, 1);
-			} else if (jugend) {
-				if (((sailors[i].year != null) && (sailors[i].year < (formatDate('Y', maxDate) - (await dbGetClassProp('youth-age'))))) ||
-					((sailors[i].year == null) && (jugstrict))) {
+			} else if (maxAge != false) {
+				if (((sailors[i].year != null) && (sailors[i].year < (formatDate('Y', maxDate) - maxAge))) ||
+					((sailors[i].year == null) && (ageStrict))) {
 						sailors.splice(i, 1);
 				}
 			}
@@ -372,7 +394,7 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 				sum += parseFloat(r[1]);
 				sailors[i].regattas[r[0]].used ++;
 				cnt ++;
-				if (cnt >= 9) break;
+				if (cnt >= altM) break;
 			}
 			delete sailors[i].tmp_rlp;
 			if (cnt > 0) {
@@ -397,6 +419,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) {
@@ -524,7 +573,7 @@ function sync() {
 				localTimes[entry['table']] = entry['time'];
 			});
 
-			syncInProgress = 12;
+			syncInProgress = 13;
 			var syncOkay = true;
 			log("[db] Sync Start");
 			$('#i-sync').addClass('fa-spin');
@@ -572,6 +621,33 @@ function sync() {
 						}
 					});
 
+					// RANKINGS
+					getJSON(QUERY_URL + 'get_rankings', function (code, data) {
+						if (code == 200) {
+							var os = db.transaction('rankings', 'readwrite').objectStore('rankings');
+							data.data.forEach(function (entry) {
+								os.put(entry);
+							});
+							os.openCursor().onsuccess = function (event) {
+								var cursor = event.target.result;
+								if (cursor) {
+									if (!data.keys.includes(parseInt(cursor.key))) {
+										os.delete(cursor.key);
+									}
+									cursor.continue();
+								} else {
+									syncInProgress --;
+									log('[db] rankings synced, remaining:', syncInProgress);
+								}
+							};
+						} else {
+							log("[db] rankings: Something went wrong (HTTP " + code + ")");
+							syncOkay = false;
+							syncInProgress --;
+							log('[db] rankings failed, remaining:', syncInProgress);
+						}
+					});
+
 					// CLUBS
 					if (localTimes['clubs'] < serverTimes['clubs']) {
 						getJSON(QUERY_URL + 'get_clubs?changed-after=' + localTimes['clubs'], function (code, data) {
@@ -1109,6 +1185,11 @@ function initDatabase() {
 				var osClass = db.createObjectStore('class', { keyPath: 'key' });
 			}
 
+			if ((oldVersion < 8) && (newVersion >= 8)) {
+				log('[db] to version 8');
+				var osRankings = db.createObjectStore('rankings', { keyPath: 'id' });
+			}
+
 			// Force resync after db update
 			if (oldVersion >= 1) {
 				var osUpdateTimes = upgradeTransaction.objectStore('update_times');

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);
+	.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,21 +412,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) {
-				toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
-			}
-			hideLoader();
+				log('[app] Subscription sent to server');
+				resolve(true);
 			},
 			error: function (jqXHR, textStatus, errorThrown) {
-			throw 'Cannot update server subscription';
+				log('[app] Error sending subscription to server');
+				resolve(false);
 			}
 		});
+	});
 }
 
 async function initPushSettings() {
@@ -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,26 +618,13 @@ var onAfterSync = function() {
 	updateNewsBadge();
 }
 
-// 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(){
+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,
+			errors: JSON.stringify(consoleOutput),
 			device: navigator.userAgent,
 			version: '<?php echo PWA_VERSION; ?>'
 		},
@@ -601,9 +640,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, classId) {
+	switch (type) {
+		case 'entrylist':
+			return 'https://manage2sail.com/de-DE/event/' + eventId + '#!/entries?classId=' + classId;
+	}
+	return '';
+}
+function ro_getLink(type, eventId, classId) {
+	switch (type) {
+		case 'entrylist':
+			return 'http://www.raceoffice.org/entrylist.php?eid=' + eventId;
+	}
+	return '';
+}
+function extServiceGetLink(serviceName, type, eventId = '', classId = '') {
+	switch (serviceName) {
+		case 'm2s':
+			return m2s_getLink(type, eventId, classId);
+		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
@@ -19,8 +19,13 @@
 
 	// Menu
 	$items = $tpl->load('menu/item-switch', ['In die Saison-Planung aufnehmen', 'html-id' => 'switch-planning-include', 'icon' => 'fa-check']);
+	$items .= $tpl->load('menu/item-simple', ['', '#', 'html-id' => 'item-boat']);
 	$items .= $tpl->load('menu/item-simple', ['', '#', 'html-id' => 'item-steuermann']);
-	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-edit', 'title' => 'Regatta bearbeiten', 'height' => 320]);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-edit', 'title' => 'Regatta bearbeiten', 'height' => 400]);
+
+	// Select boat
+	$items = $tpl->load('input', ['html-id' => 'input-edit-boat-search', 'placeholder' => 'Suche', 'type' => 'text']);
+	$sp['menus'] .= $tpl->load('menu/modal', [$items, 'html-id' => 'menu-boat', 'height' => 500, 'width' => 350]);
 
 	// Select sailor
 	$items = $tpl->load('input', ['html-id' => 'input-edit-search', 'placeholder' => 'Suche', 'type' => 'text']);

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/rank.php

@@ -7,22 +7,21 @@
 	// Title, Inputs
 	$content = "<h1>Ranglisten</h1>";
 
-	$options = '<option value="year">Jahres-Rangliste</option>';
-	$options .= '<option value="youth">Jugend-Rangliste</option>';
-	$options .= '<option value="idjm">' . $_CLASS['youth-german-name'] . '-Rangliste</option>';
-	$options .= '<option value="user">Benutzerdefiniert</option>';
-	$content .= $tpl->load('select', ['html-id' => 'select-type', 'placeholder' => 'Rangliste', 'options' => $options, 'css-class' => 'mt-3 mb-0']);
 	$content .= $tpl->load('select', ['html-id' => 'select-year', 'placeholder' => 'Jahr', 'css-class' => 'mt-3 mb-0']);
+	$content .= $tpl->load('select', ['html-id' => 'select-type', 'placeholder' => 'Rangliste', 'css-class' => 'mt-3 mb-0']);
 	$content .= $tpl->load('input', ['html-id' => 'input-from', 'placeholder' => 'Von', 'type' => 'date', 'css-class' => 'mt-3']);
 	$content .= $tpl->load('input', ['html-id' => 'input-to', 'placeholder' => 'Bis', 'type' => 'date']);
-	$chbox = $tpl->load('checkbox', ['html-id' => 'input-jugend', 'placeholder' => 'Jugend']);
-	$content .= '<div class="mb-3" style="display:inline-block; width:50%;">' . $chbox . '</div>';
-	$chbox = $tpl->load('checkbox', ['html-id' => 'input-jugstrict', 'placeholder' => 'Streng']);
-	$content .= '<div class="mb-3" style="display:inline-block; width:50%;">' . $chbox . '</div>';
+	$content .= $tpl->load('input', ['html-id' => 'input-altm', 'placeholder' => 'alt. m', 'type' => 'number']);
+	$content .= $tpl->load('input', ['html-id' => 'input-maxage', 'placeholder' => 'max. Alter (leer = nicht prüfen)', 'type' => 'number']);
+	$content .= $tpl->load('checkbox', ['html-id' => 'input-agestrict', 'placeholder' => 'unb. Jahrgänge ausschließen']);
+	$content .= $tpl->load('checkbox', ['html-id' => 'input-agecrew', 'placeholder' => 'Crew auch prüfen']);
 	$content .= $tpl->load('button', ['Anzeigen', '#', 'html-id' => 'button-show']);
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 
+	// Sepcial ranks
+	$sp['output'] .= $tpl->load('card', ['', 'html-id' => 'card-special-ranks']);
+
 	// No Results
 	$content = '<h2 class="color-white">ACHTUNG</h2>';
 	$content .= '<p class="color-white">Zu folgenden Regatten wurden noch keine Ergebnisse hinterlegt:</p>';

server/content/regatta_plan.php

@@ -12,7 +12,7 @@
 
 	// Plannings
 	$content = '<p id="p-info" class="mb-0"></p>';
-	$thead = '<tr><th>Benutzer</th><th>Steuermann/-frau</th><th>Crew</th></tr>';
+	$thead = '<tr><th>Benutzer</th><th>Boot</th><th>Steuermann/-frau</th><th>Crew</th></tr>';
 	$content .= $tpl->load('table', [$thead, 'html-id' => 'table-plannings', 'css-class' => 'mb-0 text-nowrap']);
 
 	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-plannings']);

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

@@ -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>

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>
 

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

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();
@@ -34,11 +57,18 @@ async function onRegattaClicked(id) {
 	// Your Planning
 	if (planning != null) {
 		$('#menu-item-yourplanning').show();
+		var boat = null;
+		if (planning.boat != null) {
+			boat = (await dbGetData('boats', planning.boat)).sailnumber;
+		}
 		var steuermann = null;
 		if (planning.steuermann != null) {
 			steuermann = (await dbGetData('sailors', planning.steuermann)).name;
 		}
-		var crew = [steuermann == null ? '[noch unklar]' : steuermann];
+		var crew = [
+			boat == null ? '[Boot unklar]' : boat,
+			steuermann == null ? '[St.mann unklar]' : steuermann
+		];
 		crewA = planning.crew.split(',');
 		for (i in crewA) {
 			var sailor = await dbGetData('sailors', crewA[i]);
@@ -68,12 +98,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, extServiceData.classId)); // TODO
+		$('#menu-item-entrylist').show();
+	} else {
+		$('#menu-item-entrylist').hide();
+	}
+
 	// Results
 	if (regatta['results'] == '1') {
 		$('#menu-item-results').show();
@@ -148,7 +194,7 @@ async function onRegattaClicked(id) {
 					$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 				}
 			} else {
-				$('#badge-regatta-meldung').text('Meldeschluss abgelaufen');
+				$('#badge-regatta-meldung').text('Meldeschluss abgelaufen, Nachmeldung möglich');
 				$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 			}
 		} else {

server/scripts/planning.js

@@ -74,11 +74,15 @@ function selectChange() {
 }
 
 function initYear() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#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);
@@ -171,6 +178,9 @@ var siteScript = async function() {
 			var club = null;
 			if (entry['club'] != null)
 				club = await dbGetData('clubs', entry['club']);
+			if (entry.planning.boat !== null) {
+				entry.planning.boat = (await dbGetData('boats', entry.planning.boat)).sailnumber;
+			}
 			if (entry.planning.steuermann !== null) {
 				entry.planning.steuermann = (await dbGetData('sailors', entry.planning.steuermann)).name;
 			}
@@ -190,6 +200,7 @@ var siteScript = async function() {
 			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.boat != null) row.keywords.push(entry.planning.boat);
 			if (entry.planning.steuermann != null) row.keywords.push(entry.planning.steuermann);
 			for (c in entry.planning.crew) row.keywords.push(entry.planning.crew[c]);
 
@@ -217,6 +228,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

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,29 +136,11 @@ 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 = [];
-	var dbSailors = await dbGetData('sailors');
-	dbSailors.sort(function(a,b){
-		return a.name.localeCompare(b.name);
-	});
-	for (s in dbSailors) {
-		var item = '<a class="item-sailor-search" onclick="sailorSelected(' + dbSailors[s].id + ')">';
-		item += '<span>' + dbSailors[s].name + '</span>';
-		item += '<i class="fa fa-angle-right"></i>';
-		item += '</a>';
-		sailors.push({
-			keywords: [dbSailors[s].name],
-			content: item
-		});
-	}
-}
-
 async function planningChangeCrew(sid = null) {
 	if (sid !== null) {
 		showLoader();
@@ -206,6 +199,136 @@ async function planningChangeSteuermann() {
 	$('#input-edit-search').focus();
 }
 
+var boats = [];
+var boatKnownIds = [];
+var boatKnown = [];
+
+async function boatSelected(bid) {
+	$('#menu-boat').hideMenu();
+	showLoader();
+	var rid = $('#switch-planning-include').data('regatta');
+	var action = 'planning_set_boat';
+	// add boat
+	var auth = {
+		id: localStorage.getItem('auth_id'),
+		hash: localStorage.getItem('auth_hash')
+	}
+	$.ajax({
+		url: QUERY_URL + action,
+		method: 'POST',
+		data: {
+			auth: auth,
+			regatta: rid,
+			boat: bid
+		},
+		error: function (xhr, status, error) {
+			if (xhr.status == 401) {
+				log('authentification failed');
+				toastError('Authentifizierung fehlgeschlagen. Versuche es erneut.');
+			} else if (xhr.status == 0) {
+				toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um die &Auml;nderungen zu speichern');
+			} else {
+				log(action + ': unbekannter Fehler', status, error);
+				log(xhr);
+				toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
+			}
+			hideLoader();
+		},
+		success: async function (data, status, xhr) {
+			await sync();
+			if ((bid === null) || (bid in boatKnownIds)) {
+				planningEdit(rid);
+				hideLoader();
+			} else {
+				location.reload();
+			}
+		}
+	});
+}
+
+async function boatsSearch() {
+	$('.item-boat-search').remove();
+	var item = '<a class="item-boat-search" onclick="boatSelected(null)">';
+	item += '<span style="font-style:italic;">noch unklar</span>';
+	item += '<i class="fa fa-angle-right"></i>';
+	item += '</a>';
+	$('#menu-boat').find('.content').find('.list-group').append(item);
+	if ($('#input-edit-boat-search').val().length == 0) {
+		boatKnown.forEach(function (entry) {
+			$('#menu-boat').find('.content').find('.list-group').append(entry);
+		});
+	}
+	if ($('#input-edit-boat-search').val().length >= 3) {
+		boats.forEach(function (entry) {
+			if (search($('#input-edit-boat-search').val(), entry.keywords)) {
+				$('#menu-boat').find('.content').find('.list-group').append(entry.content);
+			}
+		});
+	} else {
+		var item = '<p class="item-boat-search">Zum Suchen mindestens 3 Zeichen eingeben</p>';
+		$('#menu-boat').find('.content').find('.list-group').append(item);
+	}
+}
+
+async function planningChangeBoat() {
+	$('#input-edit-boat-search').val('').trigger('focusin').trigger('focusout');
+	boatsSearch();
+	$('#menu-edit').hideMenu();
+	$('#menu-boat').find('.menu-title').find('h1').text('Boot bearbeiten');
+	$('#menu-boat').showMenu();
+	$('#input-edit-boat-search').focus();
+}
+
+async function initBoatsSailors() {
+	boats = [];
+	sailors = [];
+	boatKnown = [];
+	known = [];
+	var plannings = await dbGetDataIndex('plannings', 'user', USER_ID);
+	boatKnownIds = {};
+	knownIds = {};
+	for (var p in plannings) {
+		p = plannings[p];
+		if (p.boat !== null) boatKnownIds[p.boat] = true;
+		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 dbBoats = await dbGetData('boats');
+	dbBoats.sort(function(a,b){
+		return a.sailnumber.localeCompare(b.sailnumber);
+	});
+	for (var b in dbBoats) {
+		var item = '<a class="item-boat-search" onclick="boatSelected(' + dbBoats[b].id + ')">';
+		item += '<span>' + dbBoats[b].sailnumber + ' - ' + dbBoats[b].name + '</span>';
+		item += '<i class="fa fa-angle-right"></i>';
+		item += '</a>';
+		boats.push({
+			keywords: [dbBoats[b].sailnumber, dbBoats[b].name],
+			content: item
+		});
+		if (dbBoats[b].id in boatKnownIds) boatKnown.push(item);
+	}
+	var dbSailors = await dbGetData('sailors');
+	dbSailors.sort(function(a,b){
+		return a.name.localeCompare(b.name);
+	});
+	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>';
+		item += '</a>';
+		sailors.push({
+			keywords: [dbSailors[s].name],
+			content: item
+		});
+		if (dbSailors[s].id in knownIds) known.push(item);
+	}
+}
+
 async function planningEdit(id) {
 	var regatta = await dbGetData('regattas', id);
 
@@ -225,7 +348,13 @@ async function planningEdit(id) {
 	$('#switch-planning-include').data('regatta', id);
 	if (planning !== null) {
 		$('#switch-planning-include').prop('checked', true);
+		$('#item-boat').show();
 		$('#item-steuermann').show();
+		if (planning.boat !== null) {
+			$('#item-boat').find('span').text('Boot: ' + (await dbGetData('boats', planning.boat)).sailnumber);
+		} else {
+			$('#item-boat').find('span').html('Boot: <font style="font-style:italic;">noch unklar</font>');
+		}
 		if (planning.steuermann !== null) {
 			$('#item-steuermann').find('span').text('Am Steuer: ' + (await dbGetData('sailors', planning.steuermann)).name);
 		} else {
@@ -250,6 +379,7 @@ async function planningEdit(id) {
 		$('#menu-edit').find('.content').find('.list-group').append(item);
 	} else {
 		$('#switch-planning-include').prop('checked', false);
+		$('#item-boat').hide();
 		$('#item-steuermann').hide();
 		$('.item-crew').remove();
 	}
@@ -267,11 +397,15 @@ function selectChange() {
 }
 
 function initYear() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#select-year').val(year);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -300,13 +434,15 @@ 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);
+		$('#item-boat').click(planningChangeBoat);
 		$('#item-steuermann').click(planningChangeSteuermann);
 		$('#input-edit-search').on('input', sailorsSearch);
-		initSailors();
+		$('#input-edit-boat-search').on('input', boatsSearch);
+		initBoatsSailors();
 	}
 
 	today = getToday();
@@ -365,6 +501,9 @@ var siteScript = async function() {
 			if (entry['club'] != null)
 				club = await dbGetData('clubs', entry['club']);
 			if (entry.planning !== null) {
+				if (entry.planning.boat !== null) {
+					entry.planning.boat = (await dbGetData('boats', entry.planning.boat)).sailnumber;
+				}
 				if (entry.planning.steuermann !== null) {
 					entry.planning.steuermann = (await dbGetData('sailors', entry.planning.steuermann)).name;
 				}
@@ -411,6 +550,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
@@ -443,10 +599,15 @@ var siteScript = async function() {
 
 				// ZEILE 5
 				row.content += '<div>';
-				row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : 'noch unklar') + '</div>';
+				row.content += '<div>' + (entry.planning.boat !== null ? entry.planning.boat : '<i>Boot unklar</i>') + '</div>';
 				row.content += '</div>';
 
-				// ZEILE 6...
+				// ZEILE 6
+				row.content += '<div>';
+				row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : '<i>St.mann unklar</i>') + '</div>';
+				row.content += '</div>';
+
+				// ZEILE 7...
 				for (var i in entry.planning.crew) {
 					row.content += '<div>';
 					row.content += '<div>' + entry.planning.crew[i] + '</div>';

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() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#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);
 	}

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() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#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);
 	}
@@ -118,6 +124,9 @@ var siteScript = async function() {
 			var club = null;
 			if (entry['club'] != null)
 				club = await dbGetData('clubs', entry['club']);
+			if (entry.planning.boat !== null) {
+				entry.planning.boat = (await dbGetData('boats', entry.planning.boat)).sailnumber;
+			}
 			if (entry.planning.steuermann !== null) {
 				entry.planning.steuermann = (await dbGetData('sailors', entry.planning.steuermann)).name;
 			}
@@ -137,6 +146,7 @@ var siteScript = async function() {
 			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.boat != null) row.keywords.push(entry.planning.boat);
 			if (entry.planning.steuermann != null) row.keywords.push(entry.planning.steuermann);
 			for (c in entry.planning.crew) row.keywords.push(entry.planning.crew[c]);
 
@@ -161,6 +171,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
@@ -192,10 +219,15 @@ var siteScript = async function() {
 
 			// ZEILE 5
 			row.content += '<div>';
-			row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : 'noch unklar') + '</div>';
+			row.content += '<div>' + (entry.planning.boat !== null ? entry.planning.boat : '<i>Boot unklar</i>') + '</div>';
 			row.content += '</div>';
 
-			// ZEILE 6...
+			// ZEILE 6
+			row.content += '<div>';
+			row.content += '<div>' + (entry.planning.steuermann !== null ? entry.planning.steuermann : '<i>St.mann unklar</i>') + '</div>';
+			row.content += '</div>';
+
+			// ZEILE 7...
 			for (var i in entry.planning.crew) {
 				row.content += '<div>';
 				row.content += '<div>' + entry.planning.crew[i] + '</div>';

server/scripts/rank.js

@@ -106,53 +106,114 @@ async function onRankingClicked(id) {
 	$('#menu-rank').scrollTop(0);
 }
 
-async function selectChange(callSiteScript = true) {
-	var type = $('#select-type').val();
-	var year = parseInt($('#select-year').val());
-	if (type == "user") {
-		$('#select-year').parent().hide();
+var rankings;
+
+function selectChange(callSiteScript = true) {
+	return new Promise(async function (resolve) {
+		var year = $('#select-year').val();
+		if (year == "user") {
+			$('#select-type').parent().hide();
 			$('#input-from').trigger('focusin').trigger('focusout').parent().show();
 			$('#input-to').trigger('focusin').trigger('focusout').parent().show();
-		$('#input-jugend').parent().parent().show();
-		$('#input-jugstrict').parent().parent().show();
+			$('#input-altm').trigger('focusin').trigger('focusout').parent().show();
+			$('#input-maxage').trigger('focusin').trigger('focusout').parent().show();
+			$('#input-agestrict').parent().show();
+			$('#input-agecrew').parent().show();
 			$('#button-show').show();
+			$('#card-special-ranks').hide();
 		} else {
-		$('#select-year').parent().show();
+			year = parseInt(year);
+			var type = $('#select-type').val();
+			console.log('[rank] selected', year, type);
+			$('#select-type').parent().show();
 			$('#input-from').parent().hide();
 			$('#input-to').parent().hide();
-		$('#input-jugend').parent().parent().hide();
-		$('#input-jugstrict').parent().parent().hide();
+			$('#input-altm').parent().hide();
+			$('#input-maxage').parent().hide();
+			$('#input-agestrict').parent().hide();
+			$('#input-agecrew').parent().hide();
 			$('#button-show').hide();
+			$('#card-special-ranks').hide(); // first hide, show only when there are special ranks
 
-		var from, to, jugend, jugstrict;
-		switch (type) {
+			var rankingsShow = {};
+			var options = '';
+			for (var i in rankings) {
+				if (rankings[i].year_from !== null && rankings[i].year_from > year) continue;
+				if (rankings[i].year_to !== null && rankings[i].year_to < year) continue;
+				var alias = rankings[i].alias;
+				options += '<option value="' + alias + '">' + rankings[i].name + '</option>';
+				rankingsShow[alias] = rankings[i];
+			}
+			$('#select-type').html(options);
+			if (!(type in rankingsShow)) {
+				console.log('[rank] selected type', type, 'not found for year', year, '. Using `year`');
+				type = 'year';
+			}
+			$('#select-type').val(type).trigger('focusin').trigger('focusout');
+
+			// special ranks
+			getJSON(QUERY_URL + 'get_special_rankings', function (code, data) {
+				if (code == 200) {
+					var specialRanks = [];
+					for (var i in data.data) {
+						var sr = data.data[i];
+						if (sr.to < (year + '-01-01')) continue;
+						if (sr.to > (year + '-12-31')) continue;
+						specialRanks.push(sr);
+					}
+					if (specialRanks.length > 0) {
+						var btns = '';
+						for (var i in specialRanks) {
+							var sr = specialRanks[i];
+							var link = 'https://regatten.net/frame.php?class=' + BOATCLASS + '&site=special_rank&rank_id=' + sr.id;
+							var name = sr.title;
+							var cssclass = i > 0 ? ' mt-3' : '';
+							btns += '<a class="btn btn-full rounded-s text-uppercase font-900 shadow-m bg-highlight' + cssclass + '" href="' + link + '">' + name + '</a>';
+						}
+						$('#card-special-ranks').find('.content').html(btns);
+						$('#card-special-ranks').show();
+					}
+				} else {
+					log("[rank] special_ranks: Something went wrong (HTTP " + code + ")");
+				}
+			});
+
+			var from, to, altm, maxage, agestrict, agecrew;
+			altm = 9; maxage = false; agestrict = false; agecrew = false;
+			var r = rankingsShow[type];
+			console.log('[rank] type', type, '=>', r);
+			if (r.max_age !== null) {
+				maxage = r.max_age;
+				agestrict = r.age_strict == 1;
+				agecrew = r.age_crew == 1;
+			}
+			if (r.alt_m !== null) {
+				altm = r.alt_m;
+			}
+			switch (r.type) {
 				case 'year':
 					from = (year - 1) + '-12-01';
 					to = year + '-11-30';
-				jugend = jugstrict = false;
 					break;
-			case 'youth':
-				from = (year - 1) + '-12-01';
-				to = year + '-11-30';
-				jugend = jugstrict = true;
-				break;
-			case 'idjm':
-				var youthGermanName = await dbGetClassProp('youth-german-name');
+				case 'quali':
+					// TODO: auslagern in function getRegattaBegin
 					var beginn = null;
 					var regattas = await dbGetData('regattas');
 					regattas.sort(function(a,b){ return b.date.localeCompare(a.date); });
-				for (var r in regattas) {
-					var regatta = regattas[r];
+					for (var ri in regattas) {
+						var regatta = regattas[ri];
 						var date = parseDate(regatta.date);
 						if ((date < parseDate('01.01.' + year)) || (date > parseDate('31.12.' + year))) {
 							continue;
 						}
-					if (regatta.name.indexOf(youthGermanName) >= 0) {
+						if (regatta.name.toLowerCase().indexOf(r.quali_search.toLowerCase()) >= 0) {
+							console.log('FOUND', regatta);
 							beginn = ((regatta.meldungSchluss != null) ? parseDate(regatta.meldungSchluss) : date);
 							break;
 						}
 					}
-				if (beginn != null) {
+					// END OF TODO
+					if (beginn !== null) {
 						from = new Date(beginn);
 						from.setFullYear(from.getFullYear() - 1);
 						from.setDate(from.getDate() - 13);
@@ -160,65 +221,98 @@ async function selectChange(callSiteScript = true) {
 						to = new Date(beginn);
 						to.setDate(to.getDate() - 14);
 						to = formatDate('Y-m-d', to);
-					jugend = true;
-					jugstrict = false;
 					} else {
-					$('#div-rank').html('Keine ' + youthGermanName + ' gefunden!');
-					$('#input-search').parent().hide();
-					return;
+						console.log('[rank] no regatta found');
+						from = year + '-12-31'; // reverse => no regattas will be found => no ranking
+						to = year + '-01-01';
+						break; // TODO: bessere Fehlermeldung - keine Regatta gefunden
 					}
 					break;
+				default: // TODO: bessere Fehlermeldung - tritt nur bei Fehlkonfiguration in DB auf
+					from = (year - 1) + '-12-01';
+					to = year + '-11-30';
+					break;
 			}
 
+			console.log('[rank] setting', from, to, altm, maxage, agestrict, agecrew);
 			$('#input-from').val(from);
 			$('#input-to').val(to);
-		$('#input-jugend').prop('checked', jugend);
-		$('#input-jugstrict').prop('checked', jugstrict);
+			$('#input-altm').val(altm);
+			$('#input-maxage').val(maxage == false ? '' : maxage);
+			$('#input-agestrict').prop('checked', agestrict);
+			$('#input-agecrew').prop('checked', agecrew);
 
 			if (callSiteScript && (typeof siteScript === 'function')) {
-			history.replaceState(null, '', '?type=' + type + '&year=' + year);
+				history.replaceState(null, '', '?year=' + year + '&type=' + type);
 				showLoader();
 				siteScript();
 			}
 		}
+		resolve();
+	});
 }
 
 function buttonShowPressed() {
 	if (typeof siteScript === 'function') {
-		var chboxes = '';
-		if ($('#input-jugend').prop('checked')) chboxes += '&jugend=on'
-		if ($('#input-jugstrict').prop('checked')) chboxes += '&jugstrict=on'
-		history.replaceState(null, '', '?type=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val() + chboxes)
+		var additional = '';
+		if ($('#input-maxage').val() != '') additional += '&maxage=' + $('#input-maxage').val();
+		if ($('#input-agestrict').prop('checked')) additional += '&agestrict=on';
+		if ($('#input-agecrew').prop('checked')) additional += '&agecrew=on';
+		history.replaceState(null, '', '?year=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val() + "&altm=" + $('#input-altm').val() + additional)
 		showLoader();
 		siteScript();
 	}
 }
 
 function initSelects() {
-	var type = findGetParameter('type');
+	return new Promise(async function(resolve) {
 		var year = findGetParameter('year');
-	if (type === null) type = 'year';
+		var type = findGetParameter('type');
 		if (year === null) year = new Date().getFullYear();
+		if (type === null) type = '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;
+		});
+		var yearFound = year == 'user';
+		var options = '<option value="user">Benutzerdefiniert</option>';
+		for (id in years) {
+			var y = years[id]['year'];
+			options += '<option value="' + y + '">' + y + '</option>';
+			if (year == y) yearFound = true;
+		}
+		$('#select-year').html(options);
+		$('#select-year').val(yearFound ? year : years[0]);
+
+		$('#select-type').html('<option value="' + type + '">' + type + '</option>');
 		$('#select-type').val(type);
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
-
-	if (type == "user") {
+		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')
+			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');
-		var jugend = findGetParameter('jugend');
-		var jugstrict = findGetParameter('jugstrict');
-		$('#input-jugend').prop('checked', jugend !== null);
-		$('#input-jugstrict').prop('checked', jugstrict !== null);
+			var altm = findGetParameter('altm');
+			if (altm === null) altm = 9;
+			$('#input-altm').val(altm).trigger('focusin').trigger('focusout');
+			var maxage = findGetParameter('maxage');
+			if (maxage === null) maxage = '';
+			$('#input-maxage').val(maxage).trigger('focusin').trigger('focusout');
+			var agestrict = findGetParameter('agestrict');
+			var agecrew = findGetParameter('agecrew');
+			$('#input-agestrict').prop('checked', agestrict !== null);
+			$('#input-agecrew').prop('checked', agecrew !== null);
 		}
 
-	selectChange(false);
+		await selectChange(false);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -231,7 +325,12 @@ async function drawList () {
 		var list = '';
 		rows.forEach(function (entry) {
 			if (entry == null) {
+				var altm = $('#input-altm').val(); if (altm == '') altm = 9; else altm = parseInt(altm);
+				if (altm == 9) {
 					list += '<div><div align="center" class="color-highlight" style="white-space:normal;"><b>Ende der Rangliste gem&auml;&szlig; DSV-Ranglistenverordnung (min. m = 9 Wertungen)</b></div></div>';
+				} else {
+					list += '<div><div align="center" class="color-highlight" style="white-space:normal;"><b>Ende der Rangliste (min. m = ' + altm + ' Wertungen)</b></div></div>';
+				}
 			} else if (search($('#input-search').val(), entry.keywords)) {
 				list += entry.content;
 			}
@@ -243,27 +342,31 @@ async function drawList () {
 var siteScript = async function() {
 	if (firstCall) {
 		firstCall = false;
-		initSelects();
-		$('#select-type').change(selectChange);
+		rankings = await dbGetData('rankings');
+		await initSelects();
 		$('#select-year').change(selectChange);
+		$('#select-type').change(selectChange);
 		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
 	}
 
 	var minDate = parseDate($('#input-from').val());
 	var maxDate = parseDate($('#input-to').val());
-	var jugend = $('#input-jugend').prop('checked');
-	var jugstrict = $('#input-jugstrict').prop('checked');
-	var dbRanking = await dbGetRanking(minDate, maxDate, jugend, jugstrict);
+	var altm = $('#input-altm').val(); if (altm == '') altm = 9; else altm = parseInt(altm);
+	var maxage = $('#input-maxage').val(); if (maxage == '') maxage = false; else maxage = parseInt(maxage);
+	var agestrict = $('#input-agestrict').prop('checked');
+	var agecrew = $('#input-agecrew').prop('checked');
+	console.log('[rank] rank params:', minDate, maxDate, altm, maxage, agestrict, agecrew);
+	var dbRanking = await dbGetRanking(minDate, maxDate, maxage, agestrict, altm, agecrew);
 	ranking = dbRanking[0];
 
-	lastRanking = null;
+	lastRanking = null; // TODO: also for quali ranks
 	if (($('#select-type').val() == 'year') || ($('#select-type').val() == 'youth')) {
 		lastRanking = {};
 		var lYear = parseInt($('#select-year').val()) - 1;
 		var lMinDate = parseDate((lYear - 1) + '-12-01');
 		var lMaxDate = parseDate(lYear + '-11-30');
-		var lDbRanking = (await dbGetRanking(lMinDate, lMaxDate, jugend, jugstrict))[0];
+		var lDbRanking = (await dbGetRanking(lMinDate, lMaxDate, maxage, agestrict, altm, agecrew))[0];
 		for (var i in lDbRanking) {
 			lastRanking[lDbRanking[i].id] = lDbRanking[i].rank;
 		}
@@ -271,20 +374,6 @@ var siteScript = async function() {
 
 	var selectedYear = $('#select-year').val();
 
-	var years = await dbGetData('years');
-	years.sort(function (a, b) {
-		if (a['year'] > b['year']) return -1;
-		if (a['year'] < b['year']) return 1;
-		return 0;
-	});
-	var options = '';
-	for (id in years) {
-		var year = years[id]['year'];
-		options += '<option value="' + year + '">' + year + '</option>';
-	}
-	$('#select-year').html(options);
-	$('#select-year').val(selectedYear);
-
 	if (dbRanking[1].length > 0) {
 		$('#card-noresults').show();
 		list = '';
@@ -326,7 +415,7 @@ var siteScript = async function() {
 			if (entry['year'] != null) row.keywords.push(entry['year']);
 			if (club != null) row.keywords.push(club['kurz'], club['name']);
 
-			if (!dsvEnd && (entry.m < 9)) {
+			if (!dsvEnd && (entry.m < altm)) {
 				rows.push(null);
 				dsvEnd = true;
 			}

server/scripts/regatta_plan.js

@@ -38,6 +38,12 @@ var siteScript = async function() {
 
 			tbody += '<td>' + (await dbGetData('users', planning.user)).username + '</td>';
 
+			if (planning.boat != null) {
+				tbody += '<td>' + (await dbGetData('boats', planning.boat)).sailnumber + '</td>';
+			} else {
+				tbody += '<td>(noch unklar)</td>';
+			}
+
 			if (planning.steuermann != null) {
 				tbody += '<td>' + (await dbGetData('sailors', planning.steuermann)).name + '</td>';
 			} else {

server/scripts/regattas.js

@@ -29,8 +29,9 @@ function buttonShowPressed() {
 }
 
 function initYear() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#select-year').val(year);
@@ -45,6 +46,9 @@ function initYear() {
 		}
 
 		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);

server/version.php

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