BUGFIX
This commit is contained in:
@@ -190,32 +190,23 @@ public class VotingController {
|
|||||||
return "errors/alreadyVoted.html";
|
return "errors/alreadyVoted.html";
|
||||||
} else {
|
} else {
|
||||||
LinkedList<PossibleCandidate> posCandidates = possibleCandidates.getPossibleCandidates();
|
LinkedList<PossibleCandidate> posCandidates = possibleCandidates.getPossibleCandidates();
|
||||||
LinkedList<PossibleCandidate> voteForPosCandidates = new LinkedList<>();
|
|
||||||
LinkedList<PossibleCandidate> addToPosCandidates = new LinkedList<>();
|
|
||||||
long index = 1;
|
long index = 1;
|
||||||
for (PossibleCandidate posCandidate : posCandidates) {
|
for (PossibleCandidate posCandidate : posCandidates) {
|
||||||
if (posCandidate.getName() != "") {
|
if (posCandidate.getName() != "") {
|
||||||
if (possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get()) != null) {
|
if (possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get()) != null) {
|
||||||
PossibleCandidate p = possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get());
|
PossibleCandidate p = possibleCandidateRepository.findByNameAndCategory(posCandidate.getName(), categoryRepository.findById(index).get());
|
||||||
voteForPosCandidates.add(p);
|
p.setVotes(p.getVotes() + 1);
|
||||||
|
possibleCandidateRepository.save(p);
|
||||||
} else {
|
} else {
|
||||||
if(index > 31 && posCandidate.getName().indexOf(" ") != -1){
|
if (index > 31 && posCandidate.getName().indexOf(" ") != -1) {
|
||||||
posCandidate.setName(posCandidate.getName().split(" ")[posCandidate.getName().split(" ").length-1]);
|
posCandidate.setName(posCandidate.getName().split(" ")[posCandidate.getName().split(" ").length - 1]);
|
||||||
}
|
}
|
||||||
PossibleCandidate possibleCandidate = new PossibleCandidate(posCandidate.getName(), categoryRepository.findById(index).get());
|
PossibleCandidate possibleCandidate = new PossibleCandidate(posCandidate.getName(), categoryRepository.findById(index).get());
|
||||||
addToPosCandidates.add(possibleCandidate);
|
possibleCandidateRepository.save(possibleCandidate);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
index++;
|
index++;
|
||||||
}
|
}
|
||||||
for (PossibleCandidate p: voteForPosCandidates) {
|
|
||||||
p.setVotes(p.getVotes() + 1);
|
|
||||||
possibleCandidateRepository.save(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
for (PossibleCandidate p: addToPosCandidates) {
|
|
||||||
possibleCandidateRepository.save(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
tableAction.updateCandidatesubmit_status(name, voterRepository);
|
tableAction.updateCandidatesubmit_status(name, voterRepository);
|
||||||
return "voteSuccessful.html";
|
return "voteSuccessful.html";
|
||||||
|
|||||||
Reference in New Issue
Block a user