Merge branch 'release/v_1.11.7'

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;
 	}
@@ -258,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);
 
@@ -277,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()) {
@@ -330,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,
@@ -352,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);
 				}
 			}
@@ -374,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) {
@@ -553,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');
@@ -601,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) {
@@ -1138,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

@@ -624,7 +624,7 @@ function sendErrorReport() {
 		url: QUERY_URL + 'error_report',
 		method: 'POST',
 		data: {
-			errors: consoleOutput,
+			errors: JSON.stringify(consoleOutput),
 			device: navigator.userAgent,
 			version: '<?php echo PWA_VERSION; ?>'
 		},
@@ -664,24 +664,24 @@ var addConsoleOpenerToPreloader = function() {
 }
 addConsoleOpenerToPreloader();
 
-function m2s_getLink(type, eventId) {
+function m2s_getLink(type, eventId, classId) {
 	switch (type) {
 		case 'entrylist':
-			return 'https://manage2sail.com/de-DE/event/' + eventId + '#!/entries';
+			return 'https://manage2sail.com/de-DE/event/' + eventId + '#!/entries?classId=' + classId;
 	}
 	return '';
 }
-function ro_getLink(type, eventId) {
+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 = '') {
+function extServiceGetLink(serviceName, type, eventId = '', classId = '') {
 	switch (serviceName) {
 		case 'm2s':
-			return m2s_getLink(type, eventId);
+			return m2s_getLink(type, eventId, classId);
 		case 'ro':
 			return ro_getLink(type, eventId);
 	}

server/content/planning_edit.php

@@ -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/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/scripts/onRegattaClicked.js

@@ -57,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]);
@@ -107,7 +114,7 @@ async function onRegattaClicked(id) {
 	}
 	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').attr('href', extServiceGetLink(regatta.extService, 'entrylist', extServiceData.eventId, extServiceData.classId)); // TODO
 		$('#menu-item-entrylist').show();
 	} else {
 		$('#menu-item-entrylist').hide();
@@ -187,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

@@ -178,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;
 			}
@@ -197,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]);
 

server/scripts/planning_edit.js

@@ -141,37 +141,6 @@ async function sailorsSearch() {
 	}
 }
 
-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 (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 planningChangeCrew(sid = null) {
 	if (sid !== null) {
 		showLoader();
@@ -230,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);
 
@@ -249,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 {
@@ -274,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();
 	}
@@ -332,9 +438,11 @@ var siteScript = async function() {
 		$('#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();
@@ -393,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;
 				}
@@ -488,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_view.js

@@ -124,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;
 			}
@@ -143,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]);
 
@@ -215,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,38 +106,96 @@ async function onRankingClicked(id) {
 	$('#menu-rank').scrollTop(0);
 }
 
+var rankings;
+
 async function selectChange(callSiteScript = true) {
-	var type = $('#select-type').val();
-	var year = parseInt($('#select-year').val());
-	if (type == "user") {
-		$('#select-year').parent().hide();
+	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); });
@@ -147,12 +205,13 @@ async function selectChange(callSiteScript = true) {
 					if ((date < parseDate('01.01.' + year)) || (date > parseDate('31.12.' + year))) {
 						continue;
 					}
-					if (regatta.name.indexOf(youthGermanName) >= 0) {
+					if (regatta.name.indexOf(r.quali_search) >= 0) {
 						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,23 +219,28 @@ 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;
+					from = (year - 1) + '-12-01';
+					to = year + '-11-30';
+					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();
 		}
@@ -185,40 +249,65 @@ async function selectChange(callSiteScript = true) {
 
 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');
-	var year = findGetParameter('year');
-	if (type === null) type = 'year';
-	if (year === null) year = new Date().getFullYear();
+	return new Promise(async function(resolve) {
+		var year = findGetParameter('year');
+		var type = findGetParameter('type');
+		if (year === null) year = new Date().getFullYear();
+		if (type === null) type = 'year';
 
-	$('#select-type').val(type);
+		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-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-type').html('<option value="' + type + '">' + type + '</option>');
+		$('#select-type').val(type);
 
-	if (type == "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');
-		var jugend = findGetParameter('jugend');
-		var jugstrict = findGetParameter('jugstrict');
-		$('#input-jugend').prop('checked', jugend !== null);
-		$('#input-jugstrict').prop('checked', jugstrict !== null);
-	}
+		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');
+			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);
+		selectChange(false);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -231,7 +320,12 @@ async function drawList () {
 		var list = '';
 		rows.forEach(function (entry) {
 			if (entry == null) {
-				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>';
+				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 +337,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 +369,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 +410,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/version.php

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