cato447/AbizeitungVotingSystem
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Expanded the number of candidates from 5 to 10-15

Browse Source
This commit is contained in:
Simon
2021-01-04 00:28:55 +01:00
parent f63847a092
commit dfaf2c55e2
3 changed files with 124 additions and 1211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1315
logs/Voting.log
View File

File diff suppressed because it is too large Load Diff

1
src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java
View File

@@ -22,7 +22,6 @@ import javax.annotation.PostConstruct;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.Month; import java.time.Month;
import java.util.*; import java.util.*;
import java.util.concurrent.ExecutionException;
@Controller @Controller
public class VotingController { public class VotingController {

19
src/main/java/com/github/cato447/AbizeitungVotingSystem/table/TableAction.java
View File

@@ -71,12 +71,8 @@ public class TableAction {
authCodesRepository.delete(authCodesRepository.findByName(name)); authCodesRepository.delete(authCodesRepository.findByName(name));
} }
private boolean fiveMinutesPassed(Long time){
return System.currentTimeMillis() >= (time + 300*1000);
}
private int getLimit(List<PossibleCandidate> possibleCandidates){ private int getLimit(List<PossibleCandidate> possibleCandidates){
return possibleCandidates.size() <= 5 ? possibleCandidates.size() : 5; return possibleCandidates.size() <= 15 ? possibleCandidates.size() : 15;
} }
public void voteForCandidate(String id, CandidateRepository candidateRepository){ public void voteForCandidate(String id, CandidateRepository candidateRepository){
@@ -123,8 +119,17 @@ public class TableAction {
Collections.sort(possibleCandidatesPerCategory, Comparator.comparing(PossibleCandidate::getVotes)); Collections.sort(possibleCandidatesPerCategory, Comparator.comparing(PossibleCandidate::getVotes));
Collections.reverse(possibleCandidatesPerCategory); Collections.reverse(possibleCandidatesPerCategory);
for (int j = 0; j < getLimit(possibleCandidatesPerCategory); j++){ for (int j = 0; j < getLimit(possibleCandidatesPerCategory); j++){
Candidate candidate = new Candidate(possibleCandidatesPerCategory.get(j).getName(), possibleCandidatesPerCategory.get(j).getCategory()); if (j >= 10 && possibleCandidatesPerCategory.get(j).getVotes() == possibleCandidatesPerCategory.get(j-1).getVotes()){
candidateRepository.save(candidate); Candidate candidate = new Candidate(possibleCandidatesPerCategory.get(j).getName(), possibleCandidatesPerCategory.get(j).getCategory());
candidateRepository.save(candidate);
}
if (j < 10){
Candidate candidate = new Candidate(possibleCandidatesPerCategory.get(j).getName(), possibleCandidatesPerCategory.get(j).getCategory());
candidateRepository.save(candidate);
}
if (j == 14){
break;
}
} }
i += -1; i += -1;
possibleCandidatesPerCategory.clear(); possibleCandidatesPerCategory.clear();