Merge branch 'hotfix/register_on_regatten_net'

.gitignore

@@ -3,3 +3,4 @@ server/config.php
 api/config.php
 .htaccess
 !.keepfolder
+.idea

client/scripts/database.js

@@ -1,4 +1,4 @@
-const DB_VERSION = 8;
+const DB_VERSION = 9;
 
 const USER_ID = localStorage.getItem('auth_user');
 const USER_NAME = localStorage.getItem('auth_username');
@@ -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 'OCS': results[id]['values'][i] = p1points; copy[i] = p1points; 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 'UFD': results[id]['values'][i] = p1points; copy[i] = p1points; 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 '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 'DNF': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Did not finish
-							case 'RET': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Retired (Aufgegeben)
+							case 'RET': results[id]['values'][i] = p1points; copy[i] = p1points; break; // Retired (Aufgegeben)
-							case 'RAF': results[id]['values'][i] = gemeldet + 1; copy[i] = gemeldet + 1; break; // Retired after finish
+							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 'DSQ': results[id]['values'][i] = p1points; copy[i] = p1points; 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 '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] = gemeldet + 1; copy[i] = -2; break; // Disqualification Gross Missconduct (kann nach 69.1(b)(2) nicht gestr. werden, grobes Fehlverhalten)
+							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] + ']';
 					}
@@ -608,7 +619,7 @@ function sync() {
 				localTimes[entry['table']] = entry['time'];
 			});
 
-			syncInProgress = 13;
+			syncInProgress = 14;
 			var syncOkay = true;
 			log("[db] Sync Start");
 			$('#i-sync').addClass('fa-spin');
@@ -997,8 +1008,35 @@ function sync() {
 							syncInProgress --;
 						}
 
+						// FOLLOWS
+						getJSON(QUERY_URL + 'get_follows', function (code, data) {
+							if (code == 200) {
+								var os = db.transaction('follows', 'readwrite').objectStore('follows');
+								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 -= 3;
+										syncInProgress --;
+										log('[db] follows synced, remaining:', syncInProgress);
+									}
+								};
+							} else {
+								log("[db] follows: Something went wrong (HTTP " + code + ")");
+								syncOkay = false;
+								syncInProgress --;
+								log('[db] follows failed, remaining:', syncInProgress);
+							}
+						});
+
+					} else {
+						syncInProgress -= 4;
 					}
 
 					// NEWS
@@ -1225,6 +1263,11 @@ function initDatabase() {
 				var osRankings = db.createObjectStore('rankings', { keyPath: 'id' });
 			}
 
+			if ((oldVersion < 9) && (newVersion >= 9)) {
+				log('[db] to version 9');
+				var osFollows = db.createObjectStore('follows', { keyPath: 'id' });
+			}
+
 			// Force resync after db update
 			if (oldVersion >= 1) {
 				var osUpdateTimes = upgradeTransaction.objectStore('update_times');

client/scripts/regatten.js.php

@@ -157,51 +157,6 @@ function findGetParameter(parameterName) {
 	return result;
 }
 
-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');
-	$('#input-signup-password').val('').trigger('focusin').trigger('focusout');
-	$.ajax({
-		url: QUERY_URL + 'signup',
-		method: 'POST',
-		data: {
-			username: username,
-			email: email,
-			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');
-			} else if (xhr.status == 0) {
-				toastError('Du bist momentan offline.<br>Stelle eine Internetverbindung her, um Dich anzumelden');
-				$('#menu-signup').hideMenu();
-			} else {
-				log('[app] Signup: unbekannter Fehler', status, error);
-				log(xhr);
-				toastError('Ein unbekannter Fehler ist aufgetreten. Bitte versuche es noch einmal', 5000);
-			}
-			hideLoader();
-		},
-		success: function (data, status, xhr) {
-			log('[app] Signup successful, logging in');
-			$('#input-login-username').val(username);
-			$('#input-login-password').val(password);
-			login();
-		}
-	});
-}
-
 var login = function() {
 	log('[app] Login');
 	showLoader();
@@ -692,9 +647,9 @@ function extServiceGetLink(serviceName, type, eventId = '', classId = '') {
 		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);
+			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 .= '<p>';
-	$content .= 'Alternativ erreichst Du uns auch telefonisch unter <a href="tel:+4941039659768">+49 (0) 4103 965 976 8</a><br>';
+	//$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 .= 'Mo-Fr: 7-20 Uhr<br>';
-	$content .= 'Sa: 9-17 Uhr';
+	//$content .= 'Sa: 9-17 Uhr';
-	$content .= '</p>';
+	//$content .= '</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content]);
 

server/content/index.php

@@ -32,7 +32,7 @@
 	$content = '<h2>Nicht angemeldet</h2>';
 	$content .= '<p class="mt-3">';
 	$content .= 'Um alle Funktionen dieser Seite nutzen zu k&ouml;nnen, <a href="#" data-menu="menu-login">logge Dich bitte ein</a>.<br>';
-	$content .= 'Solltest Du noch kein Benutzerkonto haben, kannst Du Dich kostenlos <a href="#" data-menu="menu-signup">registrieren</a>.';
+	$content .= 'Solltest Du noch kein Benutzerkonto haben, kannst Du Dich kostenlos <a href="https://regatten.net/#signup">registrieren</a>.';
 	$content .= '</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content, 'html-id' => 'card-notloggedin']);
@@ -72,7 +72,7 @@
 	$content .= '<p>Du willst alle Regatta-Termine in deinem Kalender, aber nicht alles abtippen?<br>Kein Problem! Abonniere einfach unseren ics-Kalender.</p>';
 	$content .= '<p><b>Nur die Regatten, zu denen Du gehst?</b><br>Auch kein Problem! ';
 	$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 .= '<font class="show-notloggedin"><a href="https://regatten.net/#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://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']);

server/content/planning.php

@@ -15,7 +15,7 @@
 
 	// Not loggedin
 	$content = '<h1>Saison-Planung</h1>';
-	$content .= '<p>Um Deine Saison-Planung zu sehen, musst Du angemeldet sein.<br><a href="#" data-menu="menu-login">Melde Dich hier an</a> oder <a href="#" data-menu="menu-signup">registriere Dich jetzt kostenlos</a>.</p>';
+	$content .= '<p>Um Deine Saison-Planung zu sehen, musst Du angemeldet sein.<br><a href="#" data-menu="menu-login">Melde Dich hier an</a> oder <a href="https://regatten.net/#signup">registriere Dich jetzt kostenlos</a>.</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-notloggedin']);
 

server/content/planning_list.php

@@ -12,7 +12,7 @@
 
 	// Not loggedin
 	$content = '<h1>Saison-Planungen</h1>';
-	$content .= '<p>Um die Saison-Planungen anderer zu sehen, musst Du angemeldet sein.<br><a href="#" data-menu="menu-login">Melde Dich hier an</a> oder <a href="#" data-menu="menu-signup">registriere Dich jetzt kostenlos</a>.</p>';
+	$content .= '<p>Um die Saison-Planungen anderer zu sehen, musst Du angemeldet sein.<br><a href="#" data-menu="menu-login">Melde Dich hier an</a> oder <a href="https://regatten.net/#signup">registriere Dich jetzt kostenlos</a>.</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content, 'css-class' => 'show-notloggedin']);
 

server/content/regatta_plan.php

@@ -21,7 +21,7 @@
 	$content = '<p>Du planst, hier hinzufahren, aber stehst nicht auf dieser Liste?<br>';
 	$content .= 'Das kannst Du &auml;ndern! ';
 	$content .= '<font class="show-loggedin">Erstelle einfach <a href="' . LINK_PRE . 'planning">hier</a> Deine eigene Saison-Planung.</font>';
-	$content .= '<font class="show-notloggedin"><a href="#" data-menu="menu-login">Melde Dich an</a> oder <a href="#" data-menu="menu-signup">registriere Dich kostenlos</a> und erstelle Deine eigene Saison-Planung.</font>';
+	$content .= '<font class="show-notloggedin"><a href="#" data-menu="menu-login">Melde Dich an</a> oder <a href="https://regatten.net/#signup">registriere Dich kostenlos</a> und erstelle Deine eigene Saison-Planung.</font>';
 	$content .= '</p>';
 
 	$sp['output'] .= $tpl->load('card', [$content]);

server/page/menus.php

@@ -110,7 +110,7 @@
 				<span>Login</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="#" data-menu="menu-signup" class="show-notloggedin">
+			<a href="https://regatten.net/#signup" class="show-notloggedin">
 				<i class="fa font-14 fa-user-plus rounded-s bg-highlight color-white"></i>
 				<span>Registrieren</span>
 				<span class="badge bg-red2-dark color-white">FREE</span>
@@ -266,28 +266,6 @@
 	</div>
 </div>
 
-<div id="menu-signup" class="menu menu-box-top menu-box-detached rounded-m" data-menu-height="340">
-	<div class="content bottom-0">
-		<h1 class="text-center mt-5 font-900">Registrieren</h1>
-		<div class="input-style input-style-2 has-icon input-required">
-			<i class="input-icon fa fa-user color-theme"></i>
-			<span class="color-highlight">Benutzername</span>
-			<input id="input-signup-username" class="form-control" type="name" placeholder="Benutzername" />
-		</div>
-		<div class="input-style input-style-2 has-icon input-required">
-			<i class="input-icon fa fa-envelope color-theme"></i>
-			<span class="color-highlight">Email</span>
-			<input id="input-signup-email" class="form-control" type="email" placeholder="Email" />
-		</div>
-		<div class="input-style input-style-2 has-icon input-required">
-			<i class="input-icon fa fa-lock color-theme"></i>
-			<span class="color-highlight">Passwort</span>
-			<input id="input-signup-password" class="form-control" type="password" placeholder="Passwort" />
-		</div>
-		<a class="btn btn-m mt-2 mb-2 btn-full bg-green2-dark text-uppercase font-900" href="#" onclick="signup();">Registrieren</a>
-	</div>
-</div>
-
 <div id="menu-welcome" class="menu menu-box-bottom" style="height: 70vh">
 	<div class="content bottom-0">
 		<h1 class="text-center font-900">Willkommen</h1>

server/scripts/index.js

@@ -85,12 +85,10 @@ var siteScript = async function() {
 		var user = await dbGetData('users', localStorage.getItem('auth_user'));
 
 		// Favorites
+		var follows = await dbGetData('follows');
 		var watched = [];
-		for (var i = 1; i <= 5; i ++) {
+		for (var i in follows) {
-			sailor_id = user['sailor' + i];
+			watched.push(await dbGetData('sailors', follows[i].sailor));
-			if (sailor_id != null) {
-				watched.push(await dbGetData('sailors', sailor_id));
-			}
 		}
 		if (watched.length > 0) {
 			var year = (new Date()).getFullYear();

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

@@ -194,12 +194,10 @@ var siteScript = async function() {
 
 	if (isLoggedIn()) {
 		var user = await dbGetData('users', USER_ID);
+		var follows = await dbGetData('follows');
 		followedSailors = [];
-		for (var i = 1; i <= 5; i ++) {
+		for (var i in follows) {
-			sailor_id = user['sailor' + i];
+			followedSailors.push(await dbGetData('sailors', follows[i].sailor));
-			if (sailor_id != null) {
-				followedSailors.push(await dbGetData('sailors', sailor_id));
-			}
 		}
 	}
 

server/version.php

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