Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Enhort
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Michael Menzel
Enhort
Commits
813003c1
Commit
813003c1
authored
Mar 01, 2019
by
Michael Menzel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
migrated to thymeleaf 2 and spring boot 2
parent
9e7df2af
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
188 additions
and
164 deletions
+188
-164
frontend/Enhort.iml
frontend/Enhort.iml
+65
-52
frontend/pom.xml
frontend/pom.xml
+13
-3
frontend/src/main/java/de/thm/spring/controller/ApplicationController.java
.../java/de/thm/spring/controller/ApplicationController.java
+1
-1
frontend/src/main/java/de/thm/spring/controller/ControllerHelper.java
.../main/java/de/thm/spring/controller/ControllerHelper.java
+2
-0
frontend/src/main/resources/application.properties
frontend/src/main/resources/application.properties
+2
-2
frontend/src/main/resources/templates/batch.html
frontend/src/main/resources/templates/batch.html
+47
-42
frontend/src/main/resources/templates/contact.html
frontend/src/main/resources/templates/contact.html
+34
-34
frontend/src/main/resources/templates/header.html
frontend/src/main/resources/templates/header.html
+0
-3
frontend/src/main/resources/templates/result.html
frontend/src/main/resources/templates/result.html
+22
-25
frontend/src/main/resources/templates/stat.html
frontend/src/main/resources/templates/stat.html
+2
-2
No files found.
frontend/Enhort.iml
View file @
813003c1
...
...
@@ -29,68 +29,81 @@
</content>
<orderEntry
type=
"inheritedJdk"
/>
<orderEntry
type=
"sourceFolder"
forTests=
"false"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.springframework.boot:spring-boot-properties-migrator:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-context:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.springframework.boot:spring-boot-configuration-metadata:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: de.thm.enhort.lib:Enhortlib:1.01"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-math3:3.6"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-lang3:3.
4
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-lang3:3.
8.1
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: commons-io:commons-io:2.4"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.commons:commons-exec:1.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:slf4j-api:1.7.25"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: junit:junit:4.11"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.hamcrest:hamcrest-core:1.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.json:json:20151123"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-web:
1.5.4
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter:
1.5.4
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot
:1.5.4
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-
autoconfigure:1.5.4
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven:
org.springframework.boot:spring-boot-starter-logging:1.5.4.RELEASE
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: ch.qos.logback:logback-c
lassic:1.1.11
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven:
ch.qos.logback:logback-core:1.1.11
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.
slf4j:jcl-over-slf4j:1.7.25
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-web:
2.1.3
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter:
2.1.3
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot
-autoconfigure:2.1.3
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-
starter-logging:2.1.3
.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven:
ch.qos.logback:logback-classic:1.2.3
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: ch.qos.logback:logback-c
ore:1.2.3
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven:
org.apache.logging.log4j:log4j-to-slf4j:2.11.2
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.
apache.logging.log4j:log4j-api:2.11.2
"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:jul-to-slf4j:1.7.25"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.slf4j:log4j-over-slf4j:1.7.25"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.yaml:snakeyaml:1.17"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.15"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.15"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.15"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.hibernate:hibernate-validator:5.3.5.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: javax.validation:validation-api:1.1.0.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.logging:jboss-logging:3.3.1.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml:classmate:1.3.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-databind:2.8.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-core:2.8.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-web:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-aop:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-beans:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-context:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-webmvc:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-expression:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-starter-test:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-test:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: com.jayway.jsonpath:json-path:2.2.0"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.minidev:json-smart:2.2.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.minidev:accessors-smart:1.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.ow2.asm:asm:5.0.3"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.assertj:assertj-core:2.6.0"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.mockito:mockito-core:1.10.19"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.objenesis:objenesis:2.1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: javax.annotation:javax.annotation-api:1.3.2"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"RUNTIME"
name=
"Maven: org.yaml:snakeyaml:1.23"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-json:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-databind:2.9.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-annotations:2.9.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.core:jackson-core:2.9.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.9.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-tomcat:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-core:9.0.16"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-el:9.0.16"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.apache.tomcat.embed:tomcat-embed-websocket:9.0.16"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.hibernate.validator:hibernate-validator:6.0.14.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: javax.validation:validation-api:2.0.1.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.jboss.logging:jboss-logging:3.3.2.Final"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: com.fasterxml:classmate:1.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-web:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-beans:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-webmvc:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-aop:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-expression:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-starter-test:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-test:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework.boot:spring-boot-test-autoconfigure:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: com.jayway.jsonpath:json-path:2.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.minidev:json-smart:2.3"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.minidev:accessors-smart:1.2"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.ow2.asm:asm:5.0.4"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.assertj:assertj-core:3.11.1"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.mockito:mockito-core:2.23.4"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.bytebuddy:byte-buddy:1.9.10"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: net.bytebuddy:byte-buddy-agent:1.9.10"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.objenesis:objenesis:2.6"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.hamcrest:hamcrest-library:1.3"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.skyscreamer:jsonassert:1.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-core:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework:spring-test:4.3.9.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-thymeleaf:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.thymeleaf:thymeleaf:2.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: ognl:ognl:3.0.8"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.javassist:javassist:3.21.0-GA"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.unbescape:unbescape:1.1.0.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.codehaus.groovy:groovy:2.4.11"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-actuator:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-actuator:1.5.4.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.skyscreamer:jsonassert:1.5.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-core:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework:spring-jcl:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.springframework:spring-test:5.1.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
scope=
"TEST"
name=
"Maven: org.xmlunit:xmlunit-core:2.6.2"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-thymeleaf:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.thymeleaf:thymeleaf:3.0.11.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.attoparser:attoparser:2.0.5.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.unbescape:unbescape:1.1.6.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-starter-actuator:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-actuator-autoconfigure:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.springframework.boot:spring-boot-actuator:2.1.3.RELEASE"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: io.micrometer:micrometer-core:1.1.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.hdrhistogram:HdrHistogram:2.1.9"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: org.latencyutils:LatencyUtils:2.0.3"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: net.sourceforge.nekohtml:nekohtml:1.9.22"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: xerces:xercesImpl:2.11.0"
level=
"project"
/>
<orderEntry
type=
"library"
name=
"Maven: xml-apis:xml-apis:1.4.01"
level=
"project"
/>
...
...
frontend/pom.xml
View file @
813003c1
...
...
@@ -12,7 +12,7 @@
<parent>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-parent
</artifactId>
<version>
1.5.4
.RELEASE
</version>
<version>
2.1.3
.RELEASE
</version>
<relativePath/>
<!-- lookup parent from repository -->
</parent>
...
...
@@ -30,6 +30,15 @@
</build>
<dependencies>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-properties-migrator
</artifactId>
<scope>
runtime
</scope>
</dependency>
<dependency>
<groupId>
de.thm.enhort.lib
</groupId>
<artifactId>
Enhortlib
</artifactId>
...
...
@@ -62,15 +71,16 @@
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-thymeleaf
</artifactId>
<version>
1.5.4
.RELEASE
</version>
<version>
2.1.3
.RELEASE
</version>
</dependency>
<dependency>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-starter-actuator
</artifactId>
<version>
1.5.4
.RELEASE
</version>
<version>
2.1.3
.RELEASE
</version>
</dependency>
<dependency>
<groupId>
net.sourceforge.nekohtml
</groupId>
<artifactId>
nekohtml
</artifactId>
...
...
frontend/src/main/java/de/thm/spring/controller/ApplicationController.java
View file @
813003c1
...
...
@@ -21,7 +21,7 @@ import de.thm.command.InterfaceCommand;
import
de.thm.monitoring.Monitor
;
import
de.thm.spring.backend.Sessions
;
import
de.thm.spring.backend.StatisticsCollector
;
import
org.springframework.boot.
autoconfigure.web
.ErrorController
;
import
org.springframework.boot.
web.servlet.error
.ErrorController
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.stereotype.Controller
;
...
...
frontend/src/main/java/de/thm/spring/controller/ControllerHelper.java
View file @
813003c1
...
...
@@ -214,6 +214,8 @@ public class ControllerHelper {
model
.
addAttribute
(
"sequencelogo_name"
,
logo1
.
getName
());
model
.
addAttribute
(
"sequencelogo2_name"
,
logo2
.
getName
());
cmd
.
setLogo
(
true
);
}
model
.
addAttribute
(
"sl_effect"
,
collector
.
logoEffectSize
());
...
...
frontend/src/main/resources/application.properties
View file @
813003c1
...
...
@@ -3,7 +3,7 @@ logging.level.root=INFO
logging.level.org.springframework.web
=
INFO
logging.level.org.hibernate
=
INFO
spring.mvc.favicon.enabled
=
false
spring.
http
.multipart.max-file-size
=
20MB
spring.
http
.multipart.max-request-size
=
20MB
spring.
servlet
.multipart.max-file-size
=
20MB
spring.
servlet
.multipart.max-request-size
=
20MB
#
management.security.enabled
=
false
\ No newline at end of file
frontend/src/main/resources/templates/batch.html
View file @
813003c1
...
...
@@ -247,59 +247,62 @@
</body>
<script>
let
f
=
document
.
getElementById
(
"
files
"
);
let
sub
=
document
.
getElementById
(
"
startButton
"
);
<th:block
th:unless=
"${ran}"
>
<script>
let
f
=
document
.
getElementById
(
"
files
"
);
let
sub
=
document
.
getElementById
(
"
startButton
"
);
f
.
onchange
=
function
(
e
)
{
sub
.
disabled
=
f
.
length
===
0
;
};
f
.
onchange
=
function
(
e
)
{
sub
.
disabled
=
f
.
length
===
0
;
};
function
has_package
()
{
let
checkboxes
=
document
.
getElementsByTagName
(
"
input
"
);
function
has_package
()
{
let
checkboxes
=
document
.
getElementsByTagName
(
"
input
"
);
for
(
let
i
=
0
;
i
<
checkboxes
.
length
;
i
++
)
{
if
(
checkboxes
[
i
].
checked
===
false
)
{
continue
;
for
(
let
i
=
0
;
i
<
checkboxes
.
length
;
i
++
)
{
if
(
checkboxes
[
i
].
checked
===
false
)
{
continue
;
}
return
true
;
}
return
tru
e
;
return
fals
e
;
}
return
false
;
}
sub
.
addEventListener
(
"
click
"
,
function
(
e
)
{
e
.
preventDefault
();
sub
.
addEventListener
(
"
click
"
,
function
(
e
)
{
e
.
preventDefault
();
if
(
!
has_package
())
{
document
.
getElementById
(
"
info
"
).
innerText
=
"
You have to select at least one annotation package.
"
}
else
{
document
.
getElementById
(
"
uploadForm
"
).
submit
();
}
});
if
(
!
has_package
())
{
document
.
getElementById
(
"
info
"
).
innerText
=
"
You have to select at least one annotation package.
"
}
else
{
document
.
getElementById
(
"
uploadForm
"
).
submit
();
}
});
</script>
</script>
<script>
$
(
'
a
'
).
tooltip
();
<script>
$
(
'
a
'
).
tooltip
();
let
e
=
document
.
getElementById
(
"
cellline
"
);
let
hid
=
document
.
getElementById
(
"
hidden
"
);
let
e
=
document
.
getElementById
(
"
cellline
"
);
let
hid
=
document
.
getElementById
(
"
hidden
"
);
e
.
onchange
=
function
()
{
let
option
=
e
.
options
[
e
.
selectedIndex
].
value
;
e
.
onchange
=
function
()
{
let
option
=
e
.
options
[
e
.
selectedIndex
].
value
;
if
(
option
===
""
)
{
hid
.
style
.
visibility
=
"
hidden
"
;
}
else
{
hid
.
style
.
visibility
=
"
visible
"
;
}
};
if
(
option
===
""
)
{
hid
.
style
.
visibility
=
"
hidden
"
;
}
else
{
hid
.
style
.
visibility
=
"
visible
"
;
}
};
e
.
click
();
e
.
click
();
</script>
</
script
>
</
th:block
>
<th:block
th:if=
"${ran}"
>
...
...
@@ -311,6 +314,9 @@
var
results
=
[[
$
{
results
}]];
var
yValues
=
[[
$
{
tracks
}]];
//track names
console
.
log
(
results
);
console
.
log
(
yValues
);
var
xValues
=
[];
// .bed filenames
var
zValues
=
[];
// effect sizes
var
pValues
=
[];
// p values
...
...
@@ -324,9 +330,9 @@
var
tmpZ
=
[];
var
tmpP
=
[];
for
(
var
i
=
0
;
i
<
results
[
v
].
length
;
i
++
)
{
tmpZ
.
push
(
results
[
v
][
i
].
left
);
tmpP
.
push
(
results
[
v
][
i
]
.
right
);
for
(
let
i
=
0
;
i
<
results
[
v
].
length
;
i
++
)
{
tmpZ
.
push
(
Object
.
keys
(
results
[
v
][
i
])[
0
]
);
tmpP
.
push
(
results
[
v
][
i
]
[
Object
.
keys
(
results
[
v
][
i
])[
0
]]
);
}
zValues
.
push
(
tmpZ
);
...
...
@@ -364,8 +370,6 @@
hovers
.
push
(
tmp
);
}
console
.
log
(
hovers
);
var
data
=
[{
x
:
xValues
,
y
:
yValues
,
...
...
@@ -420,6 +424,7 @@
layout
.
annotations
.
push
(
result
);
}
}
console
.
log
(
data
);
Plotly
.
newPlot
(
'
heatmapDiv
'
,
data
,
layout
,
{
displayModeBar
:
false
});
...
...
frontend/src/main/resources/templates/contact.html
View file @
813003c1
...
...
@@ -28,15 +28,15 @@
(
function
(
_0x522698
,
_0x1757a3
)
{
var
_0x48a421
=
function
(
_0x27c1df
)
{
while
(
--
_0x27c1df
)
{
_0x522698
[
'
push
'
](
_0x522698
[
'
shift
'
]());
_0x522698
[
'
push
'
](
_0x522698
[
'
shift
'
]());
}
};
_0x48a421
(
++
_0x1757a3
);
}(
_0x1c22
,
0x1cf
));
var
_0x2d94
=
function
(
_0x10a316
,
_0x5d4f30
)
{
_0x10a316
=
_0x10a316
-
0x0
;
var
_0x4f825c
=
_0x1c22
[
_0x10a316
];
if
(
_0x2d94
[
'
initialized
'
]
===
undefined
)
{
var
_0x4f825c
=
_0x1c22
[
_0x10a316
];
if
(
_0x2d94
[
'
initialized
'
]
===
undefined
)
{
(
function
()
{
var
_0x488f4b
=
function
()
{
var
_0x311d05
;
...
...
@@ -49,10 +49,10 @@
};
var
_0x46d7f1
=
_0x488f4b
();
var
_0x239d32
=
'
ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=
'
;
_0x46d7f1
[
'
atob
'
]
||
(
_0x46d7f1
[
'
atob
'
]
=
function
(
_0x480c8b
)
{
var
_0x1068b9
=
String
(
_0x480c8b
)[
'
replace
'
](
/=+$/
,
''
);
for
(
var
_0x4834c2
=
0x0
,
_0x21a582
,
_0x5cd778
,
_0x4b75fc
=
0x0
,
_0xc2e5ea
=
''
;
_0x5cd778
=
_0x1068b9
[
'
charAt
'
](
_0x4b75fc
++
);
~
_0x5cd778
&&
(
_0x21a582
=
_0x4834c2
%
0x4
?
_0x21a582
*
0x40
+
_0x5cd778
:
_0x5cd778
,
_0x4834c2
++
%
0x4
)
?
_0xc2e5ea
+=
String
[
'
fromCharCode
'
](
0xff
&
_0x21a582
>>
(
-
0x2
*
_0x4834c2
&
0x6
))
:
0x0
)
{
_0x5cd778
=
_0x239d32
[
'
indexOf
'
](
_0x5cd778
);
_0x46d7f1
[
'
atob
'
]
||
(
_0x46d7f1
[
'
atob
'
]
=
function
(
_0x480c8b
)
{
var
_0x1068b9
=
String
(
_0x480c8b
)
[
'
replace
'
](
/=+$/
,
''
);
for
(
var
_0x4834c2
=
0x0
,
_0x21a582
,
_0x5cd778
,
_0x4b75fc
=
0x0
,
_0xc2e5ea
=
''
;
_0x5cd778
=
_0x1068b9
[
'
charAt
'
](
_0x4b75fc
++
);
~
_0x5cd778
&&
(
_0x21a582
=
_0x4834c2
%
0x4
?
_0x21a582
*
0x40
+
_0x5cd778
:
_0x5cd778
,
_0x4834c2
++
%
0x4
)
?
_0xc2e5ea
+=
String
[
'
fromCharCode
'
](
0xff
&
_0x21a582
>>
(
-
0x2
*
_0x4834c2
&
0x6
))
:
0x0
)
{
_0x5cd778
=
_0x239d32
[
'
indexOf
'
](
_0x5cd778
);
}
return
_0xc2e5ea
;
});
...
...
@@ -60,42 +60,42 @@
var
_0x3f0197
=
function
(
_0x5f190a
,
_0x55cf6c
)
{
var
_0x1afe30
=
[],
_0x719ab9
=
0x0
,
_0xc70d53
,
_0x3cb478
=
''
,
_0x207739
=
''
;
_0x5f190a
=
atob
(
_0x5f190a
);
for
(
var
_0x4be729
=
0x0
,
_0x196fb9
=
_0x5f190a
[
'
length
'
];
_0x4be729
<
_0x196fb9
;
_0x4be729
++
)
{
_0x207739
+=
'
%
'
+
(
'
00
'
+
_0x5f190a
[
'
charCodeAt
'
](
_0x4be729
)[
'
toString
'
](
0x10
))
[
'
slice
'
](
-
0x2
);
for
(
var
_0x4be729
=
0x0
,
_0x196fb9
=
_0x5f190a
[
'
length
'
];
_0x4be729
<
_0x196fb9
;
_0x4be729
++
)
{
_0x207739
+=
'
%
'
+
(
'
00
'
+
_0x5f190a
[
'
charCodeAt
'
](
_0x4be729
)
[
'
toString
'
](
0x10
))
[
'
slice
'
](
-
0x2
);
}
_0x5f190a
=
decodeURIComponent
(
_0x207739
);
for
(
var
_0x5a7ab7
=
0x0
;
_0x5a7ab7
<
0x100
;
_0x5a7ab7
++
)
{
_0x1afe30
[
_0x5a7ab7
]
=
_0x5a7ab7
;
_0x1afe30
[
_0x5a7ab7
]
=
_0x5a7ab7
;
}
for
(
_0x5a7ab7
=
0x0
;
_0x5a7ab7
<
0x100
;
_0x5a7ab7
++
)
{
_0x719ab9
=
(
_0x719ab9
+
_0x1afe30
[
_0x5a7ab7
]
+
_0x55cf6c
[
'
charCodeAt
'
](
_0x5a7ab7
%
_0x55cf6c
[
'
length
'
]))
%
0x100
;
_0xc70d53
=
_0x1afe30
[
_0x5a7ab7
];
_0x1afe30
[
_0x5a7ab7
]
=
_0x1afe30
[
_0x719ab9
];
_0x1afe30
[
_0x719ab9
]
=
_0xc70d53
;
_0x719ab9
=
(
_0x719ab9
+
_0x1afe30
[
_0x5a7ab7
]
+
_0x55cf6c
[
'
charCodeAt
'
](
_0x5a7ab7
%
_0x55cf6c
[
'
length
'
]))
%
0x100
;
_0xc70d53
=
_0x1afe30
[
_0x5a7ab7
];
_0x1afe30
[
_0x5a7ab7
]
=
_0x1afe30
[
_0x719ab9
];
_0x1afe30
[
_0x719ab9
]
=
_0xc70d53
;
}
_0x5a7ab7
=
0x0
;
_0x719ab9
=
0x0
;
for
(
var
_0x54cbcf
=
0x0
;
_0x54cbcf
<
_0x5f190a
[
'
length
'
];
_0x54cbcf
++
)
{
for
(
var
_0x54cbcf
=
0x0
;
_0x54cbcf
<
_0x5f190a
[
'
length
'
];
_0x54cbcf
++
)
{
_0x5a7ab7
=
(
_0x5a7ab7
+
0x1
)
%
0x100
;
_0x719ab9
=
(
_0x719ab9
+
_0x1afe30
[
_0x5a7ab7
])
%
0x100
;
_0xc70d53
=
_0x1afe30
[
_0x5a7ab7
];
_0x1afe30
[
_0x5a7ab7
]
=
_0x1afe30
[
_0x719ab9
];
_0x1afe30
[
_0x719ab9
]
=
_0xc70d53
;
_0x3cb478
+=
String
[
'
fromCharCode
'
](
_0x5f190a
[
'
charCodeAt
'
](
_0x54cbcf
)
^
_0x1afe30
[(
_0x1afe30
[
_0x5a7ab7
]
+
_0x1afe30
[
_0x719ab9
])
%
0x100
]);
_0x719ab9
=
(
_0x719ab9
+
_0x1afe30
[
_0x5a7ab7
])
%
0x100
;
_0xc70d53
=
_0x1afe30
[
_0x5a7ab7
];
_0x1afe30
[
_0x5a7ab7
]
=
_0x1afe30
[
_0x719ab9
];
_0x1afe30
[
_0x719ab9
]
=
_0xc70d53
;
_0x3cb478
+=
String
[
'
fromCharCode
'
](
_0x5f190a
[
'
charCodeAt
'
](
_0x54cbcf
)
^
_0x1afe30
[(
_0x1afe30
[
_0x5a7ab7
]
+
_0x1afe30
[
_0x719ab9
])
%
0x100
]);
}
return
_0x3cb478
;
};
_0x2d94
[
'
rc4
'
]
=
_0x3f0197
;
_0x2d94
[
'
data
'
]
=
{};
_0x2d94
[
'
initialized
'
]
=
!!
[];
_0x2d94
[
'
rc4
'
]
=
_0x3f0197
;
_0x2d94
[
'
data
'
]
=
{};
_0x2d94
[
'
initialized
'
]
=
!!
[];
}
var
_0xd38cc4
=
_0x2d94
[
'
data
'
]
[
_0x10a316
];
var
_0xd38cc4
=
_0x2d94
[
'
data
'
]
[
_0x10a316
];
if
(
_0xd38cc4
===
undefined
)
{
if
(
_0x2d94
[
'
once
'
]
===
undefined
)
{
_0x2d94
[
'
once
'
]
=
!!
[];
if
(
_0x2d94
[
'
once
'
]
===
undefined
)
{
_0x2d94
[
'
once
'
]
=
!!
[];
}
_0x4f825c
=
_0x2d94
[
'
rc4
'
](
_0x4f825c
,
_0x5d4f30
);
_0x2d94
[
'
data
'
]
[
_0x10a316
]
=
_0x4f825c
;
_0x4f825c
=
_0x2d94
[
'
rc4
'
](
_0x4f825c
,
_0x5d4f30
);
_0x2d94
[
'
data
'
]
[
_0x10a316
]
=
_0x4f825c
;
}
else
{
_0x4f825c
=
_0xd38cc4
;
}
...
...
@@ -103,12 +103,12 @@
};
function
dec
(
_0x1f38a7
)
{
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x0
'
,
'
KC4a
'
)](
/.de/
,
''
);
_0x1f38a7
=
_0x1f38a7
[
'
replace
'
](
/thm/
,
_0x2d94
(
'
0x1
'
,
'
(cy(
'
));
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x2
'
,
'
yog$
'
)](
/sp/
,
_0x2d94
(
'
0x3
'
,
'
yGy8
'
));
_0x1f38a7
=
_0x1f38a7
[
'
replace
'
](
/am/
,
_0x2d94
(
'
0x4
'
,
'
a3JB
'
));
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x5
'
,
'
DLDc
'
)](
/
\|
/
,
''
);
document
[
_0x2d94
(
'
0x6
'
,
'
Y^c(
'
)](
_0x2d94
(
'
0x7
'
,
'
aYSI
'
))
[
_0x2d94
(
'
0x8
'
,
'
4Exg
'
)]
=
_0x1f38a7
;
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x0
'
,
'
KC4a
'
)](
/.de/
,
''
);
_0x1f38a7
=
_0x1f38a7
[
'
replace
'
](
/thm/
,
_0x2d94
(
'
0x1
'
,
'
(cy(
'
));
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x2
'
,
'
yog$
'
)](
/sp/
,
_0x2d94
(
'
0x3
'
,
'
yGy8
'
));
_0x1f38a7
=
_0x1f38a7
[
'
replace
'
](
/am/
,
_0x2d94
(
'
0x4
'
,
'
a3JB
'
));
_0x1f38a7
=
_0x1f38a7
[
_0x2d94
(
'
0x5
'
,
'
DLDc
'
)](
/
\|
/
,
''
);
document
[
_0x2d94
(
'
0x6
'
,
'
Y^c(
'
)](
_0x2d94
(
'
0x7
'
,
'
aYSI
'
))
[
_0x2d94
(
'
0x8
'
,
'
4Exg
'
)]
=
_0x1f38a7
;
}
</script>
...
...
frontend/src/main/resources/templates/header.html
View file @
813003c1
...
...
@@ -44,9 +44,6 @@
</a>
</nav>
</nav>
</div>
</body>
</html>
\ No newline at end of file
frontend/src/main/resources/templates/result.html
View file @
813003c1
...
...
@@ -14,6 +14,7 @@
<script
src=
"/js/plotly-latest.min.js"
th:href=
"@{/js/plotly-latest.min.js}"
></script>
<script
src=
"/js/jquery-1.12.0.min.js"
th:href=
"@{/js/jquery-1.12.0.min.js}"
></script>
<script
src=
"/js/bootstrap.min.js"
th:href=
"@{/js/bootstrap.min.js}"
></script>
<script
src=
"/js/popper.js"
th:href=
"@{/js/popper.js}"
></script>
<script
src=
"/js/d3.min.js"
th:href=
"@{/js/d3.min.js}"
></script>
<script
src=
"/js/result.js"
th:href=
"@{/js/result.js}"
></script>
<script
src=
"/js/radar.js"
th:href=
"@{/js/radar.js}"
></script>
...
...
@@ -118,7 +119,6 @@
<!-- Tab 1 Overview -->
<div
id=
"nav1"
class=
"tab-pane fade show active"
>
<th:block
th:if=
"${ran}"
>
<div
class=
"row"
>
...
...
@@ -168,7 +168,6 @@
<tbody>
<!-- Sequencelogo Entry -->
<th:block
th:if=
"${ran}"
>
<th:block
th:if=
"${interfaceCommand.logo}"
>
<th:block
th:if=
"${not interfaceCommand.logoCovariate}"
>
<tr
id=
"seqlogorow"
data-target=
"#sequencelogodiv"
...
...
@@ -200,7 +199,6 @@
</tr>
</th:block>
</th:block>
</th:block>
<!-- Sequencelogo Entry END -->
...
...
@@ -316,20 +314,20 @@
th:id=
"${#strings.replace('accordion_'+result.id,'.','_')}"
>
<div>
<table
class=
"table dattable"
>
<t
head
>
<t
r
>
<th></th>
<th>
In
</th>
<th>
Out
</th>
</t
head
>
</t
r
>
<tr
class=
"datrow"
>
<td
th:text=
"${interfaceCommand.originalFilename}"
></td>
<td
th:text=
"${result.measuredIn
+ ' (' + result.percentInM +
'%)'}"
></td>
<td
th:text=
"${result.measuredOut+
' (' + result.percentOutM+
'%)'}"
></td>
<td
th:text=
"${result.measuredIn
+' ('+result.percentInM+
'%)'}"
></td>
<td
th:text=
"${result.measuredOut+
' ('+result.percentOutM+
'%)'}"
></td>
</tr>
<tr
class=
"datrow"
>
<td
th:text=
"${bgfilename}"
></td>
<td
th:text=
"${result.expectedIn+
' (' + result.percentInE +
'%)'}"
></td>
<td
th:text=
"${result.expectedOut+
' (' + result.percentOutE+
'%)'}"
></td>
<td
th:text=
"${result.expectedIn+
' ('+result.percentInE+
'%)'}"
></td>
<td
th:text=
"${result.expectedOut+
' ('+result.percentOutE+
'%)'}"
></td>
</tr>
</table>
</div>
...
...
@@ -340,6 +338,7 @@
</tr>
</th:block>
</table>
</div>
</td>
...
...
@@ -535,13 +534,6 @@
</th:block>
</tbody>
</table>
<!-- Result table end -->
<th:block
th:if=
"${ran}"
>
<tr>
<!-- create or upload custom track button -->
<td
class=
"add"
colspan=
"5"
data-placement=
"right"
title=
"Upload custom track"
data-toggle=
"tooltip"
>
...
...
@@ -551,9 +543,13 @@
</button>
</td>
</tr>
</th:block>
</tbody>
</table>
<!-- Result table end -->
</div>
<div
class=
"col-4"
>
...
...
@@ -569,7 +565,9 @@
<col
width=
"400px"
/>
<col
width=
"30px"
/>
<thead>
<th
th:text=
"${'Covariates' + ' (' + covariantCount + ')'}"
>
Covariates
</th>
<tr>
<th
th:text=
"${'Covariates' + ' (' + covariantCount + ')'}"
>
Covariates
</th>
</tr>
</thead>
<tbody>
...
...
@@ -620,15 +618,15 @@
<div>
<table
class=
"table"
>
<thead>
<th></th>
<th>
In
</th>
<th>
Out
</th>
<tr>
<th></th>
<th>
In
</th>
<th>
Out
</th>
</tr>
</thead>
<tr
class=
""
>
<td
th:text=
"${interfaceCommand.originalFilename}"
></td>
<td
th:text=
"${interfaceCommand.originalFilename}"
></td>
<td
th:text=
"${cov.measuredIn + ' (' + cov.percentInM + '%)'}"
></td>
<td
th:text=
"${cov.measuredOut+ ' (' + cov.percentOutM+ '%)'}"
></td>
</tr>