Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/rank_quali'

Browse Source
This commit is contained in:
ostertun
2022-04-27 14:14:03 +02:00
parent 343d898afd ae8aed446b
commit 32cc8c0bfb
2 changed files with 133 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/scripts/rank.js
View File

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

2
server/version.php
View File

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