From 853895d26b0a11c38eb1b7f32d586e5bffb722a7 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Wed, 30 Aug 2023 16:41:52 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=E2=9C=A8=20:=20add=20submission=20date=20f?= =?UTF-8?q?or=20exercise=20assignments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dashboard/student-dashboard.html | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/resources/templates/dashboard/student-dashboard.html b/src/main/resources/templates/dashboard/student-dashboard.html index 69674d0..9676278 100644 --- a/src/main/resources/templates/dashboard/student-dashboard.html +++ b/src/main/resources/templates/dashboard/student-dashboard.html @@ -43,20 +43,7 @@

-
-
- - - - - - - - Open in Gitlab - -
-
-
+
Submission date : @@ -70,6 +57,19 @@
+
+
+ + + + + + + + Open in Gitlab + +
+
-- 2.51.2 From 30b9f0987cc846f1a2f3761c86badb5925b28108 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Wed, 30 Aug 2023 16:43:19 +0200 Subject: [PATCH 2/5] =?UTF-8?q?=E2=9C=A8=20:=20show=20submission=20score?= =?UTF-8?q?=20for=20exercise=20assignments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../templates/dashboard/student-dashboard.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/resources/templates/dashboard/student-dashboard.html b/src/main/resources/templates/dashboard/student-dashboard.html index 9676278..bc87588 100644 --- a/src/main/resources/templates/dashboard/student-dashboard.html +++ b/src/main/resources/templates/dashboard/student-dashboard.html @@ -57,6 +57,14 @@
+
+
+
+ Score : +
8/10
+
+
+
@@ -70,14 +78,6 @@
-
-
-
- Score : -
8/10
-
-
-
-- 2.51.2 From 11516928ea2d50125b97aeccd38ee5badf1192d7 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Wed, 30 Aug 2023 17:23:23 +0200 Subject: [PATCH 3/5] =?UTF-8?q?=E2=9C=A8=20:=20show=20exercise=20results?= =?UTF-8?q?=20for=20teacher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/exercise/all-submissions.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/templates/exercise/all-submissions.html b/src/main/resources/templates/exercise/all-submissions.html index d9ab1e7..8c9620c 100644 --- a/src/main/resources/templates/exercise/all-submissions.html +++ b/src/main/resources/templates/exercise/all-submissions.html @@ -59,11 +59,11 @@
- - + +
8/10
- - + +
date
 -- 2.51.2 From 62235765c97ae6367ff5c2f909f4a941a17952dc Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Wed, 30 Aug 2023 17:33:28 +0200 Subject: [PATCH 4/5] =?UTF-8?q?=E2=9C=A8=20:=20add=20localizedSubmissionDa?= =?UTF-8?q?te=20property?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assignments/StudentAssignment.java | 5 ++++ .../assignments/StudentAssignmentTest.java | 29 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/test/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignmentTest.java diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java index aab7d19..f204a93 100644 --- a/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java +++ b/src/main/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignment.java @@ -3,6 +3,7 @@ package fr.univ_lille.gitlab.classrooms.assignments; import fr.univ_lille.gitlab.classrooms.users.ClassroomUser; import jakarta.persistence.*; +import org.springframework.context.i18n.LocaleContextHolder; import java.time.ZonedDateTime; import java.util.UUID; @@ -54,6 +55,10 @@ public abstract class StudentAssignment { return submissionDate; } + public ZonedDateTime getLocalizedSubmissionDate(){ + return submissionDate.withZoneSameInstant(LocaleContextHolder.getTimeZone().toZoneId()); + } + public void setSubmissionDate(ZonedDateTime submissionDate) { this.submissionDate = submissionDate; } diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignmentTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignmentTest.java new file mode 100644 index 0000000..8fd908d --- /dev/null +++ b/src/test/java/fr/univ_lille/gitlab/classrooms/assignments/StudentAssignmentTest.java @@ -0,0 +1,29 @@ +package fr.univ_lille.gitlab.classrooms.assignments; + +import org.junit.jupiter.api.Test; +import org.springframework.context.i18n.LocaleContextHolder; + +import java.time.ZoneId; +import java.time.ZonedDateTime; +import java.util.TimeZone; + +import static org.assertj.core.api.Assertions.*; + +class StudentAssignmentTest { + + @Test + void getLocalizedSubmissionDate_shouldChangeTheTimeZoneOfTheDate() { + var nowAtUTC = ZonedDateTime.now(ZoneId.of("UTC")); + + var studentAssignment = new StudentExerciseAssignment(); + studentAssignment.setSubmissionDate(nowAtUTC); + + LocaleContextHolder.setTimeZone(TimeZone.getTimeZone("CET")); + var nowAtCET = studentAssignment.getLocalizedSubmissionDate(); + + assertThat(nowAtUTC).isEqualTo(nowAtCET); + + assertThat(nowAtUTC.getZone()).isEqualTo(ZoneId.of("UTC")); + assertThat(nowAtCET.getZone()).isEqualTo(ZoneId.of("CET")); + } +} -- 2.51.2 From b121af6c13252e0e6860055d5ef61b093e2aab08 Mon Sep 17 00:00:00 2001 From: Julien WITTOUCK Date: Wed, 30 Aug 2023 17:35:42 +0200 Subject: [PATCH 5/5] =?UTF-8?q?=E2=9C=A8=20:=20use=20localizedSubmissionDa?= =?UTF-8?q?te=20where=20possible?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/templates/dashboard/student-dashboard.html | 2 +- src/main/resources/templates/exercise/all-submissions.html | 2 +- src/main/resources/templates/quiz/all-submissions.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/templates/dashboard/student-dashboard.html b/src/main/resources/templates/dashboard/student-dashboard.html index bc87588..683267a 100644 --- a/src/main/resources/templates/dashboard/student-dashboard.html +++ b/src/main/resources/templates/dashboard/student-dashboard.html @@ -47,7 +47,7 @@
Submission date : - date + date
diff --git a/src/main/resources/templates/exercise/all-submissions.html b/src/main/resources/templates/exercise/all-submissions.html index 8c9620c..be813a6 100644 --- a/src/main/resources/templates/exercise/all-submissions.html +++ b/src/main/resources/templates/exercise/all-submissions.html @@ -63,7 +63,7 @@
8/10
-
date
+
date
 diff --git a/src/main/resources/templates/quiz/all-submissions.html b/src/main/resources/templates/quiz/all-submissions.html index bda690c..613d325 100644 --- a/src/main/resources/templates/quiz/all-submissions.html +++ b/src/main/resources/templates/quiz/all-submissions.html @@ -58,7 +58,7 @@
8/10
-
date
+
date
-- 2.51.2