pom.xml

@@ -186,16 +186,6 @@
             <artifactId>viritin</artifactId>
             <version>2.8.22</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml</artifactId>
-            <version>5.2.3</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.poi</groupId>
-            <artifactId>poi-ooxml-schemas</artifactId>
-            <version>4.1.2</version>
-        </dependency>
         <dependency>
             <groupId>com.flowingcode.addons</groupId>
             <artifactId>simple-timer</artifactId>

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

@@ -1,56 +0,0 @@
-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 java.util.UUID;
-
-@Entity
-public class HoursWorked extends BaseEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
-    @ManyToOne
-    private Employee employee;
-
-    private int weekNumber;
-    private double totalHours;
-
-    public HoursWorked() { }
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(final UUID id) {
-        this.id = id;
-    }
-
-    public Employee getEmployee() {
-        return employee;
-    }
-
-    public void setEmployee(final Employee value) {
-        this.employee = value;
-    }
-
-    public int getWeekNumber() {
-        return weekNumber;
-    }
-
-    public void setWeekNumber(final int weekNumber) {
-        this.weekNumber = weekNumber;
-    }
-
-    public double getTotalHours() {
-        return totalHours;
-    }
-
-    public void setTotalHours(final double totalHours) {
-        this.totalHours = totalHours;
-    }
-}

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

@@ -1,10 +0,0 @@
-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.
-}

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

@@ -1,35 +0,0 @@
-package com.primefactorsolutions.service;
-
-import com.primefactorsolutions.model.HoursWorked;
-import com.primefactorsolutions.repositories.HoursWorkedRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class HoursWorkedService {
-    private final HoursWorkedRepository hoursWorkedRepository;
-
-    @Autowired
-    public HoursWorkedService(final HoursWorkedRepository hoursWorkedRepository) {
-        this.hoursWorkedRepository = hoursWorkedRepository;
-    }
-
-    public List<HoursWorked> findAll() {
-        return hoursWorkedRepository.findAll();
-    }
-
-    public HoursWorked saveHoursWorked(final HoursWorked hoursWorked) {
-        return hoursWorkedRepository.save(hoursWorked);
-    }
-
-    public HoursWorked save(final HoursWorked hoursWorked) {
-        return hoursWorkedRepository.save(hoursWorked);
-    }
-
-    public void deleteHoursWorked(final Long id) {
-        hoursWorkedRepository.deleteById(id);
-    }
-}
-

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

@@ -2,7 +2,6 @@ package com.primefactorsolutions.service;
 
 import com.openhtmltopdf.pdfboxout.PdfBoxRenderer;
 import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
-import com.primefactorsolutions.repositories.HoursWorkedRepository;
 import freemarker.template.Configuration;
 import freemarker.template.DefaultObjectWrapper;
 import freemarker.template.Template;
@@ -10,77 +9,15 @@ import freemarker.template.TemplateExceptionHandler;
 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.xssf.usermodel.XSSFWorkbook;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.Map;
 import java.util.TimeZone;
 
 @Service
 public class ReportService {
-    private final HoursWorkedRepository hoursWorkedRepository;
-
-    public ReportService(final HoursWorkedRepository hoursWorkedRepository) {
-        this.hoursWorkedRepository = hoursWorkedRepository;
-    }
-
-    // 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)
-            throws IOException {
-        return createExcelFile(reportName, headers, data);
-    }
-
-    private byte[] createExcelFile(final String reportName, final List<String> headers,
-                                   final List<Map<String, Object>> data)
-            throws IOException {
-        try (Workbook workbook = new XSSFWorkbook();
-             ByteArrayOutputStream os = new ByteArrayOutputStream()) {
-            Sheet sheet = workbook.createSheet(reportName);
-
-            // Crear encabezados
-            Row headerRow = sheet.createRow(0);
-            CellStyle headerStyle = workbook.createCellStyle();
-            Font headerFont = workbook.createFont();
-            headerFont.setBold(true);
-            headerStyle.setFont(headerFont);
-
-            for (int i = 0; i < headers.size(); i++) {
-                Cell cell = headerRow.createCell(i);
-                cell.setCellValue(headers.get(i));
-                cell.setCellStyle(headerStyle);
-            }
-
-            // Crear filas de datos
-            for (int i = 0; i < data.size(); i++) {
-                Row dataRow = sheet.createRow(i + 1);
-                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 -> {
-                        }
-                    }
-                }
-            }
-
-            workbook.write(os);
-            return os.toByteArray();
-        } catch (IOException e) {
-            System.err.println("Error al generar el archivo Excel: " + e.getMessage());
-            throw e; // Propagar la excepción después de registrarla
-        }
-    }
 
     @SneakyThrows
     public byte[] writeAsPdf(final String reportName, final Object model) {

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,33 +1,19 @@
 package com.primefactorsolutions.views;
-import com.primefactorsolutions.model.Actividad;
+
-import com.primefactorsolutions.model.Employee;
-import com.primefactorsolutions.model.HoursWorked;
-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.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.grid.Grid;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.html.H2;
 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 com.vaadin.flow.component.html.Label;
-
-
-import java.time.DayOfWeek;
 import java.time.LocalDate;
-import java.time.temporal.IsoFields;
-import java.time.temporal.WeekFields;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 
 @SpringComponent
 @PermitAll
@@ -35,107 +21,20 @@ import java.util.Locale;
 @PageTitle("Hours Worked")
 @Route(value = "/hours-worked/me", layout = MainLayout.class)
 public class HoursWorkedView extends VerticalLayout {
-    private final List<Actividad> actividades = new ArrayList<>();
+    public HoursWorkedView() {
-    private final Grid<Actividad> grid = new Grid<>(Actividad.class);
+        H2 title = new H2("Registro de Horas Trabajadas");
 
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
+        DatePicker datePicker = new DatePicker("Selecciona una fecha");
-    private LocalDate selectedStartOfWeek;
+        datePicker.setValue(LocalDate.now());
-    private int weekNumber;
-
-    @Autowired
-    private final EmployeeService employeeService;
-
-    private final Label fechasLabel = new Label("Selecciona una semana para ver las fechas.");
-    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;
-        this.hoursWorkedService = hoursWorkedService;
-        configurarVista();
-        cargarDatos();
-    }
-
-    private void cargarDatos() {
-        List<HoursWorked> listaDeHorasTrabajadas = obtenerDatos(); // Obtenemos la lista aquí
-        grid.setItems(actividades);
-
-        double totalHoras = calcularTotalHoras(listaDeHorasTrabajadas); // Pasa la lista aquí
-    }
-
-    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.")
-        );
-
-        employeeComboBox.addValueChangeListener(event -> {
-            Employee selectedEmployee = event.getValue();
-            if (selectedEmployee != null) {
-                Notification.show("Empleado seleccionado: "
-                        + selectedEmployee.getFirstName() + " "
-                        + selectedEmployee.getLastName());
-            }
-        });
-    }
-
-    private int getWeekOfYear(final LocalDate date) {
-        return date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
-    }
-
-    private void configurarVista() {
-        DatePicker fechaPicker = new DatePicker("Selecciona una fecha");
-        fechaPicker.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);
-            }
-        });
-
-        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.setItems("Equipo 1", "Equipo 2", "Equipo 3"); // Ejemplo de datos
-        equipoDropdown.setWidth("250px");
 
-        setEmployeeComboBoxProperties();
+        TextField empleadoSearch = new TextField("Empleado (Search)");
 
-        HorizontalLayout filtersLayout = new HorizontalLayout(equipoDropdown, employeeComboBox);
+        HorizontalLayout filtersLayout = new HorizontalLayout(equipoDropdown, empleadoSearch);
-        filtersLayout.setSpacing(true);
 
-        configurarGrid();
+        Grid<Actividad> grid = new Grid<>(Actividad.class, false);
-        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");
@@ -144,127 +43,155 @@ public class HoursWorkedView extends VerticalLayout {
         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");
+
+        grid.setItems(
+                new Actividad.Builder()
+                        .nombre("Actividad 1")
+                        .lunes(3)
+                        .martes(3)
+                        .miercoles(3)
+                        .jueves(3)
+                        .viernes(3)
+                        .sabado(1)
+                        .domingo(2)
+                        .build(),
+                new Actividad.Builder()
+                        .nombre("Actividad 2")
+                        .lunes(2)
+                        .martes(2)
+                        .miercoles(2)
+                        .jueves(2)
+                        .viernes(2)
+                        .sabado(0)
+                        .domingo(1)
+                        .build(),
+                new Actividad.Builder()
+                        .nombre("Meeting 1")
+                        .lunes(0)
+                        .martes(0.5)
+                        .miercoles(0.5)
+                        .jueves(0)
+                        .viernes(0)
+                        .sabado(0.5)
+                        .domingo(0)
+                        .build()
+        );
+
+        Button actualizarButton = new Button("Actualizar");
+        Button guardarButton = new Button("Guardar");
+        Button cerrarButton = new Button("Cerrar");
+
+        HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton, cerrarButton);
+
+        add(title, datePicker, filtersLayout, grid, buttonsLayout);
     }
 
-    private HorizontalLayout configurarFormularioActividades() {
+    public static final class Actividad {
-        TextField actividadNombre = new TextField("Actividad");
+        private final String nombre;
-        actividadNombre.setWidth("200px");
+        private final double lunes;
+        private final double martes;
+        private final double miercoles;
+        private final double jueves;
+        private final double viernes;
+        private final double sabado;
+        private final double domingo;
 
-        TextField lunesHoras = crearCampoHora("Lunes");
+        private Actividad(final Builder builder) {
-        TextField martesHoras = crearCampoHora("Martes");
+            this.nombre = builder.nombre;
-        TextField miercolesHoras = crearCampoHora("Miércoles");
+            this.lunes = builder.lunes;
-        TextField juevesHoras = crearCampoHora("Jueves");
+            this.martes = builder.martes;
-        TextField viernesHoras = crearCampoHora("Viernes");
+            this.miercoles = builder.miercoles;
-        TextField sabadoHoras = crearCampoHora("Sábado");
+            this.jueves = builder.jueves;
-        TextField domingoHoras = crearCampoHora("Domingo");
+            this.viernes = builder.viernes;
-
+            this.sabado = builder.sabado;
-        Button agregarActividadButton = new Button("Agregar Actividad", e -> {
+            this.domingo = builder.domingo;
-            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) {
+        public static class Builder {
-        TextField field = new TextField(placeholder);
+            private String nombre;
-        field.setWidth("80px");
+            private double lunes;
-        field.setPlaceholder("0.0");
+            private double martes;
-        return field;
+            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;
             }
 
-    private double parseHoras(final String value) {
+            public Builder lunes(final double lunes) {
-        if (value == null || value.trim().isEmpty()) {
+                this.lunes = lunes;
-            return 0.0;
+                return this;
-        }
-        return Double.parseDouble(value);
             }
 
-    private LocalDate getStartOfWeek(final LocalDate date) {
+            public Builder martes(final double martes) {
-        WeekFields weekFields = WeekFields.of(Locale.getDefault());
+                this.martes = martes;
-        return date.with(weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue());
+                return this;
             }
 
-    private double calcularTotalPorDia(final Actividad actividad) {
+            public Builder miercoles(final double miercoles) {
-        return actividad.getLunes() + actividad.getMartes() + actividad.getMiercoles()
+                this.miercoles = miercoles;
-                + actividad.getJueves() + actividad.getViernes() + actividad.getSabado() + actividad.getDomingo();
+                return this;
             }
 
-    private void actualizarTotales() {
+            public Builder jueves(final double jueves) {
-        double totalSemanaCompletada = actividades.stream()
+                this.jueves = jueves;
-                .mapToDouble(this::calcularTotalPorDia)
+                return this;
-                .sum();
-        double horasPendientes = 40 - totalSemanaCompletada;
-
-        totalCompletadoLabel.setText("Total Hrs/Semana Completadas: " + totalSemanaCompletada);
-        horasPendientesLabel.setText("Horas Pendientes: " + horasPendientes);
             }
 
-    private void guardarActividades() {
+            public Builder viernes(final double viernes) {
-        Employee selectedEmployee = employeeComboBox.getValue();
+                this.viernes = viernes;
-
+                return this;
-        if (selectedEmployee == null) {
-            Notification.show("Por favor, selecciona un empleado antes de guardar.");
-            return;
             }
 
-        double totalHorasSemana = actividades.stream()
+            public Builder sabado(final double sabado) {
-                .mapToDouble(this::calcularTotalPorDia)
+                this.sabado = sabado;
-                .sum();
+                return this;
+            }
 
-        HoursWorked hoursWorked = new HoursWorked();
+            public Builder domingo(final double domingo) {
-        hoursWorked.setEmployee(selectedEmployee);
+                this.domingo = domingo;
-        hoursWorked.setWeekNumber(weekNumber);
+                return this;
-        hoursWorked.setTotalHours(totalHorasSemana);
+            }
 
-        try {
+            public Actividad build() {
-            hoursWorkedService.saveHoursWorked(hoursWorked);  // Usa saveHoursWorked directamente
+                return new Actividad(this);
-            Notification.show("Actividades guardadas correctamente.");
-        } catch (Exception e) {
-            Notification.show("Error al guardar actividades: " + e.getMessage());
             }
         }
 
-    private double calcularTotalHoras(final List<HoursWorked> listaDeHorasTrabajadas) {
+        public String getNombre() {
-        return listaDeHorasTrabajadas.stream()
+            return nombre;
-                .mapToDouble(HoursWorked::getTotalHours)
-                .sum();
         }
 
-    private List<HoursWorked> obtenerDatos() {
+        public double getLunes() {
-        return new ArrayList<>();
+            return lunes;
         }
 
-    private void closeView() {
+        public double getMartes() {
-        getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class));
+            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;
+        }
     }
 }

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

@@ -1,87 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.model.HoursWorked;
-import com.primefactorsolutions.service.HoursWorkedService;
-import com.primefactorsolutions.service.ReportService;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.html.Anchor;
-import com.vaadin.flow.component.html.H2;
-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 java.io.ByteArrayInputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@PermitAll
-@Route(value = "/reportes", layout = MainLayout.class)
-@PageTitle("Reporte de Horas Trabajadas")
-public class ReporteView extends VerticalLayout {
-
-    private final HoursWorkedService hoursWorkedService;
-    private final ReportService reportService;
-
-    @Autowired
-    public ReporteView(final HoursWorkedService hoursWorkedService, final ReportService reportService) {
-        this.hoursWorkedService = hoursWorkedService;
-        this.reportService = reportService;
-
-        H2 title = new H2("Reporte de Horas Trabajadas");
-        add(title);
-
-        Button reportButton = new Button("Generar Reporte de Horas Trabajadas", event -> generateHoursWorkedReport());
-        add(reportButton);
-    }
-
-    private void generateHoursWorkedReport() {
-        List<HoursWorked> hoursWorkedList = hoursWorkedService.findAll(); // Obtener la lista de HoursWorked
-
-        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("Week Number", hoursWorked.getWeekNumber());
-                        map.put("Total Hours", hoursWorked.getTotalHours());
-                        return map;
-                    })
-                    .collect(Collectors.toList());
-
-            byte[] excelBytes = reportService.writeAsExcel("hours_worked_report", headers, data);
-
-            StreamResource excelResource = new StreamResource("hours_worked_report.xlsx",
-                    () -> new ByteArrayInputStream(excelBytes));
-            excelResource.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            excelResource.setCacheTime(0);
-
-            Anchor downloadLink = new Anchor(excelResource, "Descargar Reporte de Horas Trabajadas");
-            downloadLink.getElement().setAttribute("download", true);
-
-            add(downloadLink);
-            Notification.show("Reporte de horas trabajadas generado exitosamente.",
-                    3000, Notification.Position.MIDDLE);
-
-        } catch (Exception e) {
-            Notification.show("Error al generar el reporte de horas trabajadas. Inténtalo de nuevo.",
-                    3000, Notification.Position.MIDDLE);
-            e.printStackTrace();
-        }
-    }
-
-}