diff --git a/server/scripts/index.js b/server/scripts/index.js
index 9e27c87..93b9915 100644
--- a/server/scripts/index.js
+++ b/server/scripts/index.js
@@ -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 += '
' + regatta['special'] + '
';
// 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 += '' + regatta['special'] + '
';
// 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 += '' + regatta['special'] + '
';
// Icons
diff --git a/server/scripts/onRegattaClicked.js b/server/scripts/onRegattaClicked.js
index 057c739..b6a1fc7 100644
--- a/server/scripts/onRegattaClicked.js
+++ b/server/scripts/onRegattaClicked.js
@@ -6,15 +6,38 @@ async function onRegattaClicked(id) {
var dateTo = parseDate(regatta['date']);
dateTo.setDate(dateTo.getDate() + Math.max(parseInt(regatta['length']) - 1, 0));
+ var text = [];
var specialFields = await dbGetClassProp('special-fields');
if (specialFields === null) specialFields = {};
if (regatta.special.substr(0, 1) == '#') {
regatta.special = regatta.special.substr(1);
if (typeof specialFields[regatta.special] !== 'undefined') {
- $('#menu-item-special').text(specialFields[regatta.special]);
- } else {
- $('#menu-item-special').text('ERROR');
+ text.push(specialFields[regatta.special]);
}
+ }
+ 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);
+
+ // age class
+ if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+ var year = parseDate(regatta.date).getFullYear();
+ year = year - value + 1;
+ text.push('Jahrgänge ' + year + ' und jünger');
+ } else {
+ break;
+ }
+
+ regatta.special = regatta.special.replace('$' + key + '$', '');
+ }
+ if (text.length > 0) {
+ text.sort();
+ for (i in text) {
+ text[i] = $('').text(text[i]).html();
+ }
+ $('#menu-item-special').html(text.join('')); $('#menu-item-special').show(); } else { $('#menu-item-special').hide(); diff --git a/server/scripts/planning.js b/server/scripts/planning.js index 0820d07..3c21b1c 100644 --- a/server/scripts/planning.js +++ b/server/scripts/planning.js @@ -224,6 +224,23 @@ var siteScript = async function() { if (entry.special.substr(0, 1) == '#') { entry.special = '* ' + entry.special.substr(1); } + // replace placeholders + var pos; + while ((pos = entry.special.indexOf('$')) >= 0) { + var pos2 = entry.special.indexOf('$', pos + 1); + if (pos2 < 0) break; + var key = entry.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; + } + + entry.special = entry.special.replace('$' + key + '$', value); + } row.content += '
' + entry['special'] + '
';
// Icons
diff --git a/server/scripts/planning_edit.js b/server/scripts/planning_edit.js
index 70c11e7..4749738 100644
--- a/server/scripts/planning_edit.js
+++ b/server/scripts/planning_edit.js
@@ -439,6 +439,23 @@ var siteScript = async function() {
if (entry.special.substr(0, 1) == '#') {
entry.special = '* ' + entry.special.substr(1);
}
+ // replace placeholders
+ var pos;
+ while ((pos = entry.special.indexOf('$')) >= 0) {
+ var pos2 = entry.special.indexOf('$', pos + 1);
+ if (pos2 < 0) break;
+ var key = entry.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;
+ }
+
+ entry.special = entry.special.replace('$' + key + '$', value);
+ }
row.content += '' + entry['special'] + '
';
// Club
diff --git a/server/scripts/planning_view.js b/server/scripts/planning_view.js
index b2dd3f9..8864be9 100644
--- a/server/scripts/planning_view.js
+++ b/server/scripts/planning_view.js
@@ -167,6 +167,23 @@ var siteScript = async function() {
if (entry.special.substr(0, 1) == '#') {
entry.special = '* ' + entry.special.substr(1);
}
+ // replace placeholders
+ var pos;
+ while ((pos = entry.special.indexOf('$')) >= 0) {
+ var pos2 = entry.special.indexOf('$', pos + 1);
+ if (pos2 < 0) break;
+ var key = entry.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;
+ }
+
+ entry.special = entry.special.replace('$' + key + '$', value);
+ }
row.content += '' + entry['special'] + '
';
// Club
diff --git a/server/scripts/regattas.js b/server/scripts/regattas.js
index 420a48d..076b786 100644
--- a/server/scripts/regattas.js
+++ b/server/scripts/regattas.js
@@ -162,6 +162,27 @@ var siteScript = async function() {
entry.special = 'ERROR';
}
}
+ // replace placeholders
+ var pos;
+ while ((pos = entry.special.indexOf('$')) >= 0) {
+ var pos2 = entry.special.indexOf('$', pos + 1);
+ if (pos2 < 0) break;
+ var key = entry.special.substring(pos + 1, pos2);
+
+ var value = '';
+ // age class
+ if ((key.substr(0, 1) == 'U') && (!isNaN(value = parseInt(key.substr(1))))) {
+ var year = parseDate(entry.date).getFullYear();
+ year = year - value + 1;
+ var text = 'Jahrgänge ' + year + ' und jünger';
+ value = 'U-' + value;
+ specialShown[value] = text;
+ } else {
+ break;
+ }
+
+ entry.special = entry.special.replace('$' + key + '$', value);
+ }
row.content += '' + entry.special + '
';
// Icons
@@ -239,9 +260,12 @@ var siteScript = async function() {
rows.push(null);
}
- if (Object.keys(specialShown).length > 0) {
+ var specialKeys = Object.keys(specialShown);
+ if (specialKeys.length > 0) {
+ specialKeys.sort();
var specialText = '';
- for (key in specialShown) {
+ for (i in specialKeys) {
+ var key = specialKeys[i];
specialText += '* ' + key + ': ' + specialShown[key] + ''; } $('#card-special').find('p').html(specialText); diff --git a/server/version.php b/server/version.php index 2c4d020..34f3404 100644 --- a/server/version.php +++ b/server/version.php @@ -1,5 +1,5 @@