diff --git a/Public/assets/festival-info.js b/Public/assets/festival-info.js index 4a8a7fa..2729246 100644 --- a/Public/assets/festival-info.js +++ b/Public/assets/festival-info.js @@ -17,3 +17,17 @@ function loadList(name, source) { txtFile.open("GET", list, true); txtFile.send(null); } + +function loadCount() { + var txtFile = new XMLHttpRequest(); + var allText = ""; + txtFile.onreadystatechange = function () { + if (txtFile.readyState === XMLHttpRequest.DONE && txtFile.status == 200) { + allText = txtFile.responseText; + } + document.getElementById("left-button").innerHTML = "Registered (" + allText + ")"; + } + var list = '/festival/api/count' + name; + txtFile.open("GET", list, true); + txtFile.send(null); +} diff --git a/Public/festival-info.html b/Public/festival-info.html index ce14c1e..0446603 100644 --- a/Public/festival-info.html +++ b/Public/festival-info.html @@ -19,7 +19,7 @@ - +
@@ -49,6 +49,7 @@
Liste nicht geladen
+ diff --git a/Sources/App/configure.swift b/Sources/App/configure.swift index 7a76982..aec0d64 100755 --- a/Sources/App/configure.swift +++ b/Sources/App/configure.swift @@ -16,6 +16,16 @@ private let df: DateFormatter = { return df }() +func guestCount() -> Int { + registeredGuests + .reduce([]) { $0 + $1.components(separatedBy: "+") } + .reduce([]) { $0 + $1.components(separatedBy: "-") } + .reduce([]) { $0 + $1.components(separatedBy: "und ") } + .reduce([]) { $0 + $1.components(separatedBy: "&") } + //.map { $0.trimmingCharacters(in: .whitespacesAndNewlines) } + .count +} + func add(guest: String) -> String { registeredGuests.insert(guest) diff --git a/Sources/App/routes.swift b/Sources/App/routes.swift index 98807be..375dd08 100755 --- a/Sources/App/routes.swift +++ b/Sources/App/routes.swift @@ -12,16 +12,13 @@ private func register(_ req: Request, isAttending: Bool) -> String { } func routes(_ app: Application) throws { - app.get { req in + + app.get("festival", "api", "ping") { req in return "It works!" } - app.get("festival", "api", "hello") { req in - return "It works!" - } - - app.get("hello") { req in - return "It works!" + app.get("festival", "api", "count") { req in + return "\(guestCount())" } app.post("festival", "api", "register") { req -> String in