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

test

Browse Source
This commit is contained in:
Simon
2020-12-16 23:41:53 +01:00
parent 80b20f2098
commit 5cfade336e
5 changed files with 107 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,21 +65,9 @@ public class VotingController {
@PostConstruct
public void init() {
if (motto != null){
mottoPhase = false;
addingPhase = true;
votingPhase = false;
} else if (adding != null){
addingPhase = true;
} else if (voting != null){
votingPhase = true;
}
// //TODO: TESTING REMOVE ON SHIPPING
// votingPhase = false;
// mottoPhase = true;
// addingPhase = false;
mottoPhase = false;
votingPhase = false;
addingPhase = true;
LOGGER.info("Program started with arguments: votingPhase="+ votingPhase + " mottoPhase=" + mottoPhase + " addingPhase=" + addingPhase);

2
src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java
View File

@@ -38,7 +38,7 @@ public class AuthCode {
}
public boolean isExpired(){
return System.currentTimeMillis() >= (time + 600*1000);
return System.currentTimeMillis() >= (time + 1800*1000);
}
public void setTime(long time) {

18
src/main/resources/static/styles/alreadysubmittedcandidates.css
View File

@@ -24,25 +24,7 @@ h1 {
font-size: 75px;
}
h2.categoryHeader {
color: #FFF;
font-size: 50px;
}
button {
background: transparent;
border: none;
color: #FFF;
font-size: 35px;
font-weight: normal;
letter-spacing: .125rem;
text-transform: uppercase;
text-align: center;
transition: opacity .25s .5s;
}
.submitButton {
margin-top: 5%;
padding: .25em 0;
border: 0;
outline: 0;

30
src/main/resources/templates/errors/alreadysubmittedcandidates.html
View File

@@ -9,10 +9,34 @@
<body class="center-screen">
<div class="centered">
<h1 style="color: red;">Du hast deine Kandidaten schon vorgeschlagen!</h1>
<a href="/">Return to Login-Site</a>
<button type="submit" id="signup_button">Abstimmen</button>
<h1>Du hast schon abgestimmt!</h1>
<h2 id="time_remain">Nächste Abstimmung in: </h2>
<button id="backButton" class="submitButton">Zurück zum Anfang</button>
</div>
<script>
document.getElementById("backButton").onclick = function() {
location.href = "/";
};
// We can set endTime to whatever we want here (e.g. Midnight today )
// Use moment().endOf('day') to do this.
var dateFuture = new Date(2020, 11, 28, 0, 0);
// Show time remaining now.
showTimeRemaining();
// Set a timer to update the displayed clock every 1000 milliseconds.
setInterval(showTimeRemaining, 1000);
function showTimeRemaining() {
var dateNow = Date.now();
var days = Math.floor((dateFuture - dateNow) / (1000 * 60 * 60 * 24))
var hours = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24) / (1000 * 60 * 60))
var mins = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60) / (1000 * 60))
var secs = Math.floor(((dateFuture - dateNow) - days * 1000 * 60 * 60 * 24 - hours * 1000 * 60 * 60 - mins * 1000 * 60) / 1000)
document.getElementById("time_remain").innerHTML = "Nächste Abstimmung in: " + days + "D " + hours + ":" + mins + ":" + secs;
</script>
</body>
</html>