Merge branch 'release/V_1.11.4'

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) {

server/scripts/planning.js

@@ -74,11 +74,15 @@ function selectChange() {
 }
 
 function initYear() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#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() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#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() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#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() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#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,8 +29,9 @@ function buttonShowPressed() {
 }
 
 function initYear() {
+	return new Promise(async function (resolve) {
 		var year = findGetParameter('year');
-	if (year === null) year = new Date().getFullYear();
+		if (year === null) year = await dbGetCurrentYear();
 
 		$('#select-year').html('<option value="' + year + '">' + year + '</option>');
 		$('#select-year').val(year);
@@ -45,6 +46,9 @@ function initYear() {
 		}
 
 		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.3h1');
+	define('PWA_VERSION', '1.11.4');
 
 ?>