PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests 2 Actions Packages Projects 2 Releases Wiki Activity

Compare commits

base: PFS:5c4d2cdc74926d2c661fb7806175cc0d3cacf296
Branches Tags
PFS:main
PFS:En-desarrollo
PFS:Vacaciones
PFS:mejorar-detalles
PFS:registro-horas
PFS:hoursworked
PFS:actividadHoursWorked
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo
..
compare: PFS:59c7b2af859e16de7e84eef7cb8325d7b0d5704d
Branches Tags
PFS:En-desarrollo
PFS:Vacaciones
PFS:mejorar-detalles
PFS:main
PFS:registro-horas
PFS:hoursworked
PFS:actividadHoursWorked
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo

No commits in common. "5c4d2cdc74926d2c661fb7806175cc0d3cacf296" and "59c7b2af859e16de7e84eef7cb8325d7b0d5704d" have entirely different histories.
5c4d2cdc74 ... 59c7b2af85

5 changed files with 160 additions and 233 deletions
Show Stats Expand all files Collapse all files

5
pom.xml
View File

@ -110,11 +110,6 @@
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.9.4</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>

95
src/main/java/com/primefactorsolutions/model/Employee.java
View File

@ -1,52 +1,51 @@
package com.primefactorsolutions.model;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
package com.primefactorsolutions.model;
import java.time.LocalDate;
import io.hypersistence.utils.hibernate.type.json.JsonType;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.Type;
@Data
@Entity
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class Employee extends BaseEntity {
private String firstName;
private String lastName;
private LocalDate birthday;
private String birthCity;
@Enumerated(EnumType.STRING)
private MaritalStatus maritalStatus;
private String residenceAddress;
private String phoneNumber;
private String personalEmail;
private String position;
private String team;
private String emergencyCName;
private String emergencyCAddress;
private String emergencyCPhone;
private String emergencyCEmail;
@Lob
private byte[] profilePicture;
import java.time.LocalDate;
import java.util.List;
@Enumerated(EnumType.STRING)
private Status status;
public enum Status {
ACTIVE,
INACTIVE
}
public enum MaritalStatus {
SINGLE,
MARRIED,
WIDOWED,
DIVORCED
}
public Status getStatus() {
return status;
}
public void setStatus(final Status status) {
this.status = status;
}
@Data
@Entity
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class Employee extends BaseEntity {
private String firstName;
private String lastName;
private LocalDate birthday;
private String birthCity;
@Enumerated(EnumType.STRING)
private MaritalStatus maritalStatus;
private String residenceAddress;
private String phoneNumber;
private String personalEmail;
private String emergencyCName;
private String emergencyCAddress;
private String emergencyCPhone;
private String emergencyCEmail;
@Enumerated(EnumType.STRING)
private Status status;
public enum Status {
ACTIVE,
INACTIVE
}
public enum MaritalStatus {
SINGLE,
MARRIED,
WIDOWED,
DIVORCED
}
}

47
src/main/java/com/primefactorsolutions/service/EmployeeService.java
View File

@ -1,14 +1,17 @@
package com.primefactorsolutions.service;
import com.primefactorsolutions.model.Employee;
import org.apache.commons.beanutils.BeanComparator;
import com.primefactorsolutions.repositories.EmployeeRepository;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import lombok.Data;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.UUID;
import java.util.Optional;
import java.util.Collections;
@Service
@ -16,37 +19,31 @@ import java.util.Collections;
public class EmployeeService {
private final EmployeeRepository employeeRepository;
public EmployeeService(final EmployeeRepository employeeRepository) {
public EmployeeService(EmployeeRepository employeeRepository) {
this.employeeRepository = employeeRepository;
}
public List<Employee> findEmployees(
final int start, final int pageSize, final String sortProperty, final boolean asc) {
List<Employee> employees = employeeRepository.findAll();
int end = Math.min(start + pageSize, employees.size());
employees.sort(new BeanComparator<>(sortProperty));
if (!asc) {
Collections.reverse(employees);
}
return employees.subList(start, end);
}
public List<Employee> findEmployees(final int start, final int pageSize) {
List<Employee> employees = employeeRepository.findAll();
int end = Math.min(start + pageSize, employees.size());
return employees.subList(start, end);
}
public Employee createOrUpdate(final Employee employee) {
return employeeRepository.save(employee);
final Employee saved = employeeRepository.save(employee);
return saved;
}
public List<Employee> getEmployees() {
return employeeRepository.findAll();
}
public Employee getEmployee(final UUID id) {
Optional<Employee> employee = employeeRepository.findById(id);
return employee.orElse(null);
}
public Page<Employee> getEmployeesPaginated(int pageNo, int pageSize, String sortField, boolean ascending) {
Sort sort = ascending ? Sort.by(sortField).ascending() : Sort.by(sortField).descending();
Pageable pageable = PageRequest.of(pageNo - 1, pageSize, sort);
return employeeRepository.findAll(pageable);
}
public boolean hasNextPage(int currentPage, int pageSize, String sortField, boolean ascending) {
return getEmployeesPaginated(currentPage, pageSize, sortField, ascending).hasNext();
}
}

90
src/main/java/com/primefactorsolutions/views/EmployeeView.java
View File

@ -7,14 +7,11 @@ import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.html.H3;
import com.vaadin.flow.component.html.Image;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.orderedlayout.VerticalLayout;
import com.vaadin.flow.component.textfield.EmailField;
import com.vaadin.flow.component.textfield.TextField;
import com.vaadin.flow.component.upload.Upload;
import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
import com.vaadin.flow.data.value.ValueChangeMode;
import com.vaadin.flow.router.BeforeEvent;
import com.vaadin.flow.router.HasUrlParameter;
@ -27,8 +24,6 @@ import org.springframework.context.annotation.Scope;
import org.vaadin.firitin.components.datepicker.VDatePicker;
import org.vaadin.firitin.form.BeanValidationForm;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@ -50,8 +45,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
private final TextField residenceAddress;
private final TextField phoneNumber;
private final EmailField personalEmail;
private final TextField position;
private final TextField team;
private final TextField emergencyCName;
private final TextField emergencyCAddress;
@ -62,14 +55,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
private final H3 fs;
private final H3 ss;
private final Upload imageUpload;
private final Image employeeImage;
private byte[] imageBytes;
private final Button saveButton;
private final Button editButton;
private final List<TextField> formFields = new ArrayList<>();
public EmployeeView(final EmployeeService employeeService) {
super(Employee.class);
this.employeeService = employeeService;
@ -128,14 +113,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
personalEmail.setWidthFull();
personalEmail.setMaxLength(30);
position = new TextField("Cargo");
position.setWidthFull();
position.setMaxLength(30);
team = new TextField("Equipo");
team.setWidthFull();
team.setMaxLength(30);
emergencyCName = new TextField("Nombres y Apellidos de Contacto");
emergencyCName.setWidthFull();
emergencyCName.setMaxLength(50);
@ -158,55 +135,21 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
emergencyCEmail.setWidthFull();
emergencyCEmail.setMaxLength(30);
MemoryBuffer buffer = new MemoryBuffer();
imageUpload = new Upload(buffer);
imageUpload.setAcceptedFileTypes("image/jpeg", "image/png", "image/gif");
imageUpload.setMaxFileSize(1024 * 1024);
employeeImage = new Image();
employeeImage.setMaxHeight("150px");
employeeImage.setMaxWidth("150px");
imageUpload.addSucceededListener(event -> {
try {
InputStream inputStream = buffer.getInputStream();
imageBytes = inputStream.readAllBytes();
employeeImage.setSrc(
"data:image/png;base64," + java.util.Base64.getEncoder().encodeToString(imageBytes));
Notification.show("Imagen subida correctamente.");
} catch (Exception ex) {
Notification.show(
"Error al subir la imagen: " + ex.getMessage(), 3000, Notification.Position.MIDDLE);
}
});
editButton = new Button("Editar");
saveButton = new Button("Guardar");
setFormFieldsEnabled(false);
editButton.addClickListener(event -> setFormFieldsEnabled(true));
contentLayout.add(
mt, fs, firstName, lastName, status, birthday, birthCity, maritalStatus,
residenceAddress, phoneNumber, personalEmail, position, team, imageUpload, employeeImage);
residenceAddress, phoneNumber, personalEmail);
contentLayout2.add(
ss, emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail);
setSavedHandler((SavedHandler<Employee>) employee -> {
if (validateForm()) {
employee.setProfilePicture(imageBytes);
employee.setStatus(Employee.Status.valueOf(status.getValue()));
final Employee saved = employeeService.createOrUpdate(employee);
Notification.show("Employee saved successfully.");
Notification.show("Empleado guardado exitosamente.");
getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class));
setEntityWithEnabledSave(saved);
setFormFieldsEnabled(false);
} else {
Notification.show("Please complete the required fields correctly.", 3000, Notification.Position.MIDDLE);
Notification.show("Acción inválida. Por favor, complete todos los campos requeridos correctamente.", 3000, Notification.Position.MIDDLE);
}
});
@ -214,24 +157,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
addClassName("main-layout");
}
private void setFormFieldsEnabled(final boolean enabled) {
firstName.setEnabled(enabled);
lastName.setEnabled(enabled);
status.setEnabled(enabled);
birthday.setEnabled(enabled);
birthCity.setEnabled(enabled);
maritalStatus.setEnabled(enabled);
residenceAddress.setEnabled(enabled);
phoneNumber.setEnabled(enabled);
personalEmail.setEnabled(enabled);
position.setEnabled(enabled);
team.setEnabled(enabled);
emergencyCName.setEnabled(enabled);
emergencyCAddress.setEnabled(enabled);
emergencyCPhone.setEnabled(enabled);
emergencyCEmail.setEnabled(enabled);
}
private boolean validateForm() {
return !firstName.isEmpty() && !lastName.isEmpty() && status.getValue() != null;
}
@ -259,10 +184,8 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
if (StringUtils.isNotBlank(s) && !"new".equals(s)) {
var employee = employeeService.getEmployee(UUID.fromString(s));
setEntityWithEnabledSave(employee);
setFormFieldsEnabled(true);
} else {
setEntityWithEnabledSave(new Employee());
setFormFieldsEnabled(true);
}
}
@ -280,16 +203,11 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
residenceAddress,
phoneNumber,
personalEmail,
position,
team,
imageUpload,
employeeImage,
ss,
emergencyCName,
emergencyCAddress,
emergencyCPhone,
emergencyCEmail,
editButton
emergencyCEmail
);
}
}

152
src/main/java/com/primefactorsolutions/views/EmployeesListView.java
View File

@ -3,19 +3,18 @@ package com.primefactorsolutions.views;
import com.primefactorsolutions.model.Employee;
import com.primefactorsolutions.service.EmployeeService;
import com.vaadin.flow.component.button.Button;
import com.vaadin.flow.component.combobox.ComboBox;
import com.vaadin.flow.component.html.H2;
import com.vaadin.flow.component.html.Main;
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
import com.vaadin.flow.component.notification.Notification;
import com.vaadin.flow.router.PageTitle;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.spring.annotation.SpringComponent;
import org.vaadin.firitin.components.grid.PagingGrid;
import com.vaadin.flow.component.grid.GridSortOrder;
import com.vaadin.flow.data.provider.SortDirection;
import jakarta.annotation.security.PermitAll;
import org.springframework.context.annotation.Scope;
import java.util.List;
import org.vaadin.firitin.components.grid.VGrid;
import org.springframework.data.domain.Page;
@SpringComponent
@Scope("prototype")
@ -25,92 +24,111 @@ import java.util.List;
public class EmployeesListView extends Main {
private final EmployeeService employeeService;
private final PagingGrid<Employee> table = new PagingGrid<>(Employee.class);
private final int pageSize = 5;
private int currentPage = 1;
private String sortField = "firstName";
private boolean ascending = true;
private VGrid<Employee> grid;
private Button previous;
private Button next;
public EmployeesListView(final EmployeeService employeeService) {
public EmployeesListView(EmployeeService employeeService) {
this.employeeService = employeeService;
setupView();
refreshGrid();
addComponents();
updateGrid();
}
private void setupView() {
add(new H2("Employee List"));
configureTable();
add(createAddEmployeeButton());
add(table);
private void addComponents() {
addTitle();
addOrderButtons();
configureGrid();
addNavigationButtons();
}
private void configureTable() {
table.setColumns("firstName", "lastName", "status");
addEditButtonColumn("Edit", this::navigateToEditView);
setupPagingGrid();
table.addItemDoubleClickListener(event -> {
Employee employee = event.getItem();
navigateToEditView(employee);
});
private void addTitle() {
final H2 title = new H2("Employees list");
add(title);
}
private void updateEmployeeStatus(final Employee employee, final boolean isActive) {
employee.setStatus(isActive ? Employee.Status.ACTIVE : Employee.Status.INACTIVE);
employeeService.createOrUpdate(employee);
refreshGrid();
private void addOrderButtons() {
final HorizontalLayout hl = new HorizontalLayout();
hl.add(createOrderButton("Employee List in Ascending Order", true));
hl.add(createOrderButton("Employee List in Descending Order", false));
add(hl);
}
private void addEditButtonColumn(final String label, final ButtonClickHandler handler) {
table.addComponentColumn(employee -> createButton(label, () -> handler.handle(employee)));
}
private Button createButton(final String label, final Runnable onClickAction) {
private Button createOrderButton(String label, boolean isAscending) {
Button button = new Button(label);
button.addClickListener(event -> onClickAction.run());
button.addClickListener(event -> {
sortField = "firstName";
ascending = isAscending;
updateGrid();
});
return button;
}
private Button createAddEmployeeButton() {
return createButton("Add Employee", this::navigateToAddEmployeeView);
private void configureGrid() {
grid = new VGrid<>(Employee.class);
grid.setColumns("firstName", "lastName", "status");
grid.setAllRowsVisible(true);
grid.addComponentColumn(employee -> createStatusComboBox()).setHeader("Change Status");
grid.addComponentColumn(employee -> createEditButton());
grid.addComponentColumn(employee -> createSaveButton());
add(grid);
}
private void navigateToEditView(final Employee employee) {
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, employee.getId().toString()));
private ComboBox<String> createStatusComboBox() {
ComboBox<String> statusComboBox = new ComboBox<>();
statusComboBox.setItems("Active", "Inactive");
return statusComboBox;
}
private void navigateToAddEmployeeView() {
getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, "new"));
private Button createEditButton() {
return new Button("Edit");
}
private Button createSaveButton() {
return new Button("Save");
}
private void setupPagingGrid() {
table.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
table.setPageSize(5);
private void addNavigationButtons() {
final HorizontalLayout hf = new HorizontalLayout();
previous = createNavigationButton("Previous", -1);
next = createNavigationButton("Next", 1);
hf.add(previous, next, createAddEmployeeButton());
add(hf);
}
private void refreshGrid() {
List<Employee> employees = employeeService.getEmployeeRepository().findAll();
table.setItems(employees);
table.setPagingDataProvider((page, pageSize) -> fetchEmployees((int) page, pageSize));
private Button createNavigationButton(String label, int increment) {
Button button = new Button(label);
button.addClickListener(event -> handlePageChange(increment));
return button;
}
private List<Employee> fetchEmployees(final int page, final int pageSize) {
int start = page * pageSize;
if (hasSortOrder()) {
return fetchSortedEmployees(start, pageSize);
private void handlePageChange(int increment) {
if (isPageChangeValid(increment)) {
currentPage += increment;
updateGrid();
} else {
showNotification("No existen más datos en lista.");
}
return employeeService.findEmployees(start, pageSize);
}
private boolean hasSortOrder() {
return !table.getSortOrder().isEmpty();
private boolean isPageChangeValid(int increment) {
if (increment < 0) {
return currentPage > 1;
} else if (increment > 0) {
return employeeService.hasNextPage(currentPage, pageSize, sortField, ascending);
}
return false;
}
private List<Employee> fetchSortedEmployees(final int start, final int pageSize) {
GridSortOrder<Employee> sortOrder = table.getSortOrder().getFirst();
return employeeService.findEmployees(start, pageSize,
sortOrder.getSorted().getKey(),
sortOrder.getDirection() == SortDirection.ASCENDING);
private void showNotification(String message) {
Notification notification = new Notification(message, 3000, Notification.Position.BOTTOM_END);
notification.open();
}
@FunctionalInterface
private interface ButtonClickHandler {
void handle(Employee employee);
private Button createAddEmployeeButton() {
return new Button("Add Employee", event ->
getUI().flatMap(ui -> ui.navigate(EmployeeView.class, "new"))
);
}
private void updateGrid() {
Page<Employee> page = employeeService.getEmployeesPaginated(currentPage, pageSize, sortField, ascending);
grid.setItems(page.getContent());
}
}