Merge branch 'temp'

client/scripts/database.js

@@ -258,7 +258,7 @@ function dbGetResultCalculated(regatta) {
 	});
 }
 
-function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = false) {
+function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = false, personMode = 0) {
 	return new Promise(async function(resolve) {
 		var rankNoResults = [];
 
@@ -288,6 +288,7 @@ function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = f
 			// regatta has to have rlf
 			if (regatta.rlf == 0) continue;
 
+			// get results
 			var results = await dbGetDataIndex('results', 'regatta', regatta.id);
 			if (results.length <= 0) {
 				if (regatta.dateTo <= getToday()) {
@@ -339,8 +340,10 @@ function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = f
 				// check if crew is youth
 				if ((maxAge != false) && ageCrew) {
 					var crew = result.crew.split(',');
+					crew.push(result.steuermann);
 					var okay = true;
-					for (var c in crew) {
+					for (var ci in crew) {
+						var c = crew[ci];
 						if ((c == '') || !(c in sailorIds)) continue;
 						var sailor = sailors[sailorIds[c]];
 						if (((sailor.year != null) && (sailor.year < (formatDate('Y', date) - maxAge))) ||
@@ -352,9 +355,11 @@ function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = f
 					if (!okay) continue;
 				}
 
+				if (personMode == 0 || personMode == 2) { // add to helmsman
 					sailors[sailorIds[result.steuermann]].regattas[regatta.id] = {
 						regatta: regatta.id,
 						boat: result.boat,
+						helm: result.steuermann,
 						crew: result.crew,
 						place: result.place,
 						fb: fb,
@@ -366,6 +371,28 @@ function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = f
 						sailors[sailorIds[result.steuermann]].tmp_rlp.push([regatta.id, result.rlp]);
 					}
 				}
+				if (personMode == 1 || personMode == 2) { // add to crew
+					var crew = result.crew.split(',');
+					for (var ci in crew) {
+						var c = crew[ci];
+						if ((c == '') || !(c in sailorIds)) continue;
+						sailors[sailorIds[c]].regattas[regatta.id] = {
+							regatta: regatta.id,
+							boat: result.boat,
+							helm: result.steuermann,
+							crew: result.crew,
+							place: result.place,
+							fb: fb,
+							rlp: result.rlp,
+							used: 0,
+							m: m
+						};
+						for (var j = 0; j < m; j ++) {
+							sailors[sailorIds[c]].tmp_rlp.push([regatta.id, result.rlp]);
+						}
+					}
+				}
+			}
 		}
 
 		// remove not german or not youth sailors
@@ -411,8 +438,16 @@ function dbGetRanking(minDate, maxDate, maxAge, ageStrict, altM = 9, ageCrew = f
 			return b.rlp - a.rlp;
 		});
 
+		var lastPoints = 0;
+		var lastRank = 1;
 		for (var i = 0; i < sailors.length; i ++) {
+			if (lastPoints == sailors[i].rlp) {
+				sailors[i].rank = lastRank;
+			} else {
 				sailors[i].rank = (i + 1);
+				lastRank = (i + 1);
+				lastPoints = sailors[i].rlp;
+			}
 		}
 
 		resolve([sailors, rankNoResults]);

client/scripts/regatten.js.php

@@ -5,6 +5,8 @@
 	require_once(__DIR__ . '/../../server/config.php');
 	require_once(__DIR__ . '/../../server/version.php');
 
+// QUERY_URL changed in config.php (this is to update this file on client devices)
+
 ?>
 
 const QUERY_URL = '<?php echo QUERY_URL; ?>';
@@ -678,12 +680,21 @@ function ro_getLink(type, eventId, classId) {
 	}
 	return '';
 }
+function wfn_getLink(type, eventId, classId) {
+	switch (type) {
+		case 'entrylist':
+			return 'https://wettfahrten.net/event/' + eventId + '/entrylist?class=' + classId;
+	}
+	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 ro_getLink(type, eventId, classId);
+		case 'wfn':
+			return wfn_getLink(type, eventId, classId);
 	}
 	return '';
 }

server/content/contact.php

@@ -15,11 +15,11 @@
 	$content .= 'Egal was es ist, lass es uns wissen! Schreibe uns eine Mail an <a href="mailto:info@regatten.net">info@regatten.net</a> oder nutze einfach dieses Kontakt-Formular.<br>';
 	$content .= 'Wir werden Deine Anfrage so schnell wie m&ouml;glich bearbeiten.';
 	$content .= '</p>';
-	$content .= '<p>';
-	$content .= 'Alternativ erreichst Du uns auch telefonisch unter <a href="tel:+4941039659768">+49 (0) 4103 965 976 8</a><br>';
-	$content .= 'Mo-Fr: 7-20 Uhr<br>';
-	$content .= 'Sa: 9-17 Uhr';
-	$content .= '</p>';
+	//$content .= '<p>';
+	//$content .= 'Alternativ erreichst Du uns auch telefonisch unter <a href="tel:+4941039659768">+49 (0) 4103 965 976 8</a><br>';
+	//$content .= 'Mo-Fr: 7-20 Uhr<br>';
+	//$content .= 'Sa: 9-17 Uhr';
+	//$content .= '</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 

server/content/index.php

@@ -74,8 +74,8 @@
 	$content .= '<font class="show-loggedin">Erstelle einfach eine <a href="' . LINK_PRE . 'planning">Saison-Planung</a> und abonniere Deinen persönlichen Kalender.</font>';
 	$content .= '<font class="show-notloggedin"><a href="#" data-menu="menu-signup">Registriere Dich einfach kostenlos</a>, erstelle eine Saison-Planung und wir erstellen Dir einen pers&ouml;nlichen Kalender.</font>';
 	$content .= '</p>';
-	$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Regatta-Kalender', 'https://regatten.net/client/calendar/' . BOATCLASS . '/everything.ics', 'css-class' => 'mb-2']);
-	$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Kalender f&uuml;r <font class="replace-username"></font>', 'https://regatten.net/client/calendar/' . BOATCLASS . '/user_%USERID%.ics', 'css-class' => 'show-loggedin replace-userid-href']);
+	$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Regatta-Kalender', 'https://ranglisten.net/client/calendar/' . BOATCLASS . '/everything.ics', 'css-class' => 'mb-2']);
+	$content .= $tpl->load('button', ['<i class="fas fa-calendar-alt"></i> Kalender f&uuml;r <font class="replace-username"></font>', 'https://ranglisten.net/client/calendar/' . BOATCLASS . '/user_%USERID%.ics', 'css-class' => 'show-loggedin replace-userid-href']);
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 
@@ -86,11 +86,12 @@
 	$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', ['Fakten', '', 'html-id' => 'menu-item-facts', 'icon' => 'fa-list']);
 	$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
 	$items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']);
 	$items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']);
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']);
-	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 400]);
 
 	// Favorites Menu
 	$items = $tpl->load('menu/item-icon', ['Nicht mehr folgen', '#', 'html-id' => 'menu-item-unfollow', 'icon' => 'fa-heart', 'css-class' => ' border-0']);

server/content/planning.php

@@ -34,11 +34,12 @@
 	$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', ['Fakten', '', 'html-id' => 'menu-item-facts', 'icon' => 'fa-list']);
 	$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
 	$items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']);
 	$items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']);
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']);
-	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 400]);
 
 	// Menu Edit status
 	$items = $tpl->load('menu/item-switch', ['Gemeldet', 'html-id' => 'switch-status-gemeldet', 'icon' => 'fa-file-signature']);

server/content/planning_view.php

@@ -26,11 +26,12 @@
 	$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', ['Fakten', '', 'html-id' => 'menu-item-facts', 'icon' => 'fa-list']);
 	$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
 	$items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']);
 	$items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']);
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']);
-	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 400]);
 
 	$sp['scripts'] .= $scripts->load('onRegattaClicked');
 	$sp['scripts'] .= $scripts->load('planning_view');

server/content/rank.php

@@ -15,7 +15,8 @@
 	$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']);
+	$content .= $tpl->load('select', ['html-id' => 'select-personmode', 'placeholder' => 'nach', 'css-class' => 'mt-3 mb-0']);
+	$content .= $tpl->load('button', ['Anzeigen', '#', 'html-id' => 'button-show', 'css-class' => 'mt-3']);
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 

server/content/regatta_facts.php

@@ -0,0 +1,49 @@
+<?php
+
+	$sp['title'] = 'Fakten - Regatten.net ' . $_CLASS['name'];
+	$sp['backbutton'] = true;
+	$sp['activenav'] = 2;
+
+	// Title, Inputs
+	$content = '<h1 id="h1-title"></h1>';
+	$content .= '<p id="p-title"></p>';
+
+	$sp['output'] .= $tpl->load('card', [$content]);
+
+	// NO FACTS INFO
+	$content = '<p>Es sind keine Fakten zu dieser Veranstaltung hinterlegt. Bitte lies die Ausschreibung.</p>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-nofactsinfo']);
+
+	// Meldegeld
+	$content = '<h2>Meldegeld</h2>';
+	$content .= '<p></p>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-entryfee']);
+
+	// Wettfahrten
+	$content = '<h2>Wettfahrten</h2>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-races']);
+
+	// Zeitplan
+	$content = '<h2>Zeitplan</h2>';
+	$content .= $tpl->load('table', ['css-class' => 'mb-0 text-nowrap']);
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-times']);
+
+	// Camping
+	$content = '<h2>Camping</h2>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-camping']);
+
+	// Verpflegung
+	$content = '<h2>Verpflegung</h2>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-food']);
+
+	// Weitere Infos
+	$content = '<h2>Weitere Informationen</h2><p></p>';
+	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-text']);
+
+	// Disclaimer
+	$content = '<p><i>Alle Angaben ohne Gewähr. Änderungen vorbehalten. Am Ende gilt, was in der Ausschreibung / Segelanweisung steht!</i></p>';
+	$sp['output'] .= $tpl->load('card', [$content]);
+
+	$sp['scripts'] .= $scripts->load('regatta_facts');
+
+?>

server/content/regattas.php

@@ -14,6 +14,11 @@
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 
+	// To today
+	$content = $tpl->load('button', ['<i class="fas fa-arrow-down"></i>&emsp;Heute&emsp;<i class="fas fa-arrow-down"></i>', '#', 'html-id' => 'button-totoday']);
+
+	$sp['output'] .= $tpl->load('card', [$content]);
+
 	// Regattas
 	$content = '<p id="p-count" class="mb-0"></p>';
 	$content .= $tpl->load('input', ['html-id' => 'input-search', 'placeholder' => 'Suche', 'type' => 'text', 'css-class' => 'mt-2']);
@@ -30,11 +35,12 @@
 	$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', ['Fakten', '', 'html-id' => 'menu-item-facts', 'icon' => 'fa-list']);
 	$items .= $tpl->load('menu/item-icon', ['Informationen', '', 'html-id' => 'menu-item-info', 'icon' => 'fa-info']);
 	$items .= $tpl->load('menu/item-icon-badge', ['Meldung', '', 'html-id' => 'menu-item-meldung', 'icon' => 'fa-file-signature', 'badge-id' => 'badge-regatta-meldung']);
 	$items .= $tpl->load('menu/item-icon', ['offizielle Ergebnisse', '', 'html-id' => 'menu-item-oresults', 'icon' => 'fa-poll']);
 	$items .= $tpl->load('menu/item-icon', ['Vereins-Website', '', 'html-id' => 'menu-item-clubwebsite', 'icon' => 'fa-globe']);
-	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 320]);
+	$sp['menus'] .= $tpl->load('menu/bottom', [$items, 'html-id' => 'menu-regatta', 'title' => 'Regatta-Details', 'height' => 400]);
 
 	$sp['scripts'] .= $scripts->load('onRegattaClicked');
 	$sp['scripts'] .= $scripts->load('regattas');

server/page/menus.php

@@ -317,7 +317,7 @@
 			Das Nachladen kann außerdem gerade bei großen Datenmengen (wie Ranglisten) sehr lange dauern.
 			Wir empfehlen Dir daher, auf diesem Gerät unsere normale Website zu benutzen. Diese ist auch für Mobil-Geräte optimiert.
 		</p>
-		<a class="btn btn-m mt-2 btn-full bg-highlight text-uppercase font-900" href="https://regatten.net/">Zur Website</a>
+		<a class="btn btn-m mt-2 btn-full bg-highlight text-uppercase font-900" href="https://ranglisten.net/">Zur Website</a>
 		<a id="menu-nodb-warning-okay" class="btn btn-m mt-2 mb-3 btn-full bg-highlight text-uppercase font-900" href="#">Nicht erneut anzeigen</a>
 	</div>
 </div>

server/scripts/onRegattaClicked.js

@@ -137,6 +137,14 @@ async function onRegattaClicked(id) {
 		$('#menu-item-bericht').hide();
 	}
 
+	// Fakten
+	if ('facts' in regatta && regatta['facts'] != null) {
+		$('#menu-item-facts').show();
+		$('#menu-item-facts').attr('href', LINK_PRE + 'regatta_facts?regatta=' + regatta['id']);
+	} else {
+		$('#menu-item-facts').hide();
+	}
+
 	// Info
 	if (regatta['info'] != '') {
 		$('#menu-item-info').show();
@@ -151,10 +159,10 @@ async function onRegattaClicked(id) {
 		$('#menu-item-meldung').show();
 		$('#menu-item-meldung').attr('href', regatta['meldung']);
 		$('#menu-item-meldung').attr('target', '_blank');
-		if ((planning != null) && (planning['gemeldet'] == '1')) {
+		/*if ((planning != null) && (planning['gemeldet'] == '1')) {
 			$('#badge-regatta-meldung').text('schon gemeldet');
 			$('#badge-regatta-meldung').addClass('bg-green2-dark').removeClass('bg-highlight bg-red2-dark bg-yellow2-dark');
-		} else if (regatta['meldungOffen'] == '0') {
+		} else*/ if (regatta['meldungOffen'] == '0') {
 			$('#badge-regatta-meldung').text('geschlossen');
 			$('#badge-regatta-meldung').addClass('bg-highlight').removeClass('bg-green2-dark bg-red2-dark bg-yellow2-dark');
 		} else if (regatta['meldungSchluss'] != null) {

server/scripts/rank.js

@@ -83,6 +83,7 @@ async function onRankingClicked(id) {
 
 		// ZEILE 5...
 		var crew = entry.crew.split(',');
+		crew.unshift(entry.helm);
 		for (var c in crew) {
 			var cr = await dbGetData('sailors', crew[c]);
 			if (cr != null) {
@@ -165,7 +166,7 @@ function selectChange(callSiteScript = true) {
 						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 link = 'https://ranglisten.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>';
@@ -195,6 +196,10 @@ function selectChange(callSiteScript = true) {
 					from = (year - 1) + '-12-01';
 					to = year + '-11-30';
 					break;
+				case 'year2':
+					from = year + '-01-01';
+					to = year + '-12-31';
+					break;
 				case 'quali':
 					// TODO: auslagern in function getRegattaBegin
 					var beginn = null;
@@ -234,6 +239,8 @@ function selectChange(callSiteScript = true) {
 					break;
 			}
 
+			var personMode = $('#select-personmode').val();
+
 			console.log('[rank] setting', from, to, altm, maxage, agestrict, agecrew);
 			$('#input-from').val(from);
 			$('#input-to').val(to);
@@ -243,7 +250,7 @@ function selectChange(callSiteScript = true) {
 			$('#input-agecrew').prop('checked', agecrew);
 
 			if (callSiteScript && (typeof siteScript === 'function')) {
-				history.replaceState(null, '', '?year=' + year + '&type=' + type);
+				history.replaceState(null, '', '?year=' + year + '&type=' + type + '&pm=' + personMode);
 				showLoader();
 				siteScript();
 			}
@@ -258,7 +265,7 @@ function buttonShowPressed() {
 		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)
+		history.replaceState(null, '', '?year=user&from=' + $('#input-from').val() + "&to=" + $('#input-to').val() + "&altm=" + $('#input-altm').val() + "&pm=" + $('#select-personmode').val() + additional)
 		showLoader();
 		siteScript();
 	}
@@ -268,8 +275,10 @@ function initSelects() {
 	return new Promise(async function(resolve) {
 		var year = findGetParameter('year');
 		var type = findGetParameter('type');
+		var personMode = parseInt(findGetParameter('pm'));
 		if (year === null) year = new Date().getFullYear();
 		if (type === null) type = 'year';
+		if (isNaN(personMode) || personMode < 0 || personMode > 2) personMode = 0;
 
 		var years = await dbGetData('years');
 		years.sort(function (a, b) {
@@ -309,6 +318,12 @@ function initSelects() {
 			$('#input-agecrew').prop('checked', agecrew !== null);
 		}
 
+		options = '<option value="0">Steuerleuten</option>';
+		options += '<option value="1">Vorschotern</option>';
+		options += '<option value="2">allen Seglern</option>';
+		$('#select-personmode').html(options);
+		$('#select-personmode').val(personMode);
+
 		await selectChange(false);
 
 		resolve();
@@ -346,6 +361,7 @@ var siteScript = async function() {
 		await initSelects();
 		$('#select-year').change(selectChange);
 		$('#select-type').change(selectChange);
+		$('#select-personmode').change(selectChange);
 		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
 	}
@@ -356,8 +372,9 @@ var siteScript = async function() {
 	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);
+	var personMode = $('#select-personmode').val();
+	console.log('[rank] rank params:', minDate, maxDate, altm, maxage, agestrict, agecrew, personMode);
+	var dbRanking = await dbGetRanking(minDate, maxDate, maxage, agestrict, altm, agecrew, personMode);
 	ranking = dbRanking[0];
 
 	lastRanking = null; // TODO: also for quali ranks
@@ -366,7 +383,17 @@ var siteScript = async function() {
 		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, maxage, agestrict, altm, agecrew))[0];
+		var lDbRanking = (await dbGetRanking(lMinDate, lMaxDate, maxage, agestrict, altm, agecrew, personMode))[0];
+		for (var i in lDbRanking) {
+			lastRanking[lDbRanking[i].id] = lDbRanking[i].rank;
+		}
+	}
+	if ($('#select-type').val() == 'year2') {
+		lastRanking = {};
+		var lYear = parseInt($('#select-year').val()) - 1;
+		var lMinDate = parseDate(lYear + '-01-01');
+		var lMaxDate = parseDate(lYear + '-12-31');
+		var lDbRanking = (await dbGetRanking(lMinDate, lMaxDate, maxage, agestrict, altm, agecrew, personMode))[0];
 		for (var i in lDbRanking) {
 			lastRanking[lDbRanking[i].id] = lDbRanking[i].rank;
 		}

server/scripts/regatta_facts.js

@@ -0,0 +1,258 @@
+var siteScript = async function() {
+	$('#card-nofactsinfo').hide();
+	$('#card-entryfee').hide();
+	$('#card-races').hide();
+	$('#card-races').find('p').remove();
+	$('#card-races').find('table').remove();
+	$('#card-times').hide();
+	$('#card-camping').hide();
+	$('#card-food').hide();
+	$('#card-text').hide();
+
+	var regattaId = findGetParameter('regatta');
+	if (regattaId == null) {
+		$('#h1-title').text('Regatta nicht gefunden');
+		hideLoader();
+		return;
+	}
+	var regatta = await dbGetData('regattas', regattaId);
+	if (regatta == null) {
+		$('#h1-title').text('Regatta nicht gefunden');
+		hideLoader();
+		return;
+	}
+	var dateFrom = parseDate(regatta['date']);
+	var dateTo = parseDate(regatta['date']);
+	dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0));
+
+	$('#h1-title').text(regatta.name);
+	if (regatta.length < 1) {
+		if (formatDate('d.m', dateFrom) == '01.01') {
+			$('#p-title').html('<font class="color-red2-dark">Datum noch unklar</font>');
+		} else {
+			$('#p-title').html(formatDate('d.m.Y', dateFrom) + ' - <font class="color-red2-dark">Datum nicht final</font>');
+		}
+	} else {
+		$('#p-title').html(formatDate('d.m.Y', dateFrom) + ' - ' + formatDate('d.m.Y', dateTo));
+	}
+
+	if (regatta.facts != null) {
+		var facts = JSON.parse(regatta.facts);
+
+		// Meldegeld
+		if ('entry' in facts && 'price' in facts.entry) {
+			$('#card-entryfee').show();
+			var content = 'Meldegeld: <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.entry.price)) + '</b>';
+			if ('early' in facts.entry) {
+				content += '<br />vergünstigt: <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.entry.early)) + '</b> (bis ' + formatDate('d.m.Y', parseDate(regatta.meldungEarly)) + ')';
+			}
+			if ('late' in facts.entry) {
+				content += '<br />nach Meldeschluss (' + formatDate('d.m.Y', parseDate(regatta.meldungSchluss)) + '): <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.entry.late)) + '</b>';
+			}
+			$('#card-entryfee').find('p').html(content);
+		}
+
+		// Wettfahrten / Anzahl
+		if ('races' in facts && 'cnt' in facts.races) {
+			$('#card-races').show();
+			$('#card-races').find('.content').append('<p>Anzahl Wettfahrten: <b>' + facts.races.cnt + '</b></p>');
+			if ('days' in facts.races) {
+				var table = $('<table class="table table-striped table-bordered text-nowrap">');
+				var tbody = $('<tbody>');
+				for (var day in facts.races.days) {
+					var cnt = facts.races.days[day];
+					day = formatDate('D, j.', parseDate(day));
+					tbody.append('<tr><td>' + day + '</td><td><b>' + cnt + '</b></td></tr>')
+				}
+				table.append(tbody);
+				$('#card-races').find('.content').append(table);
+			}
+		}
+
+		// Wettfahrten / Racetimes
+		if ('racetimes' in facts) {
+			$('#card-races').show();
+			var table = $('<table class="table table-striped table-bordered mb-0 text-nowrap">');
+			var tbody = $('<tbody>');
+			if ('sollzeit' in facts.racetimes) {
+				tbody.append('<tr><td>Sollzeit</td><td>' + facts.racetimes.sollzeit + ' min</td></tr>');
+			}
+			if ('zeitlimit' in facts.racetimes) {
+				tbody.append('<tr><td>Zeitlimit</td><td>' + facts.racetimes.zeitlimit + ' min</td></tr>');
+			}
+			if ('zielzeitfenster' in facts.racetimes) {
+				tbody.append('<tr><td>Zielzeitfenster</td><td>' + facts.racetimes.zielzeitfenster + ' min</td></tr>');
+			}
+			table.append(tbody);
+			$('#card-races').find('.content').append(table);
+		}
+
+		// Zeitplan
+		if ('times' in facts) {
+			$('#card-times').show();
+			var tbody = $('#card-times').find('table').find('tbody');
+			tbody.html('');
+			if ('checkin' in facts.times) {
+				tbody.append('<tr><td colspan="2" style="text-align: center; font-weight: bold;">Registrierung</td></tr>');
+				for (var day in facts.times.checkin) {
+					var times = facts.times.checkin[day];
+					day = formatDate('D, j.', parseDate(day));
+					var content = '';
+					if ('from' in times && 'to' in times) content = times.from + ' bis ' + times.to; // TODO:
+					else if ('from' in times) content = 'ab ' + times.from;
+					else if ('to' in times) content = 'bis ' + times.to;
+					tbody.append('<tr><td>' + day + '</td><td>' + content + '</td></tr>')
+				}
+			}
+			if ('measurements' in facts.times) {
+				tbody.append('<tr><td colspan="2" style="text-align: center; font-weight: bold;">Vermessung</td></tr>');
+				for (var day in facts.times.measurements) {
+					var times = facts.times.measurements[day];
+					day = formatDate('D, j.', parseDate(day));
+					var content = '';
+					if ('from' in times && 'to' in times) content = times.from + ' bis ' + times.to; // TODO:
+					else if ('from' in times) content = 'ab ' + times.from;
+					else if ('to' in times) content = 'bis ' + times.to;
+					tbody.append('<tr><td>' + day + '</td><td>' + content + '</td></tr>')
+				}
+			}
+			if ('helmmeeting' in facts.times) {
+				tbody.append('<tr><td colspan="2" style="text-align: center; font-weight: bold;">Steuerleutebesprechung</td></tr>');
+				for (var day in facts.times.helmmeeting) {
+					var time = facts.times.helmmeeting[day];
+					day = formatDate('D, j.', parseDate(day));
+					tbody.append('<tr><td>' + day + '</td><td>' + time + '</td></tr>')
+				}
+			}
+			if ('firststart' in facts.times) {
+				tbody.append('<tr><td colspan="2" style="text-align: center; font-weight: bold;">Erster Start</td></tr>');
+				for (var day in facts.times.firststart) {
+					var time = facts.times.firststart[day];
+					day = formatDate('D, j.', parseDate(day));
+					tbody.append('<tr><td>' + day + '</td><td>' + time + '</td></tr>')
+				}
+			}
+			if ('laststart' in facts.times) {
+				tbody.append('<tr><td colspan="2" style="text-align: center; font-weight: bold;">Letzter Start</td></tr>');
+				for (var day in facts.times.laststart) {
+					var time = facts.times.laststart[day];
+					day = formatDate('D, j.', parseDate(day));
+					tbody.append('<tr><td>' + day + '</td><td>' + time + '</td></tr>')
+				}
+			}
+		}
+
+		// Camping
+		if ('camping' in facts) {
+			$('#card-camping').show();
+			$('#card-camping').find('p').remove();
+			if ('tent' in facts.camping) {
+				var content = '';
+				if ('price' in facts.camping.tent && facts.camping.tent.price > 0) {
+					content += 'Zelten möglich für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.tent.price)) + '</b>';
+				}
+				else if ('pricepernight' in facts.camping.tent) {
+					content += 'Zelten möglich für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.tent.pricepernight)) + ' pro Nacht</b>';
+				}
+				else {
+					content += 'Zelten möglich und im Preis enthalten';
+				}
+				if ('electricity' in facts.camping.tent) {
+					content += '<br />';
+					if (facts.camping.tent.electricity > 0) {
+						content += 'Strom: <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.tent.electricity)) + '</b>';
+					}
+					else {
+						content += 'Strom inklusive';
+					}
+				}
+				$('#card-camping').find('.content').append('<p>' + content + '</p>');
+			}
+			if ('van' in facts.camping) {
+				var content = '';
+				if ('price' in facts.camping.van && facts.camping.van.price > 0) {
+					content += 'Wohnwagen/-mobil möglich für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.van.price)) + '</b>';
+				}
+				else if ('pricepernight' in facts.camping.van) {
+					content += 'Wohnwagen/-mobil möglich für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.van.pricepernight)) + ' pro Nacht</b>';
+				}
+				else {
+					content += 'Wohnwagen/-mobil möglich und im Preis enthalten';
+				}
+				if ('electricity' in facts.camping.van) {
+					content += '<br />';
+					if (facts.camping.van.electricity > 0) {
+						content += 'Strom: <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.van.electricity)) + '</b>';
+					}
+					else {
+						content += 'Strom inklusive';
+					}
+				}
+				$('#card-camping').find('.content').append('<p>' + content + '</p>');
+			}
+			if ('beds' in facts.camping) {
+				var content = '';
+				if ('price' in facts.camping.beds && facts.camping.beds.price > 0) {
+					content += 'Betten im Clubhaus vorhanden für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.beds.price)) + '</b>';
+				}
+				else if ('pricepernight' in facts.camping.beds) {
+					content += 'Betten im Clubhaus vorhanden für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(facts.camping.beds.pricepernight)) + ' pro Nacht</b>';
+				}
+				else {
+					content += 'Betten im Clubhaus vorhanden und im Preis enthalten';
+				}
+				$('#card-camping').find('.content').append('<p>' + content + '</p>');
+			}
+			if ('text' in facts.camping) {
+				var p = $('<p>');
+				p.text(facts.camping.text);
+				p.html(p.html().replace(/\n/g, '<br />'));
+				$('#card-camping').find('.content').append(p);
+			}
+		}
+
+		// Verpflegung
+		if ('food' in facts) {
+			$('#card-food').show();
+			$('#card-food').find('p').remove();
+			for (var day in facts.food) {
+				var food = facts.food[day];
+				if (day == 'text') {
+					var p = $('<p>');
+					p.text(food);
+					p.html(p.html().replace(/\n/g, '<br />'));
+					$('#card-food').find('.content').append(p);
+				}
+				else {
+					day = formatDate('D, j.', parseDate(day));
+					var content = '';
+					if ('breakfast' in food) {
+						content += 'Frühstück am ' + day;
+						if (food.breakfast > 0) content += ' für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(food.breakfast)) + '</b><br />';
+						else content += ' inklusive<br />';
+					}
+					if ('dinner' in food) {
+						content += 'Abendessen';
+						if ('dinnerdesc' in food) content += ' (' + food.dinnerdesc + ')';
+						content += ' am ' + day;
+						if (food.dinner > 0) content += ' für <b>' + (new Intl.NumberFormat('de-DE', { style: 'currency', currency: 'EUR' }).format(food.dinner)) + '</b><br />';
+						else content += ' inklusive<br />';
+					}
+					$('#card-food').find('.content').append('<p>' + content + '</p>');
+				}
+			}
+		}
+
+		// Weitere Informationen
+		if ('text' in facts) {
+			$('#card-text').show();
+			var p = $('#card-text').find('p');
+			p.text(facts.text);
+			p.html(p.html().replace(/\n/g, '<br />'));
+		}
+	} else {
+		$('#card-nofactsinfo').show();
+	}
+
+	hideLoader();
+}

server/scripts/regattas.js

@@ -1,3 +1,10 @@
+Element.prototype.documentOffsetTop = function() {
+	return this.offsetTop + (this.offsetParent ? this.offsetParent.documentOffsetTop() : 0);
+};
+function scrollToToday() {
+	window.scrollTo({ top: document.getElementById('div-today').documentOffsetTop() - (window.innerHeight / 2), behavior: 'smooth' });
+}
+
 function selectChange(callSiteScript = true) {
 	var val = $('#select-year').val();
 	if (val == "user") {
@@ -60,7 +67,7 @@ async function drawList () {
 		var list = '';
 		rows.forEach(function (entry) {
 			if (entry == null) {
-				list += '<div><div align="center" class="color-highlight"><b>Heute ist der ' + formatDate('d.m.Y', today) + '</b></div></div>';
+				list += '<div><div id="div-today" align="center" class="color-highlight"><b>Heute ist der ' + formatDate('d.m.Y', today) + '</b></div></div>';
 			} else if (search($('#input-search').val(), entry.keywords)) {
 				list += entry.content;
 			}
@@ -76,6 +83,7 @@ var siteScript = async function() {
 		$('#select-year').change(selectChange);
 		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);
+		$('#button-totoday').click(scrollToToday);
 	}
 
 	today = getToday();
@@ -84,6 +92,9 @@ var siteScript = async function() {
 	var maxDate = parseDate($('#input-to').val());
 	var regattas = await dbGetRegattasRange(minDate, maxDate);
 
+	if (minDate <= today && maxDate >= today) $('#button-totoday').parent().parent().show();
+	else $('#button-totoday').parent().parent().hide();
+
 	var selectedYear = $('#select-year').val();
 
 	var years = await dbGetData('years');

server/version.php

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