diff --git a/chassis/configuration/configuration/reporting/session-summary-reporting.jrxml b/chassis/configuration/configuration/reporting/session-summary-reporting.jrxml
index bd11b3b8d..cb8eb2b5e 100644
--- a/chassis/configuration/configuration/reporting/session-summary-reporting.jrxml
+++ b/chassis/configuration/configuration/reporting/session-summary-reporting.jrxml
@@ -32,8 +32,8 @@
-
-
+
+
@@ -84,10 +84,10 @@
-
+
-
+
-
+
-
+
-
+
selectedIds) throws RuntimeException {
return 0L;
}
- List startTimeList = (List) entityManager.createQuery("select ses.startTime from SessionData ses where ses.sessionId in " +
+ List startTimeList = (List) entityManager.createQuery("select ses.startTime from SessionData ses where ses.sessionId in " +
"(:sessionIds) order by ses.startTime asc")
.setMaxResults(1)
.setParameter("sessionIds", selectedIds).getResultList();
@@ -140,7 +140,7 @@ public Long getFirstPosition(Set selectedIds) throws RuntimeException {
return 0L;
}
- Date startTime = startTimeList.iterator().next();
+ Date startTime = new Date(startTimeList.iterator().next());
Long lastPosition = (Long) entityManager.createQuery("select count(ses.id) from SessionData ses where startTime<=:startTime")
.setParameter("startTime", startTime).getSingleResult();
@@ -239,8 +239,8 @@ public List getByDatePeriod(int start, int length, Date from, Da
try {
List sessionDataList = (List)
entityManager.createQuery("select sd from SessionData as sd where sd.startTime between :from and :to order by sd.startTime asc")
- .setParameter("from", from)
- .setParameter("to", to)
+ .setParameter("from", from.getTime())
+ .setParameter("to", to.getTime())
.setFirstResult(start)
.setMaxResults(length)
.getResultList();
@@ -467,8 +467,8 @@ private SessionDataDto createSessionDataDto(SessionData sessionData, String user
return new SessionDataDto(
sessionData.getId(),
sessionData.getSessionId(),
- sessionData.getStartTime(),
- sessionData.getEndTime(),
+ new Date(sessionData.getStartTime()),
+ new Date(sessionData.getEndTime()),
sessionData.getActiveKernels(),
sessionData.getTaskExecuted(),
sessionData.getTaskFailed(),
diff --git a/dbapi/src/main/java/com/griddynamics/jagger/dbapi/util/FetchUtil.java b/dbapi/src/main/java/com/griddynamics/jagger/dbapi/util/FetchUtil.java
index 0c0bc0290..57516dbfa 100644
--- a/dbapi/src/main/java/com/griddynamics/jagger/dbapi/util/FetchUtil.java
+++ b/dbapi/src/main/java/com/griddynamics/jagger/dbapi/util/FetchUtil.java
@@ -128,8 +128,8 @@ public Map> getTestInfoByTaskIds(Set taskId
String termination = (String) objects[3];
String sessionId = (String) objects[0];
- Date startTime = (Date) objects[5];
- Date endTime = (Date) objects[6];
+ Date startTime = new Date(((BigInteger) objects[5]).longValue());
+ Date endTime = new Date(((BigInteger) objects[6]).longValue());
Integer number = (Integer) objects[7];
diff --git a/docker/compose/src/main/files/my.cnf b/docker/compose/src/main/files/my.cnf
index b5ef753cb..1c4185445 100644
--- a/docker/compose/src/main/files/my.cnf
+++ b/docker/compose/src/main/files/my.cnf
@@ -1,4 +1,4 @@
[mysqld]
-#default_time_zone = "Europe/Moscow"
+#default_time_zone = "UTC"
sql_mode = "STRICT_TRANS_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY"
diff --git a/docker/compose/src/main/resources/docker-compose-with-existing-results-db.yml b/docker/compose/src/main/resources/docker-compose-with-existing-results-db.yml
index ec3974d3f..02d8bb253 100644
--- a/docker/compose/src/main/resources/docker-compose-with-existing-results-db.yml
+++ b/docker/compose/src/main/resources/docker-compose-with-existing-results-db.yml
@@ -22,7 +22,7 @@ services:
ports:
- 8087:80
environment:
- TZ: Europe/Moscow
+ TZ: UTC
JWC_HTTP_PORT: 80
JWC_JDBC_DRIVER: com.mysql.jdbc.Driver
# Specify here the existing results database
diff --git a/docker/compose/src/main/resources/docker-compose.yml b/docker/compose/src/main/resources/docker-compose.yml
index c02a97b92..44c18e5e1 100644
--- a/docker/compose/src/main/resources/docker-compose.yml
+++ b/docker/compose/src/main/resources/docker-compose.yml
@@ -43,7 +43,7 @@ services:
depends_on:
- jagger-mysql
environment:
- TZ: Europe/Moscow
+ TZ: UTC
JWC_HTTP_PORT: 80
JWC_JDBC_DRIVER: com.mysql.jdbc.Driver
JWC_JDBC_URL: jdbc:mysql://jagger-mysql:3306/jaggerdb
diff --git a/docker/jagger/webclient/Dockerfile b/docker/jagger/webclient/Dockerfile
index 046d85ad3..ac2fd26d2 100644
--- a/docker/jagger/webclient/Dockerfile
+++ b/docker/jagger/webclient/Dockerfile
@@ -12,7 +12,7 @@ ENV MYSQL_HOST mysql
ENV MYSQL_PORT 3306
# Set default timezone
-ENV TZ=Europe/Moscow
+ENV TZ=UTC
# Get latest jagger-webclient
ADD ["http://nexus.vm.griddynamics.net:8081/nexus/service/local/artifact/maven/content?r=jagger-snapshots&g=com.griddynamics.jagger&a=webclient&c=war-exec&v=${project.version}", "/com/griddynamics/jagger/jagger-webclient.jar"]