From 07ecff415069fb8a294c4f15ecaa9e7e43c85852 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 4 Aug 2023 11:58:20 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20:=20show=20previous=20quiz=20submis?=
 =?UTF-8?q?sion=20info?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gitlab/classrooms/quiz/QuizScore.java       | 11 ++++++++++-
 .../classrooms/quiz/QuizScoreService.java       |  3 +++
 .../classrooms/quiz/QuizScoreServiceImpl.java   |  7 +++++++
 .../gitlab/classrooms/ui/QuizController.java    |  9 +++++++--
 src/main/resources/templates/quiz.html          | 17 +++++++++++++++++
 5 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java
index 515f529..7f0516f 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScore.java
@@ -5,12 +5,21 @@ import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 
 import java.io.Serializable;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 
 class QuizScoreId implements Serializable {
     String quizId;
     String studentId;
 
+    public QuizScoreId() {
+    }
+
+    public QuizScoreId(String quizId, String studentId) {
+        this.quizId = quizId;
+        this.studentId = studentId;
+    }
+
     public String getQuizId() {
         return quizId;
     }
@@ -79,7 +88,7 @@ public class QuizScore {
     }
 
     public ZonedDateTime getSubmissionDate() {
-        return submissionDate;
+        return submissionDate.withZoneSameInstant(ZoneId.of("CET"));
     }
 
     public void setSubmissionDate(ZonedDateTime submissionDate) {
diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java
index 9cf6ea8..ffa5db6 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreService.java
@@ -1,6 +1,9 @@
 package fr.univ_lille.gitlab.classrooms.quiz;
 
+import java.util.Optional;
+
 public interface QuizScoreService {
     void registerScoreForStudent(Quiz quiz, String studentId);
 
+    Optional<QuizScore> getPreviousQuizSubmission(String quizId, String studentId);
 }
diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java
index fa9a5a6..d966815 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/quiz/QuizScoreServiceImpl.java
@@ -2,6 +2,8 @@ package fr.univ_lille.gitlab.classrooms.quiz;
 
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 @Service
 class QuizScoreServiceImpl implements QuizScoreService {
 
@@ -21,4 +23,9 @@ class QuizScoreServiceImpl implements QuizScoreService {
         score.setMaxScore(quiz.getQuestions().size());
         quizScoreRepository.save(score);
     }
+
+    @Override
+    public Optional<QuizScore> getPreviousQuizSubmission(String quizId, String studentId) {
+        return quizScoreRepository.findById(new QuizScoreId(quizId, studentId));
+    }
 }
diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/QuizController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/QuizController.java
index 7041419..c63c3b0 100644
--- a/src/main/java/fr/univ_lille/gitlab/classrooms/ui/QuizController.java
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/ui/QuizController.java
@@ -61,11 +61,16 @@ public class QuizController {
     }
 
     @GetMapping("/{quizId}")
-    public String showQuiz(Model model, @PathVariable String quizId) {
+    public String showQuiz(Model model, @PathVariable String quizId, Authentication authentication) {
         var quizEntity = this.quizRepository.findById(quizId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND));
         var quiz = Quiz.fromMarkdown(quizEntity.getMarkdownContent(), quizId);
 
         model.addAttribute("quiz", quiz);
+
+        var studentId = authentication.getName();
+        var previousSubmission = this.quizScoreService.getPreviousQuizSubmission(quizId, studentId);
+        previousSubmission.ifPresent(submission -> model.addAttribute("previousSubmission", submission));
+
         return "quiz";
     }
 
@@ -89,7 +94,7 @@ public class QuizController {
         }
 
         var studentId = authentication.getName();
-        quizScoreService.registerScoreForStudent(quiz, studentId);
+        this.quizScoreService.registerScoreForStudent(quiz, studentId);
 
         model.addAttribute("quiz", quiz);
         return "quiz-submitted-with-answers-correction";
diff --git a/src/main/resources/templates/quiz.html b/src/main/resources/templates/quiz.html
index b49e44f..b9cc299 100644
--- a/src/main/resources/templates/quiz.html
+++ b/src/main/resources/templates/quiz.html
@@ -12,6 +12,23 @@
     Quiz name
   </h1>
 
+  <div th:if="${previousSubmission}" class="rounded-md bg-yellow-50 p-4 mb-6">
+    <div class="flex">
+      <div class="flex-shrink-0">
+        <svg class="h-5 w-5 text-yellow-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+          <path fill-rule="evenodd" d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z" clip-rule="evenodd" />
+        </svg>
+      </div>
+      <div class="ml-3">
+        <h3 class="text-sm font-medium text-yellow-800">Attention</h3>
+        <p class="mt-2 text-sm text-yellow-700">
+          Vous avez déjà répondu à ce quiz le <span th:text="${#temporals.format(previousSubmission.submissionDate, 'dd MMMM yyyy à HH:mm', #locale.FRENCH)}">date</span> et obtenu un score de <span th:text="${previousSubmission.score}">5</span> / <span th:text="${previousSubmission.maxScore}">10</span>.
+        </p>
+        <p class="text-sm text-yellow-700">Soumettre une nouvelle réponse à ce quiz écrasera la réponse précédente et remplacera le score que vous avez déjà obtenu.</p>
+      </div>
+    </div>
+  </div>
+
   <h2><b>Plusieurs réponses correctes</b> par question sont possibles.</h2>
 
   <div th:if="${message}" class="border-l-4 border-red-400 bg-red-50 p-4 mt-12">
-- 
2.51.2