From d6fd70500a6f9af50287281ae8786f9ab37b6ede Mon Sep 17 00:00:00 2001 From: HeftyB Date: Thu, 6 Feb 2025 01:15:36 -0500 Subject: [PATCH 1/8] repo sync --- pom.xml | 10 +- .../dms/controllers/AdminController.java | 16 +- .../java/com/heftyb/dms/crm/Employee.java | 13 +- .../dms/crm/services/EmployeeServiceImp.java | 8 +- src/main/java/com/heftyb/dms/users/Role.java | 11 + .../com/heftyb/dms/users/RoleDepartment.java | 5 + .../dms/users/controllers/RoleController.java | 54 ++ .../dms/users/services/RoleService.java | 2 +- .../dms/users/services/RoleServiceImp.java | 4 +- src/main/resources/static/css/style.css | 23 +- src/main/resources/templates/fragments.html | 147 +++- .../resources/templates/hr_administrator.html | 680 ++++++++++++++++-- 12 files changed, 910 insertions(+), 63 deletions(-) create mode 100644 src/main/java/com/heftyb/dms/users/RoleDepartment.java create mode 100644 src/main/java/com/heftyb/dms/users/controllers/RoleController.java diff --git a/pom.xml b/pom.xml index d386026..ae89eb0 100644 --- a/pom.xml +++ b/pom.xml @@ -68,10 +68,14 @@ spring-boot-starter-test test + + + + + - jakarta.validation - jakarta.validation-api - 3.0.2 + org.springframework.boot + spring-boot-starter-validation org.passay diff --git a/src/main/java/com/heftyb/dms/controllers/AdminController.java b/src/main/java/com/heftyb/dms/controllers/AdminController.java index 2a8be3f..527cf6f 100644 --- a/src/main/java/com/heftyb/dms/controllers/AdminController.java +++ b/src/main/java/com/heftyb/dms/controllers/AdminController.java @@ -1,10 +1,15 @@ package com.heftyb.dms.controllers; import com.heftyb.dms.crm.Employee; +import com.heftyb.dms.crm.JobTitle; import com.heftyb.dms.crm.services.EmployeeService; +import com.heftyb.dms.users.RoleDepartment; import com.heftyb.dms.users.User; +import com.heftyb.dms.users.services.RoleService; import com.heftyb.dms.users.services.UserService; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.ui.ModelMap; @@ -17,15 +22,19 @@ @Controller @RequestMapping("admin") +@PreAuthorize("hasRole('ROLE_ADMIN')") public class AdminController { private final UserService userService; private final EmployeeService employeeService; + private final RoleService roleService; public AdminController(final UserService userService, - final EmployeeService employeeService) { + final EmployeeService employeeService, + final RoleService roleService) { this.userService = userService; this.employeeService = employeeService; + this.roleService = roleService; } @GetMapping({"/", ""}) @@ -36,6 +45,9 @@ public String adminHome(HttpServletRequest request, Model model, Principal princ List users = userService.findAll(); model.addAttribute("users", users); model.addAttribute("username", principal.getName()); + model.addAttribute("roles", roleService.findAll()); + model.addAttribute("deptRoles", RoleDepartment.values()); + model.addAttribute("jobTitles", JobTitle.values()); return "hr_administrator"; } @@ -47,7 +59,7 @@ public String create_employee_form(Principal principal, ModelMap map) { } @PostMapping({"/create_employee", "/create_employee/"}) - public String create_employee(Employee employee) { + public String create_employee(@Valid Employee employee) { employeeService.save(employee); diff --git a/src/main/java/com/heftyb/dms/crm/Employee.java b/src/main/java/com/heftyb/dms/crm/Employee.java index 5564d64..9f109e7 100644 --- a/src/main/java/com/heftyb/dms/crm/Employee.java +++ b/src/main/java/com/heftyb/dms/crm/Employee.java @@ -5,7 +5,10 @@ import com.heftyb.dms.users.User; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.Date; @Entity @@ -19,9 +22,11 @@ public class Employee extends Auditable { private boolean isActive = true; @NotNull + @Size(min = 1) private String firstName; @NotNull + @Size(min = 1) private String lastName; @NotNull @@ -46,7 +51,7 @@ public class Employee extends Auditable { private JobTitle jobTitle; - private Date hiredDate; + private LocalDateTime hiredDate; // private Employee manager; @@ -83,7 +88,7 @@ public Employee() { jobInProgress = false; } - public Employee(String firstName, String lastName, String preferredName, Address address, ContactInformation contactInformation, String taxId, JobTitle jobTitle, Date hiredDate) { + public Employee(String firstName, String lastName, String preferredName, Address address, ContactInformation contactInformation, String taxId, JobTitle jobTitle, LocalDateTime hiredDate) { this.firstName = firstName; this.lastName = lastName; this.preferredName = preferredName; @@ -174,11 +179,11 @@ public void setJobTitle(JobTitle jobTitle) { this.jobTitle = jobTitle; } - public Date getHiredDate() { + public LocalDateTime getHiredDate() { return hiredDate; } - public void setHiredDate(Date hiredDate) { + public void setHiredDate(LocalDateTime hiredDate) { this.hiredDate = hiredDate; } diff --git a/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java b/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java index bc6b2f0..09b801b 100644 --- a/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java +++ b/src/main/java/com/heftyb/dms/crm/services/EmployeeServiceImp.java @@ -37,7 +37,13 @@ public Employee findById(long id) { @Override public Employee save(Employee employee) { - Employee e = new Employee(); + Employee e; + if (employee.getId() != 0) { + e = findById(employee.getId()); + } else { + e = new Employee(); + } + e.setActive(employee.isActive()); e.setFirstName(employee.getFirstName()); e.setLastName(employee.getLastName()); e.setPreferredName(employee.getPreferredName()); diff --git a/src/main/java/com/heftyb/dms/users/Role.java b/src/main/java/com/heftyb/dms/users/Role.java index 4737e0f..439453c 100644 --- a/src/main/java/com/heftyb/dms/users/Role.java +++ b/src/main/java/com/heftyb/dms/users/Role.java @@ -15,6 +15,8 @@ public class Role { private String role; + @Enumerated(EnumType.STRING) + private RoleDepartment department; @OneToMany(mappedBy = "role", cascade = CascadeType.ALL, @@ -58,11 +60,20 @@ public void setUsers(Set users) { this.users = users; } + public RoleDepartment getDepartment() { + return department; + } + + public void setDepartment(RoleDepartment department) { + this.department = department; + } + @Override public String toString() { return "Role{" + "id=" + id + ", role='" + role + '\'' + + ", department=" + department + '}'; } } diff --git a/src/main/java/com/heftyb/dms/users/RoleDepartment.java b/src/main/java/com/heftyb/dms/users/RoleDepartment.java new file mode 100644 index 0000000..8c4704f --- /dev/null +++ b/src/main/java/com/heftyb/dms/users/RoleDepartment.java @@ -0,0 +1,5 @@ +package com.heftyb.dms.users; + +public enum RoleDepartment { + SHARED, OFFICE, SALES, SERVICE, PARTS, TECH_DEV +} diff --git a/src/main/java/com/heftyb/dms/users/controllers/RoleController.java b/src/main/java/com/heftyb/dms/users/controllers/RoleController.java new file mode 100644 index 0000000..edfc50d --- /dev/null +++ b/src/main/java/com/heftyb/dms/users/controllers/RoleController.java @@ -0,0 +1,54 @@ +package com.heftyb.dms.users.controllers; + +import com.heftyb.dms.users.Role; +import com.heftyb.dms.users.RoleDepartment; +import com.heftyb.dms.users.services.RoleService; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.Valid; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Controller +@RequestMapping("/roles") +@PreAuthorize("hasRole('ROLE_ADMIN')") +public class RoleController { + + private final RoleService roleService; + + public RoleController(final RoleService roleService) { + this.roleService = roleService; + } + + + @GetMapping({"/", ""}) + public String getAllRoles(ModelMap map) { + List roles = roleService.findAll(); + + map.addAttribute("roles", roles); + + return "role_home"; + } + + @PostMapping({"/create", "/create/"}) + public String createNewRole(String role, String department, HttpServletRequest request) { + Role r = new Role(); + r.setRole(role); + r.setDepartment(RoleDepartment.valueOf(department)); + roleService.save(r); + + String refURL = request.getHeader("Referer"); + return "redirect:" + refURL; + } + + @PostMapping({"/delete", "/delete/"}) + public String deleteRole(@RequestParam String roleId, HttpServletRequest request) { + roleService.delete(Long.parseLong(roleId)); + + String refURL = request.getHeader("Referer"); + return "redirect:" + refURL; + } +} diff --git a/src/main/java/com/heftyb/dms/users/services/RoleService.java b/src/main/java/com/heftyb/dms/users/services/RoleService.java index 9e25ebc..fc38086 100644 --- a/src/main/java/com/heftyb/dms/users/services/RoleService.java +++ b/src/main/java/com/heftyb/dms/users/services/RoleService.java @@ -13,5 +13,5 @@ public interface RoleService { Role save(Role role); - void Delete(long id); + void delete(long id); } diff --git a/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java b/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java index 7a9bc39..593cf34 100644 --- a/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java +++ b/src/main/java/com/heftyb/dms/users/services/RoleServiceImp.java @@ -46,12 +46,12 @@ public Role save(Role role) { } Role r = new Role(); r.setRole(role.getRole()); - + r.setDepartment(role.getDepartment()); return roleRepo.save(r); } @Override - public void Delete(long id) { + public void delete(long id) { findById(id); roleRepo.deleteById(id); } diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css index bda4d28..366b0a8 100644 --- a/src/main/resources/static/css/style.css +++ b/src/main/resources/static/css/style.css @@ -116,13 +116,17 @@ body { display: flex; flex-direction: column; justify-content: space-evenly; - color: white; - background-color: black; + /*color: white;*/ + /*background-color: black;*/ + height: 100vh; + position: sticky; + top: 0; } .side-navbar-open { - width: 20%; - opacity: 30%; + /*width: 20%;*/ + /*opacity: 30%;*/ + /*position: sticky;*/ } .side-navbar-closed { @@ -365,7 +369,7 @@ td a { justify-content: center; } -.edit-button-wrapper { +.edit-button-wrapper, .flex-between { display: flex; justify-content: space-between; } @@ -810,4 +814,13 @@ td a { /*overflow: hidden;*/ /*text-decoration: underline;*/ /*text-underline: black;*/ +} + +.flex-col { + display: flex; + flex-direction: column; +} + +.just-cent { + justify-content: center; } \ No newline at end of file diff --git a/src/main/resources/templates/fragments.html b/src/main/resources/templates/fragments.html index 7c39377..e80358f 100644 --- a/src/main/resources/templates/fragments.html +++ b/src/main/resources/templates/fragments.html @@ -22,7 +22,7 @@ - +