Merge branch 'hotfix/a53.2'

client/scripts/database.js

@@ -163,6 +163,15 @@ function dbGetResultCalculated(regatta) {
 		if (results.length > 0) {
 
 			var gemeldet = results.length;
+			var started = [];
+			for (var i = 0; i < regatta['races']; i++) {
+				started[i] = 0;
+				for (id in results) {
+					if (results[id]['race' + (i + 1)] != 'DNC') {
+						started[i]++;
+					}
+				}
+			}
 
 			for (id in results) {
 				results[id]['finished'] = false;
@@ -179,24 +188,25 @@ function dbGetResultCalculated(regatta) {
 						results[id]['texts'][i] = race;
 						results[id]['finished'] = true;
 					} else {
+						var p1points = (regatta.a53 ? started[i] : gemeldet) + 1;
 						switch (race.toUpperCase()) {
 							// Nicht gestartet
 							case 'DNC': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Did not come
-							case 'DNS': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Did not started
+							case 'DNS': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Did not started
 							// Startfehler
-							case 'OCS': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // On course site
-							case 'UFD': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Uniform Flag Disqualified (disqu. nach 30.3)
-							case 'BFD': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Black Flag Disqualified (disqu. nach 30.4)
+							case 'OCS': results[id]['values'][i] = p1points; copy[i] = p1points; break; // On course site
+							case 'UFD': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Uniform Flag Disqualified (disqu. nach 30.3)
+							case 'BFD': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Black Flag Disqualified (disqu. nach 30.4)
 							// Nicht durch Ziel gegangen
-							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
+							case 'DNF': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Did not finish
+							case 'RET': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Retired (Aufgegeben)
+							case 'RAF': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Retired after finish
 							// Kursfehler
-							case 'NSC': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Not sailed course
+							case 'NSC': results[id]['values'][i] = p1points; copy[i] = p1points; 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)
-							case 'DGM': results[id]['values'][i] = gemeldet + 1; copy[i] = -2; break; // Disqualification Gross Missconduct (kann nach 69.1(b)(2) nicht gestr. werden, grobes Fehlverhalten)
+							case 'DSQ': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Disqualified
+							case 'DNE': results[id]['values'][i] = p1points; copy[i] = -1; break; // Disqualified, not excludable (disqu. kann nach 90.3(b) nicht gestrichen werden)
+							case 'DGM': results[id]['values'][i] = p1points; copy[i] = -2; break; // Disqualification Gross Missconduct (kann nach 69.1(b)(2) nicht gestr. werden, grobes Fehlverhalten)
 							// Unbekannt
 							default: results[id]['values'][i] = 0; copy[i] = 0; break;
 						}
@@ -224,9 +234,10 @@ function dbGetResultCalculated(regatta) {
 				var netto = 0;
 				for (var i = 0; i < regatta['races']; i ++) {
 					brutto += results[id]['values_all'][i];
-					if      (copy[i] == -1) { results[id]['values'][i] = gemeldet + 1; }
+					/*if      (copy[i] == -1) { results[id]['values'][i] = gemeldet + 1; }
 					else if (copy[i] == -2) { results[id]['values'][i] = gemeldet + 1; }
-					else                    { results[id]['values'][i] = copy[i]; }
+					else                    { results[id]['values'][i] = copy[i]; }*/
+					if (copy[i] == 0) results[id]['values'][i] = 0;
 					if (results[id]['values'][i] == 0) {
 						results[id]['texts'][i] = '[' + results[id]['texts'][i] + ']';
 					}

server/content/contact.php

@@ -1,28 +1,28 @@
 <?php
-	
+
 	$sp['title'] = 'Kontakt - Regatten.net ' . $_CLASS['name'];
 	$sp['backbutton'] = true;
 	$sp['activenav'] = 5;
-	
+
 	// TITLE
 	$content = '<h1>Kontakt</h1>';
-	
+
 	$sp['output'] .= $tpl->load('card', [$content]);
-	
+
 	// Info
 	$content = '<p>';
 	$content .= 'Du hast eine Frage? Du hast einen Fehler in unserer Software oder in den gespeicherten Daten gefunden? Du willst Regatten.net auch f&uuml;r Deine Bootsklasse nutzen?<br>';
 	$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]);
-	
+
 	// Formular
 	$content = '<h2>Kontakt-Formular</h2>';
 	$content .= $tpl->load('input', ['html-id' => 'input-name', 'placeholder' => 'Dein Name', 'type' => 'text']);
@@ -30,9 +30,9 @@
 	$content .= $tpl->load('input', ['html-id' => 'input-subject', 'placeholder' => 'Betreff', 'type' => 'text']);
 	$content .= $tpl->load('textarea', ['html-id' => 'input-message', 'placeholder' => 'Deine Nachricht']);
 	$content .= $tpl->load('button', ['Senden', '#', 'html-id' => 'button-send']);
-	
+
 	$sp['output'] .= $tpl->load('card', [$content]);
-	
+
 	$sp['scripts'] .= $scripts->load('contact');
-	
-?>
+
+?>

server/scripts/rank.js

@@ -196,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;
@@ -384,6 +388,16 @@ var siteScript = async function() {
 			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;
+		}
+	}
 
 	var selectedYear = $('#select-year').val();
 

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.12.1h4');
+	define('PWA_VERSION', '1.12.1h7');
 
 ?>