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 69f9923..fe0669f 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -173,7 +173,6 @@ public class VotingController { List mottos = mottoRepository.findAll(); model.addAttribute("mottos", mottos); model.addAttribute("name", name); - model.addAttribute("code", code); return "mottoVoting.html"; } else if (addingPhase) { PossibleCandidateWrapper possibleCandidates = new PossibleCandidateWrapper(); @@ -184,13 +183,11 @@ public class VotingController { model.addAttribute("categories", categories); model.addAttribute("form", possibleCandidates); model.addAttribute("name", name); - model.addAttribute("code", code); return "addingCandidates.html"; } else if (votingPhase) { List categories = categoryRepository.findAll(); model.addAttribute("categories", categories); model.addAttribute("name", name); - model.addAttribute("code", code); return "voting.html"; } } else if (tokenStatus.equals("expired")) { @@ -210,11 +207,10 @@ public class VotingController { } @RequestMapping("/saveCandidates") - public String candidateSaving(@ModelAttribute PossibleCandidateWrapper possibleCandidates, @RequestParam String name, @RequestParam String code) { + public String candidateSaving(@ModelAttribute PossibleCandidateWrapper possibleCandidates, @RequestParam String name) { if (voterRepository.findByEmail(name).getVote_status()) { return "errors/alreadyVoted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); LinkedList posCandidates = possibleCandidates.getPossibleCandidates(); long index = 1; for (PossibleCandidate posCandidate : posCandidates) { @@ -236,12 +232,11 @@ public class VotingController { } @RequestMapping("/saveMotto") - public String mottoSaving(@RequestParam String name, @RequestParam String voteValue, @RequestParam String code) { + public String mottoSaving(@RequestParam String name, @RequestParam String voteValue) { LOGGER.info(name); if (voterRepository.findByEmail(name).getMotto_status()) { return "errors/alreadySubmitted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); tableAction.voteForMotto(voteValue, mottoRepository); tableAction.updateMottoStatus(name, voterRepository); LOGGER.info(name + " has choose his motto"); @@ -250,11 +245,10 @@ public class VotingController { } @RequestMapping("/processVote") - public String ProcessVote(@RequestParam String name, @RequestParam String voteValues, @RequestParam String code) { + public String ProcessVote(@RequestParam String name, @RequestParam String voteValues) { if (voterRepository.findByEmail(name).getCandidatesubmit_status()) { return "errors/alreadySubmitted.html"; } else { - authCodesRepository.delete(authCodesRepository.findByName(code)); String[] partVoteValues = voteValues.split(","); for (String s : partVoteValues) { tableAction.voteForCandidate(s, candidateRepository); diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java index c12a984..c1f07dd 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java @@ -55,6 +55,7 @@ public class TableAction { try { AuthCode authCode = authCodesRepository.findByName(name); if (authCode.getCode().equals(code) && !authCode.isExpired()) { + authCodesRepository.delete(authCode); return "matched"; } else if (authCode.isExpired()) { authCodesRepository.delete(authCode); diff --git a/src/main/resources/static/styles/addingCandidates.css b/src/main/resources/static/styles/addingCandidates.css index 9aac8ac..6d68b66 100644 --- a/src/main/resources/static/styles/addingCandidates.css +++ b/src/main/resources/static/styles/addingCandidates.css @@ -28,6 +28,7 @@ h2 { } h2.categoryCategory { + color: #bb1515; margin-top: 5%; margin-bottom: 1%; }