add approve and reject leave

src/main/java/com/attendenceSystem/constant/Routes.java

@@ -14,6 +14,8 @@ public final class Routes {
         public static final String DELETE = "/delete";
         public static final String DEACTIVATE = "/deactivate";
         public static final String ACTIVATE = "/activate";
+        public static final String ACCEPT = "/accept";
+        public static final String REJECT = "/reject";
     }
 
     public static final class Role {

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

@@ -8,6 +8,7 @@ import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -21,6 +22,7 @@ import com.attendenceSystem.module.attendance.exception.AlreadyCheckedOutExcepti
 import com.attendenceSystem.module.attendance.exception.InvalidAttendanceStateException;
 import com.attendenceSystem.module.attendance.exception.NotCheckedInException;
 import com.attendenceSystem.module.attendance.service.AttendanceService;
+import com.attendenceSystem.module.attendance.service.LeaveService;
 
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +34,7 @@ import lombok.extern.slf4j.Slf4j;
 @RequestMapping(Routes.Attendance.ROOT)
 public class AttendanceController {
     private final AttendanceService attendanceService;
+    private final LeaveService leaveService;
 
     @GetMapping
     public String toAttendanceListPage(@PageableDefault(size = 10) Pageable pageable, Model model) {
@@ -55,7 +58,7 @@ public class AttendanceController {
 
     @GetMapping(Routes.Attendance.HISTORY)
     public String attendanceHistory(@PageableDefault(size = 10) Pageable pageable, Model model) {
-        
+
         model.addAttribute("attendanceHistory", attendanceService.getAttendanceHistory(pageable));
         return Views.Attendance.HISTORY;
     }
@@ -84,7 +87,25 @@ 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    + Routes.Action.CREATE;
+        return Routes.REDIRECT + Routes.Attendance.ROOT + Routes.Attendance.LEAVE + Routes.Action.CREATE;
+    }
+
+    @PostMapping(Routes.Attendance.LEAVE + Routes.Action.ACCEPT + "/{id}")
+    public String acceptLeaveRequest(
+            @PathVariable("id") Long id,
+            RedirectAttributes redirectAttributes) {
+        leaveService.acceptLeave(id);
+        redirectAttributes.addFlashAttribute("successMessage", "Đã duyệt đơn nghỉ phép.");
+        return Routes.REDIRECT + Routes.Attendance.ROOT + Routes.Attendance.LEAVE;
+    }
+
+    @PostMapping(Routes.Attendance.LEAVE + Routes.Action.REJECT + "/{id}")
+    public String rejectLeaveRequest(
+            @PathVariable("id") Long id,
+            RedirectAttributes redirectAttributes) {
+        leaveService.rejectLeave(id);
+        redirectAttributes.addFlashAttribute("successMessage", "Đã từ chối đơn nghỉ phép.");
+        return Routes.REDIRECT + Routes.Attendance.ROOT + Routes.Attendance.LEAVE;
     }
 
     @ExceptionHandler({

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

@@ -1,5 +1,7 @@
 package com.attendenceSystem.module.attendance.repository;
 
+import java.util.Optional;
+
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -9,4 +11,6 @@ import com.attendenceSystem.module.user.entity.User;
 
 public interface LeaveRequestRepository extends JpaRepository<LeaveRequest, Long> {
     Page<LeaveRequest> findByUser(User user, Pageable pageable);
+
+    Optional<LeaveRequest> findById(long id);
 }

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

@@ -0,0 +1,6 @@
+package com.attendenceSystem.module.attendance.service;
+
+public interface LeaveService {
+    void acceptLeave(Long id);
+    void rejectLeave(Long id);
+}

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

@@ -0,0 +1,51 @@
+package com.attendenceSystem.module.attendance.service.impl;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.attendenceSystem.module.attendance.entity.LeaveRequest;
+import com.attendenceSystem.module.attendance.entity.enums.LeaveStatus;
+import com.attendenceSystem.module.attendance.repository.LeaveRequestRepository;
+import com.attendenceSystem.module.attendance.service.LeaveService;
+import com.attendenceSystem.module.user.entity.enums.Role;
+import com.attendenceSystem.util.SecurityUtil;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class LeaveServiceImpl implements LeaveService {
+    private final LeaveRequestRepository leaveRequestRepository;
+
+    @Transactional
+    @Override
+    public void acceptLeave(Long id) {
+        validateManagerAction();
+        LeaveRequest leaveRequest = findByIdWithStatusPending(id);
+        leaveRequest.setStatus(LeaveStatus.APPROVED);
+    }
+
+    @Transactional
+    @Override
+    public void rejectLeave(Long id) {
+        validateManagerAction();
+        LeaveRequest leaveRequest = findByIdWithStatusPending(id);
+        leaveRequest.setStatus(LeaveStatus.REJECTED);
+    }
+
+    private void validateManagerAction() {
+        if (SecurityUtil.getCurrentUserRole() != Role.MANAGER) {
+            throw new IllegalStateException("Bạn không có quyền thực hiện hành động này");
+        }
+    }
+
+    private LeaveRequest findByIdWithStatusPending(Long id) {
+        LeaveRequest leaveRequest = leaveRequestRepository.findById(id)
+                .orElseThrow(() -> new IllegalStateException("Không tìm thấy đơn xin nghỉ phép"));
+        if (leaveRequest.getStatus() != LeaveStatus.PENDING) {
+            throw new IllegalStateException("Đơn nghỉ phép đã được xử lý");
+        }
+        return leaveRequest;
+    }
+
+}

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

@@ -7,8 +7,6 @@ import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 public record EmployeeDashboardResponse(
 
         Long totalReports,
-        Long acceptedReports,
-        Long rejectedReports,
         String attendanceRate,
         Page<AttendanceResponse> attendanceHistory
 

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

@@ -15,22 +15,43 @@ import com.attendenceSystem.module.dashboard.dto.response.DailyAttendanceStats;
 @Component
 public class DashboardResponseMapper {
 
-    public AdminDashboardResponse toAdminDashboardResponse(long totalAccounts, long activeAccounts,
-            long inactiveAccounts, long pendingAccounts,
+    public AdminDashboardResponse toAdminDashboardResponse(
+            long totalAccounts,
+            long activeAccounts,
+            long inactiveAccounts,
+            long pendingAccounts,
             List<AccountTypeDistributionResponse> accountTypeDistribution) {
-        return new AdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts, pendingAccounts,
+        return new AdminDashboardResponse(
+                totalAccounts,
+                activeAccounts,
+                inactiveAccounts,
+                pendingAccounts,
                 accountTypeDistribution);
     }
 
-    public ManagerDashboardResponse toManagerDashboardResponse(long totalEmployees, long attendedEmployees,
-            long lateEmployees, long absentEmployees, Page<AttendanceResponse> attendanceHistory,
+    public ManagerDashboardResponse toManagerDashboardResponse(
+            long totalEmployees,
+            long attendedEmployees,
+            long lateEmployees,
+            long absentEmployees,
+            Page<AttendanceResponse> attendanceHistory,
             List<DailyAttendanceStats> weeklyStats) {
-        return new ManagerDashboardResponse(totalEmployees, attendedEmployees, lateEmployees, absentEmployees, attendanceHistory, weeklyStats);
+        return new ManagerDashboardResponse(
+                totalEmployees,
+                attendedEmployees,
+                lateEmployees,
+                absentEmployees,
+                attendanceHistory,
+                weeklyStats);
     }
 
-    public EmployeeDashboardResponse toEmployeeDashboardResponse(long totalReports, long acceptedReports,
-            long rejectedReports, String attendanceRate, Page<AttendanceResponse> attendanceHistory) {
-        return new EmployeeDashboardResponse(totalReports, acceptedReports, rejectedReports, attendanceRate,
+    public EmployeeDashboardResponse toEmployeeDashboardResponse(
+            long totalReports,
+            String attendanceRate,
+            Page<AttendanceResponse> attendanceHistory) {
+        return new EmployeeDashboardResponse(
+                totalReports,
+                attendanceRate,
                 attendanceHistory);
     }
 }

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

@@ -23,7 +23,6 @@ import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardRespon
 import com.attendenceSystem.module.dashboard.mapper.response.DashboardResponseMapper;
 import com.attendenceSystem.module.dashboard.service.DashboardService;
 import com.attendenceSystem.module.dashboard.util.DashboardCalculator;
-import com.attendenceSystem.module.report.entity.enums.ReportStatus;
 import com.attendenceSystem.module.report.repository.ReportRepository;
 import com.attendenceSystem.module.user.entity.User;
 import com.attendenceSystem.module.user.entity.enums.Role;
@@ -64,8 +63,9 @@ public class DashboardServiceImpl implements DashboardService {
 
         @Override
         public ManagerDashboardResponse getManagerDashboard() {
-                long totalEmployees = userRepository.countByRoleNot(Role.ADMIN);
                 LocalDate today = LocalDate.now();
+                
+                long totalEmployees = userRepository.countByRoleNot(Role.ADMIN);
                 long presentToday = attendanceRecordRepository.countByAttendanceDateAndStatus(
                                 today,
                                 AttendanceStatus.PRESENT);
@@ -110,8 +110,6 @@ public class DashboardServiceImpl implements DashboardService {
         public EmployeeDashboardResponse getEmployeeDashboard() {
                 User user = getCurrentUser();
                 long totalReports = reportRepository.countByEmployee(user);
-                long acceptedReports = reportRepository.countByEmployeeAndStatus(user, ReportStatus.ACCEPTED);
-                long rejectedReports = reportRepository.countByEmployeeAndStatus(user, ReportStatus.REJECTED);
                 long totalDays = attendanceRecordRepository.count();
                 long attendedDays = attendanceRecordRepository.countByCheckInTimeNotNullAndCheckOutTimeNotNull();
                 String attendenceRate = DashboardCalculator.showResultStr(attendedDays, totalDays);
@@ -120,8 +118,6 @@ public class DashboardServiceImpl implements DashboardService {
                                 .map(attendanceResponseMapper::fromEntity);
                 return dashboardResponseMapper.toEmployeeDashboardResponse(
                                 totalReports,
-                                acceptedReports,
-                                rejectedReports,
                                 attendenceRate,
                                 attendanceHistory);
         }

src/main/java/com/attendenceSystem/module/user/api/AuthApiController.java

@@ -13,6 +13,7 @@ import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.service.AuthService;
 
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 
 @RestController
@@ -23,13 +24,13 @@ public class AuthApiController {
     private final AuthService authService;
 
     @PostMapping(Routes.Auth.LOGIN)
-    public ResponseEntity<UserResponse> login(@RequestBody LoginRequest request) {
+    public ResponseEntity<UserResponse> login(@Valid @RequestBody LoginRequest request) {
         UserResponse response = authService.login(request);
         return ResponseEntity.ok(response);
     }
 
     @PostMapping(Routes.Auth.REGISTER)
-    public ResponseEntity<Void> register(@RequestBody RegisterRequest request) {
+    public ResponseEntity<Void> register(@Valid @RequestBody RegisterRequest request) {
         authService.register(request);
         return ResponseEntity.ok().build();
     }
@@ -44,7 +45,7 @@ public class AuthApiController {
         return ResponseEntity.ok().build();
     }
     @PostMapping(Routes.Auth.VERIFY_OTP)
-    public ResponseEntity<Boolean> verifyOtp(@RequestBody VerifyOtpRequest request) {
+    public ResponseEntity<Boolean> verifyOtp(@Valid @RequestBody VerifyOtpRequest request) {
         boolean isValid = authService.verifyOtp(request.getDestination(), request.getCode());
         return ResponseEntity.ok(isValid);
     }

src/main/java/com/attendenceSystem/util/SecurityUtil.java

@@ -41,7 +41,7 @@ public class SecurityUtil {
                 .map(GrantedAuthority::getAuthority)
                 .filter(authority -> authority.startsWith("ROLE_"))
                 .findFirst()
-                .map(authority -> Role.valueOf(authority.replace("ROLE_", "")))
+                .map(authority -> Role.valueOf(authority.substring(5)))
                 .orElse(null);
     }
 }

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

@@ -117,10 +117,13 @@
                                     <tr th:each="leave : ${leaveRequests.content}">
                                         <td th:text="${leave.fullName()}">Nhân viên</td>
                                         <td th:text="${leave.departmentDisplay()}">Phòng ban</td>
-                                        <td th:text="${leave.startDate()}">Từ ngày</td>
-                                        <td th:text="${leave.endDate()}">Đến ngày</td>
+                                        <td th:text="${#temporals.format(leave.startDate(), 'dd/MM/yyyy')}">Từ ngày</td>
+                                        <td th:text="${#temporals.format(leave.endDate(), 'dd/MM/yyyy')}">Đến ngày</td>
                                         <td>
-                                            <span class="status pending">Trạng thái</span>
+                                            <span th:classappend="${leave.status()} ? 'status-' + ${leave.status().name().toLowerCase()}" 
+                                                  class="status"
+                                                  th:text="${leave.status()}">
+                                            </span>
                                         </td>
                                         <td>
                                             <button th:data-id="${leave.id}"
@@ -133,20 +136,18 @@
 
                                         
                                         <td>
-                                            <div class="action-group">
-
-                                                <form method="post">
-                                                    <button class="btn-primary btn-small">
+                                            <div class="action-group" th:if="${leave.status().toString() == 'PENDING'}">
+                                                <form th:action="@{'/attendance/leave/accept/' + ${leave.id()}}" method="post" style="display:inline;">
+                                                    <button class="btn-primary btn-small" type="submit" onclick="return confirm('Bạn có chắc phê duyệt đơn nghỉ phép này?')">
                                                         Phê duyệt
                                                     </button>
                                                 </form>
 
-                                                <form method="post">
-                                                    <button class="btn-secondary btn-small">
+                                                <form th:action="@{'/attendance/leave/reject/' + ${leave.id()}}" method="post" style="display:inline;">
+                                                    <button class="btn-secondary btn-small" type="submit" onclick="return confirm('Bạn có chắc từ chối đơn nghỉ phép này?')">
                                                         Từ chối
                                                     </button>
                                                 </form>
-
                                             </div>
                                         </td>
                                     </tr>

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

@@ -36,7 +36,7 @@
                         </div>
 
                         <div class="employee-stat-card__content">
-                            <h3 class="employee-stat-card__number">12</h3>
+                            <h3 class="employee-stat-card__number" th:text="${dashboard.totalReports}">0</h3>
                             <p class="employee-stat-card__label">Báo cáo đã nộp</p>
                         </div>
 
@@ -48,7 +48,7 @@
                         </div>
 
                         <div class="employee-stat-card__content">
-                            <h3 class="employee-stat-card__number">95%</h3>
+                            <h3 class="employee-stat-card__number" th:text="${dashboard.attendanceRate}">0%</h3>
                             <p class="employee-stat-card__label">Tỷ lệ chuyên cần</p>
                         </div>
 
@@ -147,51 +147,23 @@
                                     </thead>
 
                                     <tbody>
-
-                                        <tr>
-                                            <td>2/6/2026</td>
-                                            <td>07:58</td>
-                                            <td>17:05</td>
-                                            <td>
-                                                <span class="status-badge status-success">
-                                                    Đúng giờ
-                                                </span>
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>1/6/2026</td>
-                                            <td>08:12</td>
-                                            <td>17:02</td>
-                                            <td>
-                                                <span class="status-badge status-warning">
-                                                    Đi muộn
-                                                </span>
-                                            </td>
-                                        </tr>
-
-                                        <tr>
-                                            <td>31/5/2026</td>
-                                            <td>08:00</td>
-                                            <td>17:00</td>
+                                        <tr th:each="record : ${dashboard.attendanceHistory.content}">
+                                            <td th:text="${#temporals.format(record.attendanceDate, 'dd/MM/yyyy')}"></td>
+                                            <td th:text="${record.checkInTime != null ? #temporals.format(record.checkInTime, 'HH:mm') : '--'}"></td>
+                                            <td th:text="${record.checkOutTime != null ? #temporals.format(record.checkOutTime, 'HH:mm') : '--'}"></td>
                                             <td>
-                                                <span class="status-badge status-success">
-                                                    Đúng giờ
+                                                <span th:classappend="${record.late} ? 'status-warning' : (${record.earlyLeave} ? 'status-danger' : 'status-success')"
+                                                      class="status-badge"
+                                                      th:text="${record.late} ? 'Đi muộn' : (${record.earlyLeave} ? 'Về sớm' : 'Đúng giờ')">
                                                 </span>
                                             </td>
                                         </tr>
 
-                                        <tr>
-                                            <td>30/5/2026</td>
-                                            <td>07:55</td>
-                                            <td>16:45</td>
-                                            <td>
-                                                <span class="status-badge status-danger">
-                                                    Về sớm
-                                                </span>
+                                        <tr th:if="${dashboard.attendanceHistory.content.empty}">
+                                            <td colspan="4" style="text-align: center; padding: 20px;">
+                                                Chưa có dữ liệu điểm danh
                                             </td>
                                         </tr>
-
                                     </tbody>
 
                                 </table>