From c983a1702f633a18a29afc7a0753207ae1deb97b Mon Sep 17 00:00:00 2001
From: ostertun <github@ostertun.net>
Date: Wed, 23 Dec 2020 15:08:36 +0100
Subject: [PATCH] Fix Altersklassen & no_regattas_on_index

---
 server/scripts/index.js         | 55 +++++++++++++++++++++++++++++++--
 server/scripts/planning.js      | 17 ++++++++++
 server/scripts/planning_edit.js | 17 ++++++++++
 server/scripts/planning_view.js | 17 ++++++++++
 4 files changed, 104 insertions(+), 2 deletions(-)

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 += '<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
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 += '<div>' + entry['special'] + '</div>';
 
 			// 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 += '<div>' + entry['special'] + '</div>';
 
 			// 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 += '<div>' + entry['special'] + '</div>';
 
 			// Club