Merge branch 'hotfix/rank_quali' into develop

server/scripts/rank.js

@@ -108,7 +108,8 @@ async function onRankingClicked(id) {
 
 var rankings;
 
-async function selectChange(callSiteScript = true) {
+function selectChange(callSiteScript = true) {
+	return new Promise(async function (resolve) {
 		var year = $('#select-year').val();
 		if (year == "user") {
 			$('#select-type').parent().hide();
@@ -199,13 +200,14 @@ async function selectChange(callSiteScript = true) {
 					var beginn = null;
 					var regattas = await dbGetData('regattas');
 					regattas.sort(function(a,b){ return b.date.localeCompare(a.date); });
-				for (var r in regattas) {
-					var regatta = regattas[r];
+					for (var ri in regattas) {
+						var regatta = regattas[ri];
 						var date = parseDate(regatta.date);
 						if ((date < parseDate('01.01.' + year)) || (date > parseDate('31.12.' + year))) {
 							continue;
 						}
-					if (regatta.name.indexOf(r.quali_search) >= 0) {
+						if (regatta.name.toLowerCase().indexOf(r.quali_search.toLowerCase()) >= 0) {
+							console.log('FOUND', regatta);
 							beginn = ((regatta.meldungSchluss != null) ? parseDate(regatta.meldungSchluss) : date);
 							break;
 						}
@@ -220,8 +222,9 @@ async function selectChange(callSiteScript = true) {
 						to.setDate(to.getDate() - 14);
 						to = formatDate('Y-m-d', to);
 					} else {
-					from = (year - 1) + '-12-01';
-					to = year + '-11-30';
+						console.log('[rank] no regatta found');
+						from = year + '-12-31'; // reverse => no regattas will be found => no ranking
+						to = year + '-01-01';
 						break; // TODO: bessere Fehlermeldung - keine Regatta gefunden
 					}
 					break;
@@ -245,6 +248,8 @@ async function selectChange(callSiteScript = true) {
 				siteScript();
 			}
 		}
+		resolve();
+	});
 }
 
 function buttonShowPressed() {
@@ -304,7 +309,7 @@ function initSelects() {
 			$('#input-agecrew').prop('checked', agecrew !== null);
 		}
 
-		selectChange(false);
+		await selectChange(false);
 
 		resolve();
 	});

server/version.php

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