From d751833c182b9c9a94562e72e84f096546b03014 Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Thu, 22 Aug 2024 20:37:39 -0400 Subject: [PATCH] #7 Perfil de Personal Administrativo - Listado de empleados --- .../primefactorsolutions/model/Employee.java | 12 +- .../service/EmployeeService.java | 19 ++- .../views/EmployeesListView.java | 110 ++++++++++++++++++ 3 files changed, 125 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Employee.java b/src/main/java/com/primefactorsolutions/model/Employee.java index dcc7df0..7610a4f 100644 --- a/src/main/java/com/primefactorsolutions/model/Employee.java +++ b/src/main/java/com/primefactorsolutions/model/Employee.java @@ -17,15 +17,7 @@ import java.util.List; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class Employee extends BaseEntity { - private String username; - private String firstName; + private String name; private String lastName; - private LocalDate dob; - private String personalEmail; - @Type(JsonType.class) - @Column(columnDefinition = "json") - private List phoneNumbers; - @OneToMany(fetch = FetchType.EAGER, mappedBy = "employee", cascade = {CascadeType.ALL}) - private List documents; - private Role role; + private String status; } diff --git a/src/main/java/com/primefactorsolutions/service/EmployeeService.java b/src/main/java/com/primefactorsolutions/service/EmployeeService.java index 9005783..76f9521 100644 --- a/src/main/java/com/primefactorsolutions/service/EmployeeService.java +++ b/src/main/java/com/primefactorsolutions/service/EmployeeService.java @@ -7,19 +7,26 @@ import org.apache.commons.lang3.NotImplementedException; import org.springframework.stereotype.Service; import java.util.List; +import java.util.UUID; @Service @Data public class EmployeeService { private final EmployeeRepository employeeRepository; - private List getEmployees() { - // TODO: implement - throw new NotImplementedException(); + public EmployeeService(EmployeeRepository employeeRepository) { + this.employeeRepository = employeeRepository; } - private Employee createOrUpdateEmployee(final Employee employee) { - // TODO: implement - throw new NotImplementedException(); + public Employee createOrUpdate(final Employee assessment) { + return null; + } + + public List getEmployees() { + return employeeRepository.findAll(); + } + + public Employee getEmployee(final UUID id) { + return null; } } diff --git a/src/main/java/com/primefactorsolutions/views/EmployeesListView.java b/src/main/java/com/primefactorsolutions/views/EmployeesListView.java index 45cab4f..1e13d4c 100644 --- a/src/main/java/com/primefactorsolutions/views/EmployeesListView.java +++ b/src/main/java/com/primefactorsolutions/views/EmployeesListView.java @@ -1,11 +1,28 @@ package com.primefactorsolutions.views; +import com.primefactorsolutions.model.Employee; +import com.primefactorsolutions.service.EmployeeService; +import com.vaadin.flow.component.ClickEvent; +import com.vaadin.flow.component.Component; +import com.vaadin.flow.component.ComponentEventListener; +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.data.provider.DataProvider; +import com.vaadin.flow.data.provider.DataProviderListener; +import com.vaadin.flow.data.provider.Query; +import com.vaadin.flow.function.ValueProvider; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; +import com.vaadin.flow.shared.Registration; import com.vaadin.flow.spring.annotation.SpringComponent; import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; +import org.vaadin.firitin.components.grid.VGrid; + +import java.util.stream.Stream; @SpringComponent @Scope("prototype") @@ -13,4 +30,97 @@ import org.springframework.context.annotation.Scope; @Route(value = "/employees", layout = MainLayout.class) @PermitAll public class EmployeesListView extends Main { + private final EmployeeService employeeService; + + public EmployeesListView(final EmployeeService employeeService) { + this.employeeService = employeeService; + final H2 title = new H2("Employees list"); + final HorizontalLayout hl = new HorizontalLayout(); + final HorizontalLayout hf = new HorizontalLayout(); + final Button employeeListAscendingOrder = new Button("Employee List in Ascending Order"); + employeeListAscendingOrder.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + hl.add(employeeListAscendingOrder); + final Button employeeListDescendingOrder = new Button("Employee List in Descending Order"); + employeeListDescendingOrder.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + hl.add(employeeListDescendingOrder); + final VGrid grid = new VGrid<>(Employee.class); + grid.setColumns("name", "lastName", "status"); + grid.setAllRowsVisible(true); + grid.addComponentColumn((ValueProvider) employee -> { + ComboBox statusComboBox = new ComboBox<>(); + statusComboBox.setItems("Active", "Inactive"); + return statusComboBox; + }).setHeader("Change Status"); + grid.addComponentColumn((ValueProvider) employee -> { + final Button edit = new Button("Edit"); + edit.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + return edit; + }); + grid.addComponentColumn((ValueProvider) employee -> { + final Button save = new Button("Save"); + save.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + return save; + }); + + grid.setDataProvider(new DataProvider<>() { + @Override + public boolean isInMemory() { + return false; + } + + @Override + public int size(final Query query) { + return employeeService.getEmployees().size(); + } + + @Override + public Stream fetch(final Query query) { + int limit = query.getLimit(); + int pagerSize = query.getPageSize(); + int page = query.getPage(); + return employeeService.getEmployees().stream(); + } + + @Override + public void refreshItem(final Employee employee) { + // no-op + } + + @Override + public void refreshAll() { + // no-op + } + + @Override + public Registration addDataProviderListener(final DataProviderListener dataProviderListener) { + return null; + } + }); + + final Button previous = new Button("Previous"); + previous.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + hf.add(previous); + final Button next = new Button("Next"); + next.addClickListener((ComponentEventListener>) buttonClickEvent -> { + // no-op + }); + hf.add(next); + final Button addEmployee = new Button("Add Employee"); + addEmployee.addClickListener((ComponentEventListener>) buttonClickEvent -> { + //this.getUI().get().navigate(EmployeeView.class, "new"); + }); + hf.add(addEmployee); + + add(title, hl, grid, hf); + } }