Merge branch 'hotfix/notify_android_lost_subscription'

client/scripts/custom.js.php

@@ -13,6 +13,7 @@ var showConsoleButtonTimeout = setTimeout(function(){
 	$('#button-show-console').show();
 }, 10000);
 var showLoader = function() {
+	log('[tpl] showLoader called, loaderCount:', loaderCount);
 	if (loaderCount < 1) {
 		$('#preloader').removeClass('preloader-hide');
 		loaderCount = 0;
@@ -24,6 +25,7 @@ var showLoader = function() {
 	loaderCount ++;
 }
 var hideLoader = function() {
+	log('[tpl] hideLoader called, loaderCount:', loaderCount);
 	loaderCount --;
 	if (loaderCount < 1) {
 		$('#preloader').addClass('preloader-hide');

client/scripts/database.js

@@ -397,6 +397,33 @@ function dbGetRanking(minDate, maxDate, jugend, jugstrict) {
 	});
 }
 
+function dbGetCurrentYear() {
+	return new Promise(async function (resolve) {
+		var date = new Date();
+		var year = date.getFullYear();
+		if (date.getMonth() == 11) {
+			year ++; // In DECEMBER show next year
+		} else {
+			// if there are no more regattas until end of the year, show next year
+			var regattas = dbGetRegattasRange(parseDate(date.getDate() + '.' + (date.getMonth() + 1) + '.' + year), parseDate('31.12.' + year));
+			if (regattas.length == 0) {
+				year ++;
+			}
+		}
+		var years = await dbGetData('years');
+		years.sort(function (a, b) {
+			if (a['year'] > b['year']) return -1;
+			if (a['year'] < b['year']) return 1;
+			return 0;
+		});
+		for (id in years) {
+			if (years[id].year < year) year = years[id].year;
+			if (years[id].year == year) break;
+		}
+		resolve(year);
+	});
+}
+
 function dbSettingsGet(key) {
 	return new Promise(function(resolve) {
 		if (canUseLocalDB) {

client/scripts/regatten.js.php

@@ -156,12 +156,14 @@ function findGetParameter(parameterName) {
 }
 
 var signup = function() {
+	log('[app] Signup');
 	var username = $('#input-signup-username').val();
 	var email = $('#input-signup-email').val();
 	var password = $('#input-signup-password').val();
 	if (username == '') { $('#input-signup-username').focus(); return; }
 	if (email == '') { $('#input-signup-email').focus(); return; }
 	if (password == '') { $('#input-signup-password').focus(); return; }
+	log('[app] Signup: All fields okay');
 	showLoader();
 	$('#input-signup-username').val('').trigger('focusin').trigger('focusout');
 	$('#input-signup-email').val('').trigger('focusin').trigger('focusout');
@@ -175,6 +177,7 @@ var signup = function() {
 			password: password
 		},
 		error: function (xhr, status, error) {
+			log('[app] Signup: error:', xhr.status, status);
 			if (xhr.status == 409) {
 				toastError('Benutzername bereits vergeben');
 				$('#input-signup-email').val(email).trigger('focusin').trigger('focusout');
@@ -189,6 +192,7 @@ var signup = function() {
 			hideLoader();
 		},
 		success: function (data, status, xhr) {
+			log('[app] Signup successful, logging in');
 			$('#input-login-username').val(username);
 			$('#input-login-password').val(password);
 			login();
@@ -197,6 +201,7 @@ var signup = function() {
 }
 
 var login = function() {
+	log('[app] Login');
 	showLoader();
 	var username = $('#input-login-username').val();
 	var password = $('#input-login-password').val();
@@ -211,6 +216,7 @@ var login = function() {
 			device: navigator.userAgent
 		},
 		error: function (xhr, status, error) {
+			log('[app] Login: error:', xhr.status, status);
 			if (xhr.status == 401) {
 				toastError('Benutzername oder Passwort falsch');
 				$('#input-login-username').val(username).trigger('focusin').trigger('focusout');
@@ -225,6 +231,7 @@ var login = function() {
 			hideLoader();
 		},
 		success: function (data, status, xhr) {
+			log('[app] Login successful');
 			localStorage.setItem('auth_id', data.id);
 			localStorage.setItem('auth_hash', data.auth);
 			localStorage.setItem('auth_user', data.user);
@@ -245,6 +252,7 @@ var logoutClearStorage = function() {
 }
 
 var logout = function() {
+	log('[app] Logout');
 	showLoader();
 	var auth = {
 		id: localStorage.getItem('auth_id'),
@@ -262,6 +270,7 @@ var logout = function() {
 			auth: auth
 		},
 		error: function (xhr, status, error) {
+			log('[app] Logout: error:', xhr.status, status);
 			if (xhr.status == 401) {
 				log('[app] Not logged in');
 				logoutClearStorage();
@@ -276,12 +285,14 @@ var logout = function() {
 			}
 		},
 		success: function (data, status, xhr) {
+			log('[app] Logout successful');
 			logoutClearStorage();
 		}
 	});
 }
 
 function deleteDb() {
+	log('[app] Deleting DB');
 	$('#menu-developer').hideMenu();
 	if (canUseLocalDB) {
 		showLoader();
@@ -298,11 +309,13 @@ function deleteDb() {
 			setTimeout(function(){ location.reload(); }, 3000);
 		}
 	} else {
+		log('[app] DB not supported');
 		toastWarn('Dein Gerät unterstützt kein lokales Speichern der Daten. Alle Daten werden direkt vom Server gezogen.<br>Entsprechend kannst Du die Datenbank auch nicht zurücksetzen.', 10000);
 	}
 }
 
 function deleteCache() {
+	log('[app] Deleting cache');
 	$('#menu-developer').hideMenu();
 	navigator.serviceWorker.getRegistrations().then(function (registrations) {
 		for (let registration of registrations) {
@@ -340,16 +353,28 @@ function urlB64ToUint8Array(base64String) {
 function pushesSubscribe() {
 	log('[app] Subscribing');
 	const applicationServerKey = urlB64ToUint8Array(PUSH_SERVER_KEY);
+	log('[app] Subscription app server key:', applicationServerKey);
 	swRegistration.pushManager.subscribe({
 		userVisibleOnly: true,
 		applicationServerKey: applicationServerKey
 	})
-	.then(function(subscription) {
+	.then(async function(subscription) {
-		pushesUpdateServerSubscription(subscription, true);
+		log('[app] Subscription:', subscription);
-		updatePushSwitches();
+		if (await pushesUpdateServerSubscription(subscription, true)) {
-		updatePushBadge();
+			log('[app] Subscription: Sent to server, updating UI');
+			dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
+			updatePushSwitches();
+			updatePushBadge();
+		} else {
+			$('#menu-pushes').hideMenu();
+			log('[app] Failed to subscribe the user due to connection error');
+			toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
+			pushesUnSubscribe(true);
+		}
+		hideLoader();
 	})
 	.catch(function(err) {
+		$('#menu-pushes').hideMenu();
 		log('[app] Failed to subscribe the user: ', err);
 		toastError('Da ist leider etwas schief gelaufen. Bitte stelle sicher, dass Du mit dem Internet verbunden bist und versuche es erneut.', 5000);
 		pushesUnSubscribe(true);
@@ -359,13 +384,22 @@ function pushesSubscribe() {
 function pushesUnSubscribe(silent = false) {
 	log('[app] Unsubscribing');
 	swRegistration.pushManager.getSubscription()
-	.then(function(subscription) {
+	.then(async function(subscription) {
+		log('[app] Subscription:', subscription);
 		if (subscription) {
-			pushesUpdateServerSubscription(subscription, false);
+			if (await pushesUpdateServerSubscription(subscription, false)) {
+				log('[app] Subscription: Removed from server');
+			} else {
+				log('[app] Failed to unsubscribe the user due to connection error');
+			}
+			log('[app] Removing subscription');
 			subscription.unsubscribe();
+			log('[app] Subscription: Updating UI');
 			$('#menu-pushes').hideMenu();
+			dbSettingsSet('notify_endpoint_' + BOATCLASS, false);
 			updatePushBadge();
 			hideLoader();
+			if (!silent) toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
 		}
 	})
 	.catch(function(error) {
@@ -378,20 +412,21 @@ function pushesUnSubscribe(silent = false) {
 }
 
 function pushesUpdateServerSubscription(subscription, enabled) {
-	log('[app] updateServer', enabled, subscription);
+	return new Promise(function(resolve){
-	$.ajax({
+		log('[app] updateServer', enabled, subscription);
-		url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
+		$.ajax({
-		type: 'POST',
+			url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
-		data: { subscription: JSON.stringify(subscription) },
+			type: 'POST',
-		success: function (data, textStatus, jqXHR) {
+			data: { subscription: JSON.stringify(subscription) },
-			if (!enabled) {
+			success: function (data, textStatus, jqXHR) {
-				toastOk('Du erhältst ab sofort keine Benachrichtigungen mehr von uns.');
+				log('[app] Subscription sent to server');
+				resolve(true);
+			},
+			error: function (jqXHR, textStatus, errorThrown) {
+				log('[app] Error sending subscription to server');
+				resolve(false);
 			}
-			hideLoader();
+		});
-		},
-		error: function (jqXHR, textStatus, errorThrown) {
-			throw 'Cannot update server subscription';
-		}
 	});
 }
 
@@ -477,12 +512,29 @@ function updatePushBadge() {
 		$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('BLOCKED');
 		return;
 	}
-	swRegistration.pushManager.getSubscription().then(function(subscription) {
+	swRegistration.pushManager.getSubscription().then(async function(subscription) {
+		var dbSub = await dbSettingsGet('notify_endpoint_' + BOATCLASS);
 		var isSub = (subscription !== null);
+		log('[app] DB Subscription:', dbSub);
+		log('[app] Real Subscription:', subscription);
 		if (isSub) {
 			$('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN');
+			if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
+			else if (dbSub !== subscription.endpoint) {
+				if (navigator.onLine) {
+					log('[app] Updating subscription');
+					pushesSubscribe();
+				}
+			}
 		} else {
 			$('#badge-pushes').removeClass('bg-green2-dark').addClass('bg-red2-dark').text('AUS');
+			if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, false);
+			else if (dbSub !== false) {
+				if (navigator.onLine) {
+					log('[app] Re subscribe');
+					pushesSubscribe();
+				}
+			}
 		}
 	});
 }

server/scripts/index.js

@@ -51,7 +51,7 @@ var siteScript = async function() {
 	if (firstCall) {
 		firstCall = false;
 		$('#button-notifications-activate').click(function(){
-			$('#menu-pushes').showMenu();
+			pushesOpenMenu();
 		});
 		$('#a-notifications-later').click(function(){
 			createCookie('regatten_app_' + BOATCLASS + '_rejected_push', true, 1);

server/scripts/planning.js

@@ -74,11 +74,15 @@ function selectChange() {
 }
 
 function initYear() {
-	var year = findGetParameter('year');
+	return new Promise(async function (resolve) {
-	if (year === null) year = new Date().getFullYear();
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -107,7 +111,7 @@ var siteScript = async function() {
 
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 		$('#switch-status-gemeldet').parent().parent().click(planningSwitchChanged);

server/scripts/planning_edit.js

@@ -291,11 +291,15 @@ function selectChange() {
 }
 
 function initYear() {
-	var year = findGetParameter('year');
+	return new Promise(async function (resolve) {
-	if (year === null) year = new Date().getFullYear();
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -324,7 +328,7 @@ var siteScript = async function() {
 
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 		$('#switch-planning-include').parent().parent().click(planningSwitchChanged);

server/scripts/planning_list.js

@@ -16,11 +16,15 @@ function selectChange() {
 }
 
 function initYear() {
-	var year = findGetParameter('year');
+	return new Promise(async function (resolve) {
-	if (year === null) year = new Date().getFullYear();
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -47,7 +51,7 @@ var siteScript = async function() {
 
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 	}

server/scripts/planning_view.js

@@ -11,11 +11,15 @@ function selectChange() {
 }
 
 function initYear() {
-	var year = findGetParameter('year');
+	return new Promise(async function (resolve) {
-	if (year === null) year = new Date().getFullYear();
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').val(year);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -60,7 +64,7 @@ var siteScript = async function() {
 
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#input-search').on('input', drawList);
 	}

server/scripts/regattas.js

@@ -29,22 +29,26 @@ function buttonShowPressed() {
 }
 
 function initYear() {
-	var year = findGetParameter('year');
+	return new Promise(async function (resolve) {
-	if (year === null) year = new Date().getFullYear();
+		var year = findGetParameter('year');
+		if (year === null) year = await dbGetCurrentYear();
 
-	$('#select-year').html('<option value="' + year + '">' + year + '</option>');
+		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
-	$('#select-year').val(year);
+		$('#select-year').val(year);
 
-	if (year == "user") {
+		if (year == "user") {
-		var from = findGetParameter('from');
+			var from = findGetParameter('from');
-		var to = findGetParameter('to');
+			var to = findGetParameter('to');
-		if (from === null) from = formatDate('Y-m-d')
+			if (from === null) from = formatDate('Y-m-d')
-		if (to === null) to = formatDate('Y-m-d')
+			if (to === null) to = formatDate('Y-m-d')
-		$('#input-from').val(from).trigger('focusin').trigger('focusout');
+			$('#input-from').val(from).trigger('focusin').trigger('focusout');
-		$('#input-to').val(to).trigger('focusin').trigger('focusout');
+			$('#input-to').val(to).trigger('focusin').trigger('focusout');
-	}
+		}
 
-	selectChange(false);
+		selectChange(false);
+
+		resolve();
+	});
 }
 
 var firstCall = true;
@@ -68,7 +72,7 @@ async function drawList () {
 var siteScript = async function() {
 	if (firstCall) {
 		firstCall = false;
-		initYear();
+		await initYear();
 		$('#select-year').change(selectChange);
 		$('#button-show').click(buttonShowPressed);
 		$('#input-search').on('input', drawList);

server/version.php

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