diff --git a/.gitignore b/.gitignore index 0c0a974..59b552e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,4 +31,6 @@ build/ ### VS Code ### .vscode/ -*.log + +### Logging ### +/logs/ 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 2b858ba..5e897d2 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -1,6 +1,7 @@ package com.github.cato447.AbizeitungVotingSystem.controller; import com.github.cato447.AbizeitungVotingSystem.entities.Candidate; +import com.github.cato447.AbizeitungVotingSystem.entities.Category; import com.github.cato447.AbizeitungVotingSystem.entities.Voter; import com.github.cato447.AbizeitungVotingSystem.repositories.CandidateRepository; import com.github.cato447.AbizeitungVotingSystem.repositories.CategoryRepository; @@ -76,7 +77,9 @@ public class VotingController { return "errors/alreadyVoted.html"; } else { List candidates = candidateRepository.findAll(); + List categories = categoryRepository.findAll(); model.addAttribute("candidates", candidates); + model.addAttribute("categories", categories); LOGGER.info(name + " is voting now"); return "voting.html"; } diff --git a/src/main/resources/templates/voting.html b/src/main/resources/templates/voting.html index a72f4de..17a1b3a 100644 --- a/src/main/resources/templates/voting.html +++ b/src/main/resources/templates/voting.html @@ -10,6 +10,10 @@

Wähle deine Kandidaten:

+
+

+
+