cambios de diseno tablas

Reviewed-on: #76
Reviewed-by: alex <alex@primefactorsolutions.com>

package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "dependencies": {
     "@f0rce/ace-widget": "1.0.2",
-    "@polymer/polymer": "3.5.2",
+    "@polymer/polymer": "3.5.1",
     "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
     "@vaadin/bundles": "24.5.1",
     "@vaadin/common-frontend": "0.0.19",
@@ -19,30 +19,29 @@
     "@vaadin/vaadin-usage-statistics": "2.1.3",
     "construct-style-sheets-polyfill": "3.1.0",
     "date-fns": "2.29.3",
-    "lit": "3.2.1",
+    "lit": "3.1.4",
     "print-js": "1.6.0",
     "proj4": "2.12.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.26.2"
+    "react-router-dom": "6.23.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.7",
-    "@preact/signals-react-transform": "0.4.0",
-    "@rollup/plugin-replace": "6.0.1",
-    "@rollup/pluginutils": "5.1.2",
-    "@types/react": "18.3.11",
-    "@types/react-dom": "18.3.1",
-    "@vitejs/plugin-react": "4.3.3",
-    "async": "3.2.6",
-    "glob": "10.4.5",
+    "@babel/preset-react": "7.24.7",
+    "@rollup/plugin-replace": "5.0.7",
+    "@rollup/pluginutils": "5.1.0",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@vitejs/plugin-react": "4.3.1",
+    "async": "3.2.5",
+    "glob": "10.4.1",
     "rollup-plugin-brotli": "3.1.0",
     "rollup-plugin-visualizer": "5.12.0",
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
-    "typescript": "5.6.3",
-    "vite": "5.4.9",
-    "vite-plugin-checker": "0.8.0",
+    "typescript": "5.4.5",
+    "vite": "5.3.3",
+    "vite-plugin-checker": "0.6.4",
     "workbox-build": "7.1.1",
     "workbox-core": "7.1.0",
     "workbox-precaching": "7.1.0"
@@ -50,7 +49,7 @@
   "vaadin": {
     "dependencies": {
       "@f0rce/ace-widget": "1.0.2",
-      "@polymer/polymer": "3.5.2",
+      "@polymer/polymer": "3.5.1",
       "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
       "@vaadin/bundles": "24.5.1",
       "@vaadin/common-frontend": "0.0.19",
@@ -65,35 +64,34 @@
       "@vaadin/vaadin-usage-statistics": "2.1.3",
       "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.29.3",
-      "lit": "3.2.1",
+      "lit": "3.1.4",
       "print-js": "1.6.0",
       "proj4": "2.12.1",
       "react": "18.3.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.26.2"
+      "react-router-dom": "6.23.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.7",
-      "@preact/signals-react-transform": "0.4.0",
-      "@rollup/plugin-replace": "6.0.1",
-      "@rollup/pluginutils": "5.1.2",
-      "@types/react": "18.3.11",
-      "@types/react-dom": "18.3.1",
-      "@vitejs/plugin-react": "4.3.3",
-      "async": "3.2.6",
-      "glob": "10.4.5",
+      "@babel/preset-react": "7.24.7",
+      "@rollup/plugin-replace": "5.0.7",
+      "@rollup/pluginutils": "5.1.0",
+      "@types/react": "18.3.3",
+      "@types/react-dom": "18.3.0",
+      "@vitejs/plugin-react": "4.3.1",
+      "async": "3.2.5",
+      "glob": "10.4.1",
       "rollup-plugin-brotli": "3.1.0",
       "rollup-plugin-visualizer": "5.12.0",
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
-      "typescript": "5.6.3",
-      "vite": "5.4.9",
-      "vite-plugin-checker": "0.8.0",
+      "typescript": "5.4.5",
+      "vite": "5.3.3",
+      "vite-plugin-checker": "0.6.4",
       "workbox-build": "7.1.1",
       "workbox-core": "7.1.0",
       "workbox-precaching": "7.1.0"
     },
-    "hash": "2dc40a4f634ae025081ca2239cba00b14a35fe94ab78ac0a4dd3023d882081d5"
+    "hash": "1a0f17d48b329307b5862bc57499307d1b89f7d89260121c2b7189f76957c436"
   },
   "overrides": {
     "@vaadin/bundles": "$@vaadin/bundles",

pom.xml

@@ -120,6 +120,11 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.17.0</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>

src/main/java/com/primefactorsolutions/model/TimeOffRequestType.java

@@ -14,7 +14,6 @@ public enum TimeOffRequestType {
     AÑO_NUEVO_ANDINO,
     ANIVERSARIO_DEPARTAMENTAL,
     DIA_DE_TODOS_LOS_DIFUNTOS,
-
     CUMPLEAÑOS,
     MATERNIDAD,
     PATERNIDAD,

src/main/java/com/primefactorsolutions/views/AssessmentsListView.java

@@ -8,7 +8,6 @@ import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.confirmdialog.ConfirmDialog;
 import com.vaadin.flow.component.grid.Grid;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.data.provider.DataProvider;
@@ -31,13 +30,13 @@ import java.util.stream.Stream;
 @PageTitle("Assessments")
 @Route(value = "/assessments", layout = MainLayout.class)
 @PermitAll
-public class AssessmentsListView extends Main {
+public class AssessmentsListView extends BaseView {
 
     public AssessmentsListView(final AssessmentService assessmentService) {
         final HorizontalLayout hl = new HorizontalLayout();
         final Button addAssessment = new Button("Add Assessment");
         addAssessment.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(AssessmentView.class, "new");
+            this.getUI().flatMap(ui -> ui.navigate(AssessmentView.class, "new"));
         });
         hl.add(addAssessment);
 
@@ -51,7 +50,7 @@ public class AssessmentsListView extends Main {
 
         grid.addComponentColumn((ValueProvider<Assessment, Component>) assessment -> {
             var result = new Button("Result", event ->
-                    this.getUI().get().navigate(SubmissionView.class, assessment.getId().toString())
+                    this.getUI().flatMap(ui -> ui.navigate(SubmissionView.class, assessment.getId().toString()))
             );
             result.setEnabled(assessment.isCompleted());
 
@@ -95,6 +94,7 @@ public class AssessmentsListView extends Main {
                 return assessmentService.getAssessments().size();
             }
 
+            @SuppressWarnings("unused")
             @Override
             public Stream<Assessment> fetch(final Query<Assessment, Object> query) {
                 int limit = query.getLimit();
@@ -121,7 +121,7 @@ public class AssessmentsListView extends Main {
         });
         grid.setAllRowsVisible(true);
 
-        add(hl, grid);
+        getCurrentPageLayout().add(hl, grid);
     }
 
 }

src/main/java/com/primefactorsolutions/views/BaseView.java

@@ -0,0 +1,16 @@
+package com.primefactorsolutions.views;
+
+import com.vaadin.flow.component.html.Main;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import lombok.Getter;
+
+@Getter
+public class BaseView extends Main {
+
+    private final VerticalLayout currentPageLayout;
+
+    public BaseView() {
+        currentPageLayout = new VerticalLayout();
+        add(currentPageLayout);
+    }
+}

src/main/java/com/primefactorsolutions/views/CandidatesListView.java

@@ -6,7 +6,6 @@ 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.html.Main;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.data.provider.DataProvider;
 import com.vaadin.flow.data.provider.DataProviderListener;
@@ -27,16 +26,14 @@ import java.util.stream.Stream;
 @PageTitle("Candidates")
 @Route(value = "/candidates", layout = MainLayout.class)
 @PermitAll
-public class CandidatesListView extends Main {
-    private final CandidateService candidateService;
+public class CandidatesListView extends BaseView {
 
     public CandidatesListView(final CandidateService candidateService) {
-        this.candidateService = candidateService;
 
         final HorizontalLayout hl = new HorizontalLayout();
         final Button addCandidate = new Button("Add Candidate");
         addCandidate.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(CandidateView.class, "new");
+            this.getUI().flatMap(ui -> ui.navigate(CandidateView.class, "new"));
         });
         hl.add(addCandidate);
 
@@ -46,7 +43,7 @@ public class CandidatesListView extends Main {
         grid.addComponentColumn((ValueProvider<Candidate, Component>) candidate -> {
             final Button edit = new Button("Edit");
             edit.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                    this.getUI().get().navigate(CandidateView.class, candidate.getId().toString()));
+                    this.getUI().flatMap(ui -> ui.navigate(CandidateView.class, candidate.getId().toString())));
             return edit;
         });
 
@@ -61,6 +58,7 @@ public class CandidatesListView extends Main {
                 return candidateService.getCandidates().size();
             }
 
+            @SuppressWarnings("unused")
             @Override
             public Stream<Candidate> fetch(final Query<Candidate, Object> query) {
                 int limit = query.getLimit();
@@ -85,6 +83,6 @@ public class CandidatesListView extends Main {
             }
         });
 
-        add(hl, grid);
+        getCurrentPageLayout().add(hl, grid);
     }
 }

src/main/java/com/primefactorsolutions/views/Constants.java

@@ -0,0 +1,5 @@
+package com.primefactorsolutions.views;
+
+public class Constants {
+    public static final int PAGE_SIZE = 10;
+}

src/main/java/com/primefactorsolutions/views/DocumentsListView.java

@@ -5,13 +5,22 @@ import com.primefactorsolutions.model.DocumentType;
 import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.service.DocumentService;
 import com.primefactorsolutions.service.EmployeeService;
+import com.primefactorsolutions.views.util.MenuBarUtils;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.contextmenu.MenuItem;
 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.icon.VaadinIcon;
+import com.vaadin.flow.component.menubar.MenuBar;
+import com.vaadin.flow.component.menubar.MenuBarVariant;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.data.provider.SortDirection;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.StreamRegistration;
@@ -24,13 +33,14 @@ import org.vaadin.firitin.components.grid.PagingGrid;
 import java.io.ByteArrayInputStream;
 import java.util.List;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
 
 @SpringComponent
 @Scope("prototype")
 @PageTitle("Documents")
 @Route(value = "/documents", layout = MainLayout.class)
 @PermitAll
-public class DocumentsListView extends Main {
+public class DocumentsListView extends BaseView {
 
     private final DocumentService documentService;
     private final EmployeeService employeeService;
@@ -46,11 +56,16 @@ public class DocumentsListView extends Main {
     }
 
     private void initializeView() {
+        getCurrentPageLayout().add(createActionButton("Add Document", this::navigateToAddDocumentView));
+
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createDocumentTypeFilter());
+        hl.add(createEmployeeFilter());
+
+        getCurrentPageLayout().add(hl);
+
         configureDocumentGrid();
-        add(createActionButton("Add Document", this::navigateToAddDocumentView));
-        add(createDocumentTypeFilter());
-        add(createEmployeeFilter());
-        add(documentGrid);
+        getCurrentPageLayout().add(documentGrid);
     }
 
     private void configureDocumentGrid() {
@@ -67,13 +82,20 @@ public class DocumentsListView extends Main {
     }
 
     private void addActionColumns() {
-        addDocumentActionColumn("View", this::navigateToDocumentView);
-        addDocumentActionColumn("Edit", this::navigateToEditDocumentView);
-        addDocumentActionColumn("Download", this::downloadDocument);
-    }
-
-    private void addDocumentActionColumn(final String label, final DocumentActionHandler handler) {
-        documentGrid.addComponentColumn(document -> createActionButton(label, () -> handler.handle(document)));
+        documentGrid.addComponentColumn((ValueProvider<Document, Component>) document -> {
+            final MenuBar menuBar = new MenuBar();
+            menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
+            final MenuItem viewItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.EYE, "View");
+            viewItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    navigateToDocumentView(document));
+            final MenuItem editItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.PENCIL, "Edit");
+            editItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    navigateToEditDocumentView(document));
+            final MenuItem downloadItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.DOWNLOAD, "Download");
+            downloadItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    downloadDocument(document));
+            return menuBar;
+        });
     }
 
     private Button createActionButton(final String label, final Runnable onClickAction) {
@@ -133,7 +155,7 @@ public class DocumentsListView extends Main {
 
     private void configurePagination() {
         documentGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        documentGrid.setPageSize(5);
+        documentGrid.setPageSize(PAGE_SIZE);
     }
 
     private void updateDocumentGrid(final DocumentType documentType, final Employee employee) {
@@ -197,9 +219,4 @@ public class DocumentsListView extends Main {
         StreamRegistration registration = ui.getSession().getResourceRegistry().registerResource(resource);
         ui.getPage().open(registration.getResourceUri().toString());
     }
-
-    @FunctionalInterface
-    private interface DocumentActionHandler {
-        void handle(Document document);
-    }
 }

src/main/java/com/primefactorsolutions/views/EmployeesListView.java

@@ -3,8 +3,6 @@ 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.html.H2;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
@@ -16,13 +14,12 @@ import org.springframework.context.annotation.Scope;
 
 import java.util.List;
 
-
 @SpringComponent
 @Scope("prototype")
 @PageTitle("Employees")
 @Route(value = "/employees", layout = MainLayout.class)
 @PermitAll
-public class EmployeesListView extends Main {
+public class EmployeesListView extends BaseView {
 
     private final EmployeeService employeeService;
     private final PagingGrid<Employee> table = new PagingGrid<>(Employee.class);
@@ -34,10 +31,9 @@ public class EmployeesListView extends Main {
     }
 
     private void setupView() {
-        add(new H2("Employee List"));
         configureTable();
-        add(createAddEmployeeButton());
-        add(table);
+        getCurrentPageLayout().add(createAddEmployeeButton());
+        getCurrentPageLayout().add(table);
     }
 
     private void configureTable() {
@@ -75,7 +71,7 @@ public class EmployeesListView extends Main {
 
     private void setupPagingGrid() {
         table.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        table.setPageSize(5);
+        table.setPageSize(Constants.PAGE_SIZE);
     }
 
     private void refreshGrid() {

src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java

@@ -6,11 +6,19 @@ import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.HoursWorkedService;
 import com.primefactorsolutions.service.TeamService;
+import com.primefactorsolutions.views.util.MenuBarUtils;
+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.Main;
+import com.vaadin.flow.component.contextmenu.MenuItem;
+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.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
@@ -23,22 +31,21 @@ import java.time.temporal.IsoFields;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
 @SpringComponent
 @PermitAll
 @Scope("prototype")
 @PageTitle("Registro de Horas Trabajadas")
 @Route(value = "/hours-worked-list", layout = MainLayout.class)
-public class HoursWorkedListView extends Main {
+public class HoursWorkedListView extends BaseView {
 
     private final HoursWorkedService hoursWorkedService;
     private final EmployeeService employeeService;
     private final TeamService teamService;
     private final PagingGrid<HoursWorked> hoursWorkedGrid = new PagingGrid<>();
-    private List<Employee> employees = Collections.emptyList();
     private ComboBox<Employee> employeeFilter;
     private ComboBox<Team> teamFilter;
-    private UUID selectedEmployeeId;
-
 
     public HoursWorkedListView(final HoursWorkedService hoursWorkedService,
                                final EmployeeService employeeService,
@@ -46,7 +53,6 @@ public class HoursWorkedListView extends Main {
         this.hoursWorkedService = hoursWorkedService;
         this.employeeService = employeeService;
         this.teamService = teamService;
-        this.employees = employeeService.findAllEmployees();
 
         initializeView();
         refreshGridListHoursWorked(null, null);
@@ -111,23 +117,25 @@ public class HoursWorkedListView extends Main {
     }
 
     private void initializeView() {
+        getCurrentPageLayout().add(createAddHoursWorked());
         setupFilters();
-        add(createAddHoursWorked());
         setupListHoursWorkedGrid();
-        add(hoursWorkedGrid);
-        add(createActionButtons());
+        getCurrentPageLayout().add(hoursWorkedGrid);
     }
 
     private void setupFilters() {
-        add(createEmployeeFilter());
-        add(createTeamFilter());
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+
+        getCurrentPageLayout().add(hl);
     }
 
     private void setupListHoursWorkedGrid() {
         hoursWorkedGrid.addColumn(hw -> hw.getDate() != null ? hw.getDate().toString() : "")
                 .setHeader("Fecha")
                 .setSortable(true);
-        hoursWorkedGrid.addColumn(hw -> hw.getWeekNumber())
+        hoursWorkedGrid.addColumn(HoursWorked::getWeekNumber)
                 .setHeader("Semana")
                 .setSortable(true);
         hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getFirstName() + " " + hw.getEmployee().getLastName())
@@ -136,18 +144,21 @@ public class HoursWorkedListView extends Main {
                         .getName() : "Sin asignar")
                 .setHeader("Equipo");
         hoursWorkedGrid.addColumn(HoursWorked::getActividad).setHeader("Actividad");
-        hoursWorkedGrid.addColumn(hw -> hw.getHours()).setHeader("Total Horas").setSortable(true);
+        hoursWorkedGrid.addColumn(HoursWorked::getHours).setHeader("Total Horas").setSortable(true);
         hoursWorkedGrid.addColumn(hw -> hw.getHoraspendientes() - calcularTotal(hw)).setHeader("Horas Pendientes")
                 .setSortable(true);
+        hoursWorkedGrid.addComponentColumn((ValueProvider<HoursWorked, Component>) hoursWorked -> {
+            final MenuBar menuBar = new MenuBar();
+            menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
+            final MenuItem viewItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.EYE, "Ver");
+            viewItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent -> {
+                navigateToHoursWorkedView(hoursWorked.getEmployee().getId());
+            });
+            return menuBar;
+        });
 
         hoursWorkedGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        hoursWorkedGrid.setPageSize(5);
-        hoursWorkedGrid.asSingleSelect().addValueChangeListener(event -> {
-            HoursWorked selectedHoursWorked = event.getValue();
-            if (selectedHoursWorked != null) {
-                selectedEmployeeId = selectedHoursWorked.getEmployee().getId();
-            }
-        });
+        hoursWorkedGrid.setPageSize(PAGE_SIZE);
     }
 
     private double calcularTotal(final HoursWorked hoursWorked) {
@@ -159,33 +170,18 @@ public class HoursWorkedListView extends Main {
     private double calculateTotalUtilized(final List<HoursWorked> employeeRequests) {
         return employeeRequests.stream()
                 .filter(Objects::nonNull)
-                .mapToDouble(hoursworked -> hoursworked.getHours())
+                .mapToDouble(HoursWorked::getHours)
                 .sum();
     }
 
-    private HorizontalLayout createActionButtons() {
-        Button viewButton = new Button("Ver", event -> {
-            if (selectedEmployeeId != null) {
-                navigateToHoursWorkedView(selectedEmployeeId);
-            } else {
-                Notification.show("Seleccione una solicitud.", 3000, Notification.Position.MIDDLE);
-            }
-        });
-        Button closeButton = new Button("Salir", event -> navigateToListView());
-        return new HorizontalLayout(viewButton, closeButton);
-    }
-
-    private void navigateToListView() {
-        getUI().ifPresent(ui -> ui.navigate(MainView.class));
-    }
-
     private void navigateToHoursWorkedView(final UUID idEmployee) {
         getUI().ifPresent(ui -> ui.navigate("hours-worked-list/" + idEmployee.toString()));
     }
 
     private Button createButton(final String label, final Runnable onClickAction) {
-        Button button = new Button(label);
+        final Button button = new Button(label);
         button.addClickListener(event -> onClickAction.run());
+
         return button;
     }
 
@@ -199,7 +195,7 @@ public class HoursWorkedListView extends Main {
 
     private ComboBox<Employee> createEmployeeFilter() {
         employeeFilter = new ComboBox<>("Empleado");
-        List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
+        final List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
         employees.addFirst(createAllEmployeesOption());
         employeeFilter.setItems(employees);
         employeeFilter.setItemLabelGenerator(this::getEmployeeFullName);
@@ -210,6 +206,7 @@ public class HoursWorkedListView extends Main {
                         teamFilter.getValue()
                 )
         );
+
         return employeeFilter;
     }
 
@@ -223,7 +220,7 @@ public class HoursWorkedListView extends Main {
         List<Team> teams = new ArrayList<>(teamService.findAllTeams());
         teams.addFirst(createAllTeamsOption());
         teamFilter.setItems(teams);
-        teamFilter.setItemLabelGenerator(team -> getTeamLabel(team));
+        teamFilter.setItemLabelGenerator(this::getTeamLabel);
         teamFilter.setValue(teams.getFirst());
         teamFilter.addValueChangeListener(event ->
                 refreshGridListHoursWorked(

src/main/java/com/primefactorsolutions/views/HoursWorkedView.java

@@ -1,4 +1,5 @@
 package com.primefactorsolutions.views;
+
 import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.model.HoursWorked;
 import com.primefactorsolutions.model.Team;

src/main/java/com/primefactorsolutions/views/InitAccountView.java

@@ -13,6 +13,7 @@ import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 
+@SuppressWarnings("unused")
 @Route("init-account")
 @PageTitle("PFS Intra")
 @AnonymousAllowed

src/main/java/com/primefactorsolutions/views/PendingRequestsListView.java

@@ -4,11 +4,17 @@ import com.primefactorsolutions.model.*;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.TeamService;
 import com.primefactorsolutions.service.TimeOffRequestService;
-import com.vaadin.flow.component.button.Button;
+import com.primefactorsolutions.views.util.MenuBarUtils;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Main;
-import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.contextmenu.MenuItem;
+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.HorizontalLayout;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
@@ -19,24 +25,23 @@ import org.vaadin.firitin.components.grid.PagingGrid;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
 @SpringComponent
 @Scope("prototype")
-@PageTitle("PendingRequests")
+@PageTitle("Pending Requests")
 @Route(value = "/pending-requests", layout = MainLayout.class)
 @PermitAll
-public class PendingRequestsListView extends Main {
+public class PendingRequestsListView extends BaseView {
 
     private final TimeOffRequestService requestService;
     private final EmployeeService employeeService;
     private final TeamService teamService;
     private final PagingGrid<TimeOffRequest> pendingRequestsGrid = new PagingGrid<>();
 
-    private List<Employee> employees = Collections.emptyList();
     private ComboBox<Employee> employeeFilter;
     private ComboBox<Team> teamFilter;
     private ComboBox<TimeOffRequestType> categoryFilter;
-    private UUID selectedRequestId;
-
 
     public PendingRequestsListView(final TimeOffRequestService requestService,
                                    final EmployeeService employeeService,
@@ -44,7 +49,6 @@ public class PendingRequestsListView extends Main {
         this.requestService = requestService;
         this.employeeService = employeeService;
         this.teamService = teamService;
-        this.employees = employeeService.findAllEmployees();
         initializeView();
         refreshGeneralPendingRequestsGrid(null, null, null);
     }
@@ -52,49 +56,46 @@ public class PendingRequestsListView extends Main {
     private void initializeView() {
         setupFilters();
         setupPendingRequestsGrid();
-        add(pendingRequestsGrid);
-        add(createActionButtons());
     }
 
     private void setupFilters() {
-        add(createEmployeeFilter());
-        add(createTeamFilter());
-        add(createCategoryFilter());
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+        hl.add(createCategoryFilter());
+
+        getCurrentPageLayout().add(hl);
     }
 
     private void setupPendingRequestsGrid() {
         pendingRequestsGrid.addColumn(this::getEmployeeFullName).setHeader("Empleado");
         pendingRequestsGrid.addColumn(this::getTeamName).setHeader("Equipo");
         pendingRequestsGrid.addColumn(this::getCategory).setHeader("Categoría");
+        pendingRequestsGrid.addComponentColumn((ValueProvider<TimeOffRequest, Component>) timeOffRequest -> {
+            final MenuBar menuBar = new MenuBar();
+            menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
+            final MenuItem approveItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.CHECK, "Aprobar");
+            approveItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent -> {
+                actionForRequest(timeOffRequest.getId(), TimeOffRequestStatus.APROBADO);
+            });
+            final MenuItem rejectItem = MenuBarUtils.createIconItem(menuBar, VaadinIcon.BAN, "Rechazar");
+            rejectItem.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent -> {
+                actionForRequest(timeOffRequest.getId(), TimeOffRequestStatus.RECHAZADO);
+            });
+            return menuBar;
+        });
 
         pendingRequestsGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        pendingRequestsGrid.setPageSize(5);
-        pendingRequestsGrid.asSingleSelect().addValueChangeListener(event -> {
-            TimeOffRequest selectedRequest = event.getValue();
-            if (selectedRequest != null) {
-                selectedRequestId = selectedRequest.getId();
-            }
-        });
+        pendingRequestsGrid.setPageSize(PAGE_SIZE);
+
+        getCurrentPageLayout().add(pendingRequestsGrid);
     }
 
-    private HorizontalLayout createActionButtons() {
-        Button approveButton = createActionButton("Aprobar", TimeOffRequestStatus.APROBADO);
-        Button rejectButton = createActionButton("Rechazar", TimeOffRequestStatus.RECHAZADO);
-        Button closeButton = new Button("Salir", event -> navigateToMainView());
-        return new HorizontalLayout(approveButton, rejectButton, closeButton);
-    }
-
-    private Button createActionButton(final String caption, final TimeOffRequestStatus status) {
-        return new Button(caption, event -> {
-            if (selectedRequestId != null) {
-                TimeOffRequest request = requestService.findTimeOffRequest(selectedRequestId);
-                request.setState(status);
-                requestService.saveTimeOffRequest(request);
-                refreshGeneralPendingRequestsGrid(null, null, null);
-            } else {
-                Notification.show("Seleccione una solicitud.", 3000, Notification.Position.MIDDLE);
-            }
-        });
+    private void actionForRequest(final UUID selectedRequestId, final TimeOffRequestStatus status) {
+        TimeOffRequest request = requestService.findTimeOffRequest(selectedRequestId);
+        request.setState(status);
+        requestService.saveTimeOffRequest(request);
+        refreshGeneralPendingRequestsGrid(null, null, null);
     }
 
     private void refreshGeneralPendingRequestsGrid(final Employee employee,
@@ -220,8 +221,4 @@ public class PendingRequestsListView extends Main {
         allTeamsOption.setName("TODOS");
         return allTeamsOption;
     }
-
-    private void navigateToMainView() {
-        getUI().ifPresent(ui -> ui.navigate(MainView.class));
-    }
 }

src/main/java/com/primefactorsolutions/views/QuestionsListView.java

@@ -6,7 +6,6 @@ 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.html.Main;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.data.provider.DataProvider;
 import com.vaadin.flow.data.provider.DataProviderListener;
@@ -27,17 +26,14 @@ import java.util.stream.Stream;
 @PageTitle("Questions")
 @Route(value = "/questions", layout = MainLayout.class)
 @PermitAll
-public class QuestionsListView extends Main {
-    private final QuestionService questionService;
+public class QuestionsListView extends BaseView {
 
     public QuestionsListView(final QuestionService questionService) {
-        this.questionService = questionService;
 
         final HorizontalLayout hl = new HorizontalLayout();
         final Button addQuestion = new Button("Add Question");
-        addQuestion.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(QuestionView.class, "new");
-        });
+        addQuestion.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
+                this.getUI().flatMap(ui -> ui.navigate(QuestionView.class, "new")));
         hl.add(addQuestion);
 
         final VGrid<Question> grid = new VGrid<>(Question.class);
@@ -45,7 +41,7 @@ public class QuestionsListView extends Main {
         grid.addComponentColumn((ValueProvider<Question, Component>) question -> {
             final Button edit = new Button("Edit");
             edit.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                    this.getUI().get().navigate(QuestionView.class, question.getId().toString()));
+                    this.getUI().flatMap(ui -> ui.navigate(QuestionView.class, question.getId().toString())));
             return edit;
         });
         grid.setDataProvider(new DataProvider<>() {
@@ -59,6 +55,7 @@ public class QuestionsListView extends Main {
                 return questionService.getQuestions().size();
             }
 
+            @SuppressWarnings("unused")
             @Override
             public Stream<Question> fetch(final Query<Question, Object> query) {
                 int limit = query.getLimit();
@@ -84,6 +81,6 @@ public class QuestionsListView extends Main {
         });
         grid.setAllRowsVisible(true);
 
-        add(hl, grid);
+        getCurrentPageLayout().add(hl, grid);
     }
 }

src/main/java/com/primefactorsolutions/views/ReporteView.java

@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 @PermitAll
 @Route(value = "/reportes", layout = MainLayout.class)
 @PageTitle("Reporte de Horas Trabajadas")
-public class ReporteView extends VerticalLayout {
+public class ReporteView extends BaseView {
 
     private final EmployeeService employeeService;
     private final HoursWorkedService hoursWorkedService;
@@ -51,7 +51,7 @@ public class ReporteView extends VerticalLayout {
     private final Span semanaInfoSpan = new Span();
 
     // Obtener el año actual
-    private int currentYear = LocalDate.now().getYear();
+    private final int currentYear = LocalDate.now().getYear();
 
     @Autowired
     public ReporteView(final HoursWorkedService hoursWorkedService,
@@ -63,7 +63,7 @@ public class ReporteView extends VerticalLayout {
         this.employeeService = employeeService;
 
         H2 title = new H2("Reporte de Horas Trabajadas");
-        add(title);
+        getCurrentPageLayout().add(title);
 
         List<Team> teams = teamService.findAllTeams();
         equipoComboBox.setItems(teams);
@@ -80,11 +80,12 @@ public class ReporteView extends VerticalLayout {
 
         Button reportButton = new Button("Generar Reporte de Horas Trabajadas",
                 event -> generateHoursWorkedReport());
-        HorizontalLayout filtersLayout = new HorizontalLayout(equipoComboBox, semanaComboBox, reportButton);
-        add(filtersLayout);
+        getCurrentPageLayout().add(reportButton);
 
-        // Añadir `headerLayout` al diseño principal para el encabezado dinámico
-        add(headerLayout);
+        HorizontalLayout filtersLayout = new HorizontalLayout(equipoComboBox, semanaComboBox);
+        getCurrentPageLayout().add(filtersLayout);
+
+        getCurrentPageLayout().add(headerLayout);
         updateHeaderLayout(null, null);
 
         grid.addColumn(map -> map.get("Empleado")).setHeader("Empleado");
@@ -92,7 +93,7 @@ public class ReporteView extends VerticalLayout {
         grid.addColumn(map -> map.get("Horas Pendientes")).setHeader("Horas Pendientes");
         grid.addColumn(map -> map.get("Observaciones")).setHeader("Observaciones");
 
-        add(grid);
+        getCurrentPageLayout().add(grid);
     }
 
     private void initializeSemanaComboBox() {
@@ -104,12 +105,11 @@ public class ReporteView extends VerticalLayout {
                 .map(date -> {
                     int weekNumber = date.get(WeekFields.of(DayOfWeek.MONDAY, 1)
                             .weekOfWeekBasedYear());
-                    LocalDate startOfWeek = date;
-                    LocalDate endOfWeek = startOfWeek.plusDays(6);
+                    LocalDate endOfWeek = date.plusDays(6);
 
                     return String.format("Semana %d: %s - %s",
                             weekNumber,
-                            startOfWeek.getDayOfMonth() + " de " + startOfWeek.getMonth()
+                            date.getDayOfMonth() + " de " + date.getMonth()
                                     .getDisplayName(TextStyle.FULL, Locale.getDefault()),
                             endOfWeek.getDayOfMonth() + " de " + endOfWeek.getMonth()
                                     .getDisplayName(TextStyle.FULL, Locale.getDefault())
@@ -170,15 +170,8 @@ public class ReporteView extends VerticalLayout {
         headerLayout.removeAll();
 
         if (team != null && dateInWeek != null) {
-            LocalDate startOfWeek = dateInWeek.with(DayOfWeek.FRIDAY);
-            LocalDate endOfWeek = dateInWeek.with(DayOfWeek.THURSDAY);
             int weekNumber = getWeekOfYear(dateInWeek);
 
-            String formattedStartDate = startOfWeek.getDayOfMonth() + " de "
-                    + startOfWeek.getMonth().getDisplayName(TextStyle.FULL, Locale.getDefault());
-            String formattedEndDate = endOfWeek.getDayOfMonth() + " de "
-                    + endOfWeek.getMonth().getDisplayName(TextStyle.FULL, Locale.getDefault());
-
             headerLayout.add(new Span("Informe "
                     + String.format("%03d", weekNumber) + "/" + currentYear) {{
                 getStyle().set("font-size", "24px");
@@ -217,7 +210,7 @@ public class ReporteView extends VerticalLayout {
             if (downloadLink == null) {
                 downloadLink = new Anchor(excelResource, "Descargar Reporte en Excel");
                 downloadLink.getElement().setAttribute("download", true);
-                add(downloadLink);
+                getCurrentPageLayout().add(downloadLink);
             } else {
                 downloadLink.setHref(excelResource);
             }

src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java

@@ -4,14 +4,19 @@ import com.primefactorsolutions.model.*;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.TimeOffRequestService;
 import com.primefactorsolutions.service.VacationService;
-import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.contextmenu.MenuItem;
 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.icon.VaadinIcon;
+import com.vaadin.flow.component.menubar.MenuBar;
+import com.vaadin.flow.component.menubar.MenuBarVariant;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.router.BeforeEvent;
 import com.vaadin.flow.router.HasUrlParameter;
 import com.vaadin.flow.router.PageTitle;
@@ -26,12 +31,15 @@ import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+import static com.primefactorsolutions.views.util.MenuBarUtils.createIconItem;
+
 @SpringComponent
 @PermitAll
 @Scope("prototype")
-@PageTitle("RequestEmployee")
+@PageTitle("Employee Request")
 @Route(value = "/requests", layout = MainLayout.class)
-public class RequestEmployeeView extends Div implements HasUrlParameter<String> {
+public class RequestEmployeeView extends BaseView implements HasUrlParameter<String> {
 
     private final TimeOffRequestService requestService;
     private final EmployeeService employeeService;
@@ -41,7 +49,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     private ComboBox<TimeOffRequestType> categoryFilter;
     private ComboBox<TimeOffRequestStatus> stateFilter;
     private UUID employeeId;
-    private TimeOffRequest request;
 
     public RequestEmployeeView(final TimeOffRequestService requestService,
                                final EmployeeService employeeService,
@@ -55,14 +62,15 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
         requestService.updateRequestStatuses();
         setupFilters();
         setupGrid();
-        add(requestGrid, createActionButtons(), createSummaryLayout());
+        getCurrentPageLayout().add(requestGrid, new H3("Balance"), createSummaryLayout());
         refreshRequestGrid(null, null);
     }
 
     private void setupFilters() {
         categoryFilter = createCategoryFilter();
         stateFilter = createStateFilter();
-        add(categoryFilter, stateFilter);
+        HorizontalLayout hl = new HorizontalLayout(categoryFilter, stateFilter);
+        getCurrentPageLayout().add(hl);
     }
 
     private ComboBox<TimeOffRequestType> createCategoryFilter() {
@@ -94,15 +102,20 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
         requestGrid.getColumnByKey("startDate").setHeader("Fecha de Inicio");
         requestGrid.getColumnByKey("endDate").setHeader("Fecha de Fin");
         requestGrid.getColumnByKey("daysToBeTake").setHeader("Días a Tomar");
+        requestGrid.addComponentColumn((ValueProvider<TimeOffRequest, Component>) timeOffRequest -> {
+            final MenuBar menuBar = new MenuBar();
+            menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
+            final MenuItem view = createIconItem(menuBar, VaadinIcon.EYE, "View");
+            view.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    navigateToViewRequest(timeOffRequest));
+            final MenuItem edit = createIconItem(menuBar, VaadinIcon.PENCIL, "Edit");
+            edit.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    navigateToEditRequest(timeOffRequest));
+            return menuBar;
+        });
 
         requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
-        requestGrid.asSingleSelect().addValueChangeListener(event -> {
-            TimeOffRequest selectedRequest = event.getValue();
-            if (selectedRequest != null) {
-                request = selectedRequest;
-            }
-        });
+        requestGrid.setPageSize(PAGE_SIZE);
     }
 
     private Set<TimeOffRequestType> getStandardExclusions() {
@@ -244,9 +257,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     private double calculateHolidayUtilizedDays(final int year) {
         return requests.stream()
                 .filter(this::verificationIsHoliday)
-                .filter(this::verificationIsHoliday)
-                .filter(req -> req.getState() == TimeOffRequestStatus.APROBADO)
-                .filter(req -> req.getState() == TimeOffRequestStatus.EN_USO)
                 .filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
                 .filter(req -> getStartDateYear(req) == year)
                 .mapToDouble(TimeOffRequest::getDaysToBeTake)
@@ -256,8 +266,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     private double calculatePersonalDaysUtilized(final boolean isMale, final int year) {
         return requests.stream()
                 .filter(req -> !verificationIsHoliday(req))
-                .filter(req -> req.getState() == TimeOffRequestStatus.APROBADO)
-                .filter(req -> req.getState() == TimeOffRequestStatus.EN_USO)
                 .filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
                 .filter(req -> !getStandardExclusions().contains(req.getCategory()))
                 .filter(req -> !(isMale && getMaleSpecificExclusions().contains(req.getCategory())))
@@ -294,24 +302,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
         return vacation.getType() != Vacation.Type.OTHER;
     }
 
-    private HorizontalLayout createActionButtons() {
-        Button viewButton = createButton("Ver", () -> navigateToViewRequest(request));
-        Button editButton = createButton("Editar", () -> navigateToEditRequest(request));
-        Button closeButton = new Button("Salir", event -> navigateToRequestsListView());
-
-        return new HorizontalLayout(viewButton, editButton, closeButton);
-    }
-
-    private Button createButton(final String caption, final Runnable action) {
-        return new Button(caption, event -> {
-            if (request != null) {
-                action.run();
-            } else {
-                Notification.show("Seleccione una solicitud.", 3000, Notification.Position.MIDDLE);
-            }
-        });
-    }
-
     private void navigateToRequestsListView() {
         getUI().ifPresent(ui -> ui.navigate(RequestsListView.class));
     }
@@ -420,7 +410,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     }
 
     private void setViewTitle(final String employeeName, final String employeeTeam) {
-        addComponentAsFirst(new H3("Nombre del empleado: " + employeeName));
-        addComponentAtIndex(1, new H3("Equipo: " + employeeTeam));
+        getCurrentPageLayout().addComponentAsFirst(new H3(String.format("%s (%s)", employeeName, employeeTeam)));
     }
 }

src/main/java/com/primefactorsolutions/views/RequestsListView.java

@@ -5,11 +5,16 @@ import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.TeamService;
 import com.primefactorsolutions.service.TimeOffRequestService;
 import com.primefactorsolutions.service.VacationService;
-import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.ClickEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Main;
-import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.contextmenu.MenuItem;
+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.HorizontalLayout;
+import com.vaadin.flow.function.ValueProvider;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
@@ -22,12 +27,15 @@ import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+import static com.primefactorsolutions.views.util.MenuBarUtils.createIconItem;
+
 @SpringComponent
 @Scope("prototype")
 @PageTitle("Requests")
 @Route(value = "/requests", layout = MainLayout.class)
 @PermitAll
-public class RequestsListView extends Main {
+public class RequestsListView extends BaseView {
 
     private final TimeOffRequestService requestService;
     private final EmployeeService employeeService;
@@ -35,13 +43,9 @@ public class RequestsListView extends Main {
     private final VacationService vacationService;
     private final PagingGrid<Employee> requestGrid = new PagingGrid<>();
 
-    private List<Employee> employees = Collections.emptyList();
     private ComboBox<Employee> employeeFilter;
     private ComboBox<Team> teamFilter;
-    private ComboBox<TimeOffRequestType> categoryFilter;
     private ComboBox<Status> stateFilter;
-    private UUID selectedEmployeeId;
-
 
     public RequestsListView(final TimeOffRequestService requestService,
                             final EmployeeService employeeService,
@@ -51,7 +55,6 @@ public class RequestsListView extends Main {
         this.employeeService = employeeService;
         this.teamService = teamService;
         this.vacationService = vacationService;
-        this.employees = employeeService.findAllEmployees();
         initializeView();
         refreshGeneralRequestGrid(null, null, null);
     }
@@ -60,14 +63,16 @@ public class RequestsListView extends Main {
         requestService.updateRequestStatuses();
         setupFilters();
         setupRequestGrid();
-        add(requestGrid);
-        add(createActionButtons());
+        getCurrentPageLayout().add(requestGrid);
     }
 
     private void setupFilters() {
-        add(createEmployeeFilter());
-        add(createTeamFilter());
-        add(createStateFilter());
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+        hl.add(createStateFilter());
+
+        getCurrentPageLayout().add(hl);
     }
 
     private void setupRequestGrid() {
@@ -75,27 +80,18 @@ public class RequestsListView extends Main {
         requestGrid.addColumn(this::getTeamName).setHeader("Equipo");
         requestGrid.addColumn(this::getEmployeeStatus).setHeader("Estado del empleado");
         requestGrid.addColumn(this::getGeneralTotal).setHeader("Total general");
+        requestGrid.addComponentColumn((ValueProvider<Employee, Component>) employee -> {
+            final MenuBar menuBar = new MenuBar();
+            menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
+            final MenuItem view = createIconItem(menuBar, VaadinIcon.EYE, "View");
+            view.addClickListener((ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent ->
+                    navigateToTimeOffRequestView(employee.getId()));
+
+            return menuBar;
+        });
 
         requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
-        requestGrid.asSingleSelect().addValueChangeListener(event -> {
-            Employee selectedRequest = event.getValue();
-            if (selectedRequest != null) {
-                selectedEmployeeId = selectedRequest.getId();
-            }
-        });
-    }
-
-    private HorizontalLayout createActionButtons() {
-        Button viewButton = new Button("Ver", event -> {
-            if (selectedEmployeeId != null) {
-                navigateToTimeOffRequestView(selectedEmployeeId);
-            } else {
-                Notification.show("Seleccione una solicitud.", 3000, Notification.Position.MIDDLE);
-            }
-        });
-        Button closeButton = new Button("Salir", event -> navigateToMainView());
-        return new HorizontalLayout(viewButton, closeButton);
+        requestGrid.setPageSize(PAGE_SIZE);
     }
 
     private void refreshGeneralRequestGrid(final Employee employee,
@@ -328,10 +324,8 @@ public class RequestsListView extends Main {
                 && !employeeRequestCategories.contains(vacation.getCategory())) {
             return false;
         }
-        if (!isFemale(employee) && genderSpecificExclusions.contains(vacation.getCategory())) {
-            return false;
-        }
-        return true;
+
+        return isFemale(employee) || !genderSpecificExclusions.contains(vacation.getCategory());
     }
 
     private boolean isFemale(final Employee employee) {

src/main/java/com/primefactorsolutions/views/util/MenuBarUtils.java

@@ -0,0 +1,19 @@
+package com.primefactorsolutions.views.util;
+
+import com.vaadin.flow.component.contextmenu.MenuItem;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.menubar.MenuBar;
+import lombok.experimental.UtilityClass;
+
+@UtilityClass
+public class MenuBarUtils {
+
+    public static MenuItem createIconItem(final MenuBar menu, final VaadinIcon iconName, final String ariaLabel) {
+        final Icon icon = new Icon(iconName);
+        final MenuItem item = menu.addItem(icon);
+        item.setAriaLabel(ariaLabel);
+
+        return item;
+    }
+}