Fix some bug

pom.xml

@@ -35,6 +35,10 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency> -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-mail</artifactId>

src/main/java/com/attendenceSystem/module/attendance/api/AttendanceApiController.java

@@ -26,25 +26,25 @@ public class AttendanceApiController {
 
     private final AttendanceService attendanceService;
 
-    @PostMapping("/check-in")
+    @PostMapping(Routes.Attendance.CHECK_IN)
     public ResponseEntity<AttendanceResponse> checkIn() {
         AttendanceResponse resp = attendanceService.checkIn();
         return ResponseEntity.ok(resp);
     }
 
-    @PostMapping("/check-out")
+    @PostMapping(Routes.Attendance.CHECK_OUT)
     public ResponseEntity<AttendanceResponse> checkOut() {
         AttendanceResponse resp = attendanceService.checkOut();
         return ResponseEntity.ok(resp);
     }
 
-    @GetMapping("/history")
+    @GetMapping(Routes.Attendance.HISTORY)
     public ResponseEntity<Page<AttendanceResponse>> getHistory(Pageable pageable) {
         Page<AttendanceResponse> page = attendanceService.getAttendanceHistory(pageable);
         return ResponseEntity.ok(page);
     }
 
-    @PostMapping("/leave")
+    @PostMapping(Routes.Attendance.LEAVE)
     public ResponseEntity<LeaveRequestResponse> createLeave(@RequestBody CreateLeaveRequest request) {
         LeaveRequestResponse resp = attendanceService.createLeaveRequest(request);
         return ResponseEntity.ok(resp);
@@ -56,7 +56,7 @@ public class AttendanceApiController {
         return ResponseEntity.ok(page);
     }
 
-    @GetMapping("/leave/detail/{id}")
+    @GetMapping(Routes.Attendance.LEAVE_DETAIL + "/{id}")
     public ResponseEntity<LeaveDetailResponse> getLeaveDetail(@PathVariable Long id) {
         LeaveDetailResponse detail = attendanceService.getLeaveDetail(id);
         return ResponseEntity.ok(detail);

src/main/java/com/attendenceSystem/module/attendance/api/AttendanceManagerApiController.java

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.attendance.dto.response.ManagerStatsResponse;
+import com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus;
 import com.attendenceSystem.module.attendance.service.AttendanceService;
 
 import lombok.RequiredArgsConstructor;
@@ -32,7 +33,7 @@ public class AttendanceManagerApiController {
         com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus attendanceStatus = null;
         if (status != null && !status.isEmpty()) {
             try {
-                attendanceStatus = com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.valueOf(status);
+                attendanceStatus = AttendanceStatus.valueOf(status);
             } catch (IllegalArgumentException e) {
                 // Invalid status, ignore
             }
@@ -47,10 +48,10 @@ public class AttendanceManagerApiController {
             @RequestParam(required = false) LocalDate startDate,
             @RequestParam(required = false) LocalDate endDate,
             @RequestParam(required = false) String status) {
-        com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus attendanceStatus = null;
+        AttendanceStatus attendanceStatus = null;
         if (status != null && !status.isEmpty()) {
             try {
-                attendanceStatus = com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.valueOf(status);
+                attendanceStatus = AttendanceStatus.valueOf(status);
             } catch (IllegalArgumentException e) {
                 // Invalid status, ignore
             }

src/main/java/com/attendenceSystem/module/user/entity/enums/Department.java

@@ -7,8 +7,8 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public enum Department {
     DE213("DE213", "DE213-X7A9", "Phòng DE213"),
-    DE212("DE212", "DE212-X7A9", "Phòng DE212"),
-    DE211("DE211", "DE211-X7A9", "Phòng DE211");
+    DE212("DE212", "DE212-H3O4", "Phòng DE212"),
+    DE211("DE211", "DE211-FE2O3", "Phòng DE211");
 
     private final String roomCode;
     private final String joinCode;

src/main/resources/static/js/employee/room-code.js

@@ -1,13 +1,12 @@
+// Lấy dữ liệu từ biến global đã được HTML (Thymeleaf) nạp sẵn
+const roomCodes = window.serverRoomCodes || {};
+
+console.log("Dữ liệu đồng bộ từ Backend:", roomCodes);
+
+// Logic xử lý giao diện của FE giữ nguyên
 const roomSelect = document.getElementById("roomSelect");
 const roomCode = document.getElementById("roomCode");
 
-const roomCodes = {
-    DE211: "DE211-X7A9",
-    DE212: "DE212-LP81",
-    DE213: "DE213-KM32"
-};
-
 roomSelect.addEventListener("change", () => {
-    roomCode.textContent =
-        roomCodes[roomSelect.value] || "--------";
+    roomCode.textContent = roomCodes[roomSelect.value] || "--------";
 });

src/main/resources/templates/cms/absent/absent-list.html

@@ -131,7 +131,7 @@
                                         </td>
 
 
-                                        <!-- 
+                                        
                                         <td>
                                             <div class="action-group">
 
@@ -148,7 +148,7 @@
                                                 </form>
 
                                             </div>
-                                        </td> -->
+                                        </td>
                                     </tr>
 
                                 </tbody>

src/main/resources/templates/cms/account/employee-list.html

@@ -51,7 +51,8 @@
 
                             <select>
                                 <option>Tất cả phòng ban</option>
-                                <option th:each="dept : ${departments}" th:value="${dept.name()}" th:text="${dept.displayName}"></option>
+                                <option th:each="dept : ${departments}" th:value="${dept.name()}"
+                                    th:text="${dept.displayName}"></option>
                             </select>
 
                             <select>
@@ -98,7 +99,8 @@
 
                                     <div class="user">
 
-                                        <div class="avatar" th:text="${#strings.substring(user.fullName(), 0, 1)}">H</div>
+                                        <div class="avatar" th:text="${#strings.substring(user.fullName(), 0, 1)}">H
+                                        </div>
 
                                         <strong th:text="${user.fullName()}">Nguyễn Minh Hải</strong>
 
@@ -130,10 +132,12 @@
                                             Chi tiết
                                         </a>
 
-                                        <form th:action="@{/manager/accounts/update/{id}(id=${user.id()})}" method="post" style="display:inline;">
+                                        <form th:action="@{/manager/accounts/update/{id}(id=${user.id()})}"
+                                            method="post" style="display:inline;">
                                             <select name="department" onchange="this.form.submit()">
                                                 <option value="">Chuyển phòng</option>
-                                                <option th:each="dept : ${departments}" th:value="${dept.name()}" th:text="${dept.displayName}"></option>
+                                                <option th:each="dept : ${departments}" th:value="${dept.name()}"
+                                                    th:text="${dept.displayName}"></option>
                                             </select>
                                         </form>
 
@@ -201,15 +205,23 @@
                 </div>
                 <button id="closePopup" class="close-btn">
                     <i class="fas fa-times">Đóng</i>
-                    
+
                 </button>
             </div>
 
         </div>
     </section>
-    <script src="/js/employee/employee-popup.js"></script>
-    <script src="/js/employee/room-code.js"></script>
-    <script src="/js/employee/copy-code.js"></script>
+    <script th:inline="javascript">
+        // Tạo một biến global để cầu nối sang file JS tĩnh
+        window.serverRoomCodes = {};
+
+        /*[# th:each="dept : ${T(com.attendenceSystem.module.user.entity.enums.Department).values()}"]*/
+        window.serverRoomCodes[[${ dept.roomCode }]] = [[${ dept.joinCode }]];
+        /*[/]*/
+    </script>
+    <script th:src="@{/js/employee/employee-popup.js}"></script>
+    <script th:src="@{/js/employee/js/room-code.js}"></script>
+    <script th:src="@{/js/employee/copy-code.js}"></script>
 </body>
 
 </html>

src/main/resources/templates/cms/attendance/attendance-manual.html

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Document</title>
+</head>
+<body>
+    
+</body>
+</html>

src/main/resources/templates/cms/document/document-list.html

@@ -128,7 +128,7 @@
                             '<td>' + report.title + '</td>' +
                             '<td>' + formattedDate + '</td>' +
                             '<td>' + filesHtml + '</td>' +
-                            '<td>' + linkHtml + '</td>' +
+                            '<td>' + linkHtml + '</td>'
 
                         tableBody.appendChild(row);
                     });

src/main/resources/templates/cms/face-id/faceID-create.html

@@ -40,19 +40,19 @@
 
                         <!-- THÔNG TIN -->
                         <div class="face-register-meta">
-
+                            <h3>Chuyển phòng nhanh</h3>
+                            <h4>Lưu ý: Khi đã chuyển phòng</h4>
+                            <div>
+                                <input type="text" id="roomCode" placeholder="Nhập mã phòng (VD: P101)">
+                                <button id="btnSwitchRoom" type="button">
+                                    Chuyển phòng
+                                </button>
+                            </div>
                             <h3>Thông tin đăng ký</h3>
 
-                            <label for="roomCode">Mã phòng</label>
-                            <input type="text"
-                                   id="roomCode"
-                                   placeholder="Ví dụ: P101">
-
                             <div class="face-sample-summary">
 
-                                <button id="faceSampleCount"
-                                        class="face-sample-count-btn"
-                                        type="button">
+                                <button id="faceSampleCount" class="face-sample-count-btn" type="button">
                                     0 / 5 mẫu
                                 </button>
 
@@ -73,21 +73,18 @@
                                 <div class="panel-header">
                                     <h3>Camera đăng ký</h3>
 
-                                    <button id="faceRegisterToggleBtn"
-                                            type="button">
+                                    <button id="faceRegisterToggleBtn" type="button">
                                         Bật camera
                                     </button>
                                 </div>
 
                                 <!-- MODE -->
                                 <div class="mode-tabs">
-                                    <button class="active"
-                                            type="button">
+                                    <button class="active" type="button">
                                         Đăng ký mới
                                     </button>
 
-                                    <button type="button"
-                                            id="rescanBtn">
+                                    <button type="button" id="rescanBtn">
                                         Quét lại
                                     </button>
                                 </div>
@@ -112,14 +109,10 @@
                                 <!-- VIDEO -->
                                 <div class="video-wrap">
 
-                                    <video id="video"
-                                           autoplay
-                                           playsinline
-                                           muted>
+                                    <video id="video" autoplay playsinline muted>
                                     </video>
 
-                                    <canvas id="captureCanvas"
-                                            style="display:none;">
+                                    <canvas id="captureCanvas" style="display:none;">
                                     </canvas>
 
                                 </div>
@@ -127,22 +120,18 @@
                                 <!-- ACTION -->
                                 <div class="action-row">
 
-                                    <button type="button"
-                                            id="captureFaceBtn">
+                                    <button type="button" id="captureFaceBtn">
                                         📷 Chụp mẫu
                                     </button>
 
-                                    <button type="button"
-                                            id="resetFaceScanBtn"
-                                            class="secondary">
+                                    <button type="button" id="resetFaceScanBtn" class="secondary">
                                         Làm lại
                                     </button>
 
                                 </div>
 
                                 <!-- MESSAGE -->
-                                <div id="faceRegisterMessage"
-                                     class="message">
+                                <div id="faceRegisterMessage" class="message">
                                 </div>
 
                             </div>
@@ -279,7 +268,7 @@
         // Gửi ảnh lên server
         async function submitSamples() {
             const roomCode = document.getElementById('roomCode').value;
-            
+
             try {
                 const response = await fetch('/api/face-id/register', {
                     method: 'POST',