improve tables layout

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

package.json

@@ -28,7 +28,6 @@
   },
   "devDependencies": {
     "@babel/preset-react": "7.24.7",
-    "@preact/signals-react-transform": "0.4.0",
     "@rollup/plugin-replace": "5.0.7",
     "@rollup/pluginutils": "5.1.0",
     "@types/react": "18.3.3",
@@ -74,7 +73,6 @@
     },
     "devDependencies": {
       "@babel/preset-react": "7.24.7",
-      "@preact/signals-react-transform": "0.4.0",
       "@rollup/plugin-replace": "5.0.7",
       "@rollup/pluginutils": "5.1.0",
       "@types/react": "18.3.3",
@@ -93,7 +91,7 @@
       "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>
@@ -265,11 +270,39 @@
             <artifactId>maven-surefire-plugin</artifactId>
             <version>3.3.1</version>
         </dependency>
+        <dependency>
+            <groupId>io.github.git-commit-id</groupId>
+            <artifactId>git-commit-id-maven-plugin</artifactId>
+            <version>9.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>
         <defaultGoal>spring-boot:run</defaultGoal>
         <plugins>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <version>9.0.1</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>

src/main/java/com/primefactorsolutions/config/PropertiesConfig.java

@@ -0,0 +1,19 @@
+package com.primefactorsolutions.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.io.ClassPathResource;
+
+@Configuration
+public class PropertiesConfig {
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
+        final PropertySourcesPlaceholderConfigurer propsConfig = new PropertySourcesPlaceholderConfigurer();
+        propsConfig.setLocation(new ClassPathResource("git.properties"));
+        propsConfig.setIgnoreResourceNotFound(true);
+        propsConfig.setIgnoreUnresolvablePlaceholders(true);
+
+        return propsConfig;
+    }
+}

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

@@ -1,111 +0,0 @@
-package com.primefactorsolutions.model;
-
-public final class Actividad {
-    private String nombre;
-    private double lunes;
-    private double martes;
-    private double miercoles;
-    private double jueves;
-    private double viernes;
-    private double sabado;
-    private double domingo;
-
-    public Actividad(final Builder builder) {
-        this.nombre = builder.nombre;
-        this.lunes = builder.lunes;
-        this.martes = builder.martes;
-        this.miercoles = builder.miercoles;
-        this.jueves = builder.jueves;
-        this.viernes = builder.viernes;
-        this.sabado = builder.sabado;
-        this.domingo = builder.domingo;
-    }
-
-    public String getNombre() {
-        return nombre;
-    }
-
-    public double getLunes() {
-        return lunes;
-    }
-
-    public double getMartes() {
-        return martes;
-    }
-
-    public double getMiercoles() {
-        return miercoles;
-    }
-
-    public double getJueves() {
-        return jueves;
-    }
-
-    public double getViernes() {
-        return viernes;
-    }
-
-    public double getSabado() {
-        return sabado;
-    }
-
-    public double getDomingo() {
-        return domingo;
-    }
-
-    // Builder para crear instancias de Actividad
-    public static class Builder {
-        private String nombre;
-        private double lunes;
-        private double martes;
-        private double miercoles;
-        private double jueves;
-        private double viernes;
-        private double sabado;
-        private double domingo;
-
-        public Builder nombre(final String nombre) {
-            this.nombre = nombre;
-            return this;
-        }
-
-        public Builder lunes(final double horas) {
-            this.lunes = horas;
-            return this;
-        }
-
-        public Builder martes(final double horas) {
-            this.martes = horas;
-            return this;
-        }
-
-        public Builder miercoles(final double horas) {
-            this.miercoles = horas;
-            return this;
-        }
-
-        public Builder jueves(final double horas) {
-            this.jueves = horas;
-            return this;
-        }
-
-        public Builder viernes(final double horas) {
-            this.viernes = horas;
-            return this;
-        }
-
-        public Builder sabado(final double horas) {
-            this.sabado = horas;
-            return this;
-        }
-
-        public Builder domingo(final double horas) {
-            this.domingo = horas;
-            return this;
-        }
-
-        public Actividad build() {
-            return new Actividad(this);
-        }
-    }
-}

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

@@ -28,36 +28,42 @@ public class Employee extends BaseEntity implements UserDetails {
     @Pattern(regexp = "^[a-zA-Z ]+$", message = "El apellido solo debe contener letras")
     private String lastName;
     private LocalDate birthday;
-    @Pattern(regexp = "^[a-zA-Z ]+$", message = "La ciudad de nacimiento solo debe contener letras")
+    @Pattern(regexp = "^[a-zA-Z ,]+$", message = "La ciudad de nacimiento solo debe contener letras, espacios o comas")
     private String birthCity;
     private String age;
-    @Size(max = 100, message = "La dirección de residencia no debe exceder 100 caracteres")
+    @Size(max = 50, message = "La dirección de residencia no debe exceder 50 caracteres")
     private String residenceAddress;
-    @Size(max = 100, message = "La dirección local no debe exceder 100 caracteres")
+    @Size(max = 30, message = "La dirección local no debe exceder 100 caracteres")
+    @Pattern(regexp = "^[a-zA-Z -]+$", message = "La dirección local solo debe contener letras y guion")
     private String localAddress;
     @Pattern(regexp = "^[0-9]+$", message = "El número de teléfono debe contener solo números")
     private String phoneNumber;
     @Email(message = "El correo personal no tiene un formato válido")
     private String personalEmail;
+
     @Pattern(regexp = "^[a-zA-Z ]+$", message = "El cargo solo debe contener letras")
     private String position;
     @ManyToOne
     @JoinColumn(name = "team_id", nullable = false)
     private Team team;
-    @Size(max = 100, message = "El nombre de contacto de emergencia no debe exceder 100 caracteres")
+
+    @Pattern(regexp = "^[a-zA-Z ]+$", message = "El nombre y apellido de contacto"
+            + " de emergencia solo debe contener letras")
     private String emergencyCName;
-    @Size(max = 100, message = "La dirección de contacto de emergencia no debe exceder 100 caracteres")
     private String emergencyCAddress;
-    @Pattern(regexp = "^[0-9]+$", message = "El teléfono de contacto de emergencia debe contener solo números")
+    @Pattern(regexp = "^[0-9]+$", message = "El teléfono de contacto de emergencia "
+            + " debe contener solo números")
     private String emergencyCPhone;
     @Email(message = "El correo de contacto de emergencia no tiene un formato válido")
     private String emergencyCEmail;
+
+    @Max(value = 10, message = "El número de hijos no puede exceder a 10")
     @Pattern(regexp = "^[0-9]+$", message = "La cantidad de hijos debe contener solo números")
     private String numberOfChildren;
+
     @Pattern(regexp = "^[0-9]+$", message = "El CI debe contener solo números")
     private String ci;
     private String issuedIn;
-    @Size(max = 100, message = "El título no debe exceder 100 caracteres")
     private String pTitle1;
     private String pTitle2;
     private String pTitle3;
@@ -70,9 +76,7 @@ public class Employee extends BaseEntity implements UserDetails {
     private String certification2;
     private String certification3;
     private String certification4;
-    @Size(max = 255, message = "El reconocimiento no debe exceder 255 caracteres")
     private String recognition;
-    @Size(max = 500, message = "Los logros no deben exceder 500 caracteres")
     private String achievements;
 
     private String language;

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

@@ -1,41 +1,56 @@
 package com.primefactorsolutions.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
-import java.util.UUID;
+import java.time.LocalDate;
+import java.time.temporal.WeekFields;
+import java.util.List;
+import java.util.Locale;
 
+@Data
 @Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public class HoursWorked extends BaseEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
     @ManyToOne
+    @JoinColumn(name = "employee_id", nullable = true)
     private Employee employee;
 
+    @ManyToOne
+    @JoinColumn(name = "team_id", nullable = true)
+    private Team team;
+
     private int weekNumber;
+    private LocalDate date;
+    private String actividad;
+    private String tareasEspecificas;
+    private double hours;
+    private double horasTareasEspecificas;
+    private double horaspendientes;
     private double totalHours;
 
-    public HoursWorked() { }
-
-    public UUID getId() {
-        return id;
+    public static double calculateTotalHours(final List<HoursWorked> activities) {
+        return activities.stream()
+                .mapToDouble(activity -> activity.hours + activity.horasTareasEspecificas)
+                .sum();
     }
 
-    public void setId(final UUID id) {
-        this.id = id;
+    public static double calculatePendingHours(final List<HoursWorked> activities) {
+        double totalHoursWorked = calculateTotalHours(activities);
+        return Math.max(0, 40 - totalHoursWorked);
     }
 
     public Employee getEmployee() {
         return employee;
     }
 
-    public void setEmployee(final Employee value) {
-        this.employee = value;
+    public void setEmployee(final Employee employee) {
+        this.employee = employee;
     }
 
     public int getWeekNumber() {
@@ -45,12 +60,90 @@ public class HoursWorked extends BaseEntity {
     public void setWeekNumber(final int weekNumber) {
         this.weekNumber = weekNumber;
     }
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(final LocalDate date) {
+        this.date = date;
+        if (date != null) {
+            WeekFields weekFields = WeekFields.of(Locale.getDefault());
+            this.weekNumber = date.get(weekFields.weekOfWeekBasedYear());
+        }
+    }
+
+    public String getActividad() {
+        return actividad;
+    }
+
+    public void setActividad(final String actividad) {
+        this.actividad = actividad;
+    }
+
+    public double getHours() {
+        return hours;
+    }
+
+    public void setHours(final double hours) {
+        this.hours = hours;
+    }
 
     public double getTotalHours() {
-        return totalHours;
+        double total = this.getHours();
+        return totalHours + total;
     }
 
     public void setTotalHours(final double totalHours) {
         this.totalHours = totalHours;
     }
+
+    public Team getTeam() {
+        return team;
+    }
+
+    public void setTeam(final Team team) {
+        this.team = team;
+    }
+
+    public String getTareasEspecificas() {
+        return tareasEspecificas;
+    }
+
+    public void setTareasEspecificas(final String tareasEspecificas) {
+        this.tareasEspecificas = tareasEspecificas;
+    }
+
+    public double getHorasTareasEspecificas() {
+        return horasTareasEspecificas;
+    }
+
+    public void setHorasTareasEspecificas(final double horasTareasEspecificas) {
+        this.tareasEspecificas = tareasEspecificas;
+    }
+    public double getHoraspendientes() {
+        //double horasTrabajadas = this.getTotalHours() + this.getHorasTareasEspecificas();
+        return 40;
+    }
+
+    public void setHoraspendientes(final double horaspendientes) {
+        this.horaspendientes = horaspendientes;
+    }
+
+    public double getHoursWorked() {
+        return hours;
+    }
+
+    public void setHoursWorked(final double hoursWorked) {
+        this.hours = hoursWorked;
+    }
+
+    public double getTotalHoursWorked() {
+        return totalHours;
+    }
+
+    public void setTotalHoursWorked(final double totalHoursWorked) {
+        this.totalHours = totalHoursWorked;
+    }
+
+
 }

src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java

@@ -3,6 +3,7 @@ package com.primefactorsolutions.repositories;
 import com.primefactorsolutions.model.Employee;
 import org.springframework.data.jpa.repository.JpaRepository;
 
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
@@ -10,4 +11,7 @@ public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
     Optional<Employee> findByUsername(String username);
 
     Optional<Employee> findByPersonalEmail(String personalEmail);
-}
+    Optional<Employee> findByTeamId(UUID teamId);
+
+    List<Employee> findByTeamName(String teamName);
+}

src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java

@@ -2,9 +2,15 @@ package com.primefactorsolutions.repositories;
 
 import com.primefactorsolutions.model.HoursWorked;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
 
-@Repository
-public interface HoursWorkedRepository extends JpaRepository<HoursWorked, Long> {
-    // Puedes definir consultas personalizadas aquí si es necesario.
+import java.time.LocalDate;
+import java.util.List;
+import java.util.UUID;
+
+
+public interface HoursWorkedRepository extends JpaRepository<HoursWorked, UUID> {
+    List<HoursWorked> findByWeekNumber(int weekNumber);
+    List<HoursWorked> findByDate(LocalDate date);
+    List<HoursWorked> findByEmployeeIdAndWeekNumber(UUID employeeId, int weekNumber);
 }
+

src/main/java/com/primefactorsolutions/service/EmployeeService.java

@@ -48,6 +48,13 @@ public class EmployeeService {
         return null;
     }
 
+    public String getTeamLeadName(final UUID teamId) {
+        // Encuentra al empleado con el rol de lead_manager en el equipo especificado
+        Optional<Employee> leadManager = employeeRepository.findByTeamId(teamId);
+
+        return leadManager.map(employee -> employee.getFirstName() + " " + employee.getLastName())
+                .orElse("No asignado");
+    }
     public List<Employee> findEmployees(
             final int start, final int pageSize, final String sortProperty, final boolean asc) {
         List<Employee> employees = employeeRepository.findAll();
@@ -115,4 +122,8 @@ public class EmployeeService {
     public List<Employee> findAllEmployees() {
         return employeeRepository.findAll();
     }
+
+    public List<Employee> findEmployeesByTeam(final String teamName) {
+        return employeeRepository.findByTeamName(teamName);
+    }
 }

src/main/java/com/primefactorsolutions/service/HoursWorkedService.java

@@ -2,10 +2,12 @@ package com.primefactorsolutions.service;
 
 import com.primefactorsolutions.model.HoursWorked;
 import com.primefactorsolutions.repositories.HoursWorkedRepository;
+import org.apache.commons.beanutils.BeanComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.time.LocalDate;
+import java.util.*;
 
 @Service
 public class HoursWorkedService {
@@ -20,6 +22,20 @@ public class HoursWorkedService {
         return hoursWorkedRepository.findAll();
     }
 
+    public double getTotalHoursWorkedByEmployeeForWeek(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> hoursWorkedList = hoursWorkedRepository.findByWeekNumber(weekNumber);
+        return hoursWorkedList.stream()
+                .filter(hw -> hw.getEmployee().getId().equals(employeeId))
+                .mapToDouble(HoursWorked::getTotalHours)
+                .sum();
+    }
+
+    public HoursWorked findHoursWorked(final UUID id) {
+        Optional<HoursWorked> hoursWorked = hoursWorkedRepository.findById(id);
+        HoursWorked hw = hoursWorked.get();
+        return hw;
+    }
+
     public HoursWorked saveHoursWorked(final HoursWorked hoursWorked) {
         return hoursWorkedRepository.save(hoursWorked);
     }
@@ -28,8 +44,56 @@ public class HoursWorkedService {
         return hoursWorkedRepository.save(hoursWorked);
     }
 
-    public void deleteHoursWorked(final Long id) {
-        hoursWorkedRepository.deleteById(id);
+    public double getTotalHoursForEmployee(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+        return HoursWorked.calculateTotalHours(activities);
     }
-}
 
+    public double getPendingHoursForEmployee(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+        return HoursWorked.calculatePendingHours(activities);
+    }
+
+    public List<HoursWorked> findByWeekNumber(final int weekNumber) {
+        return hoursWorkedRepository.findByWeekNumber(weekNumber);
+    }
+
+    public List<HoursWorked> findByDate(final LocalDate date) {
+        return hoursWorkedRepository.findByDate(date);
+    }
+
+    public List<HoursWorked> findByDateAndWeekNumber(final LocalDate date, final int weekNumber) {
+        return hoursWorkedRepository.findByDate(date);
+    }
+
+    public List<HoursWorked> findHoursWorkeds(
+            final int start, final int pageSize, final String sortProperty, final boolean asc) {
+        List<HoursWorked> hoursWorkeds = hoursWorkedRepository.findAll();
+
+        int end = Math.min(start + pageSize, hoursWorkeds.size());
+        hoursWorkeds.sort(new BeanComparator<>(sortProperty));
+
+        if (!asc) {
+            Collections.reverse(hoursWorkeds);
+        }
+
+        return hoursWorkeds.subList(start, end);
+    }
+
+    public List<HoursWorked> findHoursWorkeds(final int start, final int pageSize) {
+        List<HoursWorked> hoursWorkeds = hoursWorkedRepository.findAll();
+
+        int end = Math.min(start + pageSize, hoursWorkeds.size());
+        return hoursWorkeds.subList(start, end);
+    }
+
+    public HoursWorked getHoursWorked(final UUID id) {
+        final Optional<HoursWorked> hoursWorked = hoursWorkedRepository.findById(id);
+        return hoursWorked.get();
+    }
+
+    public List<HoursWorked> findListHoursWorkedEmployee(final UUID employeeId, final int weekNumber) {
+        return hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+    }
+
+}

src/main/java/com/primefactorsolutions/service/ReportService.java

@@ -11,6 +11,7 @@ import lombok.SneakyThrows;
 import org.apache.pdfbox.io.MemoryUsageSetting;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
@@ -31,20 +32,59 @@ public class ReportService {
 
     // Este método ahora solo crea el archivo Excel a partir de los datos que recibe.
     public byte[] writeAsExcel(final String reportName, final List<String> headers,
-                               final List<Map<String, Object>> data)
+                               final List<Map<String, Object>> data, final String selectedTeam,
+                               final int weekNumber, final int currentYear)
             throws IOException {
-        return createExcelFile(reportName, headers, data);
+        return createExcelFile(reportName, headers, data, selectedTeam, weekNumber, currentYear);
     }
 
     private byte[] createExcelFile(final String reportName, final List<String> headers,
-                                   final List<Map<String, Object>> data)
+                                   final List<Map<String, Object>> data, final String selectedTeam,
+                                   final int weekNumber, final int currentYear)
             throws IOException {
         try (Workbook workbook = new XSSFWorkbook();
              ByteArrayOutputStream os = new ByteArrayOutputStream()) {
             Sheet sheet = workbook.createSheet(reportName);
 
             // Crear encabezados
-            Row headerRow = sheet.createRow(0);
+            // Crear una fila para el rótulo "Reporte por equipo"
+            Row titleRow = sheet.createRow(0);  // Fila 0 para el rótulo
+            Cell titleCell = titleRow.createCell(0);
+
+            // Concatenar el nombre del equipo al rótulo
+            String titleText = "Informe: " + weekNumber + "/" + currentYear;
+            titleCell.setCellValue(titleText);
+
+            // Estilo del rótulo
+            CellStyle titleStyle = workbook.createCellStyle();
+            Font titleFont = workbook.createFont();
+            titleFont.setBold(true);
+            titleFont.setFontHeightInPoints((short) 14); // Tamaño de la fuente
+            titleStyle.setFont(titleFont);
+            titleCell.setCellStyle(titleStyle);
+
+            // Fusionar celdas para el rótulo
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, headers.size() - 1)); // Ajusta el rango de celdas
+
+            // Crear filas adicionales con la información solicitada
+            Row asuntoRow = sheet.createRow(1); // Fila 1: Asunto
+            asuntoRow.createCell(0).setCellValue("Asunto: Informe semanal de horas trabajadas");
+            sheet.addMergedRegion(new CellRangeAddress(1, 1, 0, headers.size() - 1));
+
+            Row semanaRow = sheet.createRow(2); // Fila 2: Semana
+            semanaRow.createCell(0).setCellValue("Semana:  " + weekNumber); // Puedes insertar una fecha real aquí
+            sheet.addMergedRegion(new CellRangeAddress(2, 2, 0, headers.size() - 1));
+
+            Row horasCumplirRow = sheet.createRow(3); // Fila 3: Horas a cumplir
+            horasCumplirRow.createCell(0).setCellValue("Horas a cumplir: 40 horas"); // Puedes agregar las horas reales
+            sheet.addMergedRegion(new CellRangeAddress(3, 3, 0, headers.size() - 1));
+
+            Row teamLeadRow = sheet.createRow(4); // Fila 4: Team Lead
+            teamLeadRow.createCell(0).setCellValue("Team Lead: "); // Solo texto
+            sheet.addMergedRegion(new CellRangeAddress(4, 4, 0, headers.size() - 1));
+
+            // Crear encabezados (fila 5)
+            Row headerRow = sheet.createRow(5); // Los encabezados empiezan en la fila 5
             CellStyle headerStyle = workbook.createCellStyle();
             Font headerFont = workbook.createFont();
             headerFont.setBold(true);
@@ -56,20 +96,22 @@ public class ReportService {
                 cell.setCellStyle(headerStyle);
             }
 
-            // Crear filas de datos
+            // Crear filas de datos (a partir de la fila 6)
             for (int i = 0; i < data.size(); i++) {
-                Row dataRow = sheet.createRow(i + 1);
+                Row dataRow = sheet.createRow(i + 6);  // Los datos empiezan después de la fila de encabezados
                 Map<String, Object> rowData = data.get(i);
                 int cellIndex = 0;
                 for (String key : headers) {
                     Cell cell = dataRow.createCell(cellIndex++);
                     Object value = rowData.get(key);
-                    switch (value) {
-                        case String s -> cell.setCellValue(s);
-                        case Number number -> cell.setCellValue(number.doubleValue());
-                        case null -> cell.setCellValue(""); // Manejo de valores nulos
-                        default -> {
+                    if (value != null) {
+                        if (value instanceof String) {
+                            cell.setCellValue((String) value);
+                        } else if (value instanceof Number) {
+                            cell.setCellValue(((Number) value).doubleValue());
                         }
+                    } else {
+                        cell.setCellValue(""); // Manejo de valores nulos
                     }
                 }
             }
@@ -132,4 +174,4 @@ public class ReportService {
 
         return cfg;
     }
-}
+}

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

@@ -37,7 +37,7 @@ public class AssessmentsListView extends Main {
         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 +51,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 +95,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();

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

@@ -28,15 +28,13 @@ import java.util.stream.Stream;
 @Route(value = "/candidates", layout = MainLayout.class)
 @PermitAll
 public class CandidatesListView extends Main {
-    private final CandidateService candidateService;
 
     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 +44,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 +59,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();

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

@@ -9,8 +9,8 @@ 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.grid.GridSortOrder;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.component.html.Span;
+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;
@@ -24,13 +24,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 +47,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() {
@@ -133,7 +139,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) {

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

@@ -1,5 +1,7 @@
 package com.primefactorsolutions.views;
 
+import com.primefactorsolutions.model.Employee;
+import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.model.*;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.ReportService;
@@ -54,7 +56,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
     private final TimeOffRequestService requestService;
     private final TeamService teamService;
 
-
     // TODO: campo usado para registrar al empleado en LDAP. Este campo podria estar en otro form eventualmente.
     private final TextField username = createTextField("Username: ", 30, true);
     private final TextField firstName = createTextField("Nombres: ", 30, true);
@@ -63,24 +64,21 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
     private final ComboBox<Employee.Gender> gender = createGenderComboBox();
     private final VDatePicker birthday = new VDatePicker("Fecha de Nacimiento");
     private final TextField age = createTextField("Edad", 3, false);
-    private final TextField birthCity = createTextField("Ciudad y País de Nacimiento", 20, false);
+    private final TextField birthCity = createTextField("Ciudad y País de Nacimiento     ejemplo: (Ciudad, País) ",
+            30, false);
     private final TextField residenceAddress = createTextField("Dirección de Residencia", 50, false);
-    private final TextField localAddress = createTextField("Dep/Provincia de Residencia", 10, false);
+    private final TextField localAddress = createTextField("Departamento y Provincia de Residencia   "
+            + "  ejemplo: (Departamento-Provincia)", 30, false);
     private final ComboBox<Employee.MaritalStatus> maritalStatus = createMaritalStatusComboBox();
-    private final TextField numberOfChildren = createTextField("Numero de Hijos", 3, false);
-    private final TextField ci = createTextField("CI", 30, false);
-    private final TextField issuedIn = createTextField("Expedido en ", 30, false);
+    private final TextField numberOfChildren = createTextField("Numero de Hijos", 2, false);
+    private final TextField ci = createTextField("CI", 10, false);
+    private final TextField issuedIn = createTextField("Expedido en ", 10, false);
     private final TextField phoneNumber = createTextField("Teléfono", 8, false);
-    private final EmailField personalEmail = createEmailField("E-mail");
-    private final TextField cod =  createTextField("Codigo de Empleado", 30, false);
-    private final TextField position = createTextField("Cargo", 30, false);
-    private final ComboBox<Team> team = new ComboBox<>("Equipo");
-    private final TextField leadManager =  createTextField("Lead/Manager", 30, false);
-    private final TextField project =  createTextField("Proyecto", 30, false);
+    private final EmailField personalEmail = createEmailField("E-mail      ejemplo: (ejemplo@gmail.com)");
     private final TextField emergencyCName = createTextField("Nombres y Apellidos de Contacto", 50, false);
     private final TextField emergencyCAddress = createTextField("Dirección de Contacto", 50, false);
     private final TextField emergencyCPhone = createTextField("Teléfono de Contacto", 8, false);
-    private final EmailField emergencyCEmail = createEmailField("Email de Contacto");
+    private final EmailField emergencyCEmail = createEmailField("Email de Contacto     ejemplo: (ejemplo@gmail.com)");
 
     private final MemoryBuffer buffer = new MemoryBuffer();
     private final Upload upload = new Upload(buffer);
@@ -99,10 +97,15 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
     private final TextField certification4 =  createTextField("Certificación 4", 30, false);
     private final TextField recognition =  createTextField("Reconocimientos", 30, false);
     private final TextField achievements =  createTextField("Logros Profesionales", 30, false);
-    private final TextField language =  createTextField("Idioma", 30, false);
+    private final TextField language =  createTextField("Idioma", 50, false);
     private final TextField languageLevel =  createTextField("Nivel de Idioma", 30, false);
 
-    //INFORMACION DE CONTRATACION
+    //INFORMACION ADMINISTRATIVA
+    private final TextField cod =  createTextField("Codigo de Empleado", 20, false);
+    private final TextField position = createTextField("Cargo", 30, false);
+    private final ComboBox<Team> team = new ComboBox<>("Equipo");
+    private final TextField leadManager =  createTextField("Lead/Manager", 30, false);
+    private final TextField project =  createTextField("Proyecto", 30, false);
     private final VDatePicker dateOfEntry = new VDatePicker("Fecha de Ingreso");
     private final VDatePicker dateOfExit = new VDatePicker("Fecha de Retiro");
     private final TextField contractType =  createTextField("Tipo de Contratación", 30, false);
@@ -139,7 +142,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
     //TITULOS PARA INFORMACIÓN ADMINISTRATIVA
     private final H2 infoAdm = new H2("Información Administrativa");
     private final H3 infoCont = new H3("Información de Contratación");
-    private final H3 datBanc = new H3("Datos Bancados");
+    private final H3 datBanc = new H3("Datos Bancarios");
     private final H3 datGest = new H3("Datos Gestora Pública y Seguro Social");
 
     public EmployeeView(final EmployeeService employeeService,
@@ -174,6 +177,9 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         editButton.setVisible(true);
         reportButton.setVisible(true);
         birthday.addValueChangeListener(event -> calculateAge());
+        birthday.setMax(java.time.LocalDate.now());
+        dateOfEntry.addValueChangeListener(event -> calculateSeniority());
+        dateOfEntry.addValueChangeListener(event -> calculateSeniority());
 
         reportButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
             var employee = getEntity();
@@ -201,10 +207,30 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
             int birthYear = birthday.getValue().getYear();
             int ages = currentYear - birthYear;
             age.setValue(String.valueOf(ages));
+            if (ages < 18) {
+                birthday.setInvalid(true);
+                birthday.setErrorMessage("La edad no puede ser menor a 18 años.");
+                Notification.show("La edad ingresada no es válida, debe ser mayor o igual a 18 años.");
+            } else {
+                birthday.setInvalid(false);
+            }
             System.out.println(age);
         }
     }
 
+    private void calculateSeniority() {
+        LocalDate entryDate = dateOfEntry.getValue();
+        LocalDate exitDate = dateOfExit.getValue() != null ? dateOfExit.getValue() : LocalDate.now();
+
+        if (entryDate != null) {
+            long yearsOfService = ChronoUnit.YEARS.between(entryDate, exitDate);
+            String seniorityValue = yearsOfService + " años ";
+            seniority.setValue(seniorityValue);
+        } else {
+            seniority.setValue("No disponible");
+        }
+    }
+
     private void configureUpload() {
         upload.setAcceptedFileTypes("image/jpeg", "image/png");
         upload.setMaxFileSize(1024 * 1024);
@@ -216,11 +242,15 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
 
                 getEntity().setProfileImage(base64Image);
 
-                profileImagePreview.setSrc("data:image/jpeg;base64," + base64Image);
+                profileImagePreview.setSrc("data:image/png;base64," + base64Image);
                 profileImagePreview.setMaxWidth("150px");
                 profileImagePreview.setMaxHeight("150px");
             } catch (IOException e) {
-                Notification.show("Error al subir la imagen.");
+                Notification.show("Error al subir la imagen: " + e.getMessage());
+                e.printStackTrace();
+            } catch (Exception e) {
+                Notification.show("Error en el servidor al procesar la imagen.");
+                e.printStackTrace();
             }
         });
     }
@@ -391,12 +421,12 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         if (employee.getProfileImage() != null && !employee.getProfileImage().isEmpty()) {
             profileImagePreview.setSrc("data:image/jpeg;base64," + employee.getProfileImage());
             profileImagePreview.setVisible(true);
-            profileImagePreview.setMaxWidth("150px");
-            profileImagePreview.setMaxHeight("150px");
+            profileImagePreview.setMaxWidth("250px");
+            profileImagePreview.setMaxHeight("250px");
 
-            upload.setVisible(false);
+            upload.setVisible(true);
         } else {
-            profileImagePreview.setVisible(false);
+            profileImagePreview.setVisible(true);
             upload.setVisible(true);
         }
     }
@@ -476,6 +506,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         emergencyCPhone.setReadOnly(false);
         emergencyCEmail.setReadOnly(false);
         upload.setVisible(false);
+        profileImagePreview.setVisible(true);
         age.setReadOnly(false);
         gender.setReadOnly(false);
         status.setReadOnly(false);
@@ -523,7 +554,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
                 birthCity, residenceAddress, localAddress,
                 maritalStatus, ci, issuedIn, numberOfChildren,
                 phoneNumber, personalEmail,
-                cod, position, team, leadManager, project,
                 contEmerg, emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail,
                 infProf,
                 titulos, pTitle1, pTitle2, pTitle3, pStudy1, pStudy2, pStudy3,
@@ -531,6 +561,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
                 logros, recognition, achievements,
                 idioma, language, languageLevel,
                 infoAdm,
+                cod, position, team, leadManager, project,
                 infoCont, dateOfEntry, dateOfExit, contractType, seniority, salary,
                 datBanc, bankName, accountNumber,
                 datGest, gpss, sss, beneficiaries,

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

@@ -4,7 +4,6 @@ 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 +15,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 +32,10 @@ public class EmployeesListView extends Main {
     }
 
     private void setupView() {
-        add(new H2("Employee List"));
+        getCurrentPageLayout().add(new H2("Employee List"));
         configureTable();
-        add(createAddEmployeeButton());
-        add(table);
+        getCurrentPageLayout().add(createAddEmployeeButton());
+        getCurrentPageLayout().add(table);
     }
 
     private void configureTable() {
@@ -75,7 +73,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

@@ -0,0 +1,256 @@
+package com.primefactorsolutions.views;
+
+import com.primefactorsolutions.model.Employee;
+import com.primefactorsolutions.model.HoursWorked;
+import com.primefactorsolutions.model.Team;
+import com.primefactorsolutions.service.EmployeeService;
+import com.primefactorsolutions.service.HoursWorkedService;
+import com.primefactorsolutions.service.TeamService;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+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 org.vaadin.firitin.components.grid.PagingGrid;
+
+import java.time.LocalDate;
+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 BaseView {
+
+    private final HoursWorkedService hoursWorkedService;
+    private final EmployeeService employeeService;
+    private final TeamService teamService;
+    private final PagingGrid<HoursWorked> hoursWorkedGrid = new PagingGrid<>();
+    private ComboBox<Employee> employeeFilter;
+    private ComboBox<Team> teamFilter;
+    private UUID selectedEmployeeId;
+
+
+    public HoursWorkedListView(final HoursWorkedService hoursWorkedService,
+                               final EmployeeService employeeService,
+                               final TeamService teamService) {
+        this.hoursWorkedService = hoursWorkedService;
+        this.employeeService = employeeService;
+        this.teamService = teamService;
+
+        initializeView();
+        refreshGridListHoursWorked(null, null);
+    }
+
+    private void refreshGridListHoursWorked(final Employee employee,
+                                            final Team team) {
+        hoursWorkedGrid.setPagingDataProvider((page, pageSize) -> {
+            int start = (int) (page * hoursWorkedGrid.getPageSize());
+            List<HoursWorked> hoursWorkedList = fetchFilteredHoursWorked(start, pageSize, employee, team);
+
+            double totalHours = hoursWorkedList.stream()
+                    .mapToDouble(HoursWorked::getTotalHours)
+                    .sum();
+
+            Notification.show("Total de horas trabajadas: " + totalHours,
+                    3000, Notification.Position.BOTTOM_CENTER);
+
+            return hoursWorkedList;
+        });
+        hoursWorkedGrid.getDataProvider().refreshAll();
+    }
+
+    private List<HoursWorked> fetchFilteredHoursWorked(final int start,
+                                                       final int pageSize,
+                                                       final Employee employee,
+                                                       final Team team) {
+        List<HoursWorked> filteredHoursWorked = hoursWorkedService.findAll();
+
+        if (employee != null && !"TODOS".equals(employee.getFirstName())) {
+            filteredHoursWorked = filteredHoursWorked.stream()
+                    .filter(hw -> hw.getEmployee().getId().equals(employee.getId()))
+                    .collect(Collectors.toList());
+        }
+
+        if (team != null && !"TODOS".equals(team.getName())) {
+            filteredHoursWorked = filteredHoursWorked.stream()
+                    .filter(hw -> hw.getEmployee().getTeam() != null
+                            && hw.getEmployee().getTeam().getId().equals(team.getId()))
+                    .collect(Collectors.toList());
+        }
+
+        for (HoursWorked hoursWorked : filteredHoursWorked) {
+            if (employee != null && hoursWorked.getEmployee().getId().equals(employee.getId())) {
+                LocalDate date = hoursWorked.getDate();
+                int currentWeek = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+
+                double totalWorkedInSameWeek = filteredHoursWorked.stream()
+                        .filter(hw -> hw.getEmployee().getId().equals(employee.getId())
+                                &&
+                                hw.getDate().get(IsoFields.WEEK_OF_WEEK_BASED_YEAR) == currentWeek)
+                        .mapToDouble(HoursWorked::getHours)
+                        .sum();
+
+                double updatedPendingHours = totalWorkedInSameWeek - hoursWorked.getHours();
+                hoursWorked.setHoraspendientes(updatedPendingHours);
+            }
+        }
+
+        int end = Math.min(start + pageSize, filteredHoursWorked.size());
+        return filteredHoursWorked.subList(start, end);
+    }
+
+    private void initializeView() {
+        getCurrentPageLayout().add(createAddHoursWorked());
+        setupFilters();
+        setupListHoursWorkedGrid();
+        getCurrentPageLayout().add(hoursWorkedGrid);
+        getCurrentPageLayout().add(createActionButtons());
+    }
+
+    private void setupFilters() {
+        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(HoursWorked::getWeekNumber)
+                .setHeader("Semana")
+                .setSortable(true);
+        hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getFirstName() + " " + hw.getEmployee().getLastName())
+                .setHeader("Empleado");
+        hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getTeam() != null ? hw.getEmployee().getTeam()
+                        .getName() : "Sin asignar")
+                .setHeader("Equipo");
+        hoursWorkedGrid.addColumn(HoursWorked::getActividad).setHeader("Actividad");
+        hoursWorkedGrid.addColumn(HoursWorked::getHours).setHeader("Total Horas").setSortable(true);
+        hoursWorkedGrid.addColumn(hw -> hw.getHoraspendientes() - calcularTotal(hw)).setHeader("Horas Pendientes")
+                .setSortable(true);
+
+        hoursWorkedGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
+        hoursWorkedGrid.setPageSize(PAGE_SIZE);
+        hoursWorkedGrid.asSingleSelect().addValueChangeListener(event -> {
+            HoursWorked selectedHoursWorked = event.getValue();
+            if (selectedHoursWorked != null) {
+                selectedEmployeeId = selectedHoursWorked.getEmployee().getId();
+            }
+        });
+    }
+
+    private double calcularTotal(final HoursWorked hoursWorked) {
+        List<HoursWorked> listHoursworkedemploye = hoursWorkedService.findListHoursWorkedEmployee(
+                hoursWorked.getEmployee().getId(), hoursWorked.getWeekNumber());
+        return calculateTotalUtilized(listHoursworkedemploye);
+    }
+
+    private double calculateTotalUtilized(final List<HoursWorked> employeeRequests) {
+        return employeeRequests.stream()
+                .filter(Objects::nonNull)
+                .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) {
+        final Button button = new Button(label);
+        button.addClickListener(event -> onClickAction.run());
+
+        return button;
+    }
+
+    private Button createAddHoursWorked() {
+        return createButton("Agregar Actividad", this::navigateToHours);
+    }
+
+    private void navigateToHours() {
+        getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));
+    }
+
+    private ComboBox<Employee> createEmployeeFilter() {
+        employeeFilter = new ComboBox<>("Empleado");
+        final List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
+        employees.addFirst(createAllEmployeesOption());
+        employeeFilter.setItems(employees);
+        employeeFilter.setItemLabelGenerator(this::getEmployeeFullName);
+        employeeFilter.setValue(employees.getFirst());
+        employeeFilter.addValueChangeListener(event ->
+                refreshGridListHoursWorked(
+                        event.getValue(),
+                        teamFilter.getValue()
+                )
+        );
+
+        return employeeFilter;
+    }
+
+    private String getEmployeeFullName(final Employee employee) {
+        return "TODOS".equals(employee.getFirstName())
+                ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
+    }
+
+    private ComboBox<Team> createTeamFilter() {
+        teamFilter = new ComboBox<>("Equipo");
+        List<Team> teams = new ArrayList<>(teamService.findAllTeams());
+        teams.addFirst(createAllTeamsOption());
+        teamFilter.setItems(teams);
+        teamFilter.setItemLabelGenerator(this::getTeamLabel);
+        teamFilter.setValue(teams.getFirst());
+        teamFilter.addValueChangeListener(event ->
+                refreshGridListHoursWorked(
+                        employeeFilter.getValue(),
+                        event.getValue()
+                )
+        );
+        return teamFilter;
+    }
+
+    private String getTeamLabel(final Team team) {
+        return team != null && !"TODOS".equals(team.getName()) ? team.getName() : "TODOS";
+    }
+
+    private Employee createAllEmployeesOption() {
+        Employee allEmployeesOption = new Employee();
+        allEmployeesOption.setFirstName("TODOS");
+        return allEmployeesOption;
+    }
+
+    private Team createAllTeamsOption() {
+        Team allTeamsOption = new Team();
+        allTeamsOption.setName("TODOS");
+        return allTeamsOption;
+    }
+}

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

@@ -1,161 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.model.Employee;
-import com.primefactorsolutions.model.Actividad;
-import com.primefactorsolutions.service.EmployeeService;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.datepicker.DatePicker;
-import com.vaadin.flow.component.grid.Grid;
-import com.vaadin.flow.component.html.Label;
-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.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.spring.annotation.SpringComponent;
-import jakarta.annotation.security.PermitAll;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@SpringComponent
-@PermitAll
-@Scope("prototype")
-@PageTitle("Hours Worked Month")
-@Route(value = "/hours-worked-month/me", layout = MainLayout.class)
-public class HoursWorkedMonthView extends VerticalLayout {
-    private final EmployeeService employeeService;
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Empleado");
-    private final ComboBox<String> equipoDropdown = new ComboBox<>("Equipo");
-    private final Grid<Actividad> grid = new Grid<>(Actividad.class);
-
-    private final Label totalCompletadoLabel = new Label();
-    private final Label horasPendientesLabel = new Label();
-    private final Label totalAcumuladasLabel = new Label();
-    private final Label horasAdeudadasLabel = new Label();
-    private final Button actualizarButton = new Button("Actualizar");
-    private final Button guardarButton = new Button("Guardar");
-    private final Button cerrarButton = new Button("Cerrar");
-
-    private LocalDate selectedMonth;
-
-    @Autowired
-    public HoursWorkedMonthView(final EmployeeService employeeService) {
-        this.employeeService = employeeService;
-        configurarVista();
-    }
-
-    private void configurarVista() {
-        DatePicker monthPicker = new DatePicker("Selecciona un mes");
-        monthPicker.setValue(LocalDate.now());
-        monthPicker.addValueChangeListener(event -> {
-            selectedMonth = event.getValue().withDayOfMonth(1);
-            //cargarDatosMes(selectedMonth);
-        });
-
-        equipoDropdown.setItems("Equipo 1", "Equipo 2", "Equipo 3");
-        equipoDropdown.setWidth("250px");
-
-        setEmployeeComboBoxProperties();
-
-        configurarGrid();
-
-        actualizarButton.addClickListener(event -> actualizarDatos());
-        guardarButton.addClickListener(event -> guardarActividades());
-        cerrarButton.addClickListener(event -> closeView());
-
-        HorizontalLayout headerLayout = new HorizontalLayout(monthPicker, equipoDropdown, employeeComboBox);
-        add(
-                headerLayout, grid, totalCompletadoLabel,
-                horasPendientesLabel, totalAcumuladasLabel,
-                horasAdeudadasLabel, actualizarButton,
-                guardarButton, cerrarButton);
-    }
-
-    private void setEmployeeComboBoxProperties() {
-        employeeComboBox.setWidth("250px");
-        employeeComboBox.setPlaceholder("Buscar empleado...");
-        employeeComboBox.setItems(employeeService.findAllEmployees());
-        employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
-    }
-
-    private void configurarGrid() {
-        grid.removeAllColumns();
-        grid.addColumn(Actividad::getLunes).setHeader("Lunes");
-        grid.addColumn(Actividad::getMartes).setHeader("Martes");
-        grid.addColumn(Actividad::getMiercoles).setHeader("Miércoles");
-        grid.addColumn(Actividad::getJueves).setHeader("Jueves");
-        grid.addColumn(Actividad::getViernes).setHeader("Viernes");
-        grid.addColumn(Actividad::getSabado).setHeader("Sábado");
-        grid.addColumn(Actividad::getDomingo).setHeader("Domingo");
-        grid.addColumn(this::calcularTotalPorDia).setHeader("Total Semanal").setKey("totalSemanal");
-    }
-
-//    private void cargarDatosMes(final LocalDate month) {
-//        List<Actividad> actividadesDelMes = obtenerActividadesDelMes(month);
-//        grid.setItems(actividadesDelMes);
-//
-//        double totalCompletado = calcularTotalCompletado(actividadesDelMes);
-//        double horasPendientes = calcularHorasPendientes(totalCompletado);
-//        double totalAcumuladas = 166;
-//        double horasAdeudadas = 2;
-//
-//        totalCompletadoLabel.setText("Prom. Hrs/Semana Completadas: " + totalCompletado);
-//        horasPendientesLabel.setText("Prom. Hrs/Semana Pendientes: " + horasPendientes);
-//        totalAcumuladasLabel.setText("Total Hrs./Mes Acumuladas: " + totalAcumuladas);
-//        horasAdeudadasLabel.setText("Total Hrs./Mes Adeudadas: " + horasAdeudadas);
-//    }
-
-//    private List<Actividad> obtenerActividadesDelMes(final LocalDate month) {
-//        LocalDate startOfMonth = month.with(TemporalAdjusters.firstDayOfMonth());
-//        LocalDate endOfMonth = month.with(TemporalAdjusters.lastDayOfMonth());
-//
-//        List<Actividad> actividadesDelMes = new ArrayList<>();
-//
-//        for (LocalDate date = startOfMonth; date.isBefore(endOfMonth.plusDays(1)); date = date.plusDays(1)) {
-//            Actividad actividad = new Actividad.Builder()
-//                    .lunes(0)
-//                    .martes(0)
-//                    .miercoles(0)
-//                    .jueves(0)
-//                    .viernes(0)
-//                    .sabado(0)
-//                    .domingo(0)
-//                    .build();
-//            actividadesDelMes.add(actividad);
-//        }
-//
-//        return actividadesDelMes;
-//    }
-
-    private double calcularTotalCompletado(final List<Actividad> actividades) {
-        return actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-    }
-
-    private double calcularTotalPorDia(final Actividad actividad) {
-        return actividad.getLunes() + actividad.getMartes() + actividad.getMiercoles()
-                + actividad.getJueves() + actividad.getViernes() + actividad.getSabado()
-                + actividad.getDomingo();
-    }
-
-    private double calcularHorasPendientes(final double totalCompletado) {
-        return 40 - totalCompletado;
-    }
-
-    private void actualizarDatos() {
-        Notification.show("Datos actualizados.");
-    }
-
-    private void guardarActividades() {
-        Notification.show("Actividades guardadas correctamente.");
-    }
-
-    private void closeView() {
-        getUI().ifPresent(ui -> ui.navigate(""));
-    }
-}

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

@@ -1,270 +1,256 @@
 package com.primefactorsolutions.views;
-import com.primefactorsolutions.model.Actividad;
+
 import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.model.HoursWorked;
+import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.HoursWorkedService;
-import com.vaadin.flow.component.datepicker.DatePicker;
-import com.vaadin.flow.component.grid.Grid;
+import com.primefactorsolutions.service.TeamService;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.Label;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
+import com.vaadin.flow.router.*;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import jakarta.annotation.security.PermitAll;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
-import com.vaadin.flow.component.html.Label;
+import org.vaadin.firitin.components.datepicker.VDatePicker;
+import org.vaadin.firitin.form.BeanValidationForm;
 
-
-import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.time.temporal.IsoFields;
-import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.UUID;
 
 @SpringComponent
 @PermitAll
 @Scope("prototype")
-@PageTitle("Hours Worked")
-@Route(value = "/hours-worked/me", layout = MainLayout.class)
-public class HoursWorkedView extends VerticalLayout {
-    private final List<Actividad> actividades = new ArrayList<>();
-    private final Grid<Actividad> grid = new Grid<>(Actividad.class);
+@PageTitle("Horas Trabajadas")
+@Route(value = "/hours-worked-list/:hours-workedId?/:action?", layout = MainLayout.class)
+public class HoursWorkedView extends BeanValidationForm<HoursWorked> implements HasUrlParameter<String> {
+    private final VDatePicker dateField = new VDatePicker("Fecha");
+    private final ComboBox<Team> teamField = new ComboBox<>("Equipo");
+    private ComboBox<Employee> employeeField;
+    private final ComboBox<String> tareasEspecificasDropdown = new ComboBox<>("Tarea Específica");
+    private final TextField tareaEspecificaInput = new TextField("Otra Tarea Específica");
+    private final TextField horasTareaEspecificaField = new TextField("Horas Tarea Específica");
+    private final TextField activityField = new TextField("Actividad");
+    private final TextField hoursField = new TextField("Horas");
 
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
-    private LocalDate selectedStartOfWeek;
-    private int weekNumber;
-
-    @Autowired
-    private final EmployeeService employeeService;
-
-    private final Label fechasLabel = new Label("Selecciona una semana para ver las fechas.");
+    private final H2 equipoLabel = new H2("Tareas del Cliente/Equipo");
+    private final H2 empresaLabel = new H2("Tareas de la Empresa");
     private final Label totalCompletadoLabel = new Label();
-    private final Label horasPendientesLabel = new Label();
 
-    @Autowired
     private final HoursWorkedService hoursWorkedService;
-    public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) {
-        this.employeeService = employeeService;
+    private final EmployeeService employeeService;
+    private final TeamService teamService;
+    private HoursWorked hoursWorked;
+    private Employee employee;
+
+    private Button saveButton;
+
+    public HoursWorkedView(final HoursWorkedService hoursWorkedService,
+                           final EmployeeService employeeService,
+                           final TeamService teamService) {
+        super(HoursWorked.class);
         this.hoursWorkedService = hoursWorkedService;
-        configurarVista();
-        cargarDatos();
+        this.employeeService = employeeService;
+        this.teamService = teamService;
+
+        initializeDateField();
+        initializeTeamField();
+        initializeEmployeeField();
+        configureTareasEspecificas();
+
     }
 
-    private void cargarDatos() {
-        List<HoursWorked> listaDeHorasTrabajadas = obtenerDatos(); // Obtenemos la lista aquí
-        grid.setItems(actividades);
+    @Override
+    public void setParameter(final BeforeEvent beforeEvent, final String action) {
+        final RouteParameters params = beforeEvent.getRouteParameters();
+        final String s = params.get("hours-workedId").orElse(null);
 
-        double totalHoras = calcularTotalHoras(listaDeHorasTrabajadas); // Pasa la lista aquí
+        if ("new".equals(action)) {
+            setEntityWithEnabledSave(new HoursWorked());
+        } else {
+            UUID hoursWorkedId = UUID.fromString(s);
+            var hoursWorked = hoursWorkedService.getHoursWorked(hoursWorkedId);
+            setEntityWithEnabledSave(hoursWorked);
+
+            if ("edit".equals(action) && !s.isEmpty()) {
+                saveButton.setVisible(true);
+            } else if ("view".equals(action) && !s.isEmpty()) {
+                saveButton.setVisible(false);
+            }
+        }
     }
 
-    private void setEmployeeComboBoxProperties() {
-        employeeComboBox.setWidth("250px");
-        employeeComboBox.setPlaceholder("Buscar empleado...");
-        employeeComboBox.setItems(employeeService.findAllEmployees());
-        employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
-
-        employeeComboBox.setAllowCustomValue(false);
-        employeeComboBox.addCustomValueSetListener(event ->
-                Notification.show("Selecciona un empleado válido de la lista.")
+    @Override
+    protected List<Component> getFormComponents() {
+        return List.of(
+                dateField,
+                teamField,
+                employeeField,
+                equipoLabel,
+                activityField,
+                hoursField,
+                empresaLabel,
+                tareasEspecificasDropdown,
+                tareaEspecificaInput,
+                horasTareaEspecificaField,
+                createCloseButton()
         );
+    }
 
-        employeeComboBox.addValueChangeListener(event -> {
-            Employee selectedEmployee = event.getValue();
-            if (selectedEmployee != null) {
-                Notification.show("Empleado seleccionado: "
-                        + selectedEmployee.getFirstName() + " "
-                        + selectedEmployee.getLastName());
+    private void configureTareasEspecificas() {
+        tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones",
+                "Colaboraciones", "Aprendizajes", "Proyectos PFS", "Otros");
+        tareasEspecificasDropdown.setPlaceholder("Selecciona una tarea...");
+
+        tareasEspecificasDropdown.addValueChangeListener(event -> {
+            String selected = event.getValue();
+            boolean isOtros = "Otros".equals(selected);
+            tareaEspecificaInput.setVisible(isOtros);
+            horasTareaEspecificaField.setVisible(true);
+            if (!isOtros) {
+                tareaEspecificaInput.clear();
+                horasTareaEspecificaField.clear();
             }
         });
+        tareaEspecificaInput.setVisible(false);
+        horasTareaEspecificaField.setVisible(false);
     }
 
-    private int getWeekOfYear(final LocalDate date) {
-        return date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+    protected Button createSaveButton() {
+        saveButton = new Button("Guardar");
+        saveButton.addClickListener(event -> saveHoursWorked());
+        return saveButton;
     }
 
-    private void configurarVista() {
-        DatePicker fechaPicker = new DatePicker("Selecciona una fecha");
-        fechaPicker.addValueChangeListener(event -> {
+    protected Button createCloseButton() {
+        Button closeButton = new Button("Cerrar");
+        closeButton.addClickListener(event -> closeForm());
+        return closeButton;
+    }
+
+    private void initializeTeamField() {
+        List<Team> teams = new ArrayList<>(teamService.findAllTeams());
+        teamField.setItems(teamService.findAllTeams());
+        teamField.setItemLabelGenerator(Team::getName);
+        teamField.setValue(teams.getFirst());
+        teamField.addValueChangeListener(event -> {
+                    if (teams != null) {
+                        employeeField.getValue();
+                        event.getValue();
+                    }
+                }
+        );
+    }
+
+    private ComboBox<Employee> initializeEmployeeField() {
+        employeeField = new ComboBox<>("Empleado");
+        List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
+        employeeField.setItems(employees);
+        employeeField.setItemLabelGenerator(this::getEmployeeFullName);
+        employeeField.setValue(employees.getFirst());
+        return employeeField;
+    }
+
+    private String getEmployeeFullName(final Employee employee) {
+        return "TODOS".equals(employee.getFirstName())
+                ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
+    }
+
+    private void initializeDateField() {
+        LocalDate today = LocalDate.now();
+        YearMonth currentMonth = YearMonth.of(today.getYear(), today.getMonth());
+
+        LocalDate startOfMonth = currentMonth.atDay(1);
+
+        LocalDate maxSelectableDate = today;
+
+        dateField.setMin(startOfMonth);
+        dateField.setMax(maxSelectableDate);
+        dateField.setValue(today);
+
+        dateField.addValueChangeListener(event -> {
             LocalDate selectedDate = event.getValue();
             if (selectedDate != null) {
-                selectedStartOfWeek = getStartOfWeek(selectedDate);
-                LocalDate endOfWeek = selectedStartOfWeek.plusDays(6);
-                fechasLabel.setText("Semana del " + selectedStartOfWeek + " al " + endOfWeek);
-                weekNumber = getWeekOfYear(selectedDate);
+                int weekNumber = selectedDate.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+                Notification.show("Número de la semana: " + weekNumber, 3000, Notification.Position.BOTTOM_CENTER);
+                if (hoursWorked != null) {
+                    hoursWorked.setWeekNumber(weekNumber);
+                }
             }
         });
-
-        Button verMesButton = new Button("Ver Mes", event -> {
-            getUI().ifPresent(ui -> ui.navigate(HoursWorkedMonthView.class));
-        });
-
-        ComboBox<String> equipoDropdown = new ComboBox<>("Equipo");
-        equipoDropdown.setItems("Equipo 1", "Equipo 2", "Equipo 3");
-        equipoDropdown.setWidth("250px");
-
-        setEmployeeComboBoxProperties();
-
-        HorizontalLayout filtersLayout = new HorizontalLayout(equipoDropdown, employeeComboBox);
-        filtersLayout.setSpacing(true);
-
-        configurarGrid();
-        HorizontalLayout actividadFormLayout = configurarFormularioActividades();
-
-        Button actualizarButton = new Button("Actualizar Totales", event -> actualizarTotales());
-        Button guardarButton = new Button("Guardar", event -> guardarActividades());
-        Button cerrarButton = new Button("Cerrar", event -> this.closeView());
-
-        HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton,
-                cerrarButton, verMesButton);
-
-        VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, horasPendientesLabel);
-        totalesLayout.setSpacing(true);
-        totalesLayout.setPadding(true);
-
-        add(fechaPicker, fechasLabel, filtersLayout, grid, actividadFormLayout, buttonsLayout, totalesLayout);
-
     }
 
-    private void configurarGrid() {
-        grid.removeAllColumns();
-        grid.setItems(actividades);
-        grid.addColumn(Actividad::getNombre).setHeader("Actividad");
-        grid.addColumn(Actividad::getLunes).setHeader("Lunes");
-        grid.addColumn(Actividad::getMartes).setHeader("Martes");
-        grid.addColumn(Actividad::getMiercoles).setHeader("Miércoles");
-        grid.addColumn(Actividad::getJueves).setHeader("Jueves");
-        grid.addColumn(Actividad::getViernes).setHeader("Viernes");
-        grid.addColumn(Actividad::getSabado).setHeader("Sábado");
-        grid.addColumn(Actividad::getDomingo).setHeader("Domingo");
-        grid.addColumn(this::calcularTotalPorDia).setHeader("Total Día").setKey("totalDia");
-    }
-
-    private HorizontalLayout configurarFormularioActividades() {
-        TextField actividadNombre = new TextField("Actividad");
-        actividadNombre.setWidth("200px");
-
-        TextField lunesHoras = crearCampoHora("Lunes");
-        TextField martesHoras = crearCampoHora("Martes");
-        TextField miercolesHoras = crearCampoHora("Miércoles");
-        TextField juevesHoras = crearCampoHora("Jueves");
-        TextField viernesHoras = crearCampoHora("Viernes");
-        TextField sabadoHoras = crearCampoHora("Sábado");
-        TextField domingoHoras = crearCampoHora("Domingo");
-
-        Button agregarActividadButton = new Button("Agregar Actividad", e -> {
-            try {
-                Actividad nuevaActividad = new Actividad.Builder()
-                        .nombre(actividadNombre.getValue())
-                        .lunes(parseHoras(lunesHoras.getValue()))
-                        .martes(parseHoras(martesHoras.getValue()))
-                        .miercoles(parseHoras(miercolesHoras.getValue()))
-                        .jueves(parseHoras(juevesHoras.getValue()))
-                        .viernes(parseHoras(viernesHoras.getValue()))
-                        .sabado(parseHoras(sabadoHoras.getValue()))
-                        .domingo(parseHoras(domingoHoras.getValue()))
-                        .build();
-
-                actividades.add(nuevaActividad);
-                grid.setItems(actividades);
-                actualizarTotales();
-                Notification.show("Actividad agregada correctamente");
-                // Limpiar los campos de entrada
-                actividadNombre.clear();
-                lunesHoras.clear();
-                martesHoras.clear();
-                miercolesHoras.clear();
-                juevesHoras.clear();
-                viernesHoras.clear();
-                sabadoHoras.clear();
-                domingoHoras.clear();
-            } catch (NumberFormatException ex) {
-                Notification.show("Error: Por favor ingresa números válidos para las horas.");
-            }
-        });
-
-        return new HorizontalLayout(
-                actividadNombre, lunesHoras, martesHoras, miercolesHoras,
-                juevesHoras, viernesHoras, sabadoHoras, domingoHoras, agregarActividadButton);
-    }
-
-    private TextField crearCampoHora(final String placeholder) {
-        TextField field = new TextField(placeholder);
-        field.setWidth("80px");
-        field.setPlaceholder("0.0");
-        return field;
-    }
-
-    private double parseHoras(final String value) {
-        if (value == null || value.trim().isEmpty()) {
-            return 0.0;
+    private void saveHoursWorked() {
+        if (isFormValid()) {
+            HoursWorked hoursWorked = getEntity();
+            setFieldValues(hoursWorked);
+            hoursWorkedService.save(hoursWorked);
+            Notification.show("Horas trabajadas guardadas correctamente.");
+            closeForm();
         }
-        return Double.parseDouble(value);
     }
 
-    private LocalDate getStartOfWeek(final LocalDate date) {
-        WeekFields weekFields = WeekFields.of(Locale.getDefault());
-        return date.with(weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
-    }
-
-    private double calcularTotalPorDia(final Actividad actividad) {
-        return actividad.getLunes() + actividad.getMartes() + actividad.getMiercoles()
-                + actividad.getJueves() + actividad.getViernes() + actividad.getSabado() + actividad.getDomingo();
-    }
-
-    private void actualizarTotales() {
-        double totalSemanaCompletada = actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-        double horasPendientes = 40 - totalSemanaCompletada;
-
-        totalCompletadoLabel.setText("Total Hrs/Semana Completadas: " + totalSemanaCompletada);
-        horasPendientesLabel.setText("Horas Pendientes: " + horasPendientes);
-    }
-
-    private void guardarActividades() {
-        Employee selectedEmployee = employeeComboBox.getValue();
-
-        if (selectedEmployee == null) {
-            Notification.show("Por favor, selecciona un empleado antes de guardar.");
-            return;
-        }
-
-        double totalHorasSemana = actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-
-        HoursWorked hoursWorked = new HoursWorked();
-        hoursWorked.setEmployee(selectedEmployee);
-        hoursWorked.setWeekNumber(weekNumber);
-        hoursWorked.setTotalHours(totalHorasSemana);
-
+    private void setFieldValues(final HoursWorked hoursWorked) {
+        hoursWorked.setDate(dateField.getValue());
+        hoursWorked.setTeam(teamField.getValue());
+        hoursWorked.setEmployee(employeeField.getValue());
+        hoursWorked.setActividad(activityField.getValue());
         try {
-            hoursWorkedService.saveHoursWorked(hoursWorked);  // Usa saveHoursWorked directamente
-            Notification.show("Actividades guardadas correctamente.");
-        } catch (Exception e) {
-            Notification.show("Error al guardar actividades: " + e.getMessage());
+            double hours = Double.parseDouble(hoursField.getValue());
+            hoursWorked.setHours(hours);
+        } catch (NumberFormatException e) {
+            Notification.show("Por favor, ingrese un número válido para las horas.");
+        }
+        if ("Otros".equals(tareasEspecificasDropdown.getValue())) {
+            hoursWorked.setTareasEspecificas(tareaEspecificaInput.getValue());
+            try {
+                double horasEspecifica = Double.parseDouble(horasTareaEspecificaField.getValue());
+                hoursWorked.setHorasTareasEspecificas(horasEspecifica);
+                double totalHoras = hoursWorked.getHours() + horasEspecifica;
+                hoursWorked.setTotalHours(totalHoras);
+            } catch (NumberFormatException e) {
+                Notification.show("Por favor, ingrese un número válido para las horas de la tarea específica.");
+            }
         }
     }
 
-    private double calcularTotalHoras(final List<HoursWorked> listaDeHorasTrabajadas) {
-        return listaDeHorasTrabajadas.stream()
-                .mapToDouble(HoursWorked::getTotalHours)
-                .sum();
+    private void closeForm() {
+        getUI().ifPresent(ui -> ui.navigate("hours-worked-list/" + hoursWorked.getId().toString()));
     }
 
-    private List<HoursWorked> obtenerDatos() {
-        return new ArrayList<>();
+    private boolean isFormValid() {
+        return dateField.getValue() != null
+                &&
+                teamField.getValue() != null
+                &&
+                employeeField.getValue() != null
+                &&
+                !activityField.isEmpty();
+
     }
 
-    private void closeView() {
-        getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class));
+    private void configureViewOrEditAction(final String action) {
+        if ("edit".equals(action) && hoursWorked != null) {
+            setFieldsReadOnly(false);
+        } else if ("view".equals(action) && hoursWorked != null) {
+            setFieldsReadOnly(true);
+            saveButton.setEnabled(false);
+        }
     }
-}
+
+    private void setFieldsReadOnly(final boolean readOnly) {
+        dateField.setReadOnly(readOnly);
+        teamField.setReadOnly(readOnly);
+        employeeField.setReadOnly(readOnly);
+        activityField.setReadOnly(readOnly);
+    }
+}

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/LoginView.java

@@ -2,6 +2,7 @@ package com.primefactorsolutions.views;
 
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.H1;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.login.LoginForm;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.BeforeEnterEvent;
@@ -9,6 +10,9 @@ import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.theme.lumo.LumoUtility;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 
 @Route("login")
 @PageTitle("PFS Intra")
@@ -17,7 +21,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
 
     private final LoginForm login = new LoginForm();
 
-    public LoginView() {
+    public LoginView(@Autowired @Value("${git.commit.id.abbrev}") final String commitId) {
         addClassName("login-view");
         setSizeFull();
         setAlignItems(Alignment.CENTER);
@@ -29,6 +33,10 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
         add(new H1("PFS Intra"));
         add(login);
         add(new Anchor("/password-recovery", "Reset password?"));
+
+        final Span version = new Span(String.format("v.%s", commitId));
+        version.addClassName(LumoUtility.FontSize.XSMALL);
+        add(version);
     }
 
     @Override

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

@@ -22,6 +22,8 @@ import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.spring.security.AuthenticationContext;
 import com.vaadin.flow.theme.lumo.LumoUtility;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.vaadin.lineawesome.LineAwesomeIcon;
 
@@ -35,10 +37,11 @@ public class MainLayout extends AppLayout {
 
     private H1 viewTitle;
 
-    public MainLayout(final AuthenticationContext authContext) {
+    public MainLayout(final AuthenticationContext authContext,
+                      @Autowired @Value("${git.commit.id.abbrev}") final String commitId) {
         this.authContext = authContext;
         setPrimarySection(Section.DRAWER);
-        addDrawerContent();
+        addDrawerContent(commitId);
         addHeaderContent();
     }
 
@@ -112,12 +115,12 @@ public class MainLayout extends AppLayout {
         return icon;
     }
 
-    private void addDrawerContent() {
+    private void addDrawerContent(final String commitId) {
         final Span appName = new Span("pfs-intra");
         appName.addClassNames(LumoUtility.FontWeight.SEMIBOLD, LumoUtility.FontSize.LARGE);
         final Header header = new Header(appName);
         final Scroller scroller = new Scroller(createNavigation());
-        addToDrawer(header, scroller, createFooter());
+        addToDrawer(header, scroller, createFooter(commitId));
     }
 
     private SideNav createNavigation() {
@@ -150,7 +153,9 @@ public class MainLayout extends AppLayout {
                     LineAwesomeIcon.LIST_ALT.create()));
             SideNavItem timesheet = new SideNavItem("My Timesheet", TimesheetView.class,
                     LineAwesomeIcon.HOURGLASS_START_SOLID.create());
-            timesheet.addItem(new SideNavItem("Hours Worked", HoursWorkedView.class,
+            timesheet.addItem(new SideNavItem("Registro de Horas Trabajadas", HoursWorkedListView.class,
+                    LineAwesomeIcon.ID_CARD_SOLID.create()));
+            timesheet.addItem(new SideNavItem("Reporte Horas Trabajadas", ReporteView.class,
                     LineAwesomeIcon.ID_CARD_SOLID.create()));
 
             SideNavItem profile = new SideNavItem("My Profile", ProfileView.class,
@@ -167,8 +172,8 @@ public class MainLayout extends AppLayout {
         return nav;
     }
 
-    private Footer createFooter() {
-        return new Footer();
+    private Footer createFooter(final String commitId) {
+        return new Footer(new Text(String.format("v.%s", commitId)));
     }
 
     @Override

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

@@ -1,6 +1,5 @@
 package com.primefactorsolutions.views;
 
-import com.primefactorsolutions.service.TimeOffRequestService;
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.router.PageTitle;
@@ -12,7 +11,7 @@ import jakarta.annotation.security.PermitAll;
 @PermitAll
 public class MainView extends Main {
 
-    public MainView(final TimeOffRequestService requestService) {
+    public MainView() {
         add(new Text("Welcome"));
     }
 }

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

@@ -6,7 +6,6 @@ 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.html.Main;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.PageTitle;
@@ -19,32 +18,31 @@ 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")
 @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,
                                    final TeamService teamService) {
         this.requestService = requestService;
         this.employeeService = employeeService;
         this.teamService = teamService;
-        this.employees = employeeService.findAllEmployees();
         initializeView();
         refreshGeneralPendingRequestsGrid(null, null, null);
     }
@@ -52,14 +50,16 @@ public class PendingRequestsListView extends Main {
     private void initializeView() {
         setupFilters();
         setupPendingRequestsGrid();
-        add(pendingRequestsGrid);
-        add(createActionButtons());
+        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() {
@@ -68,20 +68,23 @@ public class PendingRequestsListView extends Main {
         pendingRequestsGrid.addColumn(this::getCategory).setHeader("Categoría");
 
         pendingRequestsGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        pendingRequestsGrid.setPageSize(5);
+        pendingRequestsGrid.setPageSize(PAGE_SIZE);
         pendingRequestsGrid.asSingleSelect().addValueChangeListener(event -> {
             TimeOffRequest selectedRequest = event.getValue();
             if (selectedRequest != null) {
                 selectedRequestId = selectedRequest.getId();
             }
         });
+
+        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 void createActionButtons() {
+        final Button approveButton = createActionButton("Aprobar", TimeOffRequestStatus.APROBADO);
+        final Button rejectButton = createActionButton("Rechazar", TimeOffRequestStatus.RECHAZADO);
+        final Button closeButton = new Button("Salir", event -> navigateToMainView());
+
+        getCurrentPageLayout().add(new HorizontalLayout(approveButton, rejectButton, closeButton));
     }
 
     private Button createActionButton(final String caption, final TimeOffRequestStatus status) {

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

@@ -28,16 +28,13 @@ import java.util.stream.Stream;
 @Route(value = "/questions", layout = MainLayout.class)
 @PermitAll
 public class QuestionsListView extends Main {
-    private final QuestionService questionService;
 
     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 +42,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 +56,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();

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

@@ -1,22 +1,34 @@
 package com.primefactorsolutions.views;
 
 import com.primefactorsolutions.model.HoursWorked;
+import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.service.HoursWorkedService;
 import com.primefactorsolutions.service.ReportService;
+import com.primefactorsolutions.service.TeamService;
 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.Anchor;
 import com.vaadin.flow.component.html.H2;
+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.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.StreamResource;
 import jakarta.annotation.security.PermitAll;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.vaadin.flow.component.notification.Notification;
+import com.primefactorsolutions.service.EmployeeService;
 
 import java.io.ByteArrayInputStream;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.TextStyle;
+import java.time.temporal.WeekFields;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.stream.Collectors;
 
@@ -25,63 +37,198 @@ import java.util.stream.Collectors;
 @PageTitle("Reporte de Horas Trabajadas")
 public class ReporteView extends VerticalLayout {
 
+    private final EmployeeService employeeService;
     private final HoursWorkedService hoursWorkedService;
     private final ReportService reportService;
+    private final TeamService teamService;
+
+    private final ComboBox<Team> equipoComboBox = new ComboBox<>("Seleccionar Equipo");
+    private final ComboBox<String> semanaComboBox = new ComboBox<>("Seleccionar Semana");
+    private final Grid<Map<String, Object>> grid = new Grid<>();
+    private final VerticalLayout headerLayout = new VerticalLayout();
+    private Anchor downloadLink;
+
+    private final Span semanaInfoSpan = new Span();
+
+    // Obtener el año actual
+    private int currentYear = LocalDate.now().getYear();
 
     @Autowired
-    public ReporteView(final HoursWorkedService hoursWorkedService, final ReportService reportService) {
+    public ReporteView(final HoursWorkedService hoursWorkedService,
+                       final ReportService reportService, final TeamService teamService,
+                       final EmployeeService employeeService) {
         this.hoursWorkedService = hoursWorkedService;
         this.reportService = reportService;
+        this.teamService = teamService;
+        this.employeeService = employeeService;
 
         H2 title = new H2("Reporte de Horas Trabajadas");
         add(title);
 
-        Button reportButton = new Button("Generar Reporte de Horas Trabajadas", event -> generateHoursWorkedReport());
-        add(reportButton);
+        List<Team> teams = teamService.findAllTeams();
+        equipoComboBox.setItems(teams);
+        equipoComboBox.setItemLabelGenerator(Team::getName);
+
+        // Configurar el ComboBox de semanas
+        initializeSemanaComboBox();
+
+        // Listener para actualizar `semanaInfoSpan` con la selección del usuario en `semanaComboBox`
+        semanaComboBox.addValueChangeListener(event -> {
+            String selectedWeek = event.getValue();
+            semanaInfoSpan.setText(selectedWeek != null ? selectedWeek : "Selecciona una semana");
+        });
+
+        Button reportButton = new Button("Generar Reporte de Horas Trabajadas",
+                event -> generateHoursWorkedReport());
+        HorizontalLayout filtersLayout = new HorizontalLayout(equipoComboBox, semanaComboBox, reportButton);
+        add(filtersLayout);
+
+        // Añadir `headerLayout` al diseño principal para el encabezado dinámico
+        add(headerLayout);
+        updateHeaderLayout(null, null);
+
+        grid.addColumn(map -> map.get("Empleado")).setHeader("Empleado");
+        grid.addColumn(map -> map.get("Horas Trabajadas")).setHeader("Horas Trabajadas");
+        grid.addColumn(map -> map.get("Horas Pendientes")).setHeader("Horas Pendientes");
+        grid.addColumn(map -> map.get("Observaciones")).setHeader("Observaciones");
+
+        add(grid);
+    }
+
+    private void initializeSemanaComboBox() {
+        int year = LocalDate.now().getYear();
+        LocalDate startOfYear = LocalDate.of(year, 1, 5);  // Suponemos que la semana comienza el 5 de enero.
+
+        List<String> semanas = startOfYear.datesUntil(LocalDate.of(year + 1, 1, 1),
+                        java.time.Period.ofWeeks(1))
+                .map(date -> {
+                    int weekNumber = date.get(WeekFields.of(DayOfWeek.MONDAY, 1)
+                            .weekOfWeekBasedYear());
+                    LocalDate startOfWeek = date;
+                    LocalDate endOfWeek = startOfWeek.plusDays(6);
+
+                    return String.format("Semana %d: %s - %s",
+                            weekNumber,
+                            startOfWeek.getDayOfMonth() + " de " + startOfWeek.getMonth()
+                                    .getDisplayName(TextStyle.FULL, Locale.getDefault()),
+                            endOfWeek.getDayOfMonth() + " de " + endOfWeek.getMonth()
+                                    .getDisplayName(TextStyle.FULL, Locale.getDefault())
+                    );
+                })
+                .collect(Collectors.toList());
+
+        semanaComboBox.setItems(semanas);
+        semanaComboBox.setPlaceholder("Seleccione una semana");
     }
 
     private void generateHoursWorkedReport() {
-        List<HoursWorked> hoursWorkedList = hoursWorkedService.findAll(); // Obtener la lista de HoursWorked
+        Team selectedEquipo = equipoComboBox.getValue();
+        String selectedWeek = semanaComboBox.getValue();
+        if (selectedEquipo == null || selectedWeek == null) {
+            Notification.show("Por favor, selecciona un equipo y una semana para generar el reporte.",
+                    3000, Notification.Position.MIDDLE);
+            return;
+        }
 
+        int weekNumber = Integer.parseInt(selectedWeek.split(" ")[1].replace(":", ""));
+        LocalDate selectedDate = LocalDate.now().with(WeekFields.of(DayOfWeek.FRIDAY, 1)
+                .weekOfWeekBasedYear(), weekNumber);
+        updateHeaderLayout(selectedEquipo, selectedDate);
+
+        List<HoursWorked> hoursWorkedList = hoursWorkedService.findAll().stream()
+                .filter(hw -> hw.getEmployee().getTeam().getId().equals(selectedEquipo
+                        .getId()) && hw.getWeekNumber() == weekNumber)
+                .collect(Collectors.toList());
+
+        System.out.println(hoursWorkedList);
         if (hoursWorkedList.isEmpty()) {
+
             Notification.show("No hay horas trabajadas disponibles para generar el reporte.",
                     3000, Notification.Position.MIDDLE);
             return;
         }
 
-        try {
-            List<String> headers = List.of("ID", "Employee ID", "Week Number", "Total Hours");
+        List<Map<String, Object>> data = hoursWorkedList.stream()
+                .map(hoursWorked -> {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("ID", hoursWorked.getId().toString());
+                    map.put("Employee ID", hoursWorked.getEmployee().getId().toString());
+                    map.put("Empleado", hoursWorked.getEmployee().getFirstName() + " "
+                            + hoursWorked.getEmployee().getLastName());
+                    map.put("Horas Trabajadas", hoursWorked.getTotalHours());
+                    map.put("Horas Pendientes", 40 - hoursWorked.getTotalHours());
+                    map.put("Observaciones", "");
+                    return map;
+                })
+                .collect(Collectors.toList());
 
-            List<Map<String, Object>> data = hoursWorkedList.stream()
-                    .map(hoursWorked -> {
-                        Map<String, Object> map = new HashMap<>();
-                        map.put("ID", hoursWorked.getId().toString());
-                        map.put("Employee ID", hoursWorked.getEmployee().getId().toString());
-                        map.put("Week Number", hoursWorked.getWeekNumber());
-                        map.put("Total Hours", hoursWorked.getTotalHours());
-                        return map;
-                    })
-                    .collect(Collectors.toList());
+        grid.setItems(data);
+        generateExcelDownloadLink(data, weekNumber);
+    }
 
-            byte[] excelBytes = reportService.writeAsExcel("hours_worked_report", headers, data);
+    private void updateHeaderLayout(final Team team, final LocalDate dateInWeek) {
+        headerLayout.removeAll();
 
-            StreamResource excelResource = new StreamResource("hours_worked_report.xlsx",
-                    () -> new ByteArrayInputStream(excelBytes));
-            excelResource.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            excelResource.setCacheTime(0);
+        if (team != null && dateInWeek != null) {
+            LocalDate startOfWeek = dateInWeek.with(DayOfWeek.FRIDAY);
+            LocalDate endOfWeek = dateInWeek.with(DayOfWeek.THURSDAY);
+            int weekNumber = getWeekOfYear(dateInWeek);
 
-            Anchor downloadLink = new Anchor(excelResource, "Descargar Reporte de Horas Trabajadas");
-            downloadLink.getElement().setAttribute("download", true);
+            String formattedStartDate = startOfWeek.getDayOfMonth() + " de "
+                    + startOfWeek.getMonth().getDisplayName(TextStyle.FULL, Locale.getDefault());
+            String formattedEndDate = endOfWeek.getDayOfMonth() + " de "
+                    + endOfWeek.getMonth().getDisplayName(TextStyle.FULL, Locale.getDefault());
 
-            add(downloadLink);
-            Notification.show("Reporte de horas trabajadas generado exitosamente.",
-                    3000, Notification.Position.MIDDLE);
+            headerLayout.add(new Span("Informe "
+                    + String.format("%03d", weekNumber) + "/" + currentYear) {{
+                getStyle().set("font-size", "24px");
+                getStyle().set("font-weight", "bold");
+            }});
 
-        } catch (Exception e) {
-            Notification.show("Error al generar el reporte de horas trabajadas. Inténtalo de nuevo.",
-                    3000, Notification.Position.MIDDLE);
-            e.printStackTrace();
+            String teamLeadName = employeeService.getTeamLeadName(team.getId());
+            headerLayout.add(
+                    new Span("Asunto: Informe Semanal de Horas Trabajadas") {{
+                        getStyle().set("font-size", "18px");
+                    }},
+                    semanaInfoSpan,
+                    new Span("Horas a cumplir: 40 horas") {{
+                        getStyle().set("font-size", "18px");
+                    }},
+                    new Span("Equipo: " + team.getName()) {{
+                        getStyle().set("font-size", "18px");
+                    }},
+                    new Span("Team Lead: " + teamLeadName) {{
+                        getStyle().set("font-size", "18px");
+                    }}
+            );
         }
     }
 
+    private void generateExcelDownloadLink(final List<Map<String, Object>> data, final int weekNumber) {
+        try {
+            List<String> headers = List.of("Empleado",
+                    "Horas Trabajadas", "Horas Pendientes", "Observaciones");
+            String selectedTeam = equipoComboBox.getValue().getName();
+            byte[] excelBytes = reportService.writeAsExcel(
+                    "hours_worked_report", headers, data, selectedTeam, weekNumber, currentYear);
+
+            StreamResource excelResource = new StreamResource("hours_worked_report.xlsx",
+                    () -> new ByteArrayInputStream(excelBytes));
+            if (downloadLink == null) {
+                downloadLink = new Anchor(excelResource, "Descargar Reporte en Excel");
+                downloadLink.getElement().setAttribute("download", true);
+                add(downloadLink);
+            } else {
+                downloadLink.setHref(excelResource);
+            }
+        } catch (Exception e) {
+            Notification.show("Error al generar el reporte de horas trabajadas en Excel.",
+                    3000, Notification.Position.MIDDLE);
+        }
+    }
+
+    private int getWeekOfYear(final LocalDate date) {
+        return date.get(WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear());
+    }
+
 }

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

@@ -26,6 +26,8 @@ import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
 @SpringComponent
 @PermitAll
 @Scope("prototype")
@@ -96,7 +98,7 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
         requestGrid.getColumnByKey("daysToBeTake").setHeader("Días a Tomar");
 
         requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
+        requestGrid.setPageSize(PAGE_SIZE);
         requestGrid.asSingleSelect().addValueChangeListener(event -> {
             TimeOffRequest selectedRequest = event.getValue();
             if (selectedRequest != null) {
@@ -244,9 +246,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 +255,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())))

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

@@ -7,7 +7,6 @@ import com.primefactorsolutions.service.TimeOffRequestService;
 import com.primefactorsolutions.service.VacationService;
 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.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.PageTitle;
@@ -22,12 +21,14 @@ import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
 @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,10 +36,8 @@ 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;
 
@@ -51,7 +50,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 +58,17 @@ public class RequestsListView extends Main {
         requestService.updateRequestStatuses();
         setupFilters();
         setupRequestGrid();
-        add(requestGrid);
-        add(createActionButtons());
+        getCurrentPageLayout().add(requestGrid);
+        getCurrentPageLayout().add(createActionButtons());
     }
 
     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() {
@@ -77,7 +78,7 @@ public class RequestsListView extends Main {
         requestGrid.addColumn(this::getGeneralTotal).setHeader("Total general");
 
         requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
+        requestGrid.setPageSize(PAGE_SIZE);
         requestGrid.asSingleSelect().addValueChangeListener(event -> {
             Employee selectedRequest = event.getValue();
             if (selectedRequest != null) {
@@ -328,10 +329,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/resources/data.sql

@@ -90,3 +90,6 @@ insert into time_off_request (id, version, employee_id, category, state, availab
 values ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'AÑO_NUEVO', 'SOLICITADO', 1, '2025-01-01', '2025-01-01', '2025-01-01', 1, 0);
 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', 'LUNES_CARNAVAL', 'APROBADO', 1, '2024-02-12', '2024-02-12', '2024-02-12', 1, 0);
+
+INSERT INTO HOURS_WORKED (ID, VERSION, ACTIVIDAD, DATE, HORAS_TAREAS_ESPECIFICAS, HORASPENDIENTES, HOURS, TAREAS_ESPECIFICAS, TOTAL_HOURS, WEEK_NUMBER, EMPLOYEE_ID, TEAM_ID)
+VALUES ('6d6b3a71-9b11-4526-8335-b089627a8cd6', 0, 'Scrum Meeting', '2024-11-15', 0.0, 0.0, 2.0, NULL, 8, 46, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');