Merge branch 'main' of https://github.com/minhhai266/Attendance

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

@@ -8,6 +8,14 @@ public final class Routes {
     public static final String REDIRECT = "redirect:";
     public static final String API = "/api";
 
+    public static final class Action {
+        public static final String CREATE = "/create";
+        public static final String UPDATE = "/update";
+        public static final String DELETE = "/delete";
+        public static final String DEACTIVATE = "/deactivate";
+        public static final String ACTIVATE = "/activate";
+    }
+
     public static final class Auth {
         public static final String ROOT = "/auth";
         public static final String LOGIN = "/login";

src/main/java/com/attendenceSystem/frontroller/HomeController.java

@@ -3,6 +3,8 @@ package com.attendenceSystem.frontroller;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 
+import com.attendenceSystem.constant.Routes;
+
 @Controller
 public class HomeController {
 
@@ -40,15 +42,15 @@ public class HomeController {
     }
     @GetMapping("/dashboardAdmin")
     public String dashboardAdmin() {
-        return "cms/dashboard/dashboard-admin";
+        return Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.ADMIN;
     }
     @GetMapping("/dashboardEmployee")
     public String dashboardEmployee() {
-        return "cms/dashboard/dashboard-employee";
+        return Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.STUDENT;
     }
     @GetMapping("/dashboardManager")
     public String dashboardManager() {
-        return "cms/dashboard/dashboard-manager";
+        return Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.MANAGER;
     }
 
     @GetMapping("/login")
@@ -108,4 +110,4 @@ public class HomeController {
     public String forgotPassword() {
         return "cms/password/forgot-password";
     }
-}
+}

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

@@ -0,0 +1,7 @@
+package com.attendenceSystem.module.dashboard.dto.response;
+
+public record AccountTypeDistributionResponse(
+        String code,
+        String label,
+        long count) {
+}

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

@@ -1,9 +1,31 @@
 package com.attendenceSystem.module.dashboard.dto.response;
 
+import java.util.List;
+import java.util.Locale;
+
 public record AdminDashboardResponse(
         long totalAccounts,
         long activeAccounts,
         long inactiveAccounts,
-        long pendingAccounts
+        long pendingAccounts,
+        List<AccountTypeDistributionResponse> accountTypeDistribution
 ) {
-}
+    public String activeRate() {
+        return formatRate(activeAccounts);
+    }
+
+    public String inactiveRate() {
+        return formatRate(inactiveAccounts);
+    }
+
+    public String pendingRate() {
+        return formatRate(pendingAccounts);
+    }
+
+    private String formatRate(long value) {
+        if (totalAccounts == 0) {
+            return "0.0%";
+        }
+        return String.format(Locale.ROOT, "%.1f%%", value * 100.0 / totalAccounts);
+    }
+}

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

@@ -1,8 +1,11 @@
 package com.attendenceSystem.module.dashboard.mapper.response;
 
+import java.util.List;
+
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Component;
 
+import com.attendenceSystem.module.dashboard.dto.response.AccountTypeDistributionResponse;
 import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
@@ -12,8 +15,10 @@ import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardRespon
 public class DashboardResponseMapper {
 
     public AdminDashboardResponse toAdminDashboardResponse(long totalAccounts, long activeAccounts,
-            long inactiveAccounts, long pendingAccounts) {
-        return new AdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts, pendingAccounts);
+            long inactiveAccounts, long pendingAccounts,
+            List<AccountTypeDistributionResponse> accountTypeDistribution) {
+        return new AdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts, pendingAccounts,
+                accountTypeDistribution);
     }
 
     public ManagerDashboardResponse toManagerDashboardResponse(long totalEmployees, long attendedEmployees,

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

@@ -1,6 +1,7 @@
 package com.attendenceSystem.module.dashboard.service.impl;
 
 import java.time.LocalDate;
+import java.util.Locale;
 
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -10,6 +11,7 @@ import com.attendenceSystem.module.attendance.dto.response.AttendanceResponse;
 import com.attendenceSystem.module.attendance.mapper.response.AttendanceResponseMapper;
 import com.attendenceSystem.module.attendance.repository.AttendanceRecordRepository;
 import com.attendenceSystem.module.attendance.util.AttendanceCalculator;
+import com.attendenceSystem.module.dashboard.dto.response.AccountTypeDistributionResponse;
 import com.attendenceSystem.module.dashboard.dto.response.AdminDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.StudentDashboardResponse;
 import com.attendenceSystem.module.dashboard.dto.response.ManagerDashboardResponse;
@@ -20,6 +22,7 @@ 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;
+import com.attendenceSystem.module.user.entity.enums.Status;
 import com.attendenceSystem.module.user.repository.UserRepository;
 import com.attendenceSystem.util.SecurityUtil;
 
@@ -37,11 +40,22 @@ public class DashboardServiceImpl implements DashboardService {
     @Override
     public AdminDashboardResponse getAdminDashboard() {
         long totalAccounts = userRepository.count();
-        long activeAccounts = userRepository.countByIsActiveTrue();
-        long inactiveAccounts = userRepository.countByIsActiveFalse();
-        long pendingAccounts = userRepository.countByMustChangePasswordTrue();
+        long activeAccounts = userRepository.countByStatus(Status.ACTIVE);
+        long inactiveAccounts = userRepository.countByStatus(Status.INACTIVE);
+        long pendingAccounts = userRepository.countByStatus(Status.PENDING);
+        var accountTypeDistribution = java.util.Arrays.stream(Role.values())
+                .map(role -> new AccountTypeDistributionResponse(
+                        role.name(),
+                        roleLabel(role),
+                        userRepository.countByRole(role)))
+                .toList();
         return dashboardResponseMapper.toAdminDashboardResponse(totalAccounts, activeAccounts, inactiveAccounts,
-                pendingAccounts);
+                pendingAccounts, accountTypeDistribution);
+    }
+
+    private String roleLabel(Role role) {
+        String roleName = role.name().toLowerCase(Locale.ROOT);
+        return roleName.substring(0, 1).toUpperCase(Locale.ROOT) + roleName.substring(1);
     }
 
     @Override

src/main/java/com/attendenceSystem/module/user/controller/AuthController.java

@@ -1,6 +1,7 @@
 package com.attendenceSystem.module.user.controller;
 
 import org.springframework.security.core.Authentication;
+import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.web.authentication.logout.SecurityContextLogoutHandler;
@@ -81,6 +82,9 @@ public class AuthController {
                 case "STUDENT" -> Routes.REDIRECT + Routes.Dashboard.ROOT + Routes.Dashboard.STUDENT;
                 default -> Routes.REDIRECT + Routes.Dashboard.ROOT;
             };
+        } catch (DisabledException e) {
+            model.addAttribute("errorMessage", e.getMessage());
+            return Views.Auth.LOGIN;
         } catch (AuthenticationException e) {
             model.addAttribute("errorMessage", "Tên đăng nhập hoặc mật khẩu không đúng.");
             return Views.Auth.LOGIN;

src/main/java/com/attendenceSystem/module/user/controller/UserController.java

@@ -10,10 +10,14 @@ import com.attendenceSystem.constant.Routes;
 import com.attendenceSystem.constant.Views;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.service.UserService;
+import com.attendenceSystem.util.SecurityUtil;
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 @Controller
 @RequestMapping(Routes.User.ROOT)
 @RequiredArgsConstructor
@@ -23,6 +27,8 @@ public class UserController {
     @GetMapping
     public String toListPage(@PageableDefault(size = 10) Pageable pageable, Model model) {
         model.addAttribute("users", userService.getUsers(pageable));
+        model.addAttribute("currentUsername", SecurityUtil.getCurrentUserName());
+        model.addAttribute("currentRole", SecurityUtil.getCurrentUserRole());
         return Views.User.LIST;
     }
 
@@ -38,4 +44,17 @@ public class UserController {
         return Views.User.PROFILE;
     }
 
+    @PostMapping(Routes.Action.DEACTIVATE + "/{id}")
+    public String deactiveUser(@PathVariable("id") Long id) {
+        userService.deactiveUser(id);
+        return Routes.REDIRECT + Routes.User.ROOT;
+    }
+
+    @PostMapping(Routes.Action.ACTIVATE + "/{id}")
+    public String activateUser(@PathVariable("id") Long id) {
+        userService.activateUser(id);
+        return Routes.REDIRECT + Routes.User.ROOT;
+    }
+
+
 }

src/main/java/com/attendenceSystem/module/user/dto/response/UserResponse.java

@@ -8,7 +8,7 @@ public record UserResponse(
         String username,
         String email,
         String fullName,
-        Boolean isActive,
+        String status,
         String role) {
 
 }

src/main/java/com/attendenceSystem/module/user/entity/User.java

@@ -7,6 +7,7 @@ import org.hibernate.annotations.UpdateTimestamp;
 
 import com.attendenceSystem.module.user.entity.enums.Department;
 import com.attendenceSystem.module.user.entity.enums.Role;
+import com.attendenceSystem.module.user.entity.enums.Status;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -42,12 +43,12 @@ public class User {
     private String password;
     @Column(name = "role", nullable = false)
     private Role role;
-    @Column(name = "is_active", nullable = false)
+    @Column(name = "status", nullable = false)
     @Builder.Default
-    private boolean isActive = true;
+    private Status status = Status.PENDING;
     @Column(name = "full_name", nullable = false, length = 255)
     private String fullName;
-    @Column(name = "department")
+    @Column(name = "department", nullable = false)
     private Department department;
     @CreationTimestamp
     @Column(name = "created_at", nullable = false, updatable = false)

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

@@ -0,0 +1,20 @@
+package com.attendenceSystem.module.user.entity.converter;
+
+import com.attendenceSystem.module.user.entity.enums.Status;
+
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
+
+@Converter(autoApply = true)
+public class StatusConverter implements AttributeConverter<Status, Integer> {
+
+    @Override
+    public Integer convertToDatabaseColumn(Status status) {
+        return status == null ? null : status.getValue();
+    }
+
+    @Override
+    public Status convertToEntityAttribute(Integer dbData) {
+        return dbData == null ? null : Status.fromValue(dbData);
+    }
+}

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

@@ -6,7 +6,8 @@ import lombok.RequiredArgsConstructor;
 @Getter
 @RequiredArgsConstructor
 public enum Department {
-    SE(0);
+    UNASSIGNED(0),
+    SE(1);
 
     public final int value;
 

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

@@ -0,0 +1,23 @@
+package com.attendenceSystem.module.user.entity.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum Status {
+    ACTIVE(1),
+    INACTIVE(2),
+    PENDING(3);
+
+    public final int value;
+
+    public static Status fromValue(int value) {
+        for (Status status : Status.values()) {
+            if (status.value == value) {
+                return status;
+            }
+        }
+        throw new IllegalArgumentException("Không tìm thấy trạng thái: " + value);
+    }
+}

src/main/java/com/attendenceSystem/module/user/mapper/request/RegisterRequestMapper.java

@@ -2,7 +2,9 @@ package com.attendenceSystem.module.user.mapper.request;
 
 import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 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.entity.enums.Status;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
@@ -15,7 +17,9 @@ public final class RegisterRequestMapper {
                 .email(request.getEmail())
                 .password(hashPassword)
                 .fullName(request.getFullName())
+                .department(Department.UNASSIGNED)
                 .role(Role.STUDENT)
+                .status(Status.PENDING)
                 .mustChangePassword(false)
                 .build();
     }

src/main/java/com/attendenceSystem/module/user/mapper/response/UserResponseMapper.java

@@ -21,8 +21,8 @@ public class UserResponseMapper {
                 .username(user.getUsername())
                 .email(user.getEmail())
                 .fullName(user.getFullName())
-                .isActive(user.isActive())
+                .status(user.getStatus() == null ? null : user.getStatus().name())
                 .role(user.getRole().name())
                 .build();
     }
-}
+}

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

@@ -9,6 +9,7 @@ import org.springframework.stereotype.Repository;
 
 import com.attendenceSystem.module.user.entity.User;
 import com.attendenceSystem.module.user.entity.enums.Role;
+import com.attendenceSystem.module.user.entity.enums.Status;
 
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
@@ -19,9 +20,9 @@ public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findUserByUsernameOrEmail(String username, String email);
     boolean existsByUsernameOrEmail(String username, String email);
     Page<User> findAllByOrderByIdAsc(Pageable pageable);
-    long countByIsActiveTrue();
-    long countByIsActiveFalse();
+    long countByStatus(Status status);
     long countByMustChangePasswordTrue();
+    long countByRole(Role role);
     long countByRoleNot(Role role);
     Optional<User> findByUsername(String username);
 }

src/main/java/com/attendenceSystem/module/user/service/UserService.java

@@ -9,4 +9,6 @@ public interface UserService {
     Page<UserResponse> getUsers(Pageable pageable);
     UserResponse getById(Long id);
     void deleteUser(Long id);
+    void deactiveUser(Long id);
+    void activateUser(Long id);
 }

src/main/java/com/attendenceSystem/module/user/service/impl/AuthServiceImpl.java

@@ -5,6 +5,7 @@ import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
 import java.util.Optional;
 
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContext;
@@ -17,6 +18,7 @@ import com.attendenceSystem.module.user.dto.request.LoginRequest;
 import com.attendenceSystem.module.user.dto.request.RegisterRequest;
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.entity.enums.Status;
 import com.attendenceSystem.module.user.repository.UserRepository;
 import com.attendenceSystem.module.user.service.AuthService;
 
@@ -49,10 +51,20 @@ public class AuthServiceImpl implements AuthService {
     @Override
     public UserResponse login(LoginRequest request) {
 
-        Authentication authentication = authenticationManager.authenticate(
-                new UsernamePasswordAuthenticationToken(
-                        request.getLogin(),
-                        request.getPassword()));
+        Authentication authentication;
+        try {
+            authentication = authenticationManager.authenticate(
+                    new UsernamePasswordAuthenticationToken(
+                            request.getLogin(),
+                            request.getPassword()));
+        } catch (DisabledException e) {
+            User user = findUser(request.getLogin())
+                    .orElseThrow(() -> new DisabledException("Tên đăng nhập hoặc mật khẩu không đúng.", e));
+            if (user.getStatus() == Status.PENDING) {
+                throw new DisabledException("Tài khoản đang chờ duyệt", e);
+            }
+            throw new DisabledException("Tài khoản đã bị khóa", e);
+        }
 
         SecurityContext context = SecurityContextHolder.createEmptyContext();
         context.setAuthentication(authentication);

src/main/java/com/attendenceSystem/module/user/service/impl/UserServiceImpl.java

@@ -7,9 +7,12 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.attendenceSystem.module.user.dto.response.UserResponse;
 import com.attendenceSystem.module.user.entity.User;
+import com.attendenceSystem.module.user.entity.enums.Role;
+import com.attendenceSystem.module.user.entity.enums.Status;
 import com.attendenceSystem.module.user.mapper.response.UserResponseMapper;
 import com.attendenceSystem.module.user.repository.UserRepository;
 import com.attendenceSystem.module.user.service.UserService;
+import com.attendenceSystem.util.SecurityUtil;
 
 import lombok.RequiredArgsConstructor;
 
@@ -27,7 +30,50 @@ public class UserServiceImpl implements UserService {
     @Transactional
     @Override
     public void deleteUser(Long id) {
-        userRepository.delete(findById(id));
+        User user = findById(id);
+        validateAdminAction(user);
+        userRepository.delete(user);
+    }
+
+    @Override
+    public Page<UserResponse> getUsers(Pageable pageable) {
+        return userRepository.findAll(pageable).map(userResponseMapper::fromEntity);
+    }
+
+    @Transactional
+    @Override
+    public void deactiveUser(Long id) {
+        User user = findById(id);
+        validateAdminAction(user);
+        if(user.getStatus() == Status.INACTIVE){
+            throw new IllegalStateException("Tài khoản đã bị khóa");
+        }
+        user.setStatus(Status.INACTIVE);
+    }
+
+    @Transactional
+    @Override
+    public void activateUser(Long id) {
+        User user = findById(id);
+        validateAdminAction(user);
+        if(user.getStatus() == Status.ACTIVE){
+            throw new IllegalStateException("Tài khoản chưa bị khóa");
+        }
+        user.setStatus(Status.ACTIVE);
+    }
+
+    private void validateAdminAction(User targetUser) {
+        String currentUsername = SecurityUtil.getCurrentUserName();
+        Role currentRole = SecurityUtil.getCurrentUserRole();
+        if (currentUsername == null || currentRole == null) {
+            throw new IllegalStateException("Không xác định được tài khoản hiện tại");
+        }
+        if (targetUser.getUsername().equals(currentUsername)) {
+            throw new IllegalStateException("Admin không thể thay đổi tài khoản của chính mình");
+        }
+        if (currentRole == Role.ADMIN && targetUser.getRole() == Role.ADMIN) {
+            throw new IllegalStateException("Admin không thể tác động tài khoản admin khác");
+        }
     }
 
     private User findById(Long id) {
@@ -35,8 +81,4 @@ public class UserServiceImpl implements UserService {
                 .orElseThrow(() -> new IllegalArgumentException("Không tìm thấy người dùng với id: " + id));
     }
 
-    @Override
-    public Page<UserResponse> getUsers(Pageable pageable) {
-        return userRepository.findAll(pageable).map(userResponseMapper::fromEntity);
-    }
 }

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

@@ -8,7 +8,7 @@ import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 
 import com.attendenceSystem.module.user.entity.User;
-import com.attendenceSystem.module.user.entity.enums.Department;
+import com.attendenceSystem.module.user.entity.enums.Status;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -24,6 +24,7 @@ public class CustomUserDetails implements UserDetails {
     private final String phone;
     private final String department;
     private final String role;
+    private final Status status;
 
     public static CustomUserDetails fromUser(User user) {
         return new CustomUserDetails(
@@ -33,12 +34,18 @@ public class CustomUserDetails implements UserDetails {
                 user.getFullName(),
                 user.getEmail(),
                 user.getPhone(),
-                user.getDepartment().name(),
-                user.getRole().name());
+                user.getDepartment() == null ? null : user.getDepartment().name(),
+                user.getRole().name(),
+                user.getStatus());
     }
 
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
         return List.of(new SimpleGrantedAuthority("ROLE_"+role));
     }
+
+    @Override
+    public boolean isEnabled() {
+        return status == Status.ACTIVE;
+    }
 }

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

@@ -1,21 +1,25 @@
 document.addEventListener("DOMContentLoaded", function () {
 
     const ctx = document.getElementById("accountTypeChart");
+    const chartData = window.accountTypeChartData || {};
+    const labels = chartData.labels || [];
+    const values = chartData.values || [];
 
     new Chart(ctx, {
         type: "doughnut",
         data: {
-            labels: [
-                "Quản trị viên",
-                "Giảng viên",
-                "Sinh viên"
-            ],
+            labels: labels,
             datasets: [{
-                data: [5, 40, 320],
+                data: values,
                 backgroundColor: [
                     "#ef4444",
                     "#3b82f6",
-                    "#10b981"
+                    "#10b981",
+                    "#f59e0b",
+                    "#8b5cf6",
+                    "#06b6d4",
+                    "#f97316",
+                    "#64748b"
                 ],
                 borderWidth: 2,
                 borderColor: "#ffffff"
@@ -45,4 +49,4 @@ document.addEventListener("DOMContentLoaded", function () {
         }
     });
 
-});
+});

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

@@ -16,7 +16,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">

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

@@ -17,7 +17,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">

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

@@ -15,7 +15,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">

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

@@ -12,7 +12,7 @@
 <body>
     <div class="bg-image"></div>
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-admin :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 
@@ -56,12 +56,27 @@
                                     </div>
                                 </td>
                                 <td th:text="${users.email()}">nguyenvana@company.com</td>
-                                <td ><span th:text="${users.role()}" class="role">Nhân viên</span></td>
-                                <td><span th:text="${users.isActive()} == true?'Hoạt động':'Ngừng hoạt động'" class="status active">Hoạt động</span></td>
+                                <td><span th:text="${users.role()}" class="role">Nhân viên</span></td>
+                                <td><span
+                                        th:text="${users.status() == 'ACTIVE' ? 'Hoạt động' : (users.status() == 'PENDING' ? 'Chờ duyệt' : 'Bị khóa')}"
+                                        th:class="${'status ' + (users.status() == 'ACTIVE' ? 'active' : 'inactive')}">Hoạt động</span>
+                                </td>
                                 <td>
-                                    <div class="actions">
-                                        <button class="icon-btn btn-role">Đổi quyền</button>
-                                        <button class="icon-btn lock">🔒</button>
+                                    <div class="actions"
+                                        th:with="canManage=${users.username() != currentUsername and users.role() != 'ADMIN'}">
+
+                                        <button class="icon-btn btn-role" th:if="${canManage}">Đổi quyền</button>
+                                        <div th:if="${canManage and users.status() == 'ACTIVE'}">
+                                            <form th:action="@{/user/deactivate/{id}(id=${users.id()})}" method="post">
+                                                <button class="icon-btn lock">🔒</button>
+                                            </form>
+                                        </div>
+                                        <div th:if="${canManage and users.status() != 'ACTIVE'}">
+                                            <form th:action="@{/user/activate/{id}(id=${users.id()})}" method="post">
+                                                <button class="icon-btn unlock">🔓</button>
+                                            </form>
+                                        </div>
+                                        <span th:unless="${canManage}" class="action-note">Không thể thao tác</span>
                                     </div>
                                 </td>
                             </tr>
@@ -134,4 +149,4 @@
 
 </body>
 
-</html>
+</html>

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

@@ -15,7 +15,7 @@
 
     <div class="layout">
 
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 

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

@@ -15,7 +15,7 @@
 
     <div class="layout">
 
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 

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

@@ -14,7 +14,7 @@
         <div class="bg-image"></div>
 
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
 
 

src/main/resources/templates/cms/auth/login.html

@@ -20,7 +20,7 @@
       <div class="hero-content">
         <h1 class="hero-title">
           <span class="hero-title-gradient">
-            SMART ATTENDANCE
+            DXLAB ATTENDANCE
           </span>
           <br>
           <span class="hero-title-white">
@@ -71,12 +71,11 @@
 
           <button class="auth-btn" type="submit">Đăng nhập</button>
         </form>
+        <br><br>
+        <a class="auth-btn" href="/dashboard/student">Nhân Viên</a>
+        <a class="auth-btn" href="/dashboard/manager">Quản lý</a>
+        <a class="auth-btn" href="/dashboard/admin">Admin</a>
         <br>
-        <!-- <br>
-        <a class="auth-btn" href="/dashboardEmployee">Nhân Viên</a>
-        <a class="auth-btn" href="/dashboardManager">Quản lý</a>
-        <a class="auth-btn" href="/dashboardAdmin">Admin</a>
-        <br> -->
         <hr style="margin: 1rem 0; opacity: 0.2" />
         <div class="other-option">
           <a th:href="@{/auth/register}" class="register-link">

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

@@ -13,7 +13,7 @@
 <body>
     <div class="bg-image"></div>
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-admin :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 
@@ -38,9 +38,9 @@
                         </div>
 
                         <div class="admin-stat-card__body">
-                            <h2 class="admin-stat-card__number">53</h2>
+                            <h2 class="admin-stat-card__number" th:text="${dashboard.totalAccounts()}">53</h2>
                             <p class="admin-stat-card__description">
-                                +12% so với tháng trước
+                                Tất cả tài khoản trong hệ thống
                             </p>
                         </div>
                     </div>
@@ -56,8 +56,9 @@
                         </div>
 
                         <div class="admin-stat-card__body">
-                            <h2 class="admin-stat-card__number">48</h2>
-                            <p class="admin-stat-card__description">
+                            <h2 class="admin-stat-card__number" th:text="${dashboard.activeAccounts()}">48</h2>
+                            <p class="admin-stat-card__description"
+                                th:text="${dashboard.activeRate()} + ' tổng số'">
                                 90.6% tổng số
                             </p>
                         </div>
@@ -74,8 +75,9 @@
                         </div>
 
                         <div class="admin-stat-card__body">
-                            <h2 class="admin-stat-card__number">5</h2>
-                            <p class="admin-stat-card__description">
+                            <h2 class="admin-stat-card__number" th:text="${dashboard.inactiveAccounts()}">5</h2>
+                            <p class="admin-stat-card__description"
+                                th:text="${dashboard.inactiveRate()} + ' tổng số'">
                                 Cần xem xét
                             </p>
                         </div>
@@ -92,8 +94,9 @@
                         </div>
 
                         <div class="admin-stat-card__body">
-                            <h2 class="admin-stat-card__number">7</h2>
-                            <p class="admin-stat-card__description">
+                            <h2 class="admin-stat-card__number" th:text="${dashboard.pendingAccounts()}">7</h2>
+                            <p class="admin-stat-card__description"
+                                th:text="${dashboard.pendingRate()} + ' tổng số'">
                                 Tài khoản mới đăng ký
                             </p>
                         </div>
@@ -323,10 +326,16 @@
             <div th:replace="~{cms/layout/footer :: footer}"></div>
         </div>
     </div>
+    <script th:inline="javascript">
+        window.accountTypeChartData = {
+            labels: /*[[${dashboard.accountTypeDistribution().![label]}]]*/ [],
+            values: /*[[${dashboard.accountTypeDistribution().![count]}]]*/ []
+        };
+    </script>
 <script th:src="@{https://cdn.jsdelivr.net/npm/chart.js}"></script>
     <script src="https://cdn.jsdelivr.net/npm/apexcharts"></script>
     <script th:src="@{/js/charts/AccountChart.js}"></script>
     <script th:src="@{/js/charts/SystemActivityChart.js}"></script>
 </body>
 
-</html>
+</html>

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

@@ -13,7 +13,7 @@
     <div class="bg-image"></div>
 
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 

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

@@ -12,7 +12,7 @@
 <body>
     <div class="bg-image"></div>
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 

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

@@ -17,7 +17,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">

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

@@ -12,7 +12,7 @@
 <body>
     <div class="bg-image"></div>
     <div class="layout">
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 
@@ -142,4 +142,4 @@
     </div>
 </body>
 
-</html>
+</html>

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

@@ -16,7 +16,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">

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

@@ -14,7 +14,7 @@
     <div class="bg-image"></div>
     <div class="layout">
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- MAIN LAYOUT -->
         <div class="container-layout">

src/main/resources/templates/cms/password/change-password.html

@@ -16,7 +16,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- MAIN CONTENT -->
         <div class="container-layout">

src/main/resources/templates/cms/report/report-day.html

@@ -15,7 +15,7 @@
     <div class="layout">
 
         <!-- Sidebar -->
-        <div th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- Content -->
         <div class="container-layout">

src/main/resources/templates/cms/report/report-month.html

@@ -15,7 +15,7 @@
 
     <div class="layout">
 
-        <div th:replace="~{cms/sidebar/sidebar-manager :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <div class="container-layout">
 

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

@@ -16,7 +16,7 @@
     <ul class="sidebar-menu">
 
         <li class="sidebar-option">
-            <a href="/dashboardAdmin" class="sidebar-link">
+            <a href="/dashboard/admin" class="sidebar-link">
                 <span>📊</span>
                 Dashboard
             </a>
@@ -84,4 +84,4 @@
             }
         });
     </script>
-</div>
+</div>

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

@@ -0,0 +1,11 @@
+<th:block th:fragment="sidebar">
+    <th:block th:if="${#authorization.expression('hasRole(''ADMIN'')')}">
+        <th:block th:replace="~{cms/sidebar/sidebar-admin :: sidebar}"></th:block>
+    </th:block>
+    <th:block th:if="${#authorization.expression('hasRole(''MANAGER'')')}">
+        <th:block th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></th:block>
+    </th:block>
+    <th:block th:if="${#authorization.expression('hasRole(''STUDENT'')')}">
+        <th:block th:replace="~{cms/sidebar/sidebar-employee :: sidebar}"></th:block>
+    </th:block>
+</th:block>

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

@@ -16,7 +16,7 @@
     <div class="layout">
 
         <!-- SIDEBAR -->
-        <div th:replace="~{cms/sidebar/sidebar-manage :: sidebar}"></div>
+        <div th:replace="~{cms/sidebar/sidebar-role :: sidebar}"></div>
 
         <!-- CONTENT -->
         <div class="container-layout">
@@ -178,4 +178,4 @@
     </script>
 </body>
 
-</html>
+</html>