From d7185572fc8101c336c8dcfa00526a94b1004b78 Mon Sep 17 00:00:00 2001 From: cato447 Date: Sat, 14 Nov 2020 01:11:17 +0100 Subject: [PATCH] All fallbacks added to the login site. Edited voting.html .gitignore: - added the /logs folder to the gitignore VotingController.java: - added log message logging false entry format Candidate.java: - return type changed from 'String' to 'Candidate' wrongEmail.html: - added html file to avoid error voting.html: - changed the way of output --- .gitignore | 1 + .../controller/VotingController.java | 1 + .../AbizeitungVotingSystem/entities/Candidate.java | 2 +- .../resources/templates/errors/wrongEmail.html | 0 src/main/resources/templates/voting.html | 14 +++++++------- 5 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 src/main/resources/templates/errors/wrongEmail.html diff --git a/.gitignore b/.gitignore index 549e00a..0c0a974 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ build/ ### VS Code ### .vscode/ +*.log diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java index ed14fd3..2b858ba 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -85,6 +85,7 @@ public class VotingController { return "errors/notRegistered.html"; } } + LOGGER.error("Wrong input format detected: " + name); return "errors/wrongEmail.html"; } diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/Candidate.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/Candidate.java index 3465da1..605b199 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/Candidate.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/Candidate.java @@ -40,5 +40,5 @@ public class Candidate { return votes; } - public String getCategory() {return category.getName();} + public Category getCategory() {return category;} } diff --git a/src/main/resources/templates/errors/wrongEmail.html b/src/main/resources/templates/errors/wrongEmail.html new file mode 100644 index 0000000..e69de29 diff --git a/src/main/resources/templates/voting.html b/src/main/resources/templates/voting.html index 023d5d6..a72f4de 100644 --- a/src/main/resources/templates/voting.html +++ b/src/main/resources/templates/voting.html @@ -10,13 +10,13 @@

Wähle deine Kandidaten:

-
-

-

-

-

- +
+

+
    +
  • +
  • +
  • +