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

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

@@ -24,15 +24,17 @@ import java.util.*;
@Controller @Controller
public class VotingController { 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 static final Logger LOGGER = LogManager.getLogger(VotingController.class);
private TableAction tableAction = new TableAction(); private TableAction tableAction = new TableAction();
@@ -61,13 +63,15 @@ public class VotingController {
@PostConstruct @PostConstruct
public void init() { public void init() {
if (voting != null) { if (motto != null){
votingPhase = true; mottoPhase = true;
} else if (adding != null){ } else if (adding != null){
addingPhase = true; addingPhase = true;
} else if (motto != null) { } else if (voting != null){
mottoPhase = true; votingPhase = true;
} }
// //TODO: TESTING REMOVE ON SHIPPING // //TODO: TESTING REMOVE ON SHIPPING
// votingPhase = false; // votingPhase = false;
// mottoPhase = true; // mottoPhase = true;