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

Merge remote-tracking branch 'origin/main' into main

Browse Source
This commit is contained in:
Simon
2020-12-11 21:21:35 +01:00
parent 5202042894 efc2bd7501
commit 3cd8670cef
1 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,15 +24,17 @@ import java.util.*;
@Controller
public class VotingController {
@Value("$(voting)")
private String voting;
@Value("$(motto)")
private String motto;
@Value("$(adding)")
private String adding;
private Boolean votingPhase = false, mottoPhase = false, addingPhase = false;
@Value("motto")
String motto;
@Value("adding")
String adding;
@Value("voting")
String voting;
private boolean votingPhase = false;
private boolean mottoPhase = false;
private boolean addingPhase = false;
private static final Logger LOGGER = LogManager.getLogger(VotingController.class);
private TableAction tableAction = new TableAction();
@@ -61,19 +63,21 @@ public class VotingController {
@PostConstruct
public void init() {
if (voting != null) {
votingPhase = true;
} else if (adding != null) {
addingPhase = true;
} else if (motto != null) {
if (motto != null){
mottoPhase = true;
} else if (adding != null){
addingPhase = true;
} else if (voting != null){
votingPhase = true;
}
// //TODO: TESTING REMOVE ON SHIPPING
// votingPhase = false;
// mottoPhase = true;
// addingPhase = false;
LOGGER.info("Program started with arguments: votingPhase=" + votingPhase + " mottoPhase=" + mottoPhase + " addingPhase=" + addingPhase);
LOGGER.info("Program started with arguments: votingPhase="+ votingPhase + " mottoPhase=" + mottoPhase + " addingPhase=" + addingPhase);
if (voterRepository.findAll().size() == 0) {
tableAction.setUpVoters(voterRepository);
@@ -85,7 +89,7 @@ public class VotingController {
LOGGER.info("Categories successfully set up");
}
if (mottoRepository.findAll().size() == 0) {
if (mottoRepository.findAll().size() == 0){
tableAction.setUpMottos(mottoRepository);
LOGGER.info("Mottos successfully set up");
}