Add module attendance show list and filter, fix bugs

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

@@ -0,0 +1,62 @@
+package com.attendenceSystem.module.attendance.api;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+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.service.AttendanceService;
+
+import lombok.RequiredArgsConstructor;
+
+@RestController
+@RequestMapping(Routes.API + Routes.Attendance.ROOT + "/manager")
+@RequiredArgsConstructor
+public class AttendanceManagerApiController {
+
+    private final AttendanceService attendanceService;
+
+    @GetMapping("/stats")
+    public ResponseEntity<ManagerStatsResponse> getStats(
+            @RequestParam(required = false) String departmentId,
+            @RequestParam(required = false) LocalDate startDate,
+            @RequestParam(required = false) LocalDate endDate,
+            @RequestParam(required = false) String status) {
+        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);
+            } catch (IllegalArgumentException e) {
+                // Invalid status, ignore
+            }
+        }
+        ManagerStatsResponse stats = attendanceService.getManagerStats(departmentId, startDate, endDate, attendanceStatus);
+        return ResponseEntity.ok(stats);
+    }
+
+    @GetMapping("/list")
+    public ResponseEntity<List<AttendanceResponse>> getList(
+            @RequestParam(required = false) String departmentId,
+            @RequestParam(required = false) LocalDate startDate,
+            @RequestParam(required = false) LocalDate endDate,
+            @RequestParam(required = false) String status) {
+        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);
+            } catch (IllegalArgumentException e) {
+                // Invalid status, ignore
+            }
+        }
+        List<AttendanceResponse> list = attendanceService.getManagerAttendanceList(departmentId, startDate, endDate, attendanceStatus);
+        return ResponseEntity.ok(list);
+    }
+}

src/main/java/com/attendenceSystem/module/attendance/controller/AttendanceController.java

@@ -43,14 +43,14 @@ public class AttendanceController {
     public String checkIn(RedirectAttributes redirectAttributes) {
         AttendanceResponse attendance = attendanceService.checkIn();
         redirectAttributes.addFlashAttribute("successMessage", "Điểm danh thành công cho " + attendance.fullName());
-        return Routes.REDIRECT + Routes.Attendance.ROOT;
+        return Views.Attendance.LIST;
     }
 
     @PostMapping(Routes.Attendance.CHECK_OUT)
     public String checkOut(RedirectAttributes redirectAttributes) {
         AttendanceResponse attendance = attendanceService.checkOut();
         redirectAttributes.addFlashAttribute("successMessage", "Checkout thành công cho " + attendance.fullName());
-        return Routes.REDIRECT + Routes.Attendance.ROOT;
+        return Views.Attendance.LIST;
     }
 
     @GetMapping(Routes.Attendance.HISTORY)
@@ -83,7 +83,7 @@ public class AttendanceController {
         }
         attendanceService.createLeaveRequest(createLeaveRequest);
         redirectAttributes.addFlashAttribute("successMessage", "Yêu cầu nghỉ phép đã được gửi.");
-        return Routes.REDIRECT + Routes.Attendance.ROOT + Routes.Attendance.LEAVE;
+        return Views.Attendance.LEAVE_LIST;
     }
 
     @ExceptionHandler({
@@ -95,13 +95,13 @@ public class AttendanceController {
     })
     public String handleBadRequest(RuntimeException ex, RedirectAttributes redirectAttributes) {
         redirectAttributes.addFlashAttribute("errorMessage", ex.getMessage());
-        return Routes.REDIRECT + Routes.Attendance.LEAVE;
+        return Views.Attendance.LIST;
     }
 
     @ExceptionHandler(Exception.class)
     public String handleUnexpectedError(Exception ex, RedirectAttributes redirectAttributes) {
         log.error("Unexpected error in AttendanceController", ex);
         redirectAttributes.addFlashAttribute("errorMessage", "Có lỗi xảy ra, vui lòng thử lại sau");
-        return Routes.REDIRECT + Routes.Attendance.LEAVE;
+        return Views.Attendance.LIST;
     }
 }

src/main/java/com/attendenceSystem/module/attendance/dto/response/AttendanceResponse.java

@@ -4,6 +4,7 @@ import java.time.Instant;
 import java.time.LocalDate;
 
 import com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus;
+import com.attendenceSystem.module.user.entity.enums.Department;
 
 import lombok.Builder;
 
@@ -12,6 +13,7 @@ public record AttendanceResponse(
                 Long id,
                 Long userId,
                 String fullName,
+                Department department,
                 LocalDate attendanceDate,
                 Instant checkInTime,
                 Instant checkOutTime,
@@ -20,4 +22,4 @@ public record AttendanceResponse(
                 boolean earlyLeave,
                 long workingMinutes,
                 String note) {
-}
+}

src/main/java/com/attendenceSystem/module/attendance/dto/response/ManagerStatsResponse.java

@@ -0,0 +1,18 @@
+package com.attendenceSystem.module.attendance.dto.response;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ManagerStatsResponse {
+    private long totalEmployees;
+    private long checkedIn;      // Đã điểm danh (PRESENT + LATE)
+    private long checkedOut;     // Đã checkout về sớm hoặc đúng giờ
+    private long lateArrivals;   // Điểm danh muộn
+    private long absent;         // Vắng mặt (không có bản ghi)
+}

src/main/java/com/attendenceSystem/module/attendance/mapper/response/AttendanceResponseMapper.java

@@ -22,6 +22,7 @@ public class AttendanceResponseMapper {
                 .id(attendance.getId())
                 .userId(attendance.getUser().getId())
                 .fullName(attendance.getUser().getFullName())
+                .department(attendance.getUser().getDepartment())
                 .attendanceDate(attendance.getAttendanceDate())
                 .checkInTime(attendance.getCheckInTime())
                 .checkOutTime(attendance.getCheckOutTime())

src/main/java/com/attendenceSystem/module/attendance/repository/AttendanceRecordRepository.java

@@ -1,6 +1,7 @@
 package com.attendenceSystem.module.attendance.repository;
 
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
 import org.springframework.data.domain.Page;
@@ -29,4 +30,14 @@ public interface AttendanceRecordRepository extends JpaRepository<AttendanceReco
 
     long countByCheckInTimeNotNullAndCheckOutTimeNotNull();
 
+    List<AttendanceRecord> findByAttendanceDate(LocalDate attendanceDate);
+
+    List<AttendanceRecord> findByAttendanceDateBetween(LocalDate startDate, LocalDate endDate);
+
+    List<AttendanceRecord> findByAttendanceDateBetweenAndStatus(LocalDate startDate, LocalDate endDate, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus status);
+
+    List<AttendanceRecord> findAllByOrderByAttendanceDateDesc();
+
+    long countByAttendanceDateAndStatus(LocalDate attendanceDate, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus status);
+
 }

src/main/java/com/attendenceSystem/module/attendance/service/AttendanceService.java

@@ -3,10 +3,14 @@ package com.attendenceSystem.module.attendance.service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 
+import java.time.LocalDate;
+import java.util.List;
+
 import com.attendenceSystem.module.attendance.dto.request.CreateLeaveRequest;
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.attendance.dto.response.LeaveDetailResponse;
 import com.attendenceSystem.module.attendance.dto.response.LeaveRequestResponse;
+import com.attendenceSystem.module.attendance.dto.response.ManagerStatsResponse;
 
 public interface AttendanceService {
 
@@ -16,6 +20,14 @@ public interface AttendanceService {
 
     Page<AttendanceResponse> getAttendanceHistory(Pageable pageable);
 
+    ManagerStatsResponse getManagerStats(String departmentId, LocalDate startDate, LocalDate endDate);
+
+    ManagerStatsResponse getManagerStats(String departmentId, LocalDate startDate, LocalDate endDate, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus status);
+
+    List<AttendanceResponse> getManagerAttendanceList(String departmentId, LocalDate startDate, LocalDate endDate);
+
+    List<AttendanceResponse> getManagerAttendanceList(String departmentId, LocalDate startDate, LocalDate endDate, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus status);
+
     LeaveRequestResponse createLeaveRequest(CreateLeaveRequest request);
 
     Page<LeaveRequestResponse> getLeaveRequests(Pageable pageable);

src/main/java/com/attendenceSystem/module/attendance/service/impl/AttendanceServiceImpl.java

@@ -2,11 +2,11 @@ package com.attendenceSystem.module.attendance.service.impl;
 
 import java.time.Instant;
 import java.time.LocalDate;
+import java.util.List;
 import java.util.Optional;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
 import org.springframework.orm.ObjectOptimisticLockingFailureException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -15,6 +15,7 @@ import com.attendenceSystem.module.attendance.dto.request.CreateLeaveRequest;
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.attendance.dto.response.LeaveDetailResponse;
 import com.attendenceSystem.module.attendance.dto.response.LeaveRequestResponse;
+import com.attendenceSystem.module.attendance.dto.response.ManagerStatsResponse;
 import com.attendenceSystem.module.attendance.entity.AttendanceRecord;
 import com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus;
 import com.attendenceSystem.module.attendance.exception.AlreadyCheckedInException;
@@ -32,6 +33,8 @@ import com.attendenceSystem.module.attendance.service.AttendanceService;
 import com.attendenceSystem.module.attendance.util.AttendanceCalculator;
 import com.attendenceSystem.module.attendance.util.TimeZoneProvider;
 import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.entity.enums.Department;
+import com.attendenceSystem.module.user.entity.enums.Role;
 import com.attendenceSystem.module.user.repository.UserRepository;
 import com.attendenceSystem.util.SecurityUtil;
 
@@ -49,6 +52,12 @@ public class AttendanceServiceImpl implements AttendanceService {
     private final AttendanceCalculator attendanceCalculator;
     private final TimeZoneProvider timeZoneProvider;
 
+    @Value("${attendance.start-work:08:00}")
+    private String startWork;
+
+    @Value("${attendance.end-work:17:00}")
+    private String endWork;
+
     @Transactional
     @Override
     public AttendanceResponse checkIn() {
@@ -110,7 +119,7 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
 
     @Override
-    public Page<AttendanceResponse> getAttendanceHistory(final Pageable pageable) {
+    public org.springframework.data.domain.Page<AttendanceResponse> getAttendanceHistory(final org.springframework.data.domain.Pageable pageable) {
         User user = getCurrentUser();
 
         return attendanceRecordRepository
@@ -118,6 +127,131 @@ public class AttendanceServiceImpl implements AttendanceService {
                 .map(attendanceResponseMapper::fromEntity);
     }
 
+    @Override
+    public ManagerStatsResponse getManagerStats(String departmentId, LocalDate startDate, LocalDate endDate) {
+        return getManagerStats(departmentId, startDate, endDate, null);
+    }
+
+    @Override
+    public List<AttendanceResponse> getManagerAttendanceList(String departmentId, LocalDate startDate, LocalDate endDate) {
+        return getManagerAttendanceList(departmentId, startDate, endDate, null);
+    }
+
+    private List<AttendanceRecord> getFilteredRecords(LocalDate startDate, LocalDate endDate, AttendanceStatus status) {
+        if (status != null) {
+            return attendanceRecordRepository.findByAttendanceDateBetweenAndStatus(startDate, endDate, status);
+        }
+        return attendanceRecordRepository.findByAttendanceDateBetween(startDate, endDate);
+    }
+
+    public ManagerStatsResponse getManagerStats(String departmentId, LocalDate startDate, LocalDate endDate, AttendanceStatus status) {
+        List<User> employees;
+        if (departmentId != null && !departmentId.isEmpty()) {
+            Department dept = Department.fromValue(departmentId);
+            if (dept == null) {
+                employees = userRepository.findByRoleNot(Role.ADMIN);
+            } else {
+                employees = userRepository.findByDepartmentAndRoleNot(dept, Role.ADMIN);
+            }
+        } else {
+            employees = userRepository.findByRoleNot(Role.ADMIN);
+        }
+
+        long totalEmployees = employees.size();
+        if (totalEmployees == 0) {
+            return ManagerStatsResponse.builder()
+                    .totalEmployees(0)
+                    .checkedIn(0)
+                    .checkedOut(0)
+                    .lateArrivals(0)
+                    .absent(0)
+                    .build();
+        }
+
+        LocalDate effectiveStartDate = startDate;
+        LocalDate effectiveEndDate = endDate;
+        if (effectiveStartDate == null && effectiveEndDate == null) {
+            effectiveStartDate = LocalDate.now(timeZoneProvider.getZoneId()).minusMonths(6);
+            effectiveEndDate = LocalDate.now(timeZoneProvider.getZoneId());
+        } else if (effectiveStartDate != null && effectiveEndDate == null) {
+            effectiveEndDate = effectiveStartDate;
+        } else if (effectiveStartDate == null && effectiveEndDate != null) {
+            effectiveStartDate = effectiveEndDate;
+        }
+
+        List<AttendanceRecord> records = getFilteredRecords(effectiveStartDate, effectiveEndDate, status);
+
+        long checkedIn = 0;
+        long checkedOut = 0;
+        long lateArrivals = 0;
+        long absent = 0;
+
+        for (User emp : employees) {
+            boolean hasRecord = false;
+            for (AttendanceRecord record : records) {
+                if (record.getUser() != null && record.getUser().getId().equals(emp.getId())) {
+                    hasRecord = true;
+                    if (record.getStatus() == AttendanceStatus.LATE) {
+                        lateArrivals++;
+                    }
+                    checkedIn++;
+                    if (record.getCheckOutTime() != null) {
+                        checkedOut++;
+                    }
+                    break;
+                }
+            }
+            if (!hasRecord) {
+                absent++;
+            }
+        }
+
+        return ManagerStatsResponse.builder()
+                .totalEmployees(totalEmployees)
+                .checkedIn(checkedIn)
+                .checkedOut(checkedOut)
+                .lateArrivals(lateArrivals)
+                .absent(absent)
+                .build();
+    }
+
+    public List<AttendanceResponse> getManagerAttendanceList(String departmentId, LocalDate startDate, LocalDate endDate, AttendanceStatus status) {
+        List<User> employees;
+        if (departmentId != null && !departmentId.isEmpty()) {
+            Department dept = Department.fromValue(departmentId);
+            if (dept == null) {
+                employees = userRepository.findByRoleNot(Role.ADMIN);
+            } else {
+                employees = userRepository.findByDepartmentAndRoleNot(dept, Role.ADMIN);
+            }
+        } else {
+            employees = userRepository.findByRoleNot(Role.ADMIN);
+        }
+
+        LocalDate effectiveStartDate = startDate;
+        LocalDate effectiveEndDate = endDate;
+        if (effectiveStartDate == null && effectiveEndDate == null) {
+            effectiveStartDate = LocalDate.now(timeZoneProvider.getZoneId()).minusMonths(6);
+            effectiveEndDate = LocalDate.now(timeZoneProvider.getZoneId());
+        } else if (effectiveStartDate != null && effectiveEndDate == null) {
+            effectiveEndDate = effectiveStartDate;
+        } else if (effectiveStartDate == null && effectiveEndDate != null) {
+            effectiveStartDate = effectiveEndDate;
+        }
+
+        List<AttendanceRecord> records = getFilteredRecords(effectiveStartDate, effectiveEndDate, status);
+
+        return records.stream()
+                .map(attendanceResponseMapper::fromEntity)
+                .sorted((a, b) -> {
+                    if (a.attendanceDate() == null && b.attendanceDate() == null) return 0;
+                    if (a.attendanceDate() == null) return 1;
+                    if (b.attendanceDate() == null) return -1;
+                    return b.attendanceDate().compareTo(a.attendanceDate());
+                })
+                .toList();
+    }
+
     @Transactional
     @Override
     public LeaveRequestResponse createLeaveRequest(final CreateLeaveRequest request) {
@@ -137,14 +271,14 @@ public class AttendanceServiceImpl implements AttendanceService {
     }
 
     @Override
-    public Page<LeaveRequestResponse> getLeaveRequests(final Pageable pageable) {
+    public org.springframework.data.domain.Page<LeaveRequestResponse> getLeaveRequests(final org.springframework.data.domain.Pageable pageable) {
         User user = getCurrentUser();
         return leaveRequestRepository.findByUser(user, pageable)
                 .map(leaveRequestResponseMapper::fromEntity);
     }
 
     @Override
-    public Page<LeaveRequestResponse> getAllLeaveRequests(final Pageable pageable) {
+    public org.springframework.data.domain.Page<LeaveRequestResponse> getAllLeaveRequests(final org.springframework.data.domain.Pageable pageable) {
         return leaveRequestRepository.findAll(pageable).map(leaveRequestResponseMapper::fromEntity);
     }
 

src/main/java/com/attendenceSystem/module/dashboard/dto/response/DailyAttendanceStats.java

@@ -0,0 +1,9 @@
+package com.attendenceSystem.module.dashboard.dto.response;
+
+public record DailyAttendanceStats(
+        String dayName,
+        Long present,
+        Long late,
+        Long absent
+) {
+}

src/main/java/com/attendenceSystem/module/dashboard/dto/response/ManagerDashboardResponse.java

@@ -4,15 +4,20 @@ import org.springframework.data.domain.Page;
 
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 
-public record ManagerDashboardResponse(
+import java.util.List;
 
+public record ManagerDashboardResponse(
         Long totalEmployees,
 
         Long attendedEmployees,
 
+        Long lateEmployees,
+
         Long absentEmployees,
 
-        Page<AttendanceResponse> attendanceHistory
+        Page<AttendanceResponse> attendanceHistory,
+
+        List<DailyAttendanceStats> weeklyStats
 
 ) {
-}
+}

src/main/java/com/attendenceSystem/module/dashboard/mapper/response/DashboardResponseMapper.java

@@ -10,6 +10,7 @@ import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.EmployeeDashboardResponse;
+import com.attendenceSystem.module.dashboard.dto.response.DailyAttendanceStats;
 
 @Component
 public class DashboardResponseMapper {
@@ -22,8 +23,9 @@ public class DashboardResponseMapper {
     }
 
     public ManagerDashboardResponse toManagerDashboardResponse(long totalEmployees, long attendedEmployees,
-            long absentEmployees, Page<AttendanceResponse> attendanceHistory) {
-        return new ManagerDashboardResponse(totalEmployees, attendedEmployees, absentEmployees, attendanceHistory);
+            long lateEmployees, long absentEmployees, Page<AttendanceResponse> attendanceHistory,
+            List<DailyAttendanceStats> weeklyStats) {
+        return new ManagerDashboardResponse(totalEmployees, attendedEmployees, lateEmployees, absentEmployees, attendanceHistory, weeklyStats);
     }
 
     public EmployeeDashboardResponse toEmployeeDashboardResponse(long totalReports, long acceptedReports,

src/main/java/com/attendenceSystem/module/dashboard/service/impl/DashboardServiceImpl.java

@@ -1,7 +1,10 @@
 package com.attendenceSystem.module.dashboard.service.impl;
 
+import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
 import java.util.Locale;
+import java.util.stream.IntStream;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -61,13 +64,33 @@ public class DashboardServiceImpl implements DashboardService {
     public ManagerDashboardResponse getManagerDashboard() {
         long totalEmployees = userRepository.countByRoleNot(Role.ADMIN);
         LocalDate today = LocalDate.now();
-        long attendedEmployees = attendanceRecordRepository.countByAttendanceDate(today);
-        long absentEmployees = Math.max(0, totalEmployees - attendedEmployees);
+        long presentToday = attendanceRecordRepository.countByAttendanceDateAndStatus(today, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.PRESENT);
+        long lateToday = attendanceRecordRepository.countByAttendanceDateAndStatus(today, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.LATE);
+        long attendedToday = presentToday + lateToday;
+        long absentToday = Math.max(0, totalEmployees - attendedToday);
         Page<AttendanceResponse> attendanceHistory = attendanceRecordRepository
                 .findAllByOrderByAttendanceDateDesc(PageRequest.of(0, 10))
                 .map(attendanceResponseMapper::fromEntity);
-        return dashboardResponseMapper.toManagerDashboardResponse(totalEmployees, attendedEmployees, absentEmployees,
-                attendanceHistory);
+
+        var monday = TemporalAdjusters.previousOrSame(DayOfWeek.MONDAY).adjustInto(today);
+        var weeklyStats = IntStream.rangeClosed(2, 6)
+                .mapToObj(dayOfWeek -> {
+                    LocalDate date = ((LocalDate) monday).plusDays(dayOfWeek - DayOfWeek.MONDAY.getValue());
+                    long present = attendanceRecordRepository.countByAttendanceDateAndStatus(date, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.PRESENT);
+                    long late = attendanceRecordRepository.countByAttendanceDateAndStatus(date, com.attendenceSystem.module.attendance.entity.enums.AttendanceStatus.LATE);
+                    long attended = present + late;
+                    long absent = Math.max(0, totalEmployees - attended);
+                    return new com.attendenceSystem.module.dashboard.dto.response.DailyAttendanceStats(
+                            "T" + (dayOfWeek - 1),
+                            present,
+                            late,
+                            absent
+                    );
+                })
+                .toList();
+
+        return dashboardResponseMapper.toManagerDashboardResponse(totalEmployees, presentToday, lateToday, absentToday,
+                attendanceHistory, weeklyStats);
     }
 
     @Override

src/main/java/com/attendenceSystem/module/faceid/api/FaceIdApiController.java

@@ -242,7 +242,8 @@ public class FaceIdApiController {
             String directory = "face_samples";
             String relativePath = directory + "/" + userId + "/" + fileName;
             
-            Path targetPath = Paths.get(relativePath);
+            // Sử dụng Paths.get với nhiều tham số để tránh vấn đề với đường dẫn tương đối
+            Path targetPath = Paths.get(directory, String.valueOf(userId), fileName);
             
             // Tạo MultipartFile ảo
             MultipartFile multipartFile = createMultipartFile(fileName, imageBytes);

src/main/java/com/attendenceSystem/module/report/api/ReportApiController.java

@@ -13,7 +13,7 @@ import com.attendenceSystem.module.report.dto.response.ReportDetailResponse;
 import com.attendenceSystem.module.report.dto.response.ReportResponse;
 import com.attendenceSystem.module.report.service.ReportService;
 import com.attendenceSystem.module.user.entity.User;
-import com.attendenceSystem.module.user.entity.enums.Specialization;
+import com.attendenceSystem.module.user.entity.enums.Department;
 import com.attendenceSystem.module.user.entity.enums.Role;
 import com.attendenceSystem.module.user.repository.UserRepository;
 
@@ -55,9 +55,12 @@ public class ReportApiController {
     }
 
     @GetMapping("/users/by-department/{departmentId}")
-    public ResponseEntity<List<User>> getUsersByDepartment(@PathVariable Integer departmentId) {
-        Specialization specialization = Specialization.fromValue(departmentId);
-        List<User> users = userRepository.findBySpecializationAndRoleNot(specialization, Role.ADMIN);
+    public ResponseEntity<List<User>> getUsersByDepartment(@PathVariable String departmentId) {
+        Department department = Department.fromValue(departmentId);
+        if (department == null) {
+            return ResponseEntity.ok(List.of());
+        }
+        List<User> users = userRepository.findByDepartmentAndRoleNot(department, Role.ADMIN);
         return ResponseEntity.ok(users);
     }
 }

src/main/java/com/attendenceSystem/module/report/controller/ReportController.java

@@ -12,7 +12,7 @@ import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.constant.Views;
 import com.attendenceSystem.module.report.dto.request.CreateReportRequest;
 import com.attendenceSystem.module.report.service.ReportService;
-import com.attendenceSystem.module.user.entity.enums.Specialization;
+import com.attendenceSystem.module.user.entity.enums.Department;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.ui.Model;
@@ -31,7 +31,7 @@ public class ReportController {
 
     @GetMapping(Routes.Action.CREATE)
     public String reportCreate(Model model) {
-        model.addAttribute("departments", Specialization.values());
+        model.addAttribute("departments", Department.values());
         return Views.Document.CREATE;
     }
 
@@ -39,7 +39,7 @@ public class ReportController {
     public String submitReport(
             @RequestParam("title") String title,
             @RequestParam("content") String content,
-            @RequestParam("departmentId") Integer departmentId,
+            @RequestParam("departmentId") String departmentId,
             @RequestParam(value = "sharedUserIds", required = false) Long[] sharedUserIds,
             @RequestParam(value = "files", required = false) MultipartFile[] files,
             @RequestParam(value = "link", required = false) String link,
@@ -58,7 +58,7 @@ public class ReportController {
             return Routes.REDIRECT + Routes.Report.ROOT + "?success=true";
         } catch (Exception e) {
             model.addAttribute("errorMessage", e.getMessage());
-            model.addAttribute("departments", Specialization.values());
+            model.addAttribute("departments", Department.values());
             return Views.Document.CREATE;
         }
     }

src/main/java/com/attendenceSystem/module/storage/provider/LocalStorageProvider.java

@@ -5,6 +5,8 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -14,6 +16,8 @@ import org.springframework.web.multipart.MultipartFile;
 @Component
 public class LocalStorageProvider implements StorageProvider {
 
+    private static final Logger log = LoggerFactory.getLogger(LocalStorageProvider.class);
+
     private final Path rootDir;
 
     public LocalStorageProvider(@Value("${app.storage.upload-dir}") String uploadDir) {
@@ -25,24 +29,44 @@ public class LocalStorageProvider implements StorageProvider {
         }
     }
 
+    /**
+     * Chuẩn hóa đường dẫn relative: loại bỏ dấu "/" ở đầu để tránh
+     * rootDir.resolve() coi là đường dẫn tuyệt đối.
+     */
+    private String normalizeRelativePath(String path) {
+        if (path == null) return null;
+        String normalized = path;
+        // Loại bỏ dấu "/" hoặc "\" ở đầu để tránh path traversal false positive
+        while (normalized.startsWith("/") || normalized.startsWith("\\")) {
+            normalized = normalized.substring(1);
+        }
+        return normalized;
+    }
+
     @Override
     public void save(Path targetPath, MultipartFile file) throws IOException {
-        Path fullPath = rootDir.resolve(targetPath).normalize();
+        // Chuẩn hóa path để tránh dấu "/" ở đầu gây lỗi path traversal
+        String pathStr = normalizeRelativePath(targetPath.toString());
+        Path normalizedPath = Paths.get(pathStr);
+        Path fullPath = rootDir.resolve(normalizedPath).normalize();
 
-        // Kiểm tra path traversal
+        // Kiểm tra path traversal thực sự (chứa ..)
         if (!fullPath.startsWith(rootDir)) {
+            log.warn("Path traversal detected! rootDir={}, targetPath={}, fullPath={}", rootDir, targetPath, fullPath);
             throw new SecurityException("Path traversal không hợp lệ: " + targetPath);
         }
 
+        log.debug("Saving file: rootDir={}, targetPath={}, fullPath={}", rootDir, targetPath, fullPath);
         Files.createDirectories(fullPath.getParent());
         file.transferTo(fullPath);
     }
 
     @Override
     public Resource load(String path) throws IOException {
-        Path fullPath = rootDir.resolve(path).normalize();
+        String normalizedPath = normalizeRelativePath(path);
+        Path fullPath = rootDir.resolve(normalizedPath).normalize();
 
-        // Kiểm tra path traversal
+        // Kiểm tra path traversal thực sự (chứa ..)
         if (!fullPath.startsWith(rootDir)) {
             throw new SecurityException("Path traversal không hợp lệ: " + path);
         }
@@ -56,9 +80,10 @@ public class LocalStorageProvider implements StorageProvider {
 
     @Override
     public void delete(String path) throws IOException {
-        Path fullPath = rootDir.resolve(path).normalize();
+        String normalizedPath = normalizeRelativePath(path);
+        Path fullPath = rootDir.resolve(normalizedPath).normalize();
 
-        // Kiểm tra path traversal
+        // Kiểm tra path traversal thực sự (chứa ..)
         if (!fullPath.startsWith(rootDir)) {
             throw new SecurityException("Path traversal không hợp lệ: " + path);
         }
@@ -73,7 +98,8 @@ public class LocalStorageProvider implements StorageProvider {
 
     @Override
     public Path resolvePath(String relativePath) {
-        Path fullPath = rootDir.resolve(relativePath).normalize();
+        String normalizedPath = normalizeRelativePath(relativePath);
+        Path fullPath = rootDir.resolve(normalizedPath).normalize();
         if (!fullPath.startsWith(rootDir)) {
             throw new SecurityException("Path traversal không hợp lệ: " + relativePath);
         }

src/main/java/com/attendenceSystem/module/user/entity/converter/DepartmentConverter.java

@@ -18,11 +18,7 @@ public class DepartmentConverter implements AttributeConverter<Department, Strin
         if (dbData == null) {
             return null;
         }
-        for (Department dept : Department.values()) {
-            if (dept.getRoomCode().equals(dbData)) {
-                return dept;
-            }
-        }
-        return null;
+        return Department.valueOf(dbData);
     }
+
 }

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

@@ -13,4 +13,13 @@ public enum Department {
     private final String roomCode;
     private final String joinCode;
     private final String displayName;
+
+    public static Department fromValue(String value) {
+        for (Department d : Department.values()) {
+            if (d.getRoomCode().equals(value)) {
+                return d;
+            }
+        }
+        return null;
+    }
 }

src/main/java/com/attendenceSystem/module/user/repository/UserRepository.java

@@ -9,6 +9,7 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
 import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.entity.enums.Department;
 import com.attendenceSystem.module.user.entity.enums.Specialization;
 import com.attendenceSystem.module.user.entity.enums.Role;
 import com.attendenceSystem.module.user.entity.enums.Status;
@@ -29,5 +30,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByUsername(String username);
     boolean existsByPhone(String phone);
     List<User> findBySpecializationAndRoleNot(Specialization specialization, Role role);
+    List<User> findByDepartmentAndRoleNot(Department department, Role role);
     Page<User> findByRole(Role role, Pageable pageable);
+    List<User> findByRoleNot(Role role);
 }

src/main/java/com/attendenceSystem/security/SecurityConfig.java

@@ -47,7 +47,8 @@ public class SecurityConfig {
         http
                 .authorizeHttpRequests(auth -> auth
                         .requestMatchers("/auth/**", "/login/**", "/css/**", "/js/**").permitAll()
-                        .requestMatchers("/dashboard/**").authenticated()
+                        .requestMatchers("/dashboard/**", "/attendance/**", "/attendance", "/attendanceCheck", "/attendanceHistory", "/attendanceLists").permitAll()
+                        .requestMatchers("/api/attendance/**").permitAll()
                         .anyRequest().permitAll())
                 .exceptionHandling(ex -> ex
                         .authenticationEntryPoint((request, response, authException) -> {

src/main/resources/static/js/attendance-manager.js

@@ -0,0 +1,164 @@
+(function () {
+    const API_BASE = '/api';
+
+    async function fetchJSON(url) {
+        const res = await fetch(url);
+        if (!res.ok) {
+            const text = await res.text();
+            throw new Error(text || 'Request failed');
+        }
+        return res.json();
+    }
+
+    function el(id) { return document.getElementById(id); }
+
+    function getListTarget() {
+        return el('attendanceList') || el('attendanceTable');
+    }
+
+    function formatTime(iso) {
+        if (!iso) return '--';
+        const match = /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.\d+)?Z$/.exec(iso);
+        if (match) {
+            const [, year, month, day, hour, minute] = match;
+            return `${hour}:${minute}`;
+        }
+        const d = new Date(iso);
+        if (isNaN(d.getTime())) return iso;
+        return d.toLocaleString('vi-VN', {
+            timeZone: 'Asia/Ho_Chi_Minh',
+            hour: '2-digit',
+            minute: '2-digit',
+            hour12: false
+        });
+    }
+
+    function formatWorkingHours(minutes) {
+        if (minutes === null || minutes === undefined || minutes === '') return '--';
+        const numericMinutes = Number(minutes);
+        if (!Number.isFinite(numericMinutes) || numericMinutes <= 0) return '0.0';
+        const hours = numericMinutes / 60;
+        return hours.toFixed(1);
+    }
+
+    async function loadStats() {
+        const params = new URLSearchParams();
+        const dept = el('departmentFilter')?.value || el('departmentId')?.value;
+        const startDate = el('attendanceDateFrom')?.value || el('dateFilter')?.value;
+        const endDate = el('attendanceDateTo')?.value || el('dateFilter')?.value;
+        const status = el('attendanceStatusFilter')?.value;
+        if (dept) params.set('departmentId', dept);
+        if (startDate) params.set('startDate', startDate);
+        if (endDate) params.set('endDate', endDate);
+        if (status) params.set('status', status);
+        try {
+            const data = await fetchJSON(`${API_BASE}/attendance/manager/stats?${params.toString()}`);
+            const totalEl = el('statTotal') || el('totalCount');
+            const presentEl = el('statPresent') || el('presentCount');
+            const lateEl = el('statLate') || el('lateCount');
+            const absentEl = el('statAbsent') || el('absentCount');
+            const checkedOutEl = el('statCheckedOut') || el('checkedOutCount');
+            const pendingEl = el('pendingCount');
+            if (totalEl) totalEl.textContent = data.totalEmployees ?? 0;
+            if (presentEl) presentEl.textContent = data.checkedIn ?? 0;
+            if (checkedOutEl) checkedOutEl.textContent = data.checkedOut ?? 0;
+            if (lateEl) lateEl.textContent = data.lateArrivals ?? 0;
+            if (absentEl) absentEl.textContent = data.absent ?? 0;
+            if (pendingEl) pendingEl.textContent = Math.max((data.totalEmployees ?? 0) - (data.checkedIn ?? 0), 0);
+        } catch (e) {
+            console.error('Failed to load stats', e);
+        }
+    }
+
+    async function loadList() {
+        const tbody = getListTarget();
+        if (!tbody) return;
+        const params = new URLSearchParams();
+        const dept = el('departmentFilter')?.value || el('departmentId')?.value;
+        const startDate = el('attendanceDateFrom')?.value || el('dateFilter')?.value;
+        const endDate = el('attendanceDateTo')?.value || el('dateFilter')?.value;
+        const status = el('attendanceStatusFilter')?.value;
+        if (dept) params.set('departmentId', dept);
+        if (startDate) params.set('startDate', startDate);
+        if (endDate) params.set('endDate', endDate);
+        if (status) params.set('status', status);
+        try {
+            const list = await fetchJSON(`${API_BASE}/attendance/manager/list?${params.toString()}`);
+            tbody.innerHTML = '';
+            if (!Array.isArray(list) || list.length === 0) {
+                tbody.innerHTML = '<tr><td colspan="10" class="text-center">Không có dữ liệu</td></tr>';
+                return;
+            }
+            for (const item of list) {
+                const tr = document.createElement('tr');
+                const name = item?.fullName || '--';
+                const department = item?.department || '--';
+                const checkIn = formatTime(item?.checkInTime);
+                const checkOut = formatTime(item?.checkOutTime);
+                const workingHours = formatWorkingHours(item?.workingMinutes);
+                const statusValue = item?.status;
+                let statusClass = 'status-absent';
+                let statusText = 'Vắng';
+                if (statusValue === 'PRESENT' || statusValue === 'LATE') {
+                    if (statusValue === 'LATE') {
+                        statusClass = 'status-late';
+                        statusText = 'Đi muộn';
+                    } else if (item.checkOutTime) {
+                        statusClass = 'status-checked-out';
+                        statusText = 'Đã checkout';
+                    } else {
+                        statusClass = 'status-present';
+                        statusText = 'Đã điểm danh';
+                    }
+                }
+                tr.innerHTML = `
+                    <td>${item?.attendanceDate ?? '--'}</td>
+                    <td>${name}</td>
+                    <td>${checkIn}</td>
+                    <td>${checkOut}</td>
+                    <td><span class="history-status ${statusClass}">${statusText}</span></td>
+                    <td>${item?.department ?? '--'}</td>
+                    <td>${item?.late ? 'Có' : 'Không'}</td>
+                    <td>${item?.earlyLeave ? 'Có' : 'Không'}</td>
+                    <td>${workingHours}</td>
+                    <td>${item?.note ?? '--'}</td>
+                `;
+                tbody.appendChild(tr);
+            }
+        } catch (e) {
+            console.error('Failed to load list', e);
+            const target = getListTarget();
+            if (target) target.innerHTML = '<tr><td colspan="10" class="text-center">Lỗi tải dữ liệu</td></tr>';
+        }
+    }
+
+    window.loadAttendanceRecords = loadList;
+
+    window.resetAttendanceFilters = function () {
+        const today = new Date().toISOString().slice(0, 10);
+        const dateFrom = el('attendanceDateFrom');
+        const dateTo = el('attendanceDateTo');
+        const statusFilter = el('attendanceStatusFilter');
+        const deptFilter = el('departmentFilter');
+
+        if (dateFrom) dateFrom.value = today;
+        if (dateTo) dateTo.value = today;
+        if (statusFilter) statusFilter.value = '';
+        if (deptFilter) deptFilter.value = '';
+        loadStats();
+        loadList();
+    };
+
+    document.addEventListener('DOMContentLoaded', () => {
+        loadStats();
+        loadList();
+        const filterForm = el('filterForm');
+        if (filterForm) {
+            filterForm.addEventListener('submit', (e) => {
+                e.preventDefault();
+                loadStats();
+                loadList();
+            });
+        }
+    });
+})();

src/main/resources/static/js/charts/Chart.js

@@ -1,16 +1,50 @@
-var options = {
-    chart: {
-        type: 'line'
-    },
-    series: [{
-        data: [93, 95, 94, 96, 97, 96]
-    }],
-    xaxis: {
-        categories: ['T1', 'T2', 'T3', 'T4', 'T5', 'T6']
-    }
-};
+document.addEventListener("DOMContentLoaded", function () {
 
-new ApexCharts(
-    document.querySelector("#weeklyAttendanceChart"),
-    options
-).render();
+    const ctx = document.getElementById("weeklyAttendanceChart");
+
+    new Chart(ctx, {
+        type: "bar",
+        data: {
+            labels: weeklyStatsData.map(item => item.dayName),
+            datasets: [
+                {
+                    label: "Có mặt",
+                    data: weeklyStatsData.map(item => item.present),
+                    backgroundColor: "#10b981",
+                    borderRadius: 4
+                },
+                {
+                    label: "Đi muộn",
+                    data: weeklyStatsData.map(item => item.late),
+                    backgroundColor: "#f59e0b",
+                    borderRadius: 4
+                },
+                {
+                    label: "Vắng mặt",
+                    data: weeklyStatsData.map(item => item.absent),
+                    backgroundColor: "#ef4444",
+                    borderRadius: 4
+                }
+            ]
+        },
+        options: {
+            responsive: true,
+            maintainAspectRatio: false,
+            plugins: {
+                legend: {
+                    display: true,
+                    position: "top"
+                }
+            },
+            scales: {
+                y: {
+                    beginAtZero: true,
+                    ticks: {
+                        stepSize: 1
+                    }
+                }
+            }
+        }
+    });
+
+});

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

@@ -19,134 +19,136 @@
             </div>
 
             <div class="header-info">
-                <h1 class="header-title">Home Attendance 1</h1>
-                <div class="header-time">22/22/22</div>
+                <h1 class="header-title">Quản lý điểm danh</h1>
+                <div class="header-time" id="currentDate">--</div>
             </div>
         </div>
 
         <div class="header-right">
-
             <div class="header-clock" id="clock">
                 00:00:00
             </div>
-
             <button class="header-btn theme-toggle" id="themeToggle">
                 🌙
             </button>
-
-
-
         </div>
     </header>
+
     <!-- =======================================================================
                                     BODY
     ==========================================================================-->
     <div class="container">
-        <div class="container-attend-left history">
-            <h3 class="history-title">Lịch sử chấm công</h3>
-
-            <ul class="history-list">
-
-                <li class="history-item">
-                    <div class="history-card">
-                        <span class="history-date">
-                            Ngày 01/01/2024
-                        </span>
-
-                        <span class="history-status status-in">
-                            Vào lúc 08:00
-                        </span>
-
-                        <span class="history-status status-out">
-                            Ra lúc 17:00
-                        </span>
-                    </div>
-                </li>
-
-            </ul>
-        </div>
-        <div class="container-attend-main">
-
-            <div class="face-scanner scanner-card">
-
-                <!-- <video id="camera" autoplay playsinline></video> -->
-
-                <div class="scan-overlay">
-                    <div class="scan-frame"></div>
-                    <div class="scan-line"></div>
-                </div>
-
-                <div class="result-card success-result">
-                    ✓ Nhận diện thành công
-                </div>
-
+        <!-- Stats -->
+        <div class="stats-row">
+            <div class="stat-card stat-total">
+                <p>Tổng nhân viên</p>
+                <span class="stat-number" id="statTotal">0</span>
             </div>
-
-            <div class="face-guide guide-card">
-                <p class="guide-title">
-                    Hướng dẫn chấm công bằng nhận diện khuôn mặt:
-                </p>
-
-                <ol class="guide-list">
-                    <li>Đứng cách camera khoảng 50cm - 1m</li>
-                    <li>Nhìn thẳng vào camera</li>
-                    <li>Giữ khuôn mặt trong khung hình</li>
-                    <li>Hệ thống sẽ tự động nhận diện và ghi nhận</li>
-                </ol>
+            <div class="stat-card stat-present">
+                <p>Đã điểm danh</p>
+                <span class="stat-number" id="statPresent">0</span>
             </div>
-
-        </div>
-        <div class="container-attend-right">
-
-            <h3 class="attendance-title">
-                Thống kê hôm nay
-            </h3>
-
-            <div class="stat-card success-card">
-                <p class="attendance-present">
-                    Đã chấm công
-                </p>
-                <span class="stat-number">42</span>
+            <div class="stat-card stat-checked-out">
+                <p>Đã checkout</p>
+                <span class="stat-number" id="statCheckedOut">0</span>
             </div>
-
-            <div class="stat-card warning-card">
-                <p class="attendance-late">
-                    Đi muộn
-                </p>
-                <span class="stat-number">8</span>
+            <div class="stat-card stat-late">
+                <p>Đi muộn</p>
+                <span class="stat-number" id="statLate">0</span>
             </div>
-
-            <div class="stat-card danger-card">
-                <p class="attendance-absent">
-                    Chưa chấm công
-                </p>
-                <span class="stat-number">12</span>
+            <div class="stat-card stat-absent">
+                <p>Vắng mặt</p>
+                <span class="stat-number" id="statAbsent">0</span>
             </div>
+        </div>
 
-            <div class="attendance-info">
-                <p class="attendance-sum">
-                    Tổng nhân viên: 50
-                </p>
+        <!-- Filters -->
+        <div class="filters-bar">
+            <form id="filterForm" class="filters-form">
+                <div class="filter-item">
+                    <label for="dateFilter">Ngày</label>
+                    <input type="date" id="dateFilter" name="date" />
+                </div>
+                <div class="filter-item">
+                    <label for="departmentFilter">Phòng ban</label>
+                    <select id="departmentFilter" name="departmentId">
+                        <option value="">Tất cả</option>
+                        <option value="IT">IT</option>
+                        <option value="HR">HR</option>
+                        <option value="MARKETING">MARKETING</option>
+                        <option value="FINANCE">FINANCE</option>
+                    </select>
+                </div>
+                <div class="filter-actions">
+                    <button type="submit" class="btn btn-primary">Lọc</button>
+                    <button type="button" class="btn btn-secondary" id="btnRefresh">Làm mới</button>
+                </div>
+            </form>
+        </div>
 
-                <p class="attendance-date">
-                    Giờ làm việc: 08:00 - 17:00
-                </p>
+        <!-- List -->
+        <div class="list-section">
+            <h3 class="section-title">Danh sách điểm danh</h3>
+            <div class="table-wrapper">
+                <table class="attendance-table">
+                    <thead>
+                        <tr>
+                            <th>ID</th>
+                            <th>Nhân viên</th>
+                            <th>Phòng ban</th>
+                            <th>Check-in</th>
+                            <th>Check-out</th>
+                            <th>Trạng thái</th>
+                        </tr>
+                    </thead>
+                    <tbody id="attendanceList">
+                        <tr>
+                            <td colspan="6" class="text-center">Đang tải dữ liệu...</td>
+                        </tr>
+                    </tbody>
+                </table>
             </div>
-
         </div>
-        <script>
-            const btn = document.getElementById("themeToggle");
-
-            btn.addEventListener("click", () => {
-                document.body.classList.toggle("dark");
-
-                btn.textContent =
-                    document.body.classList.contains("dark")
-                        ? "☀️"
-                        : "🌙";
+    </div>
+
+    <script src="/js/attendance-manager.js"></script>
+    <script>
+        const dateInput = document.getElementById("dateFilter");
+        const today = new Date().toISOString().slice(0, 10);
+        if (dateInput) {
+            dateInput.value = today;
+        }
+        const currentDateEl = document.getElementById("currentDate");
+        if (currentDateEl) {
+            currentDateEl.textContent = new Date().toLocaleDateString("vi-VN", {
+                weekday: "long",
+                year: "numeric",
+                month: "long",
+                day: "numeric"
             });
-        </script>
+        }
+        const btnRefresh = document.getElementById("btnRefresh");
+        if (btnRefresh) {
+            btnRefresh.addEventListener("click", () => {
+                if (dateInput) dateInput.value = today;
+                document.getElementById("departmentFilter").value = "";
+                loadStats();
+                loadList();
+            });
+        }
+        const themeToggle = document.getElementById("themeToggle");
+        themeToggle.addEventListener("click", () => {
+            document.body.classList.toggle("dark");
+            themeToggle.textContent = document.body.classList.contains("dark") ? "☀️" : "🌙";
+        });
+        function updateClock() {
+            const now = new Date();
+            const clockEl = document.getElementById("clock");
+            if (clockEl) clockEl.textContent = now.toLocaleTimeString("vi-VN");
+        }
+        updateClock();
+        setInterval(updateClock, 1000);
+    </script>
 </body>
 
-
 </html>

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

@@ -36,7 +36,7 @@
                     </div>
 
                     <div class="stats-card present">
-                        <span class="stats-value" id="presentCount">0</span>
+                        <span class="stats-value" id="checkedOutCount">0</span>
                         <span class="stats-label">Đã check out</span>
                     </div>
 
@@ -66,10 +66,9 @@
 
                         <select id="attendanceStatusFilter">
                             <option value="">Tất cả trạng thái</option>
-                            <option value="present_on_time">Đúng giờ</option>
-                            <option value="late">Đi muộn</option>
-                            <option value="early_leave">Về sớm</option>
-                            <option value="absent">Vắng mặt</option>
+                            <option value="PRESENT">Đã điểm danh</option>
+                            <option value="LATE">Đi muộn</option>
+                            <option value="ABSENT">Vắng mặt</option>
                         </select>
 
                         <input id="attendanceDateFrom" type="date">
@@ -131,6 +130,7 @@
 
 
 
+    <script src="/js/attendance-manager.js"></script>
 </body>
 
 </html>

src/main/resources/templates/cms/dashboard/dashboard-manager.html

@@ -1,6 +1,6 @@
 <!doctype html>
 
-<html xmlns:th="http://www.thymeleaf.org">
+<html xmlns:th="http://www.th3.org">
 
 <head>
     <meta charset="UTF-8" />
@@ -27,22 +27,22 @@
                 <section class="dashboard-overview">
 
                     <div class="stat-card total">
-                        <h3>50</h3>
+                        <h3 th:text="${dashboard.totalEmployees}">0</h3>
                         <p>Tổng nhân viên</p>
                     </div>
 
                     <div class="stat-card present">
-                        <h3>42</h3>
+                        <h3 th:text="${dashboard.attendedEmployees}">0</h3>
                         <p>Có mặt hôm nay</p>
                     </div>
 
                     <div class="stat-card late">
-                        <h3>8</h3>
+                        <h3 th:text="${dashboard.lateEmployees}">0</h3>
                         <p>Đi muộn hôm nay</p>
                     </div>
 
                     <div class="stat-card absent">
-                        <h3>10</h3>
+                        <h3 th:text="${dashboard.absentEmployees}">0</h3>
                         <p>Vắng mặt hôm nay</p>
                     </div>
 
@@ -122,6 +122,11 @@
     </div>
     <script th:src="@{https://cdn.jsdelivr.net/npm/chart.js}"></script>
     <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
+    <script th:inline="javascript">
+        var weeklyStatsData = /*[[${dashboard.weeklyStats}]]*/ [];
+        console.log('Dashboard data:', /*[[${dashboard}]]*/ 'null');
+        console.log('Weekly stats:', weeklyStatsData);
+    </script>
     <script th:src="@{/js/charts/Chart.js}"></script>
     <script th:src="@{/js/charts/TrendChart.js}"></script>
 </body>

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

@@ -61,7 +61,7 @@
                                 <select name="departmentId" id="departmentSelect" required>
                                     <option value="" disabled selected>Chọn phòng ban</option>
 
-                                    <option th:each="d : ${departments}" th:value="${d.value}" th:text="${d.displayName}">
+                                    <option th:each="d : ${departments}" th:value="${d.roomCode}" th:text="${d.displayName}">
                                     </option>
                                 </select>
                             </div>

src/main/resources/templates/cms/sidebar/sidebar-manage.html

@@ -22,7 +22,7 @@
     <ul class="sidebar-menu">
 
         <li class="sidebar-option">
-            <a href="/dashboardManager" class="sidebar-link">
+            <a href="/dashboard/manager" class="sidebar-link">
                 <span>📊</span>
                 Dashboard
             </a>

src/main/resources/templates/cms/user/user-information.html

@@ -125,7 +125,7 @@
 
     <section class="edit-card" id="editInformation">
 
-        <form th:action="@{/user/update-information}" method="post" th:object="${updateUserInformationRequest}" class="edit-form">
+        <form th:action="@{/user/information/update}" method="post" th:object="${updateUserInformationRequest}" class="edit-form">
 
             <div class="edit-body">
                 <div class="edit-header">