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

Fix Altersklassen & no_regattas_on_index

Browse Source
This commit is contained in:
ostertun
2020-12-23 15:08:36 +01:00
parent a1facbca85
commit c983a1702f
4 changed files with 104 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
server/scripts/index.js
View File

@@ -189,6 +189,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1);
}
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>';
// Icons
@@ -259,7 +276,7 @@ var siteScript = async function() {
var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0;
while (i < regattas.length) {
if (regattas.length < 1) {
if (regattas[i].length < 1) {
regattas.splice(i, 1);
} else {
i ++;
@@ -297,6 +314,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1);
}
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>';
// Icons
@@ -371,7 +405,7 @@ var siteScript = async function() {
var regattas = await dbGetRegattasRange(minDate, maxDate);
i = 0;
while (i < regattas.length) {
if (regattas.length < 1) {
if (regattas[i].length < 1) {
regattas.splice(i, 1);
} else {
i ++;
@@ -412,6 +446,23 @@ var siteScript = async function() {
if (regatta.special.substr(0, 1) == '#') {
regatta.special = '* ' + regatta.special.substr(1);
}
// replace placeholders
var pos;
while ((pos = regatta.special.indexOf('$')) >= 0) {
var pos2 = regatta.special.indexOf('$', pos + 1);
if (pos2 < 0) break;
var key = regatta.special.substring(pos + 1, pos2);
var value = '';
// age class
if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
value = 'U-' + value;
} else {
break;
}
regatta.special = regatta.special.replace('$' + key + '$', value);
}
list += '<div>' + regatta['special'] + '</div>';
// Icons