From d5d63ac9a364b284c262fa3136d355b341d2367f Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 22 Sep 2023 11:54:50 +0200
Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20:=20add=20an=20input=20to=20fil?=
 =?UTF-8?q?ter=20students?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/classrooms/view.html  | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/templates/classrooms/view.html b/src/main/resources/templates/classrooms/view.html
index cc66e1c..11c19ab 100644
--- a/src/main/resources/templates/classrooms/view.html
+++ b/src/main/resources/templates/classrooms/view.html
@@ -3,7 +3,7 @@
 <head>
 </head>
 <body>
-<section>
+<section x-data="filterStudentsFeature()">
 
     <script type="application/javascript">
         async function copyToClipboard(element){
@@ -11,6 +11,15 @@
             const url = `${window.location.protocol}//${window.location.host}${relativeUrl}`;
             await navigator.clipboard.writeText(url);
         }
+
+        function filterStudentsFeature() {
+            return {
+                filter: '',
+                filterStudents(studentName) {
+                    return studentName.toLowerCase().includes(this.filter.toLowerCase());
+                }
+            }
+        }
     </script>
 
     <h1
@@ -38,11 +47,25 @@
             <h3 class="text-base font-semibold leading-6 text-gray-900">Students</h3>
             <p class="max-w-4xl text-sm text-gray-500">Students who already joined the Classroom.</p>
         </div>
+
         <div class="mt-3 flex sm:ml-4 sm:mt-0">
+            <div class="relative rounded-md shadow-sm">
+                <div class="pointer-events-none absolute inset-y-0 left-0 flex items-center pl-3">
+                    <svg class="h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
+                        <path d="M7 8a3 3 0 100-6 3 3 0 000 6zM14.5 9a2.5 2.5 0 100-5 2.5 2.5 0 000 5zM1.615 16.428a1.224 1.224 0 01-.569-1.175 6.002 6.002 0 0111.908 0c.058.467-.172.92-.57 1.174A9.953 9.953 0 017 18a9.953 9.953 0 01-5.385-1.572zM14.5 16h-.106c.07-.297.088-.611.048-.933a7.47 7.47 0 00-1.588-3.755 4.502 4.502 0 015.874 2.636.818.818 0 01-.36.98A7.465 7.465 0 0114.5 16z" />
+                    </svg>
+                </div>
+                <input
+                        x-model="filter"
+                        type="text"
+                        class="block w-full rounded-md border-0 px-3 py-1.5 pl-10 text-gray-900 ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
+                        placeholder="Search for Students">
+            </div>
+
             <button type="button"
                     onclick="copyToClipboard(this)"
                     th:data-clipboard="@{/classrooms/{classroomId}/join(classroomId=${classroom.id})}"
-                    class="ml-3 inline-flex items-center rounded-md bg-indigo-600 px-3 py-2 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">
+                    class="ml-3 inline-flex items-center rounded-md bg-indigo-600 px-3 text-sm font-semibold text-white shadow-sm hover:bg-indigo-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-indigo-600">
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 mr-1.5">
                     <path stroke-linecap="round" stroke-linejoin="round" d="M13.19 8.688a4.5 4.5 0 011.242 7.244l-4.5 4.5a4.5 4.5 0 01-6.364-6.364l1.757-1.757m13.35-.622l1.757-1.757a4.5 4.5 0 00-6.364-6.364l-4.5 4.5a4.5 4.5 0 001.242 7.244" />
                 </svg>
@@ -53,6 +76,7 @@
 
     <ul role="list" class="grid grid-cols-1 gap-6 sm:grid-cols-2 lg:grid-cols-3 pt-5">
         <li th:each="student: ${classroom.students}"
+            th:x-show="|filterStudents('${student.name}')|"
             class="col-span-1 divide-y divide-gray-200 rounded-lg bg-gray-100 shadow">
             <div class="flex w-full items-center justify-between space-x-6 p-6">
                 <img class="h-10 w-10 flex-shrink-0 rounded-full bg-gray-300" th:src="${student.avatarUrl}" alt="">
-- 
2.51.2


From 0a123e8f50e448d9e83bdaa48f4ac1f2e1a03fb9 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 22 Sep 2023 14:12:52 +0200
Subject: [PATCH 2/3] =?UTF-8?q?=E2=9C=A8=20:=20add=20classroom=20student?=
 =?UTF-8?q?=20view?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ClassroomStudentController.java           |  47 ++++++++
 .../templates/classrooms/student.html         | 106 ++++++++++++++++++
 .../resources/templates/classrooms/view.html  |   4 +-
 .../ClassroomStudentControllerTest.java       |  55 +++++++++
 4 files changed, 210 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentController.java
 create mode 100644 src/main/resources/templates/classrooms/student.html
 create mode 100644 src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentControllerTest.java

diff --git a/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentController.java b/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentController.java
new file mode 100644
index 0000000..9b96e93
--- /dev/null
+++ b/src/main/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentController.java
@@ -0,0 +1,47 @@
+package fr.univ_lille.gitlab.classrooms.classrooms;
+
+import fr.univ_lille.gitlab.classrooms.assignments.AssignmentService;
+import fr.univ_lille.gitlab.classrooms.users.ClassroomUserService;
+import jakarta.annotation.security.RolesAllowed;
+import org.springframework.http.HttpStatus;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.server.ResponseStatusException;
+import org.springframework.web.servlet.ModelAndView;
+
+import java.util.UUID;
+
+@Controller
+@RolesAllowed("TEACHER")
+class ClassroomStudentController {
+
+    private final ClassroomService classroomService;
+
+    private final AssignmentService assignmentService;
+
+    private final ClassroomUserService classroomUserService;
+
+    ClassroomStudentController(ClassroomService classroomService, AssignmentService assignmentService, ClassroomUserService classroomUserService) {
+        this.classroomService = classroomService;
+        this.assignmentService = assignmentService;
+        this.classroomUserService = classroomUserService;
+    }
+
+    @GetMapping("/classrooms/{classroomId}/students/{studentName}")
+    ModelAndView showClassroomStudent(@PathVariable UUID classroomId, @PathVariable String studentName) {
+        var classroom = this.classroomService.getClassroom(classroomId).orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "Classroom with id %s does not exists".formatted(classroomId)));
+
+        var student = this.classroomUserService.getClassroomUser(studentName);
+
+        var studentAssignments = this.assignmentService.getAllStudentAssignmentsForAClassroom(classroom, student);
+
+        var model = new ModelAndView("classrooms/student");
+
+        model.addObject("classroom", classroom);
+        model.addObject("student", student);
+        model.addObject("assignments", studentAssignments);
+
+        return model;
+    }
+}
diff --git a/src/main/resources/templates/classrooms/student.html b/src/main/resources/templates/classrooms/student.html
new file mode 100644
index 0000000..7e6ac33
--- /dev/null
+++ b/src/main/resources/templates/classrooms/student.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html>
+<html th:replace="~{layout-without-menu :: layout-without-menu(|Classroom ${classroom.name} - Student ${student.name}|, ~{::section})}">
+<head>
+</head>
+<body>
+<section>
+    <div class="border-b border-gray-200 mt-5 pb-5 sm:flex sm:items-center sm:justify-between">
+        <div>
+            <h3 th:text="${classroom.name}" class="text-base font-semibold leading-6 text-gray-900">Classroom
+                Name</h3>
+            <p class="max-w-4xl text-sm text-gray-500">Accepted assignments of the classroom <span
+                    th:text="${classroom.name}">Classroom Name</span>.</p>
+        </div>
+    </div>
+
+    <ul role="list" class="mt-6 grid grid-cols-1 gap-x-6 gap-y-8 md:grid-cols-2 lg:grid-cols-3 xl:gap-x-8">
+        <li
+                th:each="studentAssignment : ${assignments}"
+                class="overflow-hidden rounded-xl border border-gray-200"
+        >
+            <div class="flex items-center gap-x-4 border-b border-gray-900/5 bg-gray-50 p-6">
+                <!-- question mark icon -->
+                <svg th:if="${studentAssignment.assignment.type.name() == 'QUIZ'}" xmlns="http://www.w3.org/2000/svg"
+                     fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+                     class="h-12 w-12 flex-none rounded-lg bg-white object-cover ring-1 ring-gray-900/10">
+                    <path stroke-linecap="round" stroke-linejoin="round"
+                          d="M9.879 7.519c1.171-1.025 3.071-1.025 4.242 0 1.172 1.025 1.172 2.687 0 3.712-.203.179-.43.326-.67.442-.745.361-1.45.999-1.45 1.827v.75M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9 5.25h.008v.008H12v-.008z"/>
+                </svg>
+                <!-- shell icon -->
+                <svg th:if="${studentAssignment.assignment.type.name() == 'EXERCISE'}"
+                     xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                     stroke="currentColor"
+                     class="h-12 w-12 flex-none rounded-lg bg-white object-cover ring-1 ring-gray-900">
+                    <path stroke-linecap="round" stroke-linejoin="round"
+                          d="M6.75 7.5l3 2.25-3 2.25m4.5 0h3m-9 8.25h13.5A2.25 2.25 0 0021 18V6a2.25 2.25 0 00-2.25-2.25H5.25A2.25 2.25 0 003 6v12a2.25 2.25 0 002.25 2.25z"/>
+                </svg>
+
+                <p th:text="${studentAssignment.assignment.name}" class="text-sm font-medium leading-6 text-gray-900">
+                    Assignment Name
+                </p>
+            </div>
+            <dl class="-my-3 divide-y divide-gray-100 px-6 py-4 text-sm leading-6">
+                <div class="flex justify-between gap-x-4 py-3">
+                    <div class="flex justify-between gap-x-4 py-3">
+                        <dt class="text-gray-800 inline-flex" th:if="${studentAssignment.submissionDate}">
+                            <span class="whitespace-pre">Submission date : </span>
+                            <span th:text="${#temporals.format(studentAssignment.localizedSubmissionDate, 'dd MMMM yyyy à HH:mm', #locale.FRENCH)}">date</span>
+                        </dt>
+                        <dt class="text-gray-800 inline-flex" th:unless="${studentAssignment.submissionDate}">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                 stroke="currentColor" class="w-6 h-6 mr-1.5">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                      d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z"/>
+                            </svg>
+                            No submission received yet.
+                        </dt>
+                    </div>
+                </div>
+                <div th:if="${studentAssignment.submissionDate!=null}" class="flex justify-between gap-x-4 py-3">
+                    <div class="flex justify-between gap-x-4 py-3">
+                        <dt class="text-gray-800 inline-flex">
+                            <span class="whitespace-pre">Score : </span>
+                            <div class="text-gray-900"
+                                 th:text="${studentAssignment.score} + ' / ' + ${studentAssignment.maxScore}">8/10
+                            </div>
+                        </dt>
+                    </div>
+                </div>
+                <div th:if="${studentAssignment.assignment.type.name() == 'EXERCISE'}"
+                     class="flex justify-between gap-x-4 py-3">
+                    <dt class="text-gray-800">
+                        <a th:href="${studentAssignment.gitlabProjectUrl}" target="_blank"
+                           class="inline-flex items-center">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                 stroke="currentColor" class="w-6 h-6">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                      d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
+                            </svg>
+                            <svg fill="currentColor" stroke="currentColor" viewBox="0 0 256 256" id="Flat"
+                                 xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 mr-1.5">
+                                <path d="M234.415,153.53322,207.08594,51.04787a7.99994,7.99994,0,0,0-15.22022-.74756L170.228,108H85.772L64.13477,50.3008a8.00014,8.00014,0,0,0-15.22071.74707L21.585,153.53322a12.02834,12.02834,0,0,0,4.76416,12.958l94.82031,65.645a11.94608,11.94608,0,0,0,5.45264,2.03467,3.97163,3.97163,0,0,0,.71924.07275c.02734,0,.05517-.00683.08252-.00732.19214.00879.384.02148.57617.02148s.384-.01269.57617-.02148c.02735.00049.05518.00732.08252.00732a3.95865,3.95865,0,0,0,.71826-.07275,11.9487,11.9487,0,0,0,5.45362-2.03467l94.82031-65.645A12.02834,12.02834,0,0,0,234.415,153.53322ZM199.35645,53.1094,213.9939,108H178.772ZM128,220.60891,88.77173,116h78.45654ZM56.644,53.1094,77.228,108H42.00635ZM29.31445,155.59426,39.87305,116H80.228l39.53784,105.43457-88.863-61.52051A4.01148,4.01148,0,0,1,29.31445,155.59426Zm195.78272,4.31982-88.863,61.52051L175.772,116H216.1272l10.55835,39.59424A4.01148,4.01148,0,0,1,225.09717,159.91408Z"></path>
+                            </svg>
+                            Open in Gitlab
+                        </a>
+                    </dt>
+                </div>
+                <div th:if="${studentAssignment.assignment.type.name() == 'QUIZ'}"
+                     class="flex justify-between gap-x-4 py-3">
+                    <dt class="text-gray-800">
+                        <a th:href="@{/assignments/{assignmentId}/quiz(assignmentId=${studentAssignment.assignment.id})}"
+                           target="_blank" class="inline-flex items-center">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                 stroke="currentColor" class="w-6 h-6 mr-1.5">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                      d="M13.5 6H5.25A2.25 2.25 0 003 8.25v10.5A2.25 2.25 0 005.25 21h10.5A2.25 2.25 0 0018 18.75V10.5m-10.5 6L21 3m0 0h-5.25M21 3v5.25"/>
+                            </svg>
+                            Answer Quiz
+                        </a>
+                    </dt>
+                </div>
+            </dl>
+        </li>
+    </ul>
+</section>
+</body>
+</html>
diff --git a/src/main/resources/templates/classrooms/view.html b/src/main/resources/templates/classrooms/view.html
index 11c19ab..0b951f5 100644
--- a/src/main/resources/templates/classrooms/view.html
+++ b/src/main/resources/templates/classrooms/view.html
@@ -81,10 +81,10 @@
             <div class="flex w-full items-center justify-between space-x-6 p-6">
                 <img class="h-10 w-10 flex-shrink-0 rounded-full bg-gray-300" th:src="${student.avatarUrl}" alt="">
                 <div class="flex-1 truncate">
-                    <div class="flex items-center space-x-3">
+                    <a th:href="@{/classrooms/{classroomId}/students/{studentName}(classroomId=${classroom.id},studentName=${student.name})}" class="items-center space-x-3">
                         <h3 class="truncate text-sm font-medium text-gray-900" th:text="${student.name}">Jane
                             Cooper</h3>
-                    </div>
+                    </a>
                     <a th:href="'mailto:'+${student.email}" class="mt-1 truncate text-sm text-gray-500 flex">
                         <svg class="h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                             <path d="M3 4a2 2 0 00-2 2v1.161l8.441 4.221a1.25 1.25 0 001.118 0L19 7.162V6a2 2 0 00-2-2H3z"/>
diff --git a/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentControllerTest.java b/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentControllerTest.java
new file mode 100644
index 0000000..ee25cfb
--- /dev/null
+++ b/src/test/java/fr/univ_lille/gitlab/classrooms/classrooms/ClassroomStudentControllerTest.java
@@ -0,0 +1,55 @@
+package fr.univ_lille.gitlab.classrooms.classrooms;
+
+import fr.univ_lille.gitlab.classrooms.assignments.AssignmentService;
+import fr.univ_lille.gitlab.classrooms.assignments.StudentAssignment;
+import fr.univ_lille.gitlab.classrooms.assignments.StudentExerciseAssignment;
+import fr.univ_lille.gitlab.classrooms.users.ClassroomUser;
+import fr.univ_lille.gitlab.classrooms.users.ClassroomUserService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+@ExtendWith(MockitoExtension.class)
+class ClassroomStudentControllerTest {
+
+    @InjectMocks
+    private ClassroomStudentController classroomStudentController;
+
+    @Mock
+    private ClassroomService classroomService;
+
+    @Mock
+    private AssignmentService assignmentService;
+
+    @Mock
+    private ClassroomUserService classroomUserService;
+
+    @Test
+    void showClassroomStudent() {
+        var classroom = new Classroom();
+        var classroomId = UUID.randomUUID();
+        when(this.classroomService.getClassroom(classroomId)).thenReturn(Optional.of(classroom));
+
+        var student = new ClassroomUser();
+        var studentId = "luke.skywalker";
+        when(this.classroomUserService.getClassroomUser(studentId)).thenReturn(student);
+
+        List<StudentAssignment> assignments = List.of(new StudentExerciseAssignment());
+        when(this.assignmentService.getAllStudentAssignmentsForAClassroom(classroom, student)).thenReturn(assignments);
+
+        var model = this.classroomStudentController.showClassroomStudent(classroomId, studentId);
+
+        assertThat(model).isNotNull();
+        assertThat(model.getViewName()).isEqualTo("classrooms/student");
+        assertThat(model.getModel()).containsKeys("classroom", "student", "assignments");
+    }
+}
-- 
2.51.2


From 4b6a32eb6c04f97a27e0a9feb7ed1123b188d4a9 Mon Sep 17 00:00:00 2001
From: Julien WITTOUCK <julien.wittouck@gmail.com>
Date: Fri, 22 Sep 2023 14:16:35 +0200
Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=96=20:=20version=200.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 14 ++++++++++++++
 pom.xml      |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5612a23..229db6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,19 @@
 # Changelog
 
+<a name="0.1.0"></a>
+## 0.1.0 (2023-09-22)
+
+### Added
+
+- ✨ : add classroom student view [0a123e8]
+- ✨ : add an input to filter students [d5d63ac]
+
+### Miscellaneous
+
+- 🔀 : merge branch &#x27;feature/student-view&#x27; into develop [039a6de]
+- 🔀 : merge tag &#x27;0.0.13&#x27; into develop [f0ae265]
+
+
 <a name="0.0.13"></a>
 ## 0.0.13 (2023-09-14)
 
diff --git a/pom.xml b/pom.xml
index 6ea84d3..d4705e3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>fr.univ-lille</groupId>
     <artifactId>gitlab-classrooms</artifactId>
-    <version>0.0.13</version>
+    <version>0.1.0</version>
 
     <name>gitlab-classrooms</name>
     <description>GitLab Classroom is a modest clone of GitHub Classroom, aimed at GitLab.</description>
-- 
2.51.2

