This commit is contained in:
2020-12-16 23:41:53 +01:00
parent 80b20f2098
commit 5cfade336e
5 changed files with 107 additions and 37 deletions

View File

@@ -3773,3 +3773,79 @@ java.lang.NullPointerException: null
2020-12-12 00:17:46,632 INFO [SpringContextShutdownHook] Closing JPA EntityManagerFactory for persistence unit 'default'
2020-12-12 00:17:46,633 INFO [SpringContextShutdownHook] HikariPool-2 - Shutdown initiated...
2020-12-12 00:17:46,655 INFO [SpringContextShutdownHook] HikariPool-2 - Shutdown completed.
2020-12-16 23:08:53,594 INFO [restartedMain] Starting AbizeitungVotingSystemApplication on bitecoding-System-Product-Name with PID 29783 (/home/bitecoding/Code/GitHub/AbizeitungVotingSystem/target/classes started by bitecoding in /home/bitecoding/Code/GitHub/AbizeitungVotingSystem)
2020-12-16 23:08:53,597 INFO [restartedMain] No active profile set, falling back to default profiles: default
2020-12-16 23:08:53,662 INFO [restartedMain] Devtools property defaults active! Set 'spring.devtools.add-properties' to 'false' to disable
2020-12-16 23:08:53,662 INFO [restartedMain] For additional web related logging consider setting the 'logging.level.web' property to 'DEBUG'
2020-12-16 23:08:54,075 INFO [restartedMain] Bootstrapping Spring Data JPA repositories in DEFAULT mode.
2020-12-16 23:08:54,124 INFO [restartedMain] Finished Spring Data repository scanning in 42ms. Found 6 JPA repository interfaces.
2020-12-16 23:08:54,748 INFO [restartedMain] Tomcat initialized with port(s): 8000 (http)
2020-12-16 23:08:54,757 INFO [restartedMain] Initializing ProtocolHandler ["http-nio-8000"]
2020-12-16 23:08:54,758 INFO [restartedMain] Starting service [Tomcat]
2020-12-16 23:08:54,758 INFO [restartedMain] Starting Servlet engine: [Apache Tomcat/9.0.38]
2020-12-16 23:08:54,812 INFO [restartedMain] Initializing Spring embedded WebApplicationContext
2020-12-16 23:08:54,812 INFO [restartedMain] Root WebApplicationContext: initialization completed in 1149 ms
2020-12-16 23:08:54,965 INFO [restartedMain] HHH000204: Processing PersistenceUnitInfo [name: default]
2020-12-16 23:08:54,995 INFO [restartedMain] HHH000412: Hibernate ORM core version 5.4.21.Final
2020-12-16 23:08:55,082 INFO [restartedMain] HCANN000001: Hibernate Commons Annotations {5.1.0.Final}
2020-12-16 23:08:55,148 INFO [restartedMain] HikariPool-1 - Starting...
2020-12-16 23:08:55,495 INFO [restartedMain] HikariPool-1 - Start completed.
2020-12-16 23:08:55,519 INFO [restartedMain] HHH000400: Using dialect: org.hibernate.dialect.MySQL8Dialect
2020-12-16 23:08:56,112 INFO [restartedMain] HHH000490: Using JtaPlatform implementation: [org.hibernate.engine.transaction.jta.platform.internal.NoJtaPlatform]
2020-12-16 23:08:56,117 INFO [restartedMain] Initialized JPA EntityManagerFactory for persistence unit 'default'
2020-12-16 23:08:56,129 INFO [restartedMain] LiveReload server is running on port 35729
2020-12-16 23:08:56,530 INFO [restartedMain] Program started with arguments: votingPhase=false mottoPhase=false addingPhase=true
2020-12-16 23:08:56,728 WARN [restartedMain] spring.jpa.open-in-view is enabled by default. Therefore, database queries may be performed during view rendering. Explicitly configure spring.jpa.open-in-view to disable this warning
2020-12-16 23:08:56,850 INFO [restartedMain] Initializing ExecutorService 'applicationTaskExecutor'
2020-12-16 23:08:57,034 INFO [restartedMain] Starting ProtocolHandler ["http-nio-8000"]
2020-12-16 23:08:57,048 INFO [restartedMain] Tomcat started on port(s): 8000 (http) with context path ''
2020-12-16 23:08:57,057 INFO [restartedMain] Started AbizeitungVotingSystemApplication in 3.782 seconds (JVM running for 4.4)
2020-12-16 23:09:02,314 INFO [http-nio-8000-exec-1] Initializing Spring DispatcherServlet 'dispatcherServlet'
2020-12-16 23:09:02,314 INFO [http-nio-8000-exec-1] Initializing Servlet 'dispatcherServlet'
2020-12-16 23:09:02,320 INFO [http-nio-8000-exec-1] Completed initialization in 6 ms
2020-12-16 23:09:07,865 WARN [http-nio-8000-exec-4] simon.bussmann@adolfinum.de
2020-12-16 23:09:07,881 WARN [http-nio-8000-exec-4] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:09:15,281 WARN [http-nio-8000-exec-8] simon.bussmann@adolfinum.de
2020-12-16 23:09:15,285 WARN [http-nio-8000-exec-8] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:09:22,285 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de
2020-12-16 23:09:22,288 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:09:28,718 WARN [http-nio-8000-exec-6] simon.bussmann@adolfinum.de
2020-12-16 23:09:28,722 WARN [http-nio-8000-exec-6] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:09:53,815 WARN [http-nio-8000-exec-8] simon.bussmann@adolfinum.de
2020-12-16 23:09:53,819 WARN [http-nio-8000-exec-8] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:10:25,035 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de
2020-12-16 23:10:25,039 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:19:59,443 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de
2020-12-16 23:19:59,446 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:26:44,029 WARN [http-nio-8000-exec-6] simon.bussmann@adolfinum.de
2020-12-16 23:26:44,032 WARN [http-nio-8000-exec-6] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:27:03,861 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de
2020-12-16 23:27:03,865 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:28:24,302 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de
2020-12-16 23:28:24,306 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:29:40,410 WARN [http-nio-8000-exec-5] simon.bussmann@adolfinum.de
2020-12-16 23:29:40,413 WARN [http-nio-8000-exec-5] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:30:36,480 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de
2020-12-16 23:30:36,484 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:30:48,686 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de
2020-12-16 23:30:48,690 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:34:24,829 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de
2020-12-16 23:34:24,832 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:34:43,629 WARN [http-nio-8000-exec-4] simon.bussmann@adolfinum.de
2020-12-16 23:34:43,634 WARN [http-nio-8000-exec-4] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:36:23,582 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de
2020-12-16 23:36:23,586 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:36:51,244 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de
2020-12-16 23:36:51,247 WARN [http-nio-8000-exec-9] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:37:06,180 WARN [http-nio-8000-exec-1] simon.bussmann@adolfinum.de
2020-12-16 23:37:06,183 WARN [http-nio-8000-exec-1] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:37:39,778 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de
2020-12-16 23:37:39,782 WARN [http-nio-8000-exec-3] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:38:01,467 WARN [http-nio-8000-exec-5] simon.bussmann@adolfinum.de
2020-12-16 23:38:01,472 WARN [http-nio-8000-exec-5] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:38:27,209 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de
2020-12-16 23:38:27,213 WARN [http-nio-8000-exec-7] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:40:06,985 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de
2020-12-16 23:40:06,992 WARN [http-nio-8000-exec-10] simon.bussmann@adolfinum.de has already submitted its candidates
2020-12-16 23:41:01,246 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de
2020-12-16 23:41:01,250 WARN [http-nio-8000-exec-2] simon.bussmann@adolfinum.de has already submitted its candidates

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;
LOGGER.info("Program started with arguments: votingPhase="+ votingPhase + " mottoPhase=" + mottoPhase + " addingPhase=" + addingPhase);

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) {

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;

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>