From 3768a69cf466e332684fc5d18eda9c69c37de35a Mon Sep 17 00:00:00 2001 From: Alex Prudencio Date: Fri, 11 Oct 2024 22:45:51 -0400 Subject: [PATCH 1/5] adding user avatar and logout menu --- .../views/MainLayout.java | 105 ++++++++++++------ 1 file changed, 69 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/views/MainLayout.java b/src/main/java/com/primefactorsolutions/views/MainLayout.java index 5ebd36e..e64ad07 100644 --- a/src/main/java/com/primefactorsolutions/views/MainLayout.java +++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java @@ -1,13 +1,18 @@ package com.primefactorsolutions.views; import com.primefactorsolutions.model.Employee; +import com.vaadin.flow.component.Text; import com.vaadin.flow.component.applayout.AppLayout; import com.vaadin.flow.component.applayout.DrawerToggle; -import com.vaadin.flow.component.button.Button; -import com.vaadin.flow.component.html.Footer; -import com.vaadin.flow.component.html.H1; -import com.vaadin.flow.component.html.Header; -import com.vaadin.flow.component.html.Span; +import com.vaadin.flow.component.avatar.Avatar; +import com.vaadin.flow.component.contextmenu.HasMenuItems; +import com.vaadin.flow.component.contextmenu.MenuItem; +import com.vaadin.flow.component.contextmenu.SubMenu; +import com.vaadin.flow.component.html.*; +import com.vaadin.flow.component.icon.Icon; +import com.vaadin.flow.component.icon.VaadinIcon; +import com.vaadin.flow.component.menubar.MenuBar; +import com.vaadin.flow.component.menubar.MenuBarVariant; import com.vaadin.flow.component.orderedlayout.FlexComponent; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.Scroller; @@ -38,55 +43,85 @@ public class MainLayout extends AppLayout { } private void addHeaderContent() { - DrawerToggle toggle = new DrawerToggle(); + final DrawerToggle toggle = new DrawerToggle(); toggle.setAriaLabel("Menu toggle"); viewTitle = new H1(); viewTitle.addClassNames(LumoUtility.FontSize.LARGE, LumoUtility.Margin.NONE); - HorizontalLayout - header = - authContext.getAuthenticatedUser(UserDetails.class) - .map(user -> { - final Button logout = new Button("Logout", click -> this.authContext.logout()); - final Span loggedUser = new Span("Welcome " + user.getUsername()); - String employeeId = "N/A"; + final HorizontalLayout header = authContext.getAuthenticatedUser(UserDetails.class) + .map(user -> { + final Avatar loggedUser = new Avatar(user.getUsername()); + loggedUser.getStyle().set("display", "block"); + loggedUser.getElement().setAttribute("tabindex", "-1"); + final MenuBar menuBar = new MenuBar(); + menuBar.addThemeVariants(MenuBarVariant.LUMO_ICON); + final MenuItem actions = createIconItem(menuBar, VaadinIcon.ELLIPSIS_V, null, "", + false); + final SubMenu actionsSubMenu = actions.getSubMenu(); + final MenuItem signOutMenuItem = createIconItem(actionsSubMenu, VaadinIcon.EXIT, "Sign-out", + null, true); + signOutMenuItem.addClickListener(c -> this.authContext.logout()); - if (user instanceof Employee) { - final UUID uuid = ((Employee) user).getId(); + String employeeId = "N/A"; - if (uuid != null) { - employeeId = uuid.toString(); - } - } + if (user instanceof Employee) { + final UUID uuid = ((Employee) user).getId(); - final Tooltip tooltip = Tooltip.forComponent(loggedUser) - .withText("Employee id: " + employeeId) - .withPosition(Tooltip.TooltipPosition.TOP_START); + if (uuid != null) { + employeeId = uuid.toString(); + } + } - final HorizontalLayout hl = new HorizontalLayout(loggedUser, logout); - hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END); + final Tooltip tooltip = Tooltip.forComponent(loggedUser) + .withText("Employee id: " + employeeId) + .withPosition(Tooltip.TooltipPosition.TOP_START); - return hl; - }).orElseGet(HorizontalLayout::new); + final HorizontalLayout hl = new HorizontalLayout(loggedUser, menuBar); + hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END); + + return hl; + }).orElseGet(HorizontalLayout::new); header.setAlignItems(FlexComponent.Alignment.STRETCH); header.setWidthFull(); addToNavbar(true, toggle, viewTitle, header); } + private MenuItem createIconItem(final HasMenuItems menu, final VaadinIcon iconName, + final String label, final String ariaLabel, final boolean isChild) { + final Icon icon = new Icon(iconName); + + if (isChild) { + icon.getStyle().set("width", "var(--lumo-icon-size-s)"); + icon.getStyle().set("height", "var(--lumo-icon-size-s)"); + icon.getStyle().set("marginRight", "var(--lumo-space-s)"); + } + + final MenuItem item = menu.addItem(icon, e -> { + }); + + if (ariaLabel != null) { + item.setAriaLabel(ariaLabel); + } + + if (label != null) { + item.add(new Text(label)); + } + + return item; + } + private void addDrawerContent() { - Span appName = new Span("pfs-intra"); + final Span appName = new Span("pfs-intra"); appName.addClassNames(LumoUtility.FontWeight.SEMIBOLD, LumoUtility.FontSize.LARGE); - Header header = new Header(appName); - - Scroller scroller = new Scroller(createNavigation()); - + final Header header = new Header(appName); + final Scroller scroller = new Scroller(createNavigation()); addToDrawer(header, scroller, createFooter()); } private SideNav createNavigation() { - SideNav nav = new SideNav(); + final SideNav nav = new SideNav(); authContext.getAuthenticatedUser(UserDetails.class).ifPresent(u -> { SideNavItem recruiting = new SideNavItem("Recruiting", MainView.class, @@ -99,7 +134,7 @@ public class MainLayout extends AppLayout { LineAwesomeIcon.QUESTION_SOLID.create())); SideNavItem admin = new SideNavItem("Admin", MainView.class, - LineAwesomeIcon.SUPERSCRIPT_SOLID.create()); + LineAwesomeIcon.BUILDING.create()); admin.addItem(new SideNavItem("Employees", EmployeesListView.class, LineAwesomeIcon.USER_EDIT_SOLID.create())); admin.addItem(new SideNavItem("Documents", DocumentsListView.class, @@ -129,9 +164,7 @@ public class MainLayout extends AppLayout { } private Footer createFooter() { - Footer layout = new Footer(); - - return layout; + return new Footer(); } @Override -- 2.34.1 From 62d678c407997d769d05f7db44ee15025ccc0642 Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Thu, 10 Oct 2024 13:29:14 -0400 Subject: [PATCH 2/5] Vacaciones del Empleado - Filtrar por categoria y estado --- .../TimeOffRequestRepository.java | 2 + .../service/TimeOffRequestService.java | 4 + .../views/RequestView.java | 193 ++++++++++++++++++ .../views/RequestsListView.java | 25 ++- 4 files changed, 221 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/primefactorsolutions/views/RequestView.java diff --git a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java index f20ad4f..f9b426b 100644 --- a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java @@ -3,7 +3,9 @@ package com.primefactorsolutions.repositories; import com.primefactorsolutions.model.TimeOffRequest; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; import java.util.UUID; public interface TimeOffRequestRepository extends JpaRepository { + List findByEmployee_Id(UUID id_employee); } diff --git a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java index d6b2030..b447657 100644 --- a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java +++ b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java @@ -85,4 +85,8 @@ public class TimeOffRequestService { int end = Math.min(start + pageSize, timeOffRequests.size()); return timeOffRequests.subList(start, end); } + + public List findRequestsByEmployeeId(UUID id_employee) { + return timeOffRequestRepository.findByEmployee_Id(id_employee); + } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/RequestView.java b/src/main/java/com/primefactorsolutions/views/RequestView.java new file mode 100644 index 0000000..98adf45 --- /dev/null +++ b/src/main/java/com/primefactorsolutions/views/RequestView.java @@ -0,0 +1,193 @@ +package com.primefactorsolutions.views; + +import com.primefactorsolutions.model.Employee; +import com.primefactorsolutions.model.TimeOffRequest; +import com.primefactorsolutions.model.TimeOffRequestType; +import com.primefactorsolutions.service.EmployeeService; +import com.primefactorsolutions.service.TimeOffRequestService; +import com.vaadin.flow.component.button.Button; +import com.vaadin.flow.component.combobox.ComboBox; +import com.vaadin.flow.component.grid.GridSortOrder; +import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.html.H3; +import com.vaadin.flow.component.html.Span; +import com.vaadin.flow.component.orderedlayout.HorizontalLayout; +import com.vaadin.flow.component.orderedlayout.VerticalLayout; +import com.vaadin.flow.data.provider.SortDirection; +import com.vaadin.flow.router.BeforeEvent; +import com.vaadin.flow.router.HasUrlParameter; +import com.vaadin.flow.router.PageTitle; +import com.vaadin.flow.router.Route; +import com.vaadin.flow.spring.annotation.SpringComponent; +import jakarta.annotation.security.PermitAll; +import org.apache.commons.beanutils.BeanComparator; +import org.springframework.context.annotation.Scope; +import org.vaadin.firitin.components.grid.PagingGrid; + +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +@SpringComponent +@PermitAll +@Scope("prototype") +@PageTitle("Request") +@Route(value = "/requests", layout = MainLayout.class) +public class RequestView extends Div implements HasUrlParameter { + + private final TimeOffRequestService requestService; + private final EmployeeService employeeService; + private final PagingGrid requestGrid = new PagingGrid<>(TimeOffRequest.class); + private List requests; + private ComboBox categoryFilter; + private ComboBox stateFilter; + private UUID employeeId; + + public RequestView(TimeOffRequestService requestService, EmployeeService employeeService) { + this.requestService = requestService; + this.employeeService = employeeService; + this.requests = Collections.emptyList(); + setupFilters(); + setupGrid(); + add(requestGrid); + add(createSummaryLayout()); + add(createActionButtons()); + refreshRequestGrid(null, null); + } + + private void setupFilters() { + categoryFilter = createCategoryFilter(); + stateFilter = createStateFilter(); + add(categoryFilter, stateFilter); + } + + private ComboBox createCategoryFilter() { + categoryFilter = new ComboBox<>("Category"); + categoryFilter.setItems(TimeOffRequestType.values()); + categoryFilter.setValue(TimeOffRequestType.values()[0]); + categoryFilter.addValueChangeListener(event -> refreshRequestGrid(event.getValue(), stateFilter.getValue())); + return categoryFilter; + } + + private ComboBox createStateFilter() { + stateFilter = new ComboBox<>("State"); + stateFilter.setItems(TimeOffRequest.Status.values()); + stateFilter.setValue(TimeOffRequest.Status.values()[0]); + stateFilter.addValueChangeListener(event -> refreshRequestGrid(categoryFilter.getValue(), event.getValue())); + return stateFilter; + } + + private void setupGrid() { + requestGrid.setColumns( + "category", + "state", + "availableDays", + "expiration", + "startDate", + "endDate", + "daysToBeTake", + "daysBalance" + ); + } + + private VerticalLayout createSummaryLayout() { + int totalVacations = 15; + int totalTimeOff = 2; + int totalAvailableDays = totalVacations + totalTimeOff; + Span holidaysLabel = new Span("TOTAL HOLIDAYS: " + totalVacations); + Span timeOffLabel = new Span("TOTAL TIME OFF: " + totalTimeOff); + Span availableDaysLabel = new Span("TOTAL AVAILABLE DAYS: " + totalAvailableDays); + return new VerticalLayout(holidaysLabel, timeOffLabel, availableDaysLabel); + } + + private HorizontalLayout createActionButtons() { + Button viewButton = new Button("View"); + Button editButton = new Button("Edit"); + Button saveButton = new Button("Save"); + Button closeButton = new Button("Close", event -> navigateToRequestsListView()); + return new HorizontalLayout(viewButton, editButton, saveButton, closeButton); + } + + private void navigateToRequestsListView() { + getUI().ifPresent(ui -> ui.navigate(RequestsListView.class)); + + } + + private void refreshRequestGrid(final TimeOffRequestType category, + final TimeOffRequest.Status state) { + requestGrid.setPagingDataProvider((page, pageSize) -> { + if (allFiltersAreNull(category, state)) { + return fetchTimeOffRequests((int) page, pageSize); + } else { + return fetchFilteredTimeOffRequests((int) page, pageSize,category, state); + } + }); + requestGrid.getDataProvider().refreshAll(); + } + + private boolean allFiltersAreNull(TimeOffRequestType category, TimeOffRequest.Status state) { + return category == null && state == null; + } + + private List fetchTimeOffRequests(int page, int pageSize) { + int start = page * pageSize; + if (requestGrid.getSortOrder().isEmpty()) { + int end = Math.min(start + pageSize, requests.size()); + return requests.subList(start, end); + } else { + return fetchSortedTimeOffRequests(start, pageSize); + } + } + + private List fetchSortedTimeOffRequests(int start, int pageSize) { + GridSortOrder sortOrder = requestGrid.getSortOrder().getFirst(); + int end = Math.min(start + pageSize, requests.size()); + requests.sort(new BeanComparator<>(sortOrder.getSorted().getKey())); + + if (sortOrder.getDirection() != SortDirection.ASCENDING) { + Collections.reverse(requests); + } + return requests.subList(start, end); + } + + private List fetchFilteredTimeOffRequests(int page, int pageSize, TimeOffRequestType category, TimeOffRequest.Status state) { + requests = requestService.findRequestsByEmployeeId(employeeId); + if (category != null && !"ALL".equals(category.name())) { + requests = requests.stream() + .filter(req -> req.getCategory().equals(category)) + .collect(Collectors.toList()); + } + if (state != null && !"ALL".equals(state.name())) { + requests = requests.stream() + .filter(req -> req.getState().equals(state)) + .collect(Collectors.toList()); + } + int end = Math.min(page + pageSize, requests.size()); + return requests.subList(page, end); + } + + @Override + public void setParameter(BeforeEvent event, String parameter) { + try { + employeeId = UUID.fromString(parameter); + Employee employee = employeeService.getEmployee(employeeId); + + String employeeName = employee.getFirstName() + " " + employee.getLastName(); + String employeeTeam = employee.getTeam(); + setViewTitle(employeeName, employeeTeam); + + requests = requestService.findRequestsByEmployeeId(employeeId); + requestGrid.setItems(requests); + } catch (IllegalArgumentException e) { + requestGrid.setItems(); + } + } + + private void setViewTitle(String employeeName, String employeeTeam) { + H3 employeeTitle = new H3("Name: " + employeeName); + H3 teamTitle = new H3("Team: " + employeeTeam); + addComponentAsFirst(employeeTitle); + addComponentAtIndex(1, teamTitle); + } +} diff --git a/src/main/java/com/primefactorsolutions/views/RequestsListView.java b/src/main/java/com/primefactorsolutions/views/RequestsListView.java index 3d4c898..8243d72 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java @@ -9,6 +9,7 @@ import com.vaadin.flow.component.combobox.ComboBox; import com.vaadin.flow.component.grid.GridSortOrder; import com.vaadin.flow.component.html.Main; import com.vaadin.flow.component.html.Span; +import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.router.PageTitle; @@ -19,6 +20,7 @@ import org.springframework.context.annotation.Scope; import org.vaadin.firitin.components.grid.PagingGrid; import java.util.List; +import java.util.UUID; @SpringComponent @Scope("prototype") @@ -35,6 +37,7 @@ public class RequestsListView extends Main { private ComboBox teamFilter; private ComboBox categoryFilter; private ComboBox stateFilter; + private UUID selectedEmployeeId; public RequestsListView(final TimeOffRequestService requestService, final EmployeeService employeeService, @@ -76,13 +79,25 @@ public class RequestsListView extends Main { requestGrid.addComponentColumn(this::createTeamSpan).setHeader("Team"); requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM); requestGrid.setPageSize(5); + requestGrid.asSingleSelect().addValueChangeListener(event -> { + TimeOffRequest selectedRequest = event.getValue(); + if (selectedRequest != null) { + selectedEmployeeId = selectedRequest.getEmployee().getId(); + } + }); } private HorizontalLayout createActionButtons() { - Button viewButton = new Button("View"); + Button viewButton = new Button("View", event -> { + if (selectedEmployeeId != null) { + navigateToTimeOffRequestView(selectedEmployeeId); + } else { + Notification.show("Please select a request to view.", 3000, Notification.Position.MIDDLE); + } + }); Button editButton = new Button("Edit"); Button saveButton = new Button("Save"); - Button closeButton = new Button("Close", event -> closeView()); + Button closeButton = new Button("Close", event -> navigateToMainView()); return new HorizontalLayout(viewButton, editButton, saveButton, closeButton); } @@ -230,7 +245,11 @@ public class RequestsListView extends Main { return "ALL".equals(team.getName()) ? "ALL" : team.getName(); } - private void closeView() { + private void navigateToMainView() { getUI().ifPresent(ui -> ui.navigate(MainView.class)); } + + private void navigateToTimeOffRequestView(final UUID id_employee) { + getUI().ifPresent(ui -> ui.navigate("requests/" + id_employee.toString())); + } } \ No newline at end of file -- 2.34.1 From 602ab686f56da38006d93b0a302d1c4200c4aeac Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Fri, 11 Oct 2024 00:53:46 -0400 Subject: [PATCH 3/5] Vacaciones del Empleado - Refactorizar --- .../TimeOffRequestRepository.java | 6 +- .../service/TimeOffRequestService.java | 63 ++--------- .../views/RequestView.java | 103 ++++++------------ .../views/RequestsListView.java | 70 +++++++----- 4 files changed, 92 insertions(+), 150 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java index f9b426b..1ea24a6 100644 --- a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java @@ -1,11 +1,15 @@ package com.primefactorsolutions.repositories; import com.primefactorsolutions.model.TimeOffRequest; +import com.primefactorsolutions.model.TimeOffRequestType; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.UUID; public interface TimeOffRequestRepository extends JpaRepository { - List findByEmployee_Id(UUID id_employee); + List findByEmployeeId(UUID idEmployee); + List findByTeamId(UUID idTeam); + List findByCategory(TimeOffRequestType category); + List findByState(TimeOffRequest.Status state); } diff --git a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java index b447657..6e19ec1 100644 --- a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java +++ b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java @@ -3,14 +3,11 @@ package com.primefactorsolutions.service; import com.primefactorsolutions.model.*; import com.primefactorsolutions.repositories.TimeOffRequestRepository; import lombok.AllArgsConstructor; -import org.apache.commons.beanutils.BeanComparator; import org.springframework.stereotype.Service; -import java.util.Collections; import java.util.List; import java.util.UUID; import java.util.Optional; -import java.util.stream.Collectors; @Service @AllArgsConstructor @@ -25,68 +22,28 @@ public class TimeOffRequestService { timeOffRequestRepository.deleteById(id); } - public List getAllTimeOffRequests() { + public List findAllTimeOffRequests() { return timeOffRequestRepository.findAll(); } - public TimeOffRequest getTimeOffRequest(final UUID id) { + public TimeOffRequest findTimeOffRequest(final UUID id) { Optional timeOffRequest = timeOffRequestRepository.findById(id); return timeOffRequest.orElse(null); } - public List findTimeOffRequests( - final int start, final int pageSize, final String sortProperty, final boolean asc) { - List timeOffRequests = timeOffRequestRepository.findAll(); - - int end = Math.min(start + pageSize, timeOffRequests.size()); - timeOffRequests.sort(new BeanComparator<>(sortProperty)); - - if (!asc) { - Collections.reverse(timeOffRequests); - } - - return timeOffRequests.subList(start, end); + public List findRequestsByEmployeeId(final UUID idEmployee) { + return timeOffRequestRepository.findByEmployeeId(idEmployee); } - public List findTimeOffRequests(final int start, final int pageSize) { - List timeOffRequests = timeOffRequestRepository.findAll(); - - int end = Math.min(start + pageSize, timeOffRequests.size()); - return timeOffRequests.subList(start, end); + public List findRequestsByTeamId(final UUID idTeam) { + return timeOffRequestRepository.findByTeamId(idTeam); } - public List findTimeOffRequestBy(final Employee employee, - final Team team, - final TimeOffRequestType category, - final TimeOffRequest.Status state, - final int start, - final int pageSize) { - List timeOffRequests = timeOffRequestRepository.findAll(); - if (employee != null && !"ALL".equals(employee.getFirstName())) { - timeOffRequests = timeOffRequests.stream() - .filter(req -> req.getEmployee().equals(employee)) - .collect(Collectors.toList()); - } - if (team != null && !"ALL".equals(team.getName())) { - timeOffRequests = timeOffRequests.stream() - .filter(req -> req.getTeam().equals(team)) - .collect(Collectors.toList()); - } - if (category != null && !"ALL".equals(category.name())) { - timeOffRequests = timeOffRequests.stream() - .filter(req -> req.getCategory().equals(category)) - .collect(Collectors.toList()); - } - if (state != null && !"ALL".equals(state.name())) { - timeOffRequests = timeOffRequests.stream() - .filter(req -> req.getState().equals(state)) - .collect(Collectors.toList()); - } - int end = Math.min(start + pageSize, timeOffRequests.size()); - return timeOffRequests.subList(start, end); + public List findRequestsByCategory(final TimeOffRequestType category) { + return timeOffRequestRepository.findByCategory(category); } - public List findRequestsByEmployeeId(UUID id_employee) { - return timeOffRequestRepository.findByEmployee_Id(id_employee); + public List findRequestsByState(final TimeOffRequest.Status state) { + return timeOffRequestRepository.findByState(state); } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/RequestView.java b/src/main/java/com/primefactorsolutions/views/RequestView.java index 98adf45..25c3c0b 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestView.java @@ -7,22 +7,19 @@ import com.primefactorsolutions.service.EmployeeService; import com.primefactorsolutions.service.TimeOffRequestService; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.combobox.ComboBox; -import com.vaadin.flow.component.grid.GridSortOrder; +import com.vaadin.flow.component.grid.Grid; import com.vaadin.flow.component.html.Div; import com.vaadin.flow.component.html.H3; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.orderedlayout.VerticalLayout; -import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.router.BeforeEvent; import com.vaadin.flow.router.HasUrlParameter; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; import jakarta.annotation.security.PermitAll; -import org.apache.commons.beanutils.BeanComparator; import org.springframework.context.annotation.Scope; -import org.vaadin.firitin.components.grid.PagingGrid; import java.util.Collections; import java.util.List; @@ -38,21 +35,22 @@ public class RequestView extends Div implements HasUrlParameter { private final TimeOffRequestService requestService; private final EmployeeService employeeService; - private final PagingGrid requestGrid = new PagingGrid<>(TimeOffRequest.class); - private List requests; + private final Grid requestGrid = new Grid<>(TimeOffRequest.class); + private List requests = Collections.emptyList(); private ComboBox categoryFilter; private ComboBox stateFilter; private UUID employeeId; - public RequestView(TimeOffRequestService requestService, EmployeeService employeeService) { + public RequestView(final TimeOffRequestService requestService, final EmployeeService employeeService) { this.requestService = requestService; this.employeeService = employeeService; - this.requests = Collections.emptyList(); + initializeView(); + } + + private void initializeView() { setupFilters(); setupGrid(); - add(requestGrid); - add(createSummaryLayout()); - add(createActionButtons()); + add(requestGrid, createSummaryLayout(), createActionButtons()); refreshRequestGrid(null, null); } @@ -89,16 +87,18 @@ public class RequestView extends Div implements HasUrlParameter { "daysToBeTake", "daysBalance" ); + requestGrid.setAllRowsVisible(true); } private VerticalLayout createSummaryLayout() { int totalVacations = 15; int totalTimeOff = 2; int totalAvailableDays = totalVacations + totalTimeOff; - Span holidaysLabel = new Span("TOTAL HOLIDAYS: " + totalVacations); - Span timeOffLabel = new Span("TOTAL TIME OFF: " + totalTimeOff); - Span availableDaysLabel = new Span("TOTAL AVAILABLE DAYS: " + totalAvailableDays); - return new VerticalLayout(holidaysLabel, timeOffLabel, availableDaysLabel); + return new VerticalLayout( + new Span("TOTAL HOLIDAYS: " + totalVacations), + new Span("TOTAL TIME OFF: " + totalTimeOff), + new Span("TOTAL AVAILABLE DAYS: " + totalAvailableDays) + ); } private HorizontalLayout createActionButtons() { @@ -111,47 +111,21 @@ public class RequestView extends Div implements HasUrlParameter { private void navigateToRequestsListView() { getUI().ifPresent(ui -> ui.navigate(RequestsListView.class)); - } - private void refreshRequestGrid(final TimeOffRequestType category, - final TimeOffRequest.Status state) { - requestGrid.setPagingDataProvider((page, pageSize) -> { - if (allFiltersAreNull(category, state)) { - return fetchTimeOffRequests((int) page, pageSize); - } else { - return fetchFilteredTimeOffRequests((int) page, pageSize,category, state); - } - }); - requestGrid.getDataProvider().refreshAll(); + private void refreshRequestGrid(final TimeOffRequestType category, final TimeOffRequest.Status state) { + List filteredRequests = allFiltersAreNull(category, state) + ? requestService.findRequestsByEmployeeId(employeeId) + : fetchFilteredTimeOffRequests(category, state); + requestGrid.setItems(filteredRequests); } - private boolean allFiltersAreNull(TimeOffRequestType category, TimeOffRequest.Status state) { + private boolean allFiltersAreNull(final TimeOffRequestType category, final TimeOffRequest.Status state) { return category == null && state == null; } - private List fetchTimeOffRequests(int page, int pageSize) { - int start = page * pageSize; - if (requestGrid.getSortOrder().isEmpty()) { - int end = Math.min(start + pageSize, requests.size()); - return requests.subList(start, end); - } else { - return fetchSortedTimeOffRequests(start, pageSize); - } - } - - private List fetchSortedTimeOffRequests(int start, int pageSize) { - GridSortOrder sortOrder = requestGrid.getSortOrder().getFirst(); - int end = Math.min(start + pageSize, requests.size()); - requests.sort(new BeanComparator<>(sortOrder.getSorted().getKey())); - - if (sortOrder.getDirection() != SortDirection.ASCENDING) { - Collections.reverse(requests); - } - return requests.subList(start, end); - } - - private List fetchFilteredTimeOffRequests(int page, int pageSize, TimeOffRequestType category, TimeOffRequest.Status state) { + private List fetchFilteredTimeOffRequests(final TimeOffRequestType category, + final TimeOffRequest.Status state) { requests = requestService.findRequestsByEmployeeId(employeeId); if (category != null && !"ALL".equals(category.name())) { requests = requests.stream() @@ -163,31 +137,20 @@ public class RequestView extends Div implements HasUrlParameter { .filter(req -> req.getState().equals(state)) .collect(Collectors.toList()); } - int end = Math.min(page + pageSize, requests.size()); - return requests.subList(page, end); + return requests; } @Override - public void setParameter(BeforeEvent event, String parameter) { - try { - employeeId = UUID.fromString(parameter); - Employee employee = employeeService.getEmployee(employeeId); - - String employeeName = employee.getFirstName() + " " + employee.getLastName(); - String employeeTeam = employee.getTeam(); - setViewTitle(employeeName, employeeTeam); - - requests = requestService.findRequestsByEmployeeId(employeeId); - requestGrid.setItems(requests); - } catch (IllegalArgumentException e) { - requestGrid.setItems(); - } + public void setParameter(final BeforeEvent event, final String parameter) { + employeeId = UUID.fromString(parameter); + Employee employee = employeeService.getEmployee(employeeId); + requests = requestService.findRequestsByEmployeeId(employeeId); + setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam()); + requestGrid.setItems(requests); } - private void setViewTitle(String employeeName, String employeeTeam) { - H3 employeeTitle = new H3("Name: " + employeeName); - H3 teamTitle = new H3("Team: " + employeeTeam); - addComponentAsFirst(employeeTitle); - addComponentAtIndex(1, teamTitle); + private void setViewTitle(final String employeeName, final String employeeTeam) { + addComponentAsFirst(new H3("Name: " + employeeName)); + addComponentAtIndex(1, new H3("Team: " + employeeTeam)); } } diff --git a/src/main/java/com/primefactorsolutions/views/RequestsListView.java b/src/main/java/com/primefactorsolutions/views/RequestsListView.java index 8243d72..b79b0a4 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java @@ -6,12 +6,10 @@ import com.primefactorsolutions.service.TeamService; import com.primefactorsolutions.service.TimeOffRequestService; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.combobox.ComboBox; -import com.vaadin.flow.component.grid.GridSortOrder; import com.vaadin.flow.component.html.Main; import com.vaadin.flow.component.html.Span; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; -import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; @@ -19,8 +17,10 @@ import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; import org.vaadin.firitin.components.grid.PagingGrid; +import java.util.Collections; import java.util.List; import java.util.UUID; +import java.util.stream.Collectors; @SpringComponent @Scope("prototype") @@ -32,7 +32,8 @@ public class RequestsListView extends Main { private final TimeOffRequestService requestService; private final EmployeeService employeeService; private final TeamService teamService; - private final PagingGrid requestGrid; + private final PagingGrid requestGrid = new PagingGrid<>(TimeOffRequest.class); + private List requests = Collections.emptyList(); private ComboBox employeeFilter; private ComboBox teamFilter; private ComboBox categoryFilter; @@ -45,7 +46,7 @@ public class RequestsListView extends Main { this.requestService = requestService; this.employeeService = employeeService; this.teamService = teamService; - this.requestGrid = new PagingGrid<>(TimeOffRequest.class); + this.requests = requestService.findAllTimeOffRequests(); initializeView(); refreshRequestGrid(null, null, null, null); } @@ -105,11 +106,14 @@ public class RequestsListView extends Main { final Team team, final TimeOffRequestType category, final TimeOffRequest.Status state) { + requestGrid.setPagingDataProvider((page, pageSize) -> { + requests = requestService.findAllTimeOffRequests(); + int start = (int) (page * requestGrid.getPageSize()); if (allFiltersAreNull(employee, team, category, state)) { - return fetchTimeOffRequests((int) page, pageSize); + return fetchTimeOffRequests(start, pageSize); } else { - return fetchFilteredTimeOffRequests((int) page, pageSize, employee, team, category, state); + return fetchFilteredTimeOffRequests(start, pageSize, employee, team, category, state); } }); requestGrid.getDataProvider().refreshAll(); @@ -122,34 +126,48 @@ public class RequestsListView extends Main { return employee == null && team == null && category == null && state == null; } - private List fetchTimeOffRequests(final int page, final int pageSize) { - int start = page * pageSize; - if (requestGrid.getSortOrder().isEmpty()) { - return requestService.findTimeOffRequests(start, pageSize); - } else { - return fetchSortedTimeOffRequests(start, pageSize); + private List fetchTimeOffRequests(final int start, final int pageSize) { + int end = start + pageSize; + if (end > requests.size()) { + end = requests.size(); } + return requests.subList(start, end); } - private List fetchSortedTimeOffRequests(final int start, final int pageSize) { - GridSortOrder sortOrder = requestGrid.getSortOrder().getFirst(); - return requestService.findTimeOffRequests( - start, - pageSize, - sortOrder.getSorted().getKey(), - sortOrder.getDirection() == SortDirection.ASCENDING - ); - } - - private List fetchFilteredTimeOffRequests(final int page, + private List fetchFilteredTimeOffRequests(final int start, final int pageSize, final Employee employee, final Team team, final TimeOffRequestType category, final TimeOffRequest.Status state) { - return requestService.findTimeOffRequestBy(employee, team, category, state, page, pageSize); + if (employee != null && !"ALL".equals(employee.getFirstName())) { + requests = requests.stream() + .filter(request -> request.getEmployee().getId().equals(employee.getId())) + .collect(Collectors.toList()); + } + if (team != null && !"ALL".equals(team.getName())) { + requests = requests.stream() + .filter(request -> request.getTeam().getId().equals(team.getId())) + .collect(Collectors.toList()); + } + if (category != null && !"ALL".equals(category.name())) { + requests = requests.stream() + .filter(request -> request.getCategory().equals(category)) + .collect(Collectors.toList()); + } + if (state != null && !"ALL".equals(state.name())) { + requests = requests.stream() + .filter(request -> request.getState().equals(state)) + .collect(Collectors.toList()); + } + int end = start + pageSize; + if (end > requests.size()) { + end = requests.size(); + } + return requests.subList(start, end); } + private Span createEmployeeSpan(final TimeOffRequest timeOffRequest) { Employee employee = timeOffRequest.getEmployee(); return new Span(employee.getFirstName() + " " + employee.getLastName()); @@ -249,7 +267,7 @@ public class RequestsListView extends Main { getUI().ifPresent(ui -> ui.navigate(MainView.class)); } - private void navigateToTimeOffRequestView(final UUID id_employee) { - getUI().ifPresent(ui -> ui.navigate("requests/" + id_employee.toString())); + private void navigateToTimeOffRequestView(final UUID idEmployee) { + getUI().ifPresent(ui -> ui.navigate("requests/" + idEmployee.toString())); } } \ No newline at end of file -- 2.34.1 From 81b3003d1b6697d04fd031f12b8e687551b85cbe Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Fri, 11 Oct 2024 01:25:56 -0400 Subject: [PATCH 4/5] Modelo empleado - Unir bd Team a la bd Employee --- .../primefactorsolutions/model/Employee.java | 4 +- .../model/TimeOffRequest.java | 3 - .../TimeOffRequestRepository.java | 4 - .../service/TimeOffRequestService.java | 12 --- .../views/RequestView.java | 2 +- .../views/RequestsListView.java | 4 +- src/main/resources/data.sql | 99 ++++++++++--------- 7 files changed, 56 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Employee.java b/src/main/java/com/primefactorsolutions/model/Employee.java index 1399c8b..e128132 100644 --- a/src/main/java/com/primefactorsolutions/model/Employee.java +++ b/src/main/java/com/primefactorsolutions/model/Employee.java @@ -29,7 +29,9 @@ private String phoneNumber; private String personalEmail; private String position; - private String team; + @ManyToOne + @JoinColumn(name = "team_id", nullable = false) + private Team team; private String emergencyCName; private String emergencyCAddress; private String emergencyCPhone; diff --git a/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java b/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java index 1010eb3..b0daea9 100644 --- a/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java +++ b/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java @@ -17,9 +17,6 @@ public class TimeOffRequest extends BaseEntity { @ManyToOne @JoinColumn(name = "employee_id", nullable = false) private Employee employee; - @ManyToOne - @JoinColumn(name = "team_id", nullable = false) - private Team team; @Enumerated(EnumType.STRING) private TimeOffRequestType category; @Enumerated(EnumType.STRING) diff --git a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java index 1ea24a6..76bdcbb 100644 --- a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java @@ -1,7 +1,6 @@ package com.primefactorsolutions.repositories; import com.primefactorsolutions.model.TimeOffRequest; -import com.primefactorsolutions.model.TimeOffRequestType; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; @@ -9,7 +8,4 @@ import java.util.UUID; public interface TimeOffRequestRepository extends JpaRepository { List findByEmployeeId(UUID idEmployee); - List findByTeamId(UUID idTeam); - List findByCategory(TimeOffRequestType category); - List findByState(TimeOffRequest.Status state); } diff --git a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java index 6e19ec1..a1f673f 100644 --- a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java +++ b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java @@ -34,16 +34,4 @@ public class TimeOffRequestService { public List findRequestsByEmployeeId(final UUID idEmployee) { return timeOffRequestRepository.findByEmployeeId(idEmployee); } - - public List findRequestsByTeamId(final UUID idTeam) { - return timeOffRequestRepository.findByTeamId(idTeam); - } - - public List findRequestsByCategory(final TimeOffRequestType category) { - return timeOffRequestRepository.findByCategory(category); - } - - public List findRequestsByState(final TimeOffRequest.Status state) { - return timeOffRequestRepository.findByState(state); - } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/RequestView.java b/src/main/java/com/primefactorsolutions/views/RequestView.java index 25c3c0b..7bc4af9 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestView.java @@ -145,7 +145,7 @@ public class RequestView extends Div implements HasUrlParameter { employeeId = UUID.fromString(parameter); Employee employee = employeeService.getEmployee(employeeId); requests = requestService.findRequestsByEmployeeId(employeeId); - setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam()); + setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam().getName()); requestGrid.setItems(requests); } diff --git a/src/main/java/com/primefactorsolutions/views/RequestsListView.java b/src/main/java/com/primefactorsolutions/views/RequestsListView.java index b79b0a4..8fbb619 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java @@ -147,7 +147,7 @@ public class RequestsListView extends Main { } if (team != null && !"ALL".equals(team.getName())) { requests = requests.stream() - .filter(request -> request.getTeam().getId().equals(team.getId())) + .filter(request -> request.getEmployee().getTeam().getId().equals(team.getId())) .collect(Collectors.toList()); } if (category != null && !"ALL".equals(category.name())) { @@ -174,7 +174,7 @@ public class RequestsListView extends Main { } private Span createTeamSpan(final TimeOffRequest timeOffRequest) { - return new Span(timeOffRequest.getTeam().getName()); + return new Span(timeOffRequest.getEmployee().getTeam().getName()); } private ComboBox createEmployeeFilter() { diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 0841f84..93f2ca9 100644 --- a/src/main/resources/data.sql +++ b/src/main/resources/data.sql @@ -9,25 +9,6 @@ insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4- insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-23fd-462f-8430-fbe67b83caab', '8a4b213c-ca81-4c38-b56d-d7028c2dde88'); -insert into employee (id, version, username, first_name, last_name, status) values ('5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 1, 'bob', 'Bob', 'Test', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('cba3efb7-32bc-44be-9fdc-fc5e4f211254', 1, 'ben', 'Ben', 'Test', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE'); -insert into employee (id, version, username, first_name, last_name, status) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE'); - INSERT INTO team (id, version, name) VALUES ('b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 1, 'ABC'); INSERT INTO team (id, version, name) VALUES ('6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 1, 'XYZ'); @@ -35,33 +16,53 @@ INSERT INTO team (id, version, name) VALUES ('c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3 INSERT INTO team (id, version, name) VALUES ('8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 1, 'GHI'); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('9d6f12ba-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'VACATION', 'TAKEN', 15, '2025-12-31', '2024-10-01', '2024-10-10', 5, 10); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('2fa314bc-f547-4b12-a8b6-bb789feabc12', 1, '19b5a76e-d7b1-4b76-8b02-4d0748e85809', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'BIRTHDAY', 'APPROVED', 15, '2025-12-31', '2024-12-01', '2024-12-15', 7, 8); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('d5f6341a-913d-4e7f-a0b2-cfe0786acd34', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FIXED_HOLIDAY', 'IN_USE', 20, '2025-11-30', '2024-11-10', '2024-11-20', 10, 10); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('4f913b23-ff23-4527-bcd6-adfe01234567', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MATERNITY', 'TAKEN', 18, '2025-06-30', '2024-07-01', '2024-07-15', 10, 8); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('8c653f2a-f9a3-4d67-b3b6-12ad98fe0983', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'VACATION', 'REQUESTED', 10, '2025-10-31', '2024-09-15', '2024-09-20', 5, 5); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('fb9d9d75-b2ab-4ea4-b8b3-0a8f89e5c123', 1, '2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'FIXED_HOLIDAY', 'IN_USE', 12, '2025-08-31', '2024-08-05', '2024-08-15', 6, 6); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('1c913a12-46e9-47b7-9e31-ab903fedc789', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'BIRTHDAY', 'TAKEN', 14, '2025-12-31', '2024-10-20', '2024-10-25', 5, 9); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('b1249d3a-cc34-4954-88d9-1e4f67fe2436', 1, 'afc5c741-f70a-4394-853b-39d51b118927', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'MATERNITY', 'APPROVED', 20, '2025-11-30', '2024-11-05', '2024-11-12', 7, 13); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'VACATION', 'TAKEN', 18, '2025-06-30', '2024-07-10', '2024-07-20', 8, 10); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FIXED_HOLIDAY', 'PENDING', 15, '2025-12-31', '2024-09-01', '2024-09-05', 4, 11); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('89bc4b2a-943f-487c-a9f3-bacf78145e67', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'VACATION', 'APPROVED', 20, '2025-11-30', '2024-10-25', '2024-11-05', 9, 11); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('37adfc2a-7463-4b2d-a7c1-fae04567cdef', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'BIRTHDAY', 'TAKEN', 18, '2025-06-30', '2024-06-01', '2024-06-10', 6, 12); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('2bc138ea-12db-4b89-a0b4-78e045e34b4e', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MATERNITY', 'REQUESTED', 10, '2025-10-31', '2024-10-01', '2024-10-10', 3, 7); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('14de1a56-6893-4e12-90f3-4faec457f002', 1, 'cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'FIXED_HOLIDAY', 'PENDING', 22, '2025-08-31', '2024-07-15', '2024-07-25', 8, 14); -insert into time_off_request (id, version, employee_id, team_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) -values ('fb08a6c9-cd17-42e8-b9e2-734ec834cae2', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'VACATION', 'TAKEN', 16, '2025-12-31', '2024-09-30', '2024-10-05', 4, 12); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 1, 'bob', 'Bob', 'Test', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('cba3efb7-32bc-44be-9fdc-fc5e4f211254', 1, 'ben', 'Ben', 'Test', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); +insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28'); + + +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('9d6f12ba-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VACATION', 'TAKEN', 15, '2025-12-31', '2024-10-01', '2024-10-10', 5, 10); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('2fa314bc-f547-4b12-a8b6-bb789feabc12', 1, '19b5a76e-d7b1-4b76-8b02-4d0748e85809', 'BIRTHDAY', 'APPROVED', 15, '2025-12-31', '2024-12-01', '2024-12-15', 7, 8); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('d5f6341a-913d-4e7f-a0b2-cfe0786acd34', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'FIXED_HOLIDAY', 'IN_USE', 20, '2025-11-30', '2024-11-10', '2024-11-20', 10, 10); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('4f913b23-ff23-4527-bcd6-adfe01234567', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'MATERNITY', 'TAKEN', 18, '2025-06-30', '2024-07-01', '2024-07-15', 10, 8); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('8c653f2a-f9a3-4d67-b3b6-12ad98fe0983', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'VACATION', 'REQUESTED', 10, '2025-10-31', '2024-09-15', '2024-09-20', 5, 5); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('fb9d9d75-b2ab-4ea4-b8b3-0a8f89e5c123', 1, '2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 'FIXED_HOLIDAY', 'IN_USE', 12, '2025-08-31', '2024-08-05', '2024-08-15', 6, 6); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('1c913a12-46e9-47b7-9e31-ab903fedc789', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'BIRTHDAY', 'TAKEN', 14, '2025-12-31', '2024-10-20', '2024-10-25', 5, 9); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('b1249d3a-cc34-4954-88d9-1e4f67fe2436', 1, 'afc5c741-f70a-4394-853b-39d51b118927', 'MATERNITY', 'APPROVED', 20, '2025-11-30', '2024-11-05', '2024-11-12', 7, 13); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'VACATION', 'TAKEN', 18, '2025-06-30', '2024-07-10', '2024-07-20', 8, 10); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'FIXED_HOLIDAY', 'PENDING', 15, '2025-12-31', '2024-09-01', '2024-09-05', 4, 11); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('89bc4b2a-943f-487c-a9f3-bacf78145e67', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'VACATION', 'APPROVED', 20, '2025-11-30', '2024-10-25', '2024-11-05', 9, 11); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('37adfc2a-7463-4b2d-a7c1-fae04567cdef', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'BIRTHDAY', 'TAKEN', 18, '2025-06-30', '2024-06-01', '2024-06-10', 6, 12); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('2bc138ea-12db-4b89-a0b4-78e045e34b4e', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'MATERNITY', 'REQUESTED', 10, '2025-10-31', '2024-10-01', '2024-10-10', 3, 7); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('14de1a56-6893-4e12-90f3-4faec457f002', 1, 'cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 'FIXED_HOLIDAY', 'PENDING', 22, '2025-08-31', '2024-07-15', '2024-07-25', 8, 14); +insert into time_off_request (id, version, employee_id, category, state, available_days, expiration, start_date, end_date, days_to_be_take, days_balance) +values ('fb08a6c9-cd17-42e8-b9e2-734ec834cae2', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'VACATION', 'TAKEN', 16, '2025-12-31', '2024-09-30', '2024-10-05', 4, 12); -- 2.34.1 From 0d9e0755b0f41e9626b2d7dc105c12bb5e53cf96 Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Mon, 14 Oct 2024 01:17:23 -0400 Subject: [PATCH 5/5] #49, #50 Perfil de Personal Administrativo - Ver/Editar Vacaciones del Empleado --- .../model/TimeOffRequest.java | 23 +- .../model/TimeOffRequestStatus.java | 15 + .../views/RequestEmployeeView.java | 185 ++++++++++++ .../views/RequestView.java | 263 +++++++++--------- .../views/RequestsListView.java | 18 +- 5 files changed, 351 insertions(+), 153 deletions(-) create mode 100644 src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java create mode 100644 src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java diff --git a/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java b/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java index b0daea9..6d0046e 100644 --- a/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java +++ b/src/main/java/com/primefactorsolutions/model/TimeOffRequest.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.util.Date; +import java.time.LocalDate; @Data @Entity @@ -20,24 +20,11 @@ public class TimeOffRequest extends BaseEntity { @Enumerated(EnumType.STRING) private TimeOffRequestType category; @Enumerated(EnumType.STRING) - private Status state; + private TimeOffRequestStatus state; private Double availableDays; - private Date expiration; - private Date startDate; - private Date endDate; + private LocalDate expiration; + private LocalDate startDate; + private LocalDate endDate; private Double daysToBeTake; private Double daysBalance; - public enum Status { - ALL, - TAKEN, - REQUESTED, - APPROVED, - IN_USE, - UNDER_REVIEW, - PENDING, - REJECTED, - COMPLETED, - CANCELLED, - EXPIRED, - } } diff --git a/src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java b/src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java new file mode 100644 index 0000000..e549c4e --- /dev/null +++ b/src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java @@ -0,0 +1,15 @@ +package com.primefactorsolutions.model; + +public enum TimeOffRequestStatus { + ALL, + TAKEN, + REQUESTED, + APPROVED, + IN_USE, + UNDER_REVIEW, + PENDING, + REJECTED, + COMPLETED, + CANCELLED, + EXPIRED +} diff --git a/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java b/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java new file mode 100644 index 0000000..8af34ea --- /dev/null +++ b/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java @@ -0,0 +1,185 @@ +package com.primefactorsolutions.views; + +import com.primefactorsolutions.model.*; +import com.primefactorsolutions.service.EmployeeService; +import com.primefactorsolutions.service.TimeOffRequestService; +import com.vaadin.flow.component.button.Button; +import com.vaadin.flow.component.combobox.ComboBox; +import com.vaadin.flow.component.grid.Grid; +import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.html.H3; +import com.vaadin.flow.component.html.Span; +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.router.BeforeEvent; +import com.vaadin.flow.router.HasUrlParameter; +import com.vaadin.flow.router.PageTitle; +import com.vaadin.flow.router.Route; +import com.vaadin.flow.spring.annotation.SpringComponent; +import jakarta.annotation.security.PermitAll; +import org.springframework.context.annotation.Scope; + +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +@SpringComponent +@PermitAll +@Scope("prototype") +@PageTitle("RequestEmployee") +@Route(value = "/requests", layout = MainLayout.class) +public class RequestEmployeeView extends Div implements HasUrlParameter { + + private final TimeOffRequestService requestService; + private final EmployeeService employeeService; + private final Grid requestGrid = new Grid<>(TimeOffRequest.class); + private List requests = Collections.emptyList(); + private ComboBox categoryFilter; + private ComboBox stateFilter; + private UUID employeeId; + private TimeOffRequest request; + + public RequestEmployeeView(final TimeOffRequestService requestService, final EmployeeService employeeService) { + this.requestService = requestService; + this.employeeService = employeeService; + initializeView(); + } + + private void initializeView() { + setupFilters(); + setupGrid(); + add(requestGrid, createSummaryLayout(), createActionButtons()); + refreshRequestGrid(null, null); + } + + private void setupFilters() { + categoryFilter = createCategoryFilter(); + stateFilter = createStateFilter(); + add(categoryFilter, stateFilter); + } + + private ComboBox createCategoryFilter() { + categoryFilter = new ComboBox<>("Category"); + categoryFilter.setItems(TimeOffRequestType.values()); + categoryFilter.setValue(TimeOffRequestType.values()[0]); + categoryFilter.addValueChangeListener(event -> refreshRequestGrid(event.getValue(), stateFilter.getValue())); + return categoryFilter; + } + + private ComboBox createStateFilter() { + stateFilter = new ComboBox<>("State"); + stateFilter.setItems(TimeOffRequestStatus.values()); + stateFilter.setValue(TimeOffRequestStatus.values()[0]); + stateFilter.addValueChangeListener(event -> refreshRequestGrid(categoryFilter.getValue(), event.getValue())); + return stateFilter; + } + + private void setupGrid() { + requestGrid.setColumns( + "category", + "state", + "availableDays", + "expiration", + "startDate", + "endDate", + "daysToBeTake", + "daysBalance" + ); + requestGrid.setAllRowsVisible(true); + requestGrid.asSingleSelect().addValueChangeListener(event -> { + TimeOffRequest selectedRequest = event.getValue(); + if (selectedRequest != null) { + request = selectedRequest; + } + }); + } + + private VerticalLayout createSummaryLayout() { + int totalVacations = 15; + int totalTimeOff = 2; + int totalAvailableDays = totalVacations + totalTimeOff; + return new VerticalLayout( + new Span("TOTAL HOLIDAYS: " + totalVacations), + new Span("TOTAL TIME OFF: " + totalTimeOff), + new Span("TOTAL AVAILABLE DAYS: " + totalAvailableDays) + ); + } + + private HorizontalLayout createActionButtons() { + Button viewButton = new Button("View", event -> { + if (request != null) { + navigateToViewRequest(request); + } else { + Notification.show("Please select a request to view.", 3000, Notification.Position.MIDDLE); + } + }); + Button editButton = new Button("Edit", event -> { + if (request != null) { + navigateToEditRequest(request); + } else { + Notification.show("Please select a request to view.", 3000, Notification.Position.MIDDLE); + } + }); + Button closeButton = new Button("Close", event -> navigateToRequestsListView()); + return new HorizontalLayout(viewButton, editButton, closeButton); + } + + private void navigateToRequestsListView() { + getUI().ifPresent(ui -> ui.navigate(RequestsListView.class)); + } + + private void navigateToEditRequest(final TimeOffRequest request) { + navigateToRequestView(request, "edit"); + } + + private void navigateToViewRequest(final TimeOffRequest request) { + navigateToRequestView(request, "view"); + } + + private void navigateToRequestView(final TimeOffRequest request, final String action) { + getUI().ifPresent(ui -> ui.navigate(RequestView.class, request.getId().toString() + "/" + action)); + } + + private void refreshRequestGrid(final TimeOffRequestType category, final TimeOffRequestStatus state) { + List filteredRequests = allFiltersAreNull(category, state) + ? requestService.findRequestsByEmployeeId(employeeId) + : fetchFilteredTimeOffRequests(category, state); + requestGrid.setItems(filteredRequests); + } + + private boolean allFiltersAreNull(final TimeOffRequestType category, final TimeOffRequestStatus state) { + return category == null && state == null; + } + + private List fetchFilteredTimeOffRequests(final TimeOffRequestType category, + final TimeOffRequestStatus state) { + requests = requestService.findRequestsByEmployeeId(employeeId); + if (category != null && !"ALL".equals(category.name())) { + requests = requests.stream() + .filter(req -> req.getCategory().equals(category)) + .collect(Collectors.toList()); + } + if (state != null && !"ALL".equals(state.name())) { + requests = requests.stream() + .filter(req -> req.getState().equals(state)) + .collect(Collectors.toList()); + } + return requests; + } + + @Override + public void setParameter(final BeforeEvent event, final String parameter) { + employeeId = UUID.fromString(parameter); + Employee employee = employeeService.getEmployee(employeeId); + requests = requestService.findRequestsByEmployeeId(employeeId); + setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam().getName()); + requestGrid.setItems(requests); + } + + private void setViewTitle(final String employeeName, final String employeeTeam) { + addComponentAsFirst(new H3("Name: " + employeeName)); + addComponentAtIndex(1, new H3("Team: " + employeeTeam)); + } +} diff --git a/src/main/java/com/primefactorsolutions/views/RequestView.java b/src/main/java/com/primefactorsolutions/views/RequestView.java index 7bc4af9..45b1ea4 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestView.java @@ -1,156 +1,169 @@ package com.primefactorsolutions.views; -import com.primefactorsolutions.model.Employee; -import com.primefactorsolutions.model.TimeOffRequest; -import com.primefactorsolutions.model.TimeOffRequestType; +import com.primefactorsolutions.model.*; import com.primefactorsolutions.service.EmployeeService; +import com.primefactorsolutions.service.TeamService; import com.primefactorsolutions.service.TimeOffRequestService; +import com.vaadin.flow.component.Component; import com.vaadin.flow.component.button.Button; import com.vaadin.flow.component.combobox.ComboBox; -import com.vaadin.flow.component.grid.Grid; -import com.vaadin.flow.component.html.Div; +import com.vaadin.flow.component.datepicker.DatePicker; import com.vaadin.flow.component.html.H3; -import com.vaadin.flow.component.html.Span; -import com.vaadin.flow.component.orderedlayout.HorizontalLayout; -import com.vaadin.flow.component.orderedlayout.VerticalLayout; -import com.vaadin.flow.router.BeforeEvent; -import com.vaadin.flow.router.HasUrlParameter; -import com.vaadin.flow.router.PageTitle; -import com.vaadin.flow.router.Route; +import com.vaadin.flow.component.notification.Notification; +import com.vaadin.flow.component.textfield.NumberField; +import com.vaadin.flow.router.*; import com.vaadin.flow.spring.annotation.SpringComponent; import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; +import org.vaadin.firitin.form.BeanValidationForm; -import java.util.Collections; import java.util.List; import java.util.UUID; -import java.util.stream.Collectors; @SpringComponent @PermitAll @Scope("prototype") @PageTitle("Request") -@Route(value = "/requests", layout = MainLayout.class) -public class RequestView extends Div implements HasUrlParameter { +@Route(value = "/requests/:requestId?/:action?", layout = MainLayout.class) +public class RequestView extends BeanValidationForm implements HasUrlParameter { + + private final ComboBox state = new ComboBox<>("State"); + private final DatePicker expiration = new DatePicker("Expiration"); + private final DatePicker startDate = new DatePicker("Start Date"); + private final DatePicker endDate = new DatePicker("End Date"); + private final NumberField availableDays = new NumberField("Available Days"); + private final NumberField daysToBeTake = new NumberField("Days To Be Take"); private final TimeOffRequestService requestService; private final EmployeeService employeeService; - private final Grid requestGrid = new Grid<>(TimeOffRequest.class); - private List requests = Collections.emptyList(); - private ComboBox categoryFilter; - private ComboBox stateFilter; - private UUID employeeId; + private TimeOffRequest request; + private Employee employee; - public RequestView(final TimeOffRequestService requestService, final EmployeeService employeeService) { + private Button saveButton; + + public RequestView(final TimeOffRequestService requestService, + final EmployeeService employeeService, + final TeamService teamService) { + super(TimeOffRequest.class); this.requestService = requestService; this.employeeService = employeeService; - initializeView(); - } - - private void initializeView() { - setupFilters(); - setupGrid(); - add(requestGrid, createSummaryLayout(), createActionButtons()); - refreshRequestGrid(null, null); - } - - private void setupFilters() { - categoryFilter = createCategoryFilter(); - stateFilter = createStateFilter(); - add(categoryFilter, stateFilter); - } - - private ComboBox createCategoryFilter() { - categoryFilter = new ComboBox<>("Category"); - categoryFilter.setItems(TimeOffRequestType.values()); - categoryFilter.setValue(TimeOffRequestType.values()[0]); - categoryFilter.addValueChangeListener(event -> refreshRequestGrid(event.getValue(), stateFilter.getValue())); - return categoryFilter; - } - - private ComboBox createStateFilter() { - stateFilter = new ComboBox<>("State"); - stateFilter.setItems(TimeOffRequest.Status.values()); - stateFilter.setValue(TimeOffRequest.Status.values()[0]); - stateFilter.addValueChangeListener(event -> refreshRequestGrid(categoryFilter.getValue(), event.getValue())); - return stateFilter; - } - - private void setupGrid() { - requestGrid.setColumns( - "category", - "state", - "availableDays", - "expiration", - "startDate", - "endDate", - "daysToBeTake", - "daysBalance" - ); - requestGrid.setAllRowsVisible(true); - } - - private VerticalLayout createSummaryLayout() { - int totalVacations = 15; - int totalTimeOff = 2; - int totalAvailableDays = totalVacations + totalTimeOff; - return new VerticalLayout( - new Span("TOTAL HOLIDAYS: " + totalVacations), - new Span("TOTAL TIME OFF: " + totalTimeOff), - new Span("TOTAL AVAILABLE DAYS: " + totalAvailableDays) - ); - } - - private HorizontalLayout createActionButtons() { - Button viewButton = new Button("View"); - Button editButton = new Button("Edit"); - Button saveButton = new Button("Save"); - Button closeButton = new Button("Close", event -> navigateToRequestsListView()); - return new HorizontalLayout(viewButton, editButton, saveButton, closeButton); - } - - private void navigateToRequestsListView() { - getUI().ifPresent(ui -> ui.navigate(RequestsListView.class)); - } - - private void refreshRequestGrid(final TimeOffRequestType category, final TimeOffRequest.Status state) { - List filteredRequests = allFiltersAreNull(category, state) - ? requestService.findRequestsByEmployeeId(employeeId) - : fetchFilteredTimeOffRequests(category, state); - requestGrid.setItems(filteredRequests); - } - - private boolean allFiltersAreNull(final TimeOffRequestType category, final TimeOffRequest.Status state) { - return category == null && state == null; - } - - private List fetchFilteredTimeOffRequests(final TimeOffRequestType category, - final TimeOffRequest.Status state) { - requests = requestService.findRequestsByEmployeeId(employeeId); - if (category != null && !"ALL".equals(category.name())) { - requests = requests.stream() - .filter(req -> req.getCategory().equals(category)) - .collect(Collectors.toList()); - } - if (state != null && !"ALL".equals(state.name())) { - requests = requests.stream() - .filter(req -> req.getState().equals(state)) - .collect(Collectors.toList()); - } - return requests; + state.setItems(List.of(TimeOffRequestStatus.values())); } @Override - public void setParameter(final BeforeEvent event, final String parameter) { - employeeId = UUID.fromString(parameter); - Employee employee = employeeService.getEmployee(employeeId); - requests = requestService.findRequestsByEmployeeId(employeeId); - setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam().getName()); - requestGrid.setItems(requests); + public void setParameter(final BeforeEvent beforeEvent, final String action) { + final RouteParameters params = beforeEvent.getRouteParameters(); + final String requestIdString = params.get("requestId").orElse(null); + + if ("new".equals(action)) { + setEntityWithEnabledSave(new TimeOffRequest()); + } else { + assert requestIdString != null; + UUID requestId = UUID.fromString(requestIdString); + request = requestService.findTimeOffRequest(requestId); + UUID employeeId = request.getEmployee().getId(); + employee = employeeService.getEmployee(employeeId); + setEntity(request); + configureViewOrEditAction(action); + } } - private void setViewTitle(final String employeeName, final String employeeTeam) { - addComponentAsFirst(new H3("Name: " + employeeName)); - addComponentAtIndex(1, new H3("Team: " + employeeTeam)); + @Override + protected List getFormComponents() { + return List.of( + createEmployeeHeader(), + createTeamHeader(), + createCategoryHeader(), + state, + expiration, + startDate, + endDate, + availableDays, + daysToBeTake, + createCloseButton() + ); + } + + protected Button createSaveButton() { + saveButton = new Button("Save"); + saveButton.addClickListener(event -> saveRequest()); + return saveButton; + } + + protected Button createCloseButton() { + Button closeButton = new Button("Close"); + closeButton.addClickListener(event -> closeForm()); + return closeButton; + } + + private void setFieldsReadOnly(final boolean option) { + state.setReadOnly(option); + expiration.setReadOnly(option); + startDate.setReadOnly(option); + endDate.setReadOnly(option); + availableDays.setReadOnly(option); + daysToBeTake.setReadOnly(option); + } + + private void saveRequest() { + if (isFormValid()) { + TimeOffRequest request = getEntity(); + setRequestFieldValues(request); + requestService.saveTimeOffRequest(request); + Notification.show("Request saved successfully."); + clearForm(); + } + } + + private void setRequestFieldValues(TimeOffRequest request) { + request.setState(state.getValue()); + request.setExpiration(expiration.getValue()); + request.setStartDate(startDate.getValue()); + request.setEndDate(endDate.getValue()); + request.setAvailableDays(availableDays.getValue()); + request.setDaysToBeTake(daysToBeTake.getValue()); + } + + private void closeForm() { + getUI().ifPresent(ui -> ui.navigate("requests/" + employee.getId().toString())); + } + + private boolean isFormValid() { + return !state.isEmpty() + && expiration.getValue() != null + && startDate.getValue() != null + && endDate.getValue() != null + && availableDays.getValue() != null + && daysToBeTake.getValue() != null; + } + + private void clearForm() { + state.clear(); + expiration.clear(); + startDate.clear(); + endDate.clear(); + availableDays.clear(); + daysToBeTake.clear(); + } + + private void configureViewOrEditAction(final String action) { + if ("edit".equals(action) && !request.getId().toString().isEmpty()) { + setFieldsReadOnly(false); + } else if ("view".equals(action) && !request.getId().toString().isEmpty()) { + setFieldsReadOnly(true); + saveButton.setEnabled(false); + } + } + + private H3 createEmployeeHeader() { + return new H3("Employee: " + employee.getFirstName() + " " + employee.getLastName()); + } + + private H3 createTeamHeader() { + return new H3("Team: " + employee.getTeam().getName()); + } + + private H3 createCategoryHeader() { + return new H3("Category: " + request.getCategory()); } } diff --git a/src/main/java/com/primefactorsolutions/views/RequestsListView.java b/src/main/java/com/primefactorsolutions/views/RequestsListView.java index 8fbb619..71216d2 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java @@ -37,7 +37,7 @@ public class RequestsListView extends Main { private ComboBox employeeFilter; private ComboBox teamFilter; private ComboBox categoryFilter; - private ComboBox stateFilter; + private ComboBox stateFilter; private UUID selectedEmployeeId; public RequestsListView(final TimeOffRequestService requestService, @@ -96,16 +96,14 @@ public class RequestsListView extends Main { Notification.show("Please select a request to view.", 3000, Notification.Position.MIDDLE); } }); - Button editButton = new Button("Edit"); - Button saveButton = new Button("Save"); Button closeButton = new Button("Close", event -> navigateToMainView()); - return new HorizontalLayout(viewButton, editButton, saveButton, closeButton); + return new HorizontalLayout(viewButton, closeButton); } private void refreshRequestGrid(final Employee employee, final Team team, final TimeOffRequestType category, - final TimeOffRequest.Status state) { + final TimeOffRequestStatus state) { requestGrid.setPagingDataProvider((page, pageSize) -> { requests = requestService.findAllTimeOffRequests(); @@ -122,7 +120,7 @@ public class RequestsListView extends Main { private boolean allFiltersAreNull(final Employee employee, final Team team, final TimeOffRequestType category, - final TimeOffRequest.Status state) { + final TimeOffRequestStatus state) { return employee == null && team == null && category == null && state == null; } @@ -139,7 +137,7 @@ public class RequestsListView extends Main { final Employee employee, final Team team, final TimeOffRequestType category, - final TimeOffRequest.Status state) { + final TimeOffRequestStatus state) { if (employee != null && !"ALL".equals(employee.getFirstName())) { requests = requests.stream() .filter(request -> request.getEmployee().getId().equals(employee.getId())) @@ -228,10 +226,10 @@ public class RequestsListView extends Main { return categoryFilter; } - private ComboBox createStateFilter() { + private ComboBox createStateFilter() { stateFilter = new ComboBox<>("State"); - stateFilter.setItems(TimeOffRequest.Status.values()); - stateFilter.setValue(TimeOffRequest.Status.values()[0]); + stateFilter.setItems(TimeOffRequestStatus.values()); + stateFilter.setValue(TimeOffRequestStatus.values()[0]); stateFilter.addValueChangeListener(event -> refreshRequestGrid( employeeFilter.getValue(), -- 2.34.1