From dee4bcaf3bbadf09e6e38878b9f4ecaada5af8b7 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Tue, 12 Nov 2024 07:00:06 -0400 Subject: [PATCH 01/11] #45-Registro Semanal de Horas Trabajadas corregir duplicados --- .../primefactorsolutions/model/Actividad.java | 66 +++++++++++++++- .../model/HoursWorked.java | 19 ++++- .../repositories/HoursWorkedRepository.java | 2 - .../views/HoursWorkedView.java | 78 ++++++++++++++++--- 4 files changed, 152 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java index 6b0a4b1..7c7df34 100644 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ b/src/main/java/com/primefactorsolutions/model/Actividad.java @@ -1,6 +1,19 @@ package com.primefactorsolutions.model; -public final class Actividad { +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +import java.util.UUID; + + +@Entity +public class Actividad extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + private String nombre; private double lunes; private double martes; @@ -12,6 +25,8 @@ public final class Actividad { private String tarea; private double horas; + public Actividad() {} + public Actividad(final Builder builder) { this.nombre = builder.nombre; this.lunes = builder.lunes; @@ -25,10 +40,59 @@ public final class Actividad { this.horas = builder.horas; } + public String setNombre(final String nombre) { + this.nombre = nombre; + return nombre; + } + public String getNombre() { return nombre; } + public void setLunes(double lunes) { + this.lunes = lunes; + return; + } + + public void setMartes(double martes) { + this.martes = martes; + return; + } + + public void setMiercoles(double miercoles) { + this.miercoles = miercoles; + return; + } + + public void setJueves(double jueves) { + this.jueves = jueves; + return; + } + + public void setViernes(double viernes) { + this.viernes = viernes; + return; + } + + public void setSabado(double sabado) { + this.sabado = sabado; + return; + } + + public void setDomingo(double domingo) { + this.domingo = domingo; + return; + } + public void setTarea(String tarea) { + this.tarea = tarea; + return; + } + + public void setHoras(double horas) { + this.horas = horas; + return; + } + public double getLunes() { return lunes; } diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index d02310f..e23e9b0 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -6,6 +6,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import java.time.LocalDate; import java.util.UUID; @Entity @@ -17,10 +18,24 @@ public class HoursWorked extends BaseEntity { @ManyToOne private Employee employee; + @ManyToOne + private Actividad actividad; + private int weekNumber; private double totalHours; - public HoursWorked() { } + private LocalDate fecha; + + + public HoursWorked() {} + + public Actividad getActividad() { + return this.actividad; + } + + public void setActividad(Actividad actividad){ + this.actividad = actividad; + } public UUID getId() { return id; @@ -46,6 +61,8 @@ public class HoursWorked extends BaseEntity { this.weekNumber = weekNumber; } + public LocalDate getFecha() { return this.fecha;} + public double getTotalHours() { return totalHours; } diff --git a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java index 6e0e69c..b3d0bdb 100644 --- a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java @@ -8,7 +8,5 @@ import java.util.List; @Repository public interface HoursWorkedRepository extends JpaRepository { - // Puedes definir consultas personalizadas aquí si es necesario. List findByWeekNumber(int weekNumber); - } diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 7c1f644..a17d6de 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -4,7 +4,6 @@ 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; @@ -16,12 +15,14 @@ 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 jakarta.persistence.ManyToOne; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.html.Label; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.view.InternalResourceViewResolver; +import org.vaadin.firitin.components.datepicker.VDatePicker; import java.time.DayOfWeek; @@ -38,6 +39,9 @@ import java.util.Locale; @PageTitle("Hours Worked") @Route(value = "/hours-worked/me", layout = MainLayout.class) public class HoursWorkedView extends VerticalLayout { + @ManyToOne + private Actividad actividad; + private final List actividades = new ArrayList<>(); private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas private final Grid grid = new Grid<>(Actividad.class); @@ -64,12 +68,7 @@ public class HoursWorkedView extends VerticalLayout { private final Label numeroSemanaLabel = new Label("Número de la Semana: "); - private DatePicker fechaPicker = new DatePicker("Selecciona una fecha"); - @Autowired - private InternalResourceViewResolver defaultViewResolver; - @Qualifier("defaultServletHandlerMapping") - @Autowired - private HandlerMapping defaultServletHandlerMapping; + private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { @@ -100,9 +99,20 @@ public class HoursWorkedView extends VerticalLayout { private void cargarDatos() { if (selectedStartOfWeek != null && weekNumber > 0) { - actividades.clear(); - actividadesEspecificas.clear(); List listaDeHorasTrabajadas = obtenerDatos(); + + for (HoursWorked hours : listaDeHorasTrabajadas) { + LocalDate activityDate = hours.getFecha(); + int activityWeek = getWeekOfYear(activityDate); + if (activityWeek == weekNumber) { + Actividad actividad = hours.getActividad(); + if (actividad != null) { + DayOfWeek dayOfWeek = activityDate.getDayOfWeek(); + agregarOActualizarActividad(actividad, dayOfWeek, hours.getTotalHours()); + } + } + } + grid.setItems(actividades); gridActividadesEspecificas.setItems(actividadesEspecificas); calcularTotalHoras(listaDeHorasTrabajadas); @@ -134,6 +144,7 @@ public class HoursWorkedView extends VerticalLayout { } private void configurarVista() { + fechaPicker.setMax(LocalDate.now()); fechaPicker.addValueChangeListener(event -> { LocalDate selectedDate = event.getValue(); if (selectedDate != null) { @@ -228,6 +239,13 @@ public class HoursWorkedView extends VerticalLayout { Notification.show("Por favor, selecciona una fecha."); return; } + + int selectedWeekNumber = getWeekOfYear(selectedDate); + if (selectedWeekNumber != weekNumber) { + Notification.show("Solo puedes agregar actividades dentro de la semana actual."); + return; + } + DayOfWeek selectedDay = selectedDate.getDayOfWeek(); Actividad.Builder actividadBuilder = new Actividad.Builder() @@ -258,6 +276,10 @@ public class HoursWorkedView extends VerticalLayout { actividades.add(nuevaActividad); grid.setItems(actividades); } + + Actividad nuevaActividad = actividadBuilder.build(); + agregarOActualizarActividad(nuevaActividad, selectedDay, horas); + actualizarTotales(); Notification.show("Actividad agregada correctamente"); actividadNombre.clear(); @@ -272,6 +294,44 @@ public class HoursWorkedView extends VerticalLayout { return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); } + private void agregarOActualizarActividad(Actividad nuevaActividad, DayOfWeek dia, double horas) { + Actividad actividadExistente = actividades.stream() + .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) + .findFirst() + .orElse(null); + + if (actividadExistente != null) { + // Si la actividad ya existe, actualiza las horas para el día correspondiente + switch (dia) { + case MONDAY -> actividadExistente.setLunes(horas); + case TUESDAY -> actividadExistente.setMartes(horas); + case WEDNESDAY -> actividadExistente.setMiercoles(horas); + case THURSDAY -> actividadExistente.setJueves(horas); + case FRIDAY -> actividadExistente.setViernes(horas); + case SATURDAY -> actividadExistente.setSabado(horas); + case SUNDAY -> actividadExistente.setDomingo(horas); + default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); + } + } else { + // Si no existe, se agrega como nueva actividad + switch (dia) { + case MONDAY -> nuevaActividad.setLunes(horas); + case TUESDAY -> nuevaActividad.setMartes(horas); + case WEDNESDAY -> nuevaActividad.setMiercoles(horas); + case THURSDAY -> nuevaActividad.setJueves(horas); + case FRIDAY -> nuevaActividad.setViernes(horas); + case SATURDAY -> nuevaActividad.setSabado(horas); + case SUNDAY -> nuevaActividad.setDomingo(horas); + default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); + } + actividades.add(nuevaActividad); + } + + // Actualiza el Grid + grid.setItems(actividades); + } + + private HorizontalLayout configurarTareasEspecificasLayout() { Button agregarTareaButton = new Button("Agregar Tarea PFS", e -> { From ebb5454b29b99c73252ebfc1ecd232f48eee53bf Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Tue, 12 Nov 2024 07:00:06 -0400 Subject: [PATCH 02/11] #45-Registro Semanal de Horas Trabajadas corregir duplicados --- .../primefactorsolutions/model/Actividad.java | 66 +++++++++++++++- .../model/HoursWorked.java | 19 ++++- .../repositories/HoursWorkedRepository.java | 2 - .../views/HoursWorkedView.java | 78 ++++++++++++++++--- 4 files changed, 152 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java index 6b0a4b1..7c7df34 100644 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ b/src/main/java/com/primefactorsolutions/model/Actividad.java @@ -1,6 +1,19 @@ package com.primefactorsolutions.model; -public final class Actividad { +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; + +import java.util.UUID; + + +@Entity +public class Actividad extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.UUID) + private UUID id; + private String nombre; private double lunes; private double martes; @@ -12,6 +25,8 @@ public final class Actividad { private String tarea; private double horas; + public Actividad() {} + public Actividad(final Builder builder) { this.nombre = builder.nombre; this.lunes = builder.lunes; @@ -25,10 +40,59 @@ public final class Actividad { this.horas = builder.horas; } + public String setNombre(final String nombre) { + this.nombre = nombre; + return nombre; + } + public String getNombre() { return nombre; } + public void setLunes(double lunes) { + this.lunes = lunes; + return; + } + + public void setMartes(double martes) { + this.martes = martes; + return; + } + + public void setMiercoles(double miercoles) { + this.miercoles = miercoles; + return; + } + + public void setJueves(double jueves) { + this.jueves = jueves; + return; + } + + public void setViernes(double viernes) { + this.viernes = viernes; + return; + } + + public void setSabado(double sabado) { + this.sabado = sabado; + return; + } + + public void setDomingo(double domingo) { + this.domingo = domingo; + return; + } + public void setTarea(String tarea) { + this.tarea = tarea; + return; + } + + public void setHoras(double horas) { + this.horas = horas; + return; + } + public double getLunes() { return lunes; } diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index d02310f..e23e9b0 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -6,6 +6,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import java.time.LocalDate; import java.util.UUID; @Entity @@ -17,10 +18,24 @@ public class HoursWorked extends BaseEntity { @ManyToOne private Employee employee; + @ManyToOne + private Actividad actividad; + private int weekNumber; private double totalHours; - public HoursWorked() { } + private LocalDate fecha; + + + public HoursWorked() {} + + public Actividad getActividad() { + return this.actividad; + } + + public void setActividad(Actividad actividad){ + this.actividad = actividad; + } public UUID getId() { return id; @@ -46,6 +61,8 @@ public class HoursWorked extends BaseEntity { this.weekNumber = weekNumber; } + public LocalDate getFecha() { return this.fecha;} + public double getTotalHours() { return totalHours; } diff --git a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java index 6e0e69c..b3d0bdb 100644 --- a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java @@ -8,7 +8,5 @@ import java.util.List; @Repository public interface HoursWorkedRepository extends JpaRepository { - // Puedes definir consultas personalizadas aquí si es necesario. List findByWeekNumber(int weekNumber); - } diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 7c1f644..a17d6de 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -4,7 +4,6 @@ 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; @@ -16,12 +15,14 @@ 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 jakarta.persistence.ManyToOne; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.html.Label; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.view.InternalResourceViewResolver; +import org.vaadin.firitin.components.datepicker.VDatePicker; import java.time.DayOfWeek; @@ -38,6 +39,9 @@ import java.util.Locale; @PageTitle("Hours Worked") @Route(value = "/hours-worked/me", layout = MainLayout.class) public class HoursWorkedView extends VerticalLayout { + @ManyToOne + private Actividad actividad; + private final List actividades = new ArrayList<>(); private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas private final Grid grid = new Grid<>(Actividad.class); @@ -64,12 +68,7 @@ public class HoursWorkedView extends VerticalLayout { private final Label numeroSemanaLabel = new Label("Número de la Semana: "); - private DatePicker fechaPicker = new DatePicker("Selecciona una fecha"); - @Autowired - private InternalResourceViewResolver defaultViewResolver; - @Qualifier("defaultServletHandlerMapping") - @Autowired - private HandlerMapping defaultServletHandlerMapping; + private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { @@ -100,9 +99,20 @@ public class HoursWorkedView extends VerticalLayout { private void cargarDatos() { if (selectedStartOfWeek != null && weekNumber > 0) { - actividades.clear(); - actividadesEspecificas.clear(); List listaDeHorasTrabajadas = obtenerDatos(); + + for (HoursWorked hours : listaDeHorasTrabajadas) { + LocalDate activityDate = hours.getFecha(); + int activityWeek = getWeekOfYear(activityDate); + if (activityWeek == weekNumber) { + Actividad actividad = hours.getActividad(); + if (actividad != null) { + DayOfWeek dayOfWeek = activityDate.getDayOfWeek(); + agregarOActualizarActividad(actividad, dayOfWeek, hours.getTotalHours()); + } + } + } + grid.setItems(actividades); gridActividadesEspecificas.setItems(actividadesEspecificas); calcularTotalHoras(listaDeHorasTrabajadas); @@ -134,6 +144,7 @@ public class HoursWorkedView extends VerticalLayout { } private void configurarVista() { + fechaPicker.setMax(LocalDate.now()); fechaPicker.addValueChangeListener(event -> { LocalDate selectedDate = event.getValue(); if (selectedDate != null) { @@ -228,6 +239,13 @@ public class HoursWorkedView extends VerticalLayout { Notification.show("Por favor, selecciona una fecha."); return; } + + int selectedWeekNumber = getWeekOfYear(selectedDate); + if (selectedWeekNumber != weekNumber) { + Notification.show("Solo puedes agregar actividades dentro de la semana actual."); + return; + } + DayOfWeek selectedDay = selectedDate.getDayOfWeek(); Actividad.Builder actividadBuilder = new Actividad.Builder() @@ -258,6 +276,10 @@ public class HoursWorkedView extends VerticalLayout { actividades.add(nuevaActividad); grid.setItems(actividades); } + + Actividad nuevaActividad = actividadBuilder.build(); + agregarOActualizarActividad(nuevaActividad, selectedDay, horas); + actualizarTotales(); Notification.show("Actividad agregada correctamente"); actividadNombre.clear(); @@ -272,6 +294,44 @@ public class HoursWorkedView extends VerticalLayout { return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); } + private void agregarOActualizarActividad(Actividad nuevaActividad, DayOfWeek dia, double horas) { + Actividad actividadExistente = actividades.stream() + .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) + .findFirst() + .orElse(null); + + if (actividadExistente != null) { + // Si la actividad ya existe, actualiza las horas para el día correspondiente + switch (dia) { + case MONDAY -> actividadExistente.setLunes(horas); + case TUESDAY -> actividadExistente.setMartes(horas); + case WEDNESDAY -> actividadExistente.setMiercoles(horas); + case THURSDAY -> actividadExistente.setJueves(horas); + case FRIDAY -> actividadExistente.setViernes(horas); + case SATURDAY -> actividadExistente.setSabado(horas); + case SUNDAY -> actividadExistente.setDomingo(horas); + default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); + } + } else { + // Si no existe, se agrega como nueva actividad + switch (dia) { + case MONDAY -> nuevaActividad.setLunes(horas); + case TUESDAY -> nuevaActividad.setMartes(horas); + case WEDNESDAY -> nuevaActividad.setMiercoles(horas); + case THURSDAY -> nuevaActividad.setJueves(horas); + case FRIDAY -> nuevaActividad.setViernes(horas); + case SATURDAY -> nuevaActividad.setSabado(horas); + case SUNDAY -> nuevaActividad.setDomingo(horas); + default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); + } + actividades.add(nuevaActividad); + } + + // Actualiza el Grid + grid.setItems(actividades); + } + + private HorizontalLayout configurarTareasEspecificasLayout() { Button agregarTareaButton = new Button("Agregar Tarea PFS", e -> { From e2f128c301d235558322c37f97d5e6ec6257f1a0 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Tue, 12 Nov 2024 20:20:08 -0400 Subject: [PATCH 03/11] #45-Registro Semanal de Horas Trabajadas corregir duplicados --- .../primefactorsolutions/model/Actividad.java | 20 ++++---- .../model/HoursWorked.java | 8 +-- .../views/HoursWorkedView.java | 38 ++++++-------- .../views/ReporteView.java | 51 ++++++------------- 4 files changed, 46 insertions(+), 71 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java index 7c7df34..55402f4 100644 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ b/src/main/java/com/primefactorsolutions/model/Actividad.java @@ -25,7 +25,7 @@ public class Actividad extends BaseEntity { private String tarea; private double horas; - public Actividad() {} + public Actividad() { } public Actividad(final Builder builder) { this.nombre = builder.nombre; @@ -49,46 +49,46 @@ public class Actividad extends BaseEntity { return nombre; } - public void setLunes(double lunes) { + public void setLunes(final double lunes) { this.lunes = lunes; return; } - public void setMartes(double martes) { + public void setMartes(final double martes) { this.martes = martes; return; } - public void setMiercoles(double miercoles) { + public void setMiercoles(final double miercoles) { this.miercoles = miercoles; return; } - public void setJueves(double jueves) { + public void setJueves(final double jueves) { this.jueves = jueves; return; } - public void setViernes(double viernes) { + public void setViernes(final double viernes) { this.viernes = viernes; return; } - public void setSabado(double sabado) { + public void setSabado(final double sabado) { this.sabado = sabado; return; } - public void setDomingo(double domingo) { + public void setDomingo(final double domingo) { this.domingo = domingo; return; } - public void setTarea(String tarea) { + public void setTarea(final String tarea) { this.tarea = tarea; return; } - public void setHoras(double horas) { + public void setHoras(final double horas) { this.horas = horas; return; } diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index e23e9b0..2b918d3 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -27,13 +27,13 @@ public class HoursWorked extends BaseEntity { private LocalDate fecha; - public HoursWorked() {} + public HoursWorked() { } public Actividad getActividad() { return this.actividad; } - public void setActividad(Actividad actividad){ + public void setActividad(final Actividad actividad) { this.actividad = actividad; } @@ -61,7 +61,9 @@ public class HoursWorked extends BaseEntity { this.weekNumber = weekNumber; } - public LocalDate getFecha() { return this.fecha;} + public LocalDate getFecha() { + return this.fecha; + } public double getTotalHours() { return totalHours; diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index a17d6de..62ef1cb 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -5,6 +5,7 @@ import com.primefactorsolutions.model.HoursWorked; import com.primefactorsolutions.service.EmployeeService; import com.primefactorsolutions.service.HoursWorkedService; import com.vaadin.flow.component.grid.Grid; +import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; @@ -15,13 +16,9 @@ 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 jakarta.persistence.ManyToOne; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.html.Label; -import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.vaadin.firitin.components.datepicker.VDatePicker; @@ -36,19 +33,18 @@ import java.util.Locale; @SpringComponent @PermitAll @Scope("prototype") -@PageTitle("Hours Worked") +@PageTitle("Horas Trabajadas") @Route(value = "/hours-worked/me", layout = MainLayout.class) public class HoursWorkedView extends VerticalLayout { - @ManyToOne - private Actividad actividad; - private final List actividades = new ArrayList<>(); private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas private final Grid grid = new Grid<>(Actividad.class); private final Grid gridActividadesEspecificas = new Grid<>(Actividad.class); - private final ComboBox employeeComboBox = new ComboBox<>("Employee"); + private final ComboBox employeeComboBox = new ComboBox<>("Empleado"); private final ComboBox equipoDropdown = new ComboBox<>("Equipo"); + private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); + private final ComboBox tareasEspecificasDropdown = new ComboBox<>("Tareas Específicas"); private final TextField tareaEspecificaInput = new TextField("Especificar Tarea"); @@ -62,15 +58,11 @@ public class HoursWorkedView extends VerticalLayout { @Autowired private final HoursWorkedService hoursWorkedService; - 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(); - private final Label numeroSemanaLabel = new Label("Número de la Semana: "); - - private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); - - public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { this.employeeService = employeeService; this.hoursWorkedService = hoursWorkedService; @@ -149,10 +141,7 @@ public class HoursWorkedView extends VerticalLayout { LocalDate selectedDate = event.getValue(); if (selectedDate != null) { selectedStartOfWeek = getStartOfWeek(selectedDate); - LocalDate endOfWeek = selectedStartOfWeek.plusDays(6); weekNumber = getWeekOfYear(selectedDate); - fechasLabel.setText("Semana del " + selectedStartOfWeek + " al " + endOfWeek); - numeroSemanaLabel.setText("Número de la Semana: " + weekNumber); cargarDatos(); } }); @@ -189,12 +178,14 @@ public class HoursWorkedView extends VerticalLayout { HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton, cerrarButton, verMesButton); - VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, horasPendientesLabel); + VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, + horasPendientesLabel); totalesLayout.setSpacing(true); totalesLayout.setPadding(true); - add(fechaPicker, fechasLabel, numeroSemanaLabel, filtersLayout, actividadFormLayout, - tareasEspecificasLayout, grid, gridActividadesEspecificas, buttonsLayout, totalesLayout); + add(fechaPicker, filtersLayout, actividadFormLayout, + equipoLabel, grid, empresaLabel, tareasEspecificasLayout, + gridActividadesEspecificas, buttonsLayout, totalesLayout); } private void configurarGrid() { @@ -209,6 +200,7 @@ public class HoursWorkedView extends VerticalLayout { 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(actividades); } private void configurarGridActividadesEspecificas() { @@ -294,7 +286,7 @@ public class HoursWorkedView extends VerticalLayout { return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); } - private void agregarOActualizarActividad(Actividad nuevaActividad, DayOfWeek dia, double horas) { + private void agregarOActualizarActividad(final Actividad nuevaActividad, final DayOfWeek dia, final double horas) { Actividad actividadExistente = actividades.stream() .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) .findFirst() @@ -414,7 +406,7 @@ public class HoursWorkedView extends VerticalLayout { private LocalDate getStartOfWeek(final LocalDate date) { WeekFields weekFields = WeekFields.of(Locale.getDefault()); - return date.with(weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()); + return date.with(weekFields.dayOfWeek(), DayOfWeek.FRIDAY.getValue()); } private double calcularTotalPorDia(final Actividad actividad) { diff --git a/src/main/java/com/primefactorsolutions/views/ReporteView.java b/src/main/java/com/primefactorsolutions/views/ReporteView.java index 1594cc5..3e10457 100644 --- a/src/main/java/com/primefactorsolutions/views/ReporteView.java +++ b/src/main/java/com/primefactorsolutions/views/ReporteView.java @@ -50,7 +50,6 @@ public class ReporteView extends VerticalLayout { private final Span semanaInfoSpan = new Span(); - // Obtener el año actual private int currentYear = LocalDate.now().getYear(); @@ -76,22 +75,19 @@ public class ReporteView extends VerticalLayout { // 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"); + 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); + 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("ID")).setHeader("ID") - .getElement().getStyle().set("font-weight", "bold"); + grid.addColumn(map -> map.get("ID")).setHeader("ID").getElement().getStyle().set("font-weight", "bold"); grid.addColumn(map -> map.get("Employee ID")).setHeader("Employee ID"); grid.addColumn(map -> map.get("Empleado")).setHeader("Empleado"); grid.addColumn(map -> map.get("Horas Trabajadas")).setHeader("Horas Trabajadas"); @@ -105,8 +101,7 @@ public class ReporteView extends VerticalLayout { int year = LocalDate.now().getYear(); LocalDate startOfYear = LocalDate.of(year, 1, 5); // Suponemos que la semana comienza el 5 de enero. - List semanas = startOfYear.datesUntil(LocalDate - .of(year + 1, 1, 1), + List 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) @@ -133,27 +128,23 @@ public class ReporteView extends VerticalLayout { 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); + 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); + int weekNumber = Integer.parseInt(selectedWeek.split(" ")[1].replace(":", "")); + LocalDate selectedDate = LocalDate.now().with(WeekFields.of(DayOfWeek.FRIDAY, 1) + .weekOfWeekBasedYear(), weekNumber); updateHeaderLayout(selectedEquipo, selectedDate); List hoursWorkedList = hoursWorkedService.findAll().stream() - .filter(hw -> hw.getEmployee().getTeam().getId() - .equals(selectedEquipo.getId()) && hw.getWeekNumber() == weekNumber) + .filter(hw -> hw.getEmployee().getTeam().getId().equals(selectedEquipo + .getId()) && hw.getWeekNumber() == weekNumber) .collect(Collectors.toList()); if (hoursWorkedList.isEmpty()) { Notification.show("No hay horas trabajadas disponibles para generar el reporte.", - 3000, - Notification.Position.MIDDLE); + 3000, Notification.Position.MIDDLE); return; } @@ -188,8 +179,8 @@ public class ReporteView extends VerticalLayout { String formattedEndDate = endOfWeek.getDayOfMonth() + " de " + endOfWeek.getMonth().getDisplayName(TextStyle.FULL, Locale.getDefault()); - headerLayout.add(new Span("Informe " + String.format("%03d", weekNumber) - + "/" + currentYear) {{ + headerLayout.add(new Span("Informe " + + String.format("%03d", weekNumber) + "/" + currentYear) {{ getStyle().set("font-size", "24px"); getStyle().set("font-weight", "bold"); }}); @@ -213,14 +204,13 @@ public class ReporteView extends VerticalLayout { } } - private void generateExcelDownloadLink(final List> data, - final int weekNumber) { + private void generateExcelDownloadLink(final List> data, final int weekNumber) { try { List headers = List.of("ID", "Employee ID", "Empleado", "Horas Trabajadas", "Horas Pendientes", "Observaciones"); String selectedTeam = equipoComboBox.getValue().getName(); - byte[] excelBytes = reportService.writeAsExcel("hours_worked_report", - headers, data, selectedTeam, weekNumber, currentYear); + byte[] excelBytes = reportService.writeAsExcel( + "hours_worked_report", headers, data, selectedTeam, weekNumber, currentYear); StreamResource excelResource = new StreamResource("hours_worked_report.xlsx", () -> new ByteArrayInputStream(excelBytes)); @@ -241,13 +231,4 @@ public class ReporteView extends VerticalLayout { return date.get(WeekFields.of(Locale.getDefault()).weekOfWeekBasedYear()); } - public int getCurrentYear() { - return currentYear; - } - - // Opcional: Si deseas permitir cambiar el año actual manualmente, agrega un setter - public void setCurrentYear(final int currentYear) { - this.currentYear = currentYear; - } - } From b94ec365c7c863db347ae57357c318f6123aec29 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Tue, 12 Nov 2024 07:00:06 -0400 Subject: [PATCH 04/11] #45-Registro Semanal de Horas Trabajadas corregir duplicados --- .../primefactorsolutions/model/Actividad.java | 20 +++++----- .../model/HoursWorked.java | 8 ++-- .../views/HoursWorkedView.java | 38 +++++++++++-------- 3 files changed, 36 insertions(+), 30 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java index 55402f4..7c7df34 100644 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ b/src/main/java/com/primefactorsolutions/model/Actividad.java @@ -25,7 +25,7 @@ public class Actividad extends BaseEntity { private String tarea; private double horas; - public Actividad() { } + public Actividad() {} public Actividad(final Builder builder) { this.nombre = builder.nombre; @@ -49,46 +49,46 @@ public class Actividad extends BaseEntity { return nombre; } - public void setLunes(final double lunes) { + public void setLunes(double lunes) { this.lunes = lunes; return; } - public void setMartes(final double martes) { + public void setMartes(double martes) { this.martes = martes; return; } - public void setMiercoles(final double miercoles) { + public void setMiercoles(double miercoles) { this.miercoles = miercoles; return; } - public void setJueves(final double jueves) { + public void setJueves(double jueves) { this.jueves = jueves; return; } - public void setViernes(final double viernes) { + public void setViernes(double viernes) { this.viernes = viernes; return; } - public void setSabado(final double sabado) { + public void setSabado(double sabado) { this.sabado = sabado; return; } - public void setDomingo(final double domingo) { + public void setDomingo(double domingo) { this.domingo = domingo; return; } - public void setTarea(final String tarea) { + public void setTarea(String tarea) { this.tarea = tarea; return; } - public void setHoras(final double horas) { + public void setHoras(double horas) { this.horas = horas; return; } diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index 2b918d3..e23e9b0 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -27,13 +27,13 @@ public class HoursWorked extends BaseEntity { private LocalDate fecha; - public HoursWorked() { } + public HoursWorked() {} public Actividad getActividad() { return this.actividad; } - public void setActividad(final Actividad actividad) { + public void setActividad(Actividad actividad){ this.actividad = actividad; } @@ -61,9 +61,7 @@ public class HoursWorked extends BaseEntity { this.weekNumber = weekNumber; } - public LocalDate getFecha() { - return this.fecha; - } + public LocalDate getFecha() { return this.fecha;} public double getTotalHours() { return totalHours; diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 62ef1cb..a17d6de 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -5,7 +5,6 @@ import com.primefactorsolutions.model.HoursWorked; import com.primefactorsolutions.service.EmployeeService; import com.primefactorsolutions.service.HoursWorkedService; import com.vaadin.flow.component.grid.Grid; -import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; @@ -16,9 +15,13 @@ 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 jakarta.persistence.ManyToOne; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.html.Label; +import org.springframework.web.servlet.HandlerMapping; +import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.vaadin.firitin.components.datepicker.VDatePicker; @@ -33,18 +36,19 @@ import java.util.Locale; @SpringComponent @PermitAll @Scope("prototype") -@PageTitle("Horas Trabajadas") +@PageTitle("Hours Worked") @Route(value = "/hours-worked/me", layout = MainLayout.class) public class HoursWorkedView extends VerticalLayout { + @ManyToOne + private Actividad actividad; + private final List actividades = new ArrayList<>(); private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas private final Grid grid = new Grid<>(Actividad.class); private final Grid gridActividadesEspecificas = new Grid<>(Actividad.class); - private final ComboBox employeeComboBox = new ComboBox<>("Empleado"); + private final ComboBox employeeComboBox = new ComboBox<>("Employee"); private final ComboBox equipoDropdown = new ComboBox<>("Equipo"); - private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); - private final ComboBox tareasEspecificasDropdown = new ComboBox<>("Tareas Específicas"); private final TextField tareaEspecificaInput = new TextField("Especificar Tarea"); @@ -58,11 +62,15 @@ public class HoursWorkedView extends VerticalLayout { @Autowired private final HoursWorkedService hoursWorkedService; - private final H2 equipoLabel = new H2("Tareas del Cliente/Equipo"); - private final H2 empresaLabel = new H2("Tareas de la Empresa"); + 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(); + private final Label numeroSemanaLabel = new Label("Número de la Semana: "); + + private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); + + public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { this.employeeService = employeeService; this.hoursWorkedService = hoursWorkedService; @@ -141,7 +149,10 @@ public class HoursWorkedView extends VerticalLayout { LocalDate selectedDate = event.getValue(); if (selectedDate != null) { selectedStartOfWeek = getStartOfWeek(selectedDate); + LocalDate endOfWeek = selectedStartOfWeek.plusDays(6); weekNumber = getWeekOfYear(selectedDate); + fechasLabel.setText("Semana del " + selectedStartOfWeek + " al " + endOfWeek); + numeroSemanaLabel.setText("Número de la Semana: " + weekNumber); cargarDatos(); } }); @@ -178,14 +189,12 @@ public class HoursWorkedView extends VerticalLayout { HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton, cerrarButton, verMesButton); - VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, - horasPendientesLabel); + VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, horasPendientesLabel); totalesLayout.setSpacing(true); totalesLayout.setPadding(true); - add(fechaPicker, filtersLayout, actividadFormLayout, - equipoLabel, grid, empresaLabel, tareasEspecificasLayout, - gridActividadesEspecificas, buttonsLayout, totalesLayout); + add(fechaPicker, fechasLabel, numeroSemanaLabel, filtersLayout, actividadFormLayout, + tareasEspecificasLayout, grid, gridActividadesEspecificas, buttonsLayout, totalesLayout); } private void configurarGrid() { @@ -200,7 +209,6 @@ public class HoursWorkedView extends VerticalLayout { 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(actividades); } private void configurarGridActividadesEspecificas() { @@ -286,7 +294,7 @@ public class HoursWorkedView extends VerticalLayout { return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); } - private void agregarOActualizarActividad(final Actividad nuevaActividad, final DayOfWeek dia, final double horas) { + private void agregarOActualizarActividad(Actividad nuevaActividad, DayOfWeek dia, double horas) { Actividad actividadExistente = actividades.stream() .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) .findFirst() @@ -406,7 +414,7 @@ public class HoursWorkedView extends VerticalLayout { private LocalDate getStartOfWeek(final LocalDate date) { WeekFields weekFields = WeekFields.of(Locale.getDefault()); - return date.with(weekFields.dayOfWeek(), DayOfWeek.FRIDAY.getValue()); + return date.with(weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()); } private double calcularTotalPorDia(final Actividad actividad) { From e45d0d828ff05f9cb386c7b002f3a4d01ea2ecda Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Tue, 12 Nov 2024 20:55:52 -0400 Subject: [PATCH 05/11] #45-Registro Semanal de Horas Trabajadas corregir duplicados y actividades --- .../views/HoursWorkedView.java | 38 ++++++++----------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index a17d6de..62ef1cb 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -5,6 +5,7 @@ import com.primefactorsolutions.model.HoursWorked; import com.primefactorsolutions.service.EmployeeService; import com.primefactorsolutions.service.HoursWorkedService; import com.vaadin.flow.component.grid.Grid; +import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.component.textfield.TextField; @@ -15,13 +16,9 @@ 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 jakarta.persistence.ManyToOne; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.annotation.Scope; import com.vaadin.flow.component.html.Label; -import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.view.InternalResourceViewResolver; import org.vaadin.firitin.components.datepicker.VDatePicker; @@ -36,19 +33,18 @@ import java.util.Locale; @SpringComponent @PermitAll @Scope("prototype") -@PageTitle("Hours Worked") +@PageTitle("Horas Trabajadas") @Route(value = "/hours-worked/me", layout = MainLayout.class) public class HoursWorkedView extends VerticalLayout { - @ManyToOne - private Actividad actividad; - private final List actividades = new ArrayList<>(); private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas private final Grid grid = new Grid<>(Actividad.class); private final Grid gridActividadesEspecificas = new Grid<>(Actividad.class); - private final ComboBox employeeComboBox = new ComboBox<>("Employee"); + private final ComboBox employeeComboBox = new ComboBox<>("Empleado"); private final ComboBox equipoDropdown = new ComboBox<>("Equipo"); + private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); + private final ComboBox tareasEspecificasDropdown = new ComboBox<>("Tareas Específicas"); private final TextField tareaEspecificaInput = new TextField("Especificar Tarea"); @@ -62,15 +58,11 @@ public class HoursWorkedView extends VerticalLayout { @Autowired private final HoursWorkedService hoursWorkedService; - 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(); - private final Label numeroSemanaLabel = new Label("Número de la Semana: "); - - private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); - - public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { this.employeeService = employeeService; this.hoursWorkedService = hoursWorkedService; @@ -149,10 +141,7 @@ public class HoursWorkedView extends VerticalLayout { LocalDate selectedDate = event.getValue(); if (selectedDate != null) { selectedStartOfWeek = getStartOfWeek(selectedDate); - LocalDate endOfWeek = selectedStartOfWeek.plusDays(6); weekNumber = getWeekOfYear(selectedDate); - fechasLabel.setText("Semana del " + selectedStartOfWeek + " al " + endOfWeek); - numeroSemanaLabel.setText("Número de la Semana: " + weekNumber); cargarDatos(); } }); @@ -189,12 +178,14 @@ public class HoursWorkedView extends VerticalLayout { HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton, cerrarButton, verMesButton); - VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, horasPendientesLabel); + VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel, + horasPendientesLabel); totalesLayout.setSpacing(true); totalesLayout.setPadding(true); - add(fechaPicker, fechasLabel, numeroSemanaLabel, filtersLayout, actividadFormLayout, - tareasEspecificasLayout, grid, gridActividadesEspecificas, buttonsLayout, totalesLayout); + add(fechaPicker, filtersLayout, actividadFormLayout, + equipoLabel, grid, empresaLabel, tareasEspecificasLayout, + gridActividadesEspecificas, buttonsLayout, totalesLayout); } private void configurarGrid() { @@ -209,6 +200,7 @@ public class HoursWorkedView extends VerticalLayout { 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(actividades); } private void configurarGridActividadesEspecificas() { @@ -294,7 +286,7 @@ public class HoursWorkedView extends VerticalLayout { return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); } - private void agregarOActualizarActividad(Actividad nuevaActividad, DayOfWeek dia, double horas) { + private void agregarOActualizarActividad(final Actividad nuevaActividad, final DayOfWeek dia, final double horas) { Actividad actividadExistente = actividades.stream() .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) .findFirst() @@ -414,7 +406,7 @@ public class HoursWorkedView extends VerticalLayout { private LocalDate getStartOfWeek(final LocalDate date) { WeekFields weekFields = WeekFields.of(Locale.getDefault()); - return date.with(weekFields.dayOfWeek(), DayOfWeek.MONDAY.getValue()); + return date.with(weekFields.dayOfWeek(), DayOfWeek.FRIDAY.getValue()); } private double calcularTotalPorDia(final Actividad actividad) { From 3f17eb780bcb065ad58dbc235293a22fe2ec3260 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Wed, 13 Nov 2024 13:00:39 -0400 Subject: [PATCH 06/11] #45-Registro Semanal de Horas Trabajadas guardar solo una actividad --- .../primefactorsolutions/model/Actividad.java | 10 +++- .../model/HoursWorked.java | 55 ++++++++++++++++--- .../repositories/EmployeeRepository.java | 2 +- .../service/EmployeeService.java | 2 +- .../views/EmployeeView.java | 1 + .../views/HoursWorkedView.java | 34 +++++++----- 6 files changed, 78 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java index 7c7df34..717e3aa 100644 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ b/src/main/java/com/primefactorsolutions/model/Actividad.java @@ -4,11 +4,16 @@ import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.util.UUID; - +@Data @Entity +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) public class Actividad extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.UUID) @@ -129,7 +134,6 @@ public class Actividad extends BaseEntity { return horas; } - // Builder para crear instancias de Actividad public static class Builder { private String nombre; private double lunes; @@ -139,7 +143,7 @@ public class Actividad extends BaseEntity { private double viernes; private double sabado; private double domingo; - private String tarea; // Cambié 'tarea' por 'descripcion' + private String tarea; private double horas; public Builder tarea(final String tarea, final double horas) { diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index e23e9b0..585ee9b 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -5,11 +5,20 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import jakarta.persistence.CascadeType; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; import java.time.LocalDate; +import java.time.temporal.WeekFields; +import java.util.Locale; import java.util.UUID; +@Data @Entity +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) public class HoursWorked extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.UUID) @@ -18,16 +27,20 @@ public class HoursWorked extends BaseEntity { @ManyToOne private Employee employee; - @ManyToOne + @ManyToOne(cascade = CascadeType.PERSIST) // Añadimos cascade para que persista la actividad automáticamente private Actividad actividad; private int weekNumber; private double totalHours; - private LocalDate fecha; - public HoursWorked() {} + public HoursWorked(Employee employee) { + this.employee = employee; + this.weekNumber = 0; + this.totalHours = 0; + this.fecha = LocalDate.now(); + } public Actividad getActividad() { return this.actividad; @@ -49,8 +62,8 @@ public class HoursWorked extends BaseEntity { return employee; } - public void setEmployee(final Employee value) { - this.employee = value; + public void setEmployee(final Employee employee) { + this.employee = employee; } public int getWeekNumber() { @@ -61,8 +74,6 @@ public class HoursWorked extends BaseEntity { this.weekNumber = weekNumber; } - public LocalDate getFecha() { return this.fecha;} - public double getTotalHours() { return totalHours; } @@ -70,4 +81,34 @@ public class HoursWorked extends BaseEntity { public void setTotalHours(final double totalHours) { this.totalHours = totalHours; } + + public LocalDate getFecha() { + return fecha; + } + + public void setFecha(final LocalDate fecha) { + this.fecha = fecha; + // Actualiza el número de semana automáticamente al establecer la fecha + if (fecha != null) { + this.weekNumber = calculateWeekNumber(fecha); + } + } + + // Método adicional para calcular el número de semana basado en la fecha + private int calculateWeekNumber(LocalDate date) { + WeekFields weekFields = WeekFields.of(Locale.getDefault()); + return date.get(weekFields.weekOfWeekBasedYear()); + } + + @Override + public String toString() { + return "HoursWorked{" + + "id=" + id + + ", employee=" + (employee != null ? employee.getFirstName() : "N/A") + + ", actividad=" + (actividad != null ? actividad.getNombre() : "N/A") + + ", weekNumber=" + weekNumber + + ", totalHours=" + totalHours + + ", fecha=" + fecha + + '}'; + } } diff --git a/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java b/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java index d57397f..3f09154 100644 --- a/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java @@ -11,7 +11,7 @@ public interface EmployeeRepository extends JpaRepository { Optional findByUsername(String username); Optional findByPersonalEmail(String personalEmail); - Optional findByTeamId(UUID teamId); + Optional findByTeamIdAndLeadManagerTrue(UUID teamId); List findByTeamName(String teamName); } diff --git a/src/main/java/com/primefactorsolutions/service/EmployeeService.java b/src/main/java/com/primefactorsolutions/service/EmployeeService.java index 52c15dd..646278a 100644 --- a/src/main/java/com/primefactorsolutions/service/EmployeeService.java +++ b/src/main/java/com/primefactorsolutions/service/EmployeeService.java @@ -50,7 +50,7 @@ public class EmployeeService { public String getTeamLeadName(final UUID teamId) { // Encuentra al empleado con el rol de lead_manager en el equipo especificado - Optional leadManager = employeeRepository.findByTeamId(teamId); + Optional leadManager = employeeRepository.findByTeamIdAndLeadManagerTrue(teamId); return leadManager.map(employee -> employee.getFirstName() + " " + employee.getLastName()) .orElse("No asignado"); diff --git a/src/main/java/com/primefactorsolutions/views/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/EmployeeView.java index 35b99ad..4cdbc08 100644 --- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java +++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java @@ -176,6 +176,7 @@ public class EmployeeView extends BeanValidationForm implements HasUrl editButton.setVisible(true); reportButton.setVisible(true); birthday.addValueChangeListener(event -> calculateAge()); + birthday.setMax(java.time.LocalDate.now()); reportButton.addClickListener((ComponentEventListener>) buttonClickEvent -> { var employee = getEntity(); diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 62ef1cb..6614aa2 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -305,7 +305,6 @@ public class HoursWorkedView extends VerticalLayout { default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); } } else { - // Si no existe, se agrega como nueva actividad switch (dia) { case MONDAY -> nuevaActividad.setLunes(horas); case TUESDAY -> nuevaActividad.setMartes(horas); @@ -318,9 +317,8 @@ public class HoursWorkedView extends VerticalLayout { } actividades.add(nuevaActividad); } - - // Actualiza el Grid grid.setItems(actividades); + guardarActividades(); } @@ -437,22 +435,29 @@ public class HoursWorkedView extends VerticalLayout { return; } + if (actividades.isEmpty()) { + Notification.show("No hay actividades para guardar."); + return; + } + double totalHorasSemana = actividades.stream() .mapToDouble(this::calcularTotalPorDia) .sum(); - HoursWorked hoursWorked = new HoursWorked(); - hoursWorked.setEmployee(selectedEmployee); - hoursWorked.setWeekNumber(weekNumber); - hoursWorked.setTotalHours(totalHorasSemana); + List savedHoursWorked = new ArrayList<>(); // Para almacenar los objetos guardados - try { - hoursWorkedService.saveHoursWorked(hoursWorked); // Usa saveHoursWorked directamente - Notification.show("Actividades guardadas correctamente."); - System.out.println(hoursWorked); - } catch (Exception e) { - Notification.show("Error al guardar actividades: " + e.getMessage()); - } + actividades.forEach(actividad -> { + HoursWorked hoursWorked = new HoursWorked(); + hoursWorked.setActividad(actividad); + hoursWorked.setFecha(fechaPicker.getValue()); + hoursWorked.setEmployee(selectedEmployee); + hoursWorked.setWeekNumber(weekNumber); + hoursWorked.setTotalHours(totalHorasSemana); + + hoursWorkedService.saveHoursWorked(hoursWorked); + + }); + Notification.show("Actividades guardadas correctamente."); } private double calcularTotalHoras(final List listaDeHorasTrabajadas) { @@ -468,4 +473,5 @@ public class HoursWorkedView extends VerticalLayout { private void closeView() { getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class)); } + } \ No newline at end of file From aa1f041a4f41680b999f785e202df95ec2f68664 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Thu, 14 Nov 2024 13:24:38 -0400 Subject: [PATCH 07/11] #45-Registro Semanal de Horas Trabajadas guardar solo una actividad --- .../model/ActividadesHours.java | 81 +++ .../primefactorsolutions/model/Employee.java | 18 +- .../model/HoursWorked.java | 108 ++-- .../ActividadesHoursRepository.java | 7 + .../repositories/HoursWorkedRepository.java | 8 +- .../service/HoursWorkedService.java | 21 +- .../views/EmployeeView.java | 72 ++- .../views/HoursWorkedView.java | 539 ++++-------------- .../views/TimesheetView.java | 2 +- 9 files changed, 321 insertions(+), 535 deletions(-) create mode 100644 src/main/java/com/primefactorsolutions/model/ActividadesHours.java create mode 100644 src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java diff --git a/src/main/java/com/primefactorsolutions/model/ActividadesHours.java b/src/main/java/com/primefactorsolutions/model/ActividadesHours.java new file mode 100644 index 0000000..5a93ec4 --- /dev/null +++ b/src/main/java/com/primefactorsolutions/model/ActividadesHours.java @@ -0,0 +1,81 @@ +package com.primefactorsolutions.model; + +import jakarta.persistence.*; +import java.time.LocalDate; +import java.util.UUID; + +@Entity +@Table(name = "Actividades_hours") +public class ActividadesHours { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private UUID id; + + @ManyToOne + @JoinColumn(name = "employee_id", nullable = false) + private Employee employee; + + @ManyToOne + @JoinColumn(name = "actividad_id", nullable = false) + private Actividad actividad; + + @Column(nullable = false) + private double totalHours; + + @Column(nullable = false) + private int weekNumber; + + @Column(nullable = false) + private LocalDate fecha; + + // Getters y Setters + + public UUID getId() { + return id; + } + + public void setId(UUID id) { + this.id = id; + } + + public Employee getEmployee() { + return employee; + } + + public void setEmployee(Employee employee) { + this.employee = employee; + } + + public Actividad getActividad() { + return actividad; + } + + public void setActividad(Actividad actividad) { + this.actividad = actividad; + } + + public double getTotalHours() { + return totalHours; + } + + public void setTotalHours(double totalHours) { + this.totalHours = totalHours; + } + + public int getWeekNumber() { + return weekNumber; + } + + public void setWeekNumber(int weekNumber) { + this.weekNumber = weekNumber; + } + + public LocalDate getFecha() { + return fecha; + } + + public void setFecha(LocalDate fecha) { + this.fecha = fecha; + } +} diff --git a/src/main/java/com/primefactorsolutions/model/Employee.java b/src/main/java/com/primefactorsolutions/model/Employee.java index 1d3df41..4d06336 100644 --- a/src/main/java/com/primefactorsolutions/model/Employee.java +++ b/src/main/java/com/primefactorsolutions/model/Employee.java @@ -28,36 +28,40 @@ 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") 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 +74,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; diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index 585ee9b..3f203b4 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -1,68 +1,43 @@ 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.CascadeType; +import jakarta.persistence.*; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import java.time.LocalDate; -import java.time.temporal.WeekFields; -import java.util.Locale; import java.util.UUID; @Data @Entity @AllArgsConstructor +@NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class HoursWorked extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.UUID) + @GeneratedValue(strategy = GenerationType.AUTO) private UUID id; @ManyToOne + @JoinColumn(name = "employee_id", nullable = false) private Employee employee; - @ManyToOne(cascade = CascadeType.PERSIST) // Añadimos cascade para que persista la actividad automáticamente - private Actividad actividad; + @ManyToOne + @JoinColumn(name = "team_id", nullable = false) + private Team team; private int weekNumber; + private LocalDate date; + private String actividad; + private double hours; private double totalHours; - private LocalDate fecha; - - public HoursWorked() {} - public HoursWorked(Employee employee) { - this.employee = employee; - this.weekNumber = 0; - this.totalHours = 0; - this.fecha = LocalDate.now(); - } - - public Actividad getActividad() { - return this.actividad; - } - - public void setActividad(Actividad actividad){ - this.actividad = actividad; - } - - public UUID getId() { - return id; - } - - public void setId(final UUID id) { - this.id = id; - } public Employee getEmployee() { return employee; } - public void setEmployee(final Employee employee) { + public void setEmployee(Employee employee) { this.employee = employee; } @@ -70,45 +45,48 @@ public class HoursWorked extends BaseEntity { return weekNumber; } - public void setWeekNumber(final int weekNumber) { + public void setWeekNumber(int weekNumber) { this.weekNumber = weekNumber; } + public LocalDate getDate() { + return date; + } + + public void setDate(LocalDate date) { + this.date = date; + } + + public String getActividad() { + return actividad; + } + + public void setActividad(String actividad) { + this.actividad = actividad; + } + + public double getHours() { + return hours; + } + + public void setHours(double hours) { + this.hours = hours; + } + public double getTotalHours() { return totalHours; } - public void setTotalHours(final double totalHours) { + public void setTotalHours(double totalHours) { this.totalHours = totalHours; } - public LocalDate getFecha() { - return fecha; + public Team getTeam() { + return team; } - public void setFecha(final LocalDate fecha) { - this.fecha = fecha; - // Actualiza el número de semana automáticamente al establecer la fecha - if (fecha != null) { - this.weekNumber = calculateWeekNumber(fecha); - } - } - - // Método adicional para calcular el número de semana basado en la fecha - private int calculateWeekNumber(LocalDate date) { - WeekFields weekFields = WeekFields.of(Locale.getDefault()); - return date.get(weekFields.weekOfWeekBasedYear()); - } - - @Override - public String toString() { - return "HoursWorked{" + - "id=" + id + - ", employee=" + (employee != null ? employee.getFirstName() : "N/A") + - ", actividad=" + (actividad != null ? actividad.getNombre() : "N/A") + - ", weekNumber=" + weekNumber + - ", totalHours=" + totalHours + - ", fecha=" + fecha + - '}'; + public void setTeam(Team team) { + this.team = team; } } + diff --git a/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java b/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java new file mode 100644 index 0000000..72a3013 --- /dev/null +++ b/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java @@ -0,0 +1,7 @@ +package com.primefactorsolutions.repositories; +import com.primefactorsolutions.model.ActividadesHours; +import org.springframework.data.jpa.repository.JpaRepository; +import java.util.UUID; + +public interface ActividadesHoursRepository extends JpaRepository { +} diff --git a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java index b3d0bdb..87162d9 100644 --- a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java @@ -2,11 +2,13 @@ package com.primefactorsolutions.repositories; import com.primefactorsolutions.model.HoursWorked; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; +import java.time.LocalDate; import java.util.List; +import java.util.UUID; -@Repository -public interface HoursWorkedRepository extends JpaRepository { + +public interface HoursWorkedRepository extends JpaRepository { List findByWeekNumber(int weekNumber); + List findByDate(LocalDate date); } diff --git a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java index 2bfe882..605f6f6 100644 --- a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java +++ b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java @@ -5,7 +5,9 @@ import com.primefactorsolutions.repositories.HoursWorkedRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; +import java.time.LocalDate; +import java.util.*; +import java.util.stream.Collectors; @Service public class HoursWorkedService { @@ -20,6 +22,11 @@ public class HoursWorkedService { return hoursWorkedRepository.findAll(); } + public HoursWorked findHoursWorked(final UUID id) { + Optional hoursWorked = hoursWorkedRepository.findById(id); + return hoursWorked.orElse(null); + } + public HoursWorked saveHoursWorked(final HoursWorked hoursWorked) { return hoursWorkedRepository.save(hoursWorked); } @@ -28,13 +35,17 @@ public class HoursWorkedService { return hoursWorkedRepository.save(hoursWorked); } - public void deleteHoursWorked(final Long id) { - hoursWorkedRepository.deleteById(id); - } - public List findByWeekNumber(final int weekNumber) { return hoursWorkedRepository.findByWeekNumber(weekNumber); } + public List findByDate(final LocalDate date) { + return hoursWorkedRepository.findByDate(date); + } + + public List findByDateAndWeekNumber(final LocalDate date, final int weekNumber) { + return hoursWorkedRepository.findByDate(date); + } + } diff --git a/src/main/java/com/primefactorsolutions/views/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/EmployeeView.java index 4cdbc08..a80ae9e 100644 --- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java +++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java @@ -56,7 +56,6 @@ public class EmployeeView extends BeanValidationForm 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); @@ -65,24 +64,19 @@ public class EmployeeView extends BeanValidationForm implements HasUrl private final ComboBox 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 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 = 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); @@ -101,10 +95,15 @@ public class EmployeeView extends BeanValidationForm 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 = 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); @@ -141,7 +140,7 @@ public class EmployeeView extends BeanValidationForm 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, @@ -177,6 +176,8 @@ public class EmployeeView extends BeanValidationForm implements HasUrl reportButton.setVisible(true); birthday.addValueChangeListener(event -> calculateAge()); birthday.setMax(java.time.LocalDate.now()); + dateOfEntry.addValueChangeListener(event -> calculateSeniority()); + dateOfEntry.addValueChangeListener(event -> calculateSeniority()); reportButton.addClickListener((ComponentEventListener>) buttonClickEvent -> { var employee = getEntity(); @@ -204,10 +205,30 @@ public class EmployeeView extends BeanValidationForm 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); @@ -219,11 +240,15 @@ public class EmployeeView extends BeanValidationForm 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(); } }); } @@ -394,12 +419,12 @@ public class EmployeeView extends BeanValidationForm 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); } } @@ -479,6 +504,7 @@ public class EmployeeView extends BeanValidationForm implements HasUrl emergencyCPhone.setReadOnly(false); emergencyCEmail.setReadOnly(false); upload.setVisible(false); + profileImagePreview.setVisible(true); age.setReadOnly(false); gender.setReadOnly(false); status.setReadOnly(false); @@ -526,7 +552,6 @@ public class EmployeeView extends BeanValidationForm 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, @@ -534,6 +559,7 @@ public class EmployeeView extends BeanValidationForm 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, diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 6614aa2..d0f9df8 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -1,477 +1,156 @@ 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.grid.Grid; -import com.vaadin.flow.component.html.H2; +import com.primefactorsolutions.service.TeamService; +import com.primefactorsolutions.service.TimeOffRequestService; +import com.vaadin.flow.component.Component; +import com.vaadin.flow.component.datepicker.DatePicker; +import com.vaadin.flow.component.html.H3; 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.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("Horas Trabajadas") -@Route(value = "/hours-worked/me", layout = MainLayout.class) -public class HoursWorkedView extends VerticalLayout { - private final List actividades = new ArrayList<>(); - private final List actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas - private final Grid grid = new Grid<>(Actividad.class); - private final Grid gridActividadesEspecificas = new Grid<>(Actividad.class); +@Route(value = "/timesheets/:hours-worked?/:action?", layout = MainLayout.class) +public class HoursWorkedView extends BeanValidationForm implements HasUrlParameter { + private final DatePicker dateField = new DatePicker("Fecha"); + private final ComboBox teamField = new ComboBox<>("Equipo"); + private final ComboBox employeeField = new ComboBox<>("Empleado"); + private final TextField activityField = new TextField("Actividad"); - private final ComboBox employeeComboBox = new ComboBox<>("Empleado"); - private final ComboBox equipoDropdown = new ComboBox<>("Equipo"); - private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha"); - - - private final ComboBox tareasEspecificasDropdown = new ComboBox<>("Tareas Específicas"); - private final TextField tareaEspecificaInput = new TextField("Especificar Tarea"); - private TextField horasTareaInput = crearCampoHora("Horas Tareas"); - - private LocalDate selectedStartOfWeek; - private int weekNumber; - - @Autowired - private final EmployeeService employeeService; - @Autowired private final HoursWorkedService hoursWorkedService; + private final EmployeeService employeeService; + private final TeamService teamService; + private HoursWorked request; + private Employee employee; - 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(); + private Button saveButton; - public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) { - this.employeeService = employeeService; + public HoursWorkedView(HoursWorkedService hoursWorkedService, + EmployeeService employeeService, + TeamService teamService, TimeOffRequestService timeOffRequestService) { + super(HoursWorked.class); this.hoursWorkedService = hoursWorkedService; - configurarVista(); - configurarGrid(); - configurarGridActividadesEspecificas(); - cargarDatos(); - configurarTareasEspecificas(); + this.employeeService = employeeService; + this.teamService = teamService; + + // Initialize combo boxes + initializeTeamField(); + initializeEmployeeField(); } - private void configurarTareasEspecificas() { - tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones", "Colaboraciones", - "Aprendizajes", "Proyectos PFS", "Otros"); - tareasEspecificasDropdown.setPlaceholder("Selecciona una tarea..."); + @Override + public void setParameter(BeforeEvent beforeEvent, String action) { + final RouteParameters params = beforeEvent.getRouteParameters(); + final String hoursWorkedId = params.get("hoursworkedId").orElse(null); - tareasEspecificasDropdown.addValueChangeListener(event -> { - String selected = event.getValue(); - // Activa el campo de texto si la opción seleccionada es "Otros" - tareaEspecificaInput.setVisible("Otros".equals(selected)); - if (!"Otros".equals(selected)) { - tareaEspecificaInput.clear(); - } - }); - tareaEspecificaInput.setVisible(false); - } - - private void cargarDatos() { - if (selectedStartOfWeek != null && weekNumber > 0) { - List listaDeHorasTrabajadas = obtenerDatos(); - - for (HoursWorked hours : listaDeHorasTrabajadas) { - LocalDate activityDate = hours.getFecha(); - int activityWeek = getWeekOfYear(activityDate); - if (activityWeek == weekNumber) { - Actividad actividad = hours.getActividad(); - if (actividad != null) { - DayOfWeek dayOfWeek = activityDate.getDayOfWeek(); - agregarOActualizarActividad(actividad, dayOfWeek, hours.getTotalHours()); - } - } - } - - grid.setItems(actividades); - gridActividadesEspecificas.setItems(actividadesEspecificas); - calcularTotalHoras(listaDeHorasTrabajadas); + if ("new".equals(action)) { + setEntityWithEnabledSave(new HoursWorked()); + } else if (hoursWorkedId != null) { + UUID id = UUID.fromString(hoursWorkedId); + request = hoursWorkedService.findHoursWorked(id); + setEntity(request); + configureViewOrEditAction(action); } } - 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 getFormComponents() { + return List.of( + createEmployeeHeader(), + dateField, + teamField, + employeeField, + activityField, + createCloseButton() ); + } - employeeComboBox.addValueChangeListener(event -> { - Employee selectedEmployee = event.getValue(); - if (selectedEmployee != null) { - Notification.show("Empleado seleccionado: " - + selectedEmployee.getFirstName() + " " - + selectedEmployee.getLastName()); - } + protected Button createSaveButton() { + saveButton = new Button("Guardar"); + saveButton.addClickListener(event -> saveHoursWorked()); + return saveButton; + } + + protected Button createCloseButton() { + Button closeButton = new Button("Cerrar"); + closeButton.addClickListener(event -> closeForm()); + return closeButton; + } + + private void initializeTeamField() { + teamField.setItems(teamService.findAllTeams()); + teamField.setItemLabelGenerator(Team::getName); + teamField.addValueChangeListener(event -> { + teamField.getValue(); }); } - private int getWeekOfYear(final LocalDate date) { - return date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR); + private void initializeEmployeeField() { + employeeField.setItems(employeeService.findAllEmployees()); + employeeField.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName()); } - private void configurarVista() { - fechaPicker.setMax(LocalDate.now()); - fechaPicker.addValueChangeListener(event -> { - LocalDate selectedDate = event.getValue(); - if (selectedDate != null) { - selectedStartOfWeek = getStartOfWeek(selectedDate); - weekNumber = getWeekOfYear(selectedDate); - cargarDatos(); - } - }); - - Button verMesButton = new Button("Ver Mes", event -> { - getUI().ifPresent(ui -> ui.navigate(HoursWorkedMonthView.class)); - }); - - equipoDropdown.setItems("ABC", "DEF", "XYZ"); - equipoDropdown.setWidth("250px"); - - equipoDropdown.addValueChangeListener(event -> { - String selectedEquipo = event.getValue(); - if (selectedEquipo != null) { - // Filtra la lista de empleados según el equipo seleccionado - List filteredEmployees = employeeService.findEmployeesByTeam(selectedEquipo); - employeeComboBox.setItems(filteredEmployees); - } - }); - - setEmployeeComboBoxProperties(); - - HorizontalLayout filtersLayout = new HorizontalLayout(equipoDropdown, employeeComboBox); - filtersLayout.setSpacing(true); - - HorizontalLayout actividadFormLayout = configurarFormularioActividades(); - HorizontalLayout tareasEspecificasLayout = configurarTareasEspecificasLayout(); - - - 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, filtersLayout, actividadFormLayout, - equipoLabel, grid, empresaLabel, tareasEspecificasLayout, - gridActividadesEspecificas, 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"); - grid.setItems(actividades); - } - - private void configurarGridActividadesEspecificas() { - gridActividadesEspecificas.removeAllColumns(); - gridActividadesEspecificas.setItems(actividadesEspecificas); - gridActividadesEspecificas.addColumn(Actividad::getTarea).setHeader("Actividad"); - gridActividadesEspecificas.addColumn(Actividad::getLunes).setHeader("Lunes"); - gridActividadesEspecificas.addColumn(Actividad::getMartes).setHeader("Martes"); - gridActividadesEspecificas.addColumn(Actividad::getMiercoles).setHeader("Miércoles"); - gridActividadesEspecificas.addColumn(Actividad::getJueves).setHeader("Jueves"); - gridActividadesEspecificas.addColumn(Actividad::getViernes).setHeader("Viernes"); - gridActividadesEspecificas.addColumn(Actividad::getSabado).setHeader("Sábado"); - gridActividadesEspecificas.addColumn(Actividad::getDomingo).setHeader("Domingo"); - gridActividadesEspecificas.addColumn(this::calcularTotalPorDia).setHeader("Total Día Específico") - .setKey("totalDiaEspecifico"); - } - - private HorizontalLayout configurarFormularioActividades() { - TextField actividadNombre = new TextField("Actividad"); - actividadNombre.setWidth("200px"); - - TextField horasInput = crearCampoHora("Horas"); - - Button agregarActividadButton = new Button("Agregar Actividad", e -> { - try { - LocalDate selectedDate = fechaPicker.getValue(); - if (selectedDate == null) { - Notification.show("Por favor, selecciona una fecha."); - return; - } - - int selectedWeekNumber = getWeekOfYear(selectedDate); - if (selectedWeekNumber != weekNumber) { - Notification.show("Solo puedes agregar actividades dentro de la semana actual."); - return; - } - - DayOfWeek selectedDay = selectedDate.getDayOfWeek(); - - Actividad.Builder actividadBuilder = new Actividad.Builder() - .nombre(actividadNombre.getValue()); - - double horas = parseHoras(horasInput.getValue()); - switch (selectedDay) { - case MONDAY -> actividadBuilder.lunes(horas); - case TUESDAY -> actividadBuilder.martes(horas); - case WEDNESDAY -> actividadBuilder.miercoles(horas); - case THURSDAY -> actividadBuilder.jueves(horas); - case FRIDAY -> actividadBuilder.viernes(horas); - case SATURDAY -> actividadBuilder.sabado(horas); - case SUNDAY -> actividadBuilder.domingo(horas); - default -> throw new IllegalArgumentException("Día seleccionado no válido: " + selectedDay); - } - - String tareaSeleccionada = tareasEspecificasDropdown.getValue(); - double horasTarea = parseHoras(horasTareaInput.getValue()); - - if (tareaSeleccionada != null && !tareaSeleccionada.isEmpty()) { - actividadBuilder.tarea(tareaSeleccionada).lunes(horasTarea); - Actividad nuevaActividadEspecifica = actividadBuilder.build(); - actividadesEspecificas.add(nuevaActividadEspecifica); - gridActividadesEspecificas.setItems(actividadesEspecificas); - } else { - Actividad nuevaActividad = actividadBuilder.build(); - actividades.add(nuevaActividad); - grid.setItems(actividades); - } - - Actividad nuevaActividad = actividadBuilder.build(); - agregarOActualizarActividad(nuevaActividad, selectedDay, horas); - - actualizarTotales(); - Notification.show("Actividad agregada correctamente"); - actividadNombre.clear(); - horasInput.clear(); - tareasEspecificasDropdown.clear(); - horasTareaInput.clear(); - } catch (NumberFormatException ex) { - Notification.show("Error: Por favor ingresa números válidos para las horas."); - } - }); - - return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton); - } - - private void agregarOActualizarActividad(final Actividad nuevaActividad, final DayOfWeek dia, final double horas) { - Actividad actividadExistente = actividades.stream() - .filter(a -> a.getNombre().equals(nuevaActividad.getNombre())) - .findFirst() - .orElse(null); - - if (actividadExistente != null) { - // Si la actividad ya existe, actualiza las horas para el día correspondiente - switch (dia) { - case MONDAY -> actividadExistente.setLunes(horas); - case TUESDAY -> actividadExistente.setMartes(horas); - case WEDNESDAY -> actividadExistente.setMiercoles(horas); - case THURSDAY -> actividadExistente.setJueves(horas); - case FRIDAY -> actividadExistente.setViernes(horas); - case SATURDAY -> actividadExistente.setSabado(horas); - case SUNDAY -> actividadExistente.setDomingo(horas); - default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); - } - } else { - switch (dia) { - case MONDAY -> nuevaActividad.setLunes(horas); - case TUESDAY -> nuevaActividad.setMartes(horas); - case WEDNESDAY -> nuevaActividad.setMiercoles(horas); - case THURSDAY -> nuevaActividad.setJueves(horas); - case FRIDAY -> nuevaActividad.setViernes(horas); - case SATURDAY -> nuevaActividad.setSabado(horas); - case SUNDAY -> nuevaActividad.setDomingo(horas); - default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia); - } - actividades.add(nuevaActividad); - } - grid.setItems(actividades); - guardarActividades(); - } - - - private HorizontalLayout configurarTareasEspecificasLayout() { - - Button agregarTareaButton = new Button("Agregar Tarea PFS", e -> { - try { - String tareaSeleccionada = tareasEspecificasDropdown.getValue(); - String tareaNombre = "Otros" - .equals(tareaSeleccionada) ? tareaEspecificaInput - .getValue() : tareaSeleccionada; - - if (tareaNombre == null || tareaNombre.isEmpty()) { - Notification.show("Por favor, especifica la tarea."); - return; - } - - double horasTarea = parseHoras(horasTareaInput.getValue()); - if (horasTarea <= 0) { - Notification.show("Por favor, ingresa un número válido para las horas."); - return; - } - - if (tareaSeleccionada != null && !tareaSeleccionada.isEmpty() && horasTarea > 0) { - LocalDate selectedDate = fechaPicker.getValue(); - if (selectedDate == null) { - Notification.show("Selecciona una fecha para asignar la tarea."); - return; - } - - DayOfWeek selectedDay = selectedDate.getDayOfWeek(); - Actividad.Builder actividadBuilder = new Actividad.Builder().tarea(tareaNombre); - - switch (selectedDay) { - case MONDAY -> actividadBuilder.lunes(horasTarea); - case TUESDAY -> actividadBuilder.martes(horasTarea); - case WEDNESDAY -> actividadBuilder.miercoles(horasTarea); - case THURSDAY -> actividadBuilder.jueves(horasTarea); - case FRIDAY -> actividadBuilder.viernes(horasTarea); - case SATURDAY -> actividadBuilder.sabado(horasTarea); - case SUNDAY -> actividadBuilder.domingo(horasTarea); - default -> throw new IllegalArgumentException("Día seleccionado no válido: " + selectedDay); - } - - Actividad nuevaActividadEspecifica = actividadBuilder.build(); - actividadesEspecificas.add(nuevaActividadEspecifica); - - gridActividadesEspecificas.setItems(actividadesEspecificas); - actualizarTotales(); - - tareasEspecificasDropdown.clear(); - tareaEspecificaInput.clear(); - horasTareaInput.clear(); - - Notification.show("Tarea específica agregada correctamente"); - } else { - Notification.show("Selecciona una tarea y asegúrate de ingresar horas válidas."); - } - } catch (NumberFormatException ex) { - Notification.show("Error: Por favor ingresa un número válido para las horas."); - } - }); - - HorizontalLayout layout = new HorizontalLayout(tareasEspecificasDropdown, - tareaEspecificaInput, horasTareaInput, agregarTareaButton); - layout.setSpacing(true); - return layout; - } - - 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; - } - return Double.parseDouble(value); - } - - private LocalDate getStartOfWeek(final LocalDate date) { - WeekFields weekFields = WeekFields.of(Locale.getDefault()); - return date.with(weekFields.dayOfWeek(), DayOfWeek.FRIDAY.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 totalActividadesGenerales = actividades.stream() - .mapToDouble(this::calcularTotalPorDia) - .sum(); - double totalActividadesEspecificas = actividadesEspecificas.stream() - .mapToDouble(this::calcularTotalPorDia) - .sum(); - double totalFinal = totalActividadesGenerales + totalActividadesEspecificas; - double horasPendientes = 40 - totalFinal; - - totalCompletadoLabel.setText("Total Hrs/Semana Completadas: " + totalFinal); - horasPendientesLabel.setText("Horas Pendientes: " + horasPendientes); - } - - private void guardarActividades() { - Employee selectedEmployee = employeeComboBox.getValue(); - String selectedEquipo = equipoDropdown.getValue(); - - if (selectedEmployee == null || selectedEquipo == null) { - Notification.show("Por favor selecciona un equipo y un empleado."); - return; - } - - if (actividades.isEmpty()) { - Notification.show("No hay actividades para guardar."); - return; - } - - double totalHorasSemana = actividades.stream() - .mapToDouble(this::calcularTotalPorDia) - .sum(); - - List savedHoursWorked = new ArrayList<>(); // Para almacenar los objetos guardados - - actividades.forEach(actividad -> { - HoursWorked hoursWorked = new HoursWorked(); - hoursWorked.setActividad(actividad); - hoursWorked.setFecha(fechaPicker.getValue()); - hoursWorked.setEmployee(selectedEmployee); - hoursWorked.setWeekNumber(weekNumber); - hoursWorked.setTotalHours(totalHorasSemana); - + private void saveHoursWorked() { + if (isFormValid()) { + HoursWorked hoursWorked = getEntity(); + setFieldValues(hoursWorked); hoursWorkedService.saveHoursWorked(hoursWorked); - - }); - Notification.show("Actividades guardadas correctamente."); + Notification.show("Horas trabajadas guardadas correctamente."); + closeForm(); + } } - private double calcularTotalHoras(final List listaDeHorasTrabajadas) { - return listaDeHorasTrabajadas.stream() - .mapToDouble(HoursWorked::getTotalHours) - .sum(); + private void setFieldValues(HoursWorked hoursWorked) { + hoursWorked.setDate(dateField.getValue()); + hoursWorked.setTeam(teamField.getValue()); + hoursWorked.setEmployee(employeeField.getValue()); + hoursWorked.setActividad(activityField.getValue()); } - private List obtenerDatos() { - return new ArrayList<>(); + private void closeForm() { + getUI().ifPresent(ui -> ui.navigate("hoursworked")); } - private void closeView() { - getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class)); + private boolean isFormValid() { + return dateField.getValue() != null && + teamField.getValue() != null && + employeeField.getValue() != null && + !activityField.isEmpty(); } + private void configureViewOrEditAction(String action) { + if ("edit".equals(action) && request != null) { + setFieldsReadOnly(false); + } else if ("view".equals(action) && request != null) { + setFieldsReadOnly(true); + saveButton.setEnabled(false); + } + } + + private void setFieldsReadOnly(boolean readOnly) { + dateField.setReadOnly(readOnly); + teamField.setReadOnly(readOnly); + employeeField.setReadOnly(readOnly); + activityField.setReadOnly(readOnly); + } + + private H3 createEmployeeHeader() { + return new H3("Empleado: " + (employee != null ? employee.getFirstName() + " " + employee.getLastName() : "")); + } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/TimesheetView.java b/src/main/java/com/primefactorsolutions/views/TimesheetView.java index 9a8b351..eb23e4d 100644 --- a/src/main/java/com/primefactorsolutions/views/TimesheetView.java +++ b/src/main/java/com/primefactorsolutions/views/TimesheetView.java @@ -11,7 +11,7 @@ import org.springframework.context.annotation.Scope; @PermitAll @Scope("prototype") @PageTitle("Timesheet") -@Route(value = "/timesheets/me", layout = MainLayout.class) +@Route(value = "/timesheets", layout = MainLayout.class) public class TimesheetView extends Main { } From c67cdf868ea8478cf78a646f44c5c01059b0b6d6 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Thu, 14 Nov 2024 20:38:48 -0400 Subject: [PATCH 08/11] Problema de routes --- .gitea/workflows/build-pr.yaml | 14 --- .gitea/workflows/build.yaml | 16 --- .mvn/wrapper/MavenWrapperDownloader.java | 118 ------------------ .mvn/wrapper/maven-wrapper.jar | Bin 58727 -> 0 bytes .mvn/wrapper/maven-wrapper.properties | 18 --- .../repositories/HoursWorkedRepository.java | 2 +- .../service/HoursWorkedService.java | 37 +++++- .../views/HoursWorkedListView.java | 101 +++++++++++++++ .../views/HoursWorkedView.java | 32 +++-- .../views/MainLayout.java | 2 +- .../views/TimesheestReportView.java | 2 +- 11 files changed, 159 insertions(+), 183 deletions(-) delete mode 100644 .gitea/workflows/build-pr.yaml delete mode 100644 .gitea/workflows/build.yaml delete mode 100644 .mvn/wrapper/MavenWrapperDownloader.java delete mode 100644 .mvn/wrapper/maven-wrapper.jar delete mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java diff --git a/.gitea/workflows/build-pr.yaml b/.gitea/workflows/build-pr.yaml deleted file mode 100644 index 90aad01..0000000 --- a/.gitea/workflows/build-pr.yaml +++ /dev/null @@ -1,14 +0,0 @@ -name: PR Builder -run-name: ${{ gitea.actor }} building PR -on: [pull_request] - -jobs: - Build-PR: - runs-on: ubuntu-22.04 - steps: - - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch ${{ gitea.head_ref }} and ref is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - name: Build PR - if: gitea.base_ref == 'main' - run: | - git clone --single-branch --branch "${{ gitea.head_ref }}" https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction - - run: echo "This job's status is ${{ job.status }}." diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml deleted file mode 100644 index e64cc3a..0000000 --- a/.gitea/workflows/build.yaml +++ /dev/null @@ -1,16 +0,0 @@ -name: Builder -run-name: ${{ gitea.actor }} building -on: - push: - branches: - - main - -jobs: - Build-Project: - runs-on: ubuntu-22.04 - steps: - - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." - - name: Build package - run: | - git clone --single-branch --branch main https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction && unlink /home/ubuntu/pfs-intra/app.jar && cp target/*.jar /home/ubuntu/pfs-intra/app.jar && sudo systemctl restart pfs-intra - - run: echo "This job's status is ${{ job.status }}." diff --git a/.mvn/wrapper/MavenWrapperDownloader.java b/.mvn/wrapper/MavenWrapperDownloader.java deleted file mode 100644 index 8895dd4..0000000 --- a/.mvn/wrapper/MavenWrapperDownloader.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright 2007-present the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -import java.io.*; -import java.net.*; -import java.nio.channels.*; -import java.util.Properties; - -public class MavenWrapperDownloader { - - private static final String WRAPPER_VERSION = "0.5.6"; - /** - * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is - * provided. - */ - private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/" - + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar"; - - /** - * Path to the maven-wrapper.properties file, which might contain a downloadUrl - * property to use instead of the default one. - */ - private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties"; - - /** - * Path where the maven-wrapper.jar will be saved to. - */ - private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar"; - - /** - * Name of the property which should be used to override the default download - * url for the wrapper. - */ - private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl"; - - public static void main(String args[]) { - System.out.println("- Downloader started"); - File baseDirectory = new File(args[0]); - System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath()); - - // If the maven-wrapper.properties exists, read it and check if it contains a - // custom - // wrapperUrl parameter. - File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH); - String url = DEFAULT_DOWNLOAD_URL; - if (mavenWrapperPropertyFile.exists()) { - FileInputStream mavenWrapperPropertyFileInputStream = null; - try { - mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile); - Properties mavenWrapperProperties = new Properties(); - mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream); - url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url); - } catch (IOException e) { - System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'"); - } finally { - try { - if (mavenWrapperPropertyFileInputStream != null) { - mavenWrapperPropertyFileInputStream.close(); - } - } catch (IOException e) { - // Ignore ... - } - } - } - System.out.println("- Downloading from: " + url); - - File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH); - if (!outputFile.getParentFile().exists()) { - if (!outputFile.getParentFile().mkdirs()) { - System.out.println( - "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'"); - } - } - System.out.println("- Downloading to: " + outputFile.getAbsolutePath()); - try { - downloadFileFromURL(url, outputFile); - System.out.println("Done"); - System.exit(0); - } catch (Throwable e) { - System.out.println("- Error downloading"); - e.printStackTrace(); - System.exit(1); - } - } - - private static void downloadFileFromURL(String urlString, File destination) throws Exception { - if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) { - String username = System.getenv("MVNW_USERNAME"); - char[] password = System.getenv("MVNW_PASSWORD").toCharArray(); - Authenticator.setDefault(new Authenticator() { - @Override - protected PasswordAuthentication getPasswordAuthentication() { - return new PasswordAuthentication(username, password); - } - }); - } - URL website = new URL(urlString); - ReadableByteChannel rbc; - rbc = Channels.newChannel(website.openStream()); - FileOutputStream fos = new FileOutputStream(destination); - fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE); - fos.close(); - rbc.close(); - } - -} diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar deleted file mode 100644 index c1dd12f17644411d6e840bd5a10c6ecda0175f18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58727 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%0ANsA|A3-jj|r`KAo%oTajX3>^E` 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 YM{}PByk10KD_nuQ4E7Du?}+~TKh4V)`~Uy| diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties deleted file mode 100644 index 8c79a83..0000000 --- a/.mvn/wrapper/maven-wrapper.properties +++ /dev/null @@ -1,18 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip -wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar diff --git a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java index 87162d9..06d8552 100644 --- a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java +++ b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java @@ -11,4 +11,4 @@ import java.util.UUID; public interface HoursWorkedRepository extends JpaRepository { List findByWeekNumber(int weekNumber); List findByDate(LocalDate date); -} +} \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java index 605f6f6..25d7235 100644 --- a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java +++ b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java @@ -1,7 +1,9 @@ package com.primefactorsolutions.service; +import com.primefactorsolutions.model.Employee; 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; @@ -24,7 +26,8 @@ public class HoursWorkedService { public HoursWorked findHoursWorked(final UUID id) { Optional hoursWorked = hoursWorkedRepository.findById(id); - return hoursWorked.orElse(null); + HoursWorked hw = hoursWorked.get(); + return hw; } public HoursWorked saveHoursWorked(final HoursWorked hoursWorked) { @@ -47,5 +50,35 @@ public class HoursWorkedService { return hoursWorkedRepository.findByDate(date); } -} + public List findHoursWorkeds( + final int start, final int pageSize, final String sortProperty, final boolean asc) { + List 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 findHoursWorkeds(final int start, final int pageSize) { + List hoursWorkeds = hoursWorkedRepository.findAll(); + + int end = Math.min(start + pageSize, hoursWorkeds.size()); + return hoursWorkeds.subList(start, end); + } + + public HoursWorked getHoursWorked(final UUID id) { + Optional registro = hoursWorkedRepository.findById(id); + HoursWorked hw = registro.orElse(null); + if (hw == null) { + System.out.println("No se encontró el registro de horas trabajadas"); + return null; + } + return hw; + } + +} \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java new file mode 100644 index 0000000..dd526c9 --- /dev/null +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java @@ -0,0 +1,101 @@ +package com.primefactorsolutions.views; + +import com.primefactorsolutions.model.HoursWorked; +import com.primefactorsolutions.service.HoursWorkedService; +import com.vaadin.flow.component.button.Button; +import com.vaadin.flow.component.grid.GridSortOrder; +import com.vaadin.flow.component.html.H2; +import com.vaadin.flow.component.html.Main; +import com.vaadin.flow.data.provider.SortDirection; +import com.vaadin.flow.router.PageTitle; +import com.vaadin.flow.router.Route; +import com.vaadin.flow.spring.annotation.SpringComponent; +import jakarta.annotation.security.PermitAll; +import org.springframework.context.annotation.Scope; +import org.vaadin.firitin.components.grid.PagingGrid; + +import java.util.List; + +@SpringComponent +@PermitAll +@Scope("prototype") +@PageTitle("HoursWorkedList") +@Route(value = "/hours-worked-list", layout = MainLayout.class) + +public class HoursWorkedListView extends Main { + private final HoursWorkedService hoursWorkedService; + private final PagingGrid table = new PagingGrid<>(HoursWorked.class); + + public HoursWorkedListView (final HoursWorkedService hoursWorkedService) { + this.hoursWorkedService = hoursWorkedService; + setupView(); + refreshGrid(); + } + + private void setupView() { + add(new H2("Lista de Horas trabajadas")); + configureTable(); + add(createAddHoursWorkedButton()); + add(table); + } + + private void configureTable() { + table.setColumns("Actividad", "Lunes", "Martes", "Miercoles", "Jueves", "Viernes", "Sabado", "Domingo"); + addEditButtonColumn("View", this::navigateToHoursWorkedView); + addEditButtonColumn("Edit", this::navigateToEditView); + setupPagingGrid(); + } + + private void addEditButtonColumn( final String label, final ButtonClickHandler handler) { + table.addComponentColumn(hoursWorked -> createButton(label, () -> handler.handle(hoursWorked))); + } + + private Button createButton(final String label, final Runnable onClickAction) { + Button button = new Button(label); + button.addClickListener(event -> onClickAction.run()); + return button; + } + + private Button createAddHoursWorkedButton() { return createButton("Crear Actividad", this::navigateToAddHoursWorkedView);} + + private void navigateToEditView(final HoursWorked hoursWorked) { + getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, hoursWorked.getId().toString() + "/edit")); + } + + private void navigateToHoursWorkedView(final HoursWorked hoursWorked) { + getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, hoursWorked.getId().toString() + "/view")); + } + + private void navigateToAddHoursWorkedView() { getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));} + + private void setupPagingGrid() { + table.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM); + table.setPageSize(5); + } + + private void refreshGrid() { + table.setPagingDataProvider((page, pageSize) -> fetchHoursWorkeds((int) page, pageSize)); + } + + private List fetchHoursWorkeds(final int page, final int pageSize) { + int start = page * pageSize; + if (hasSortOrder()) { + return fetchSortedHoursWorkeds(start, pageSize); + } + return hoursWorkedService.findHoursWorkeds(start, pageSize); + } + + private boolean hasSortOrder() { return !table.getSortOrder().isEmpty(); } + + private List fetchSortedHoursWorkeds(final int start, final int pageSize) { + GridSortOrder sortOrder = table.getSortOrder().getFirst(); + return hoursWorkedService.findHoursWorkeds(start, pageSize, + sortOrder.getSorted().getKey(), + sortOrder.getDirection() == SortDirection.ASCENDING); + } + + @FunctionalInterface + private interface ButtonClickHandler { + void handle(HoursWorked hoursWorked); + } +} diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index d0f9df8..2a3cbdb 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -19,6 +19,7 @@ import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; import org.vaadin.firitin.form.BeanValidationForm; +import java.awt.*; import java.util.List; import java.util.UUID; @@ -26,12 +27,13 @@ import java.util.UUID; @PermitAll @Scope("prototype") @PageTitle("Horas Trabajadas") -@Route(value = "/timesheets/:hours-worked?/:action?", layout = MainLayout.class) +@Route(value = "/timesheets/listhw/:hours-worked?/me", layout = MainLayout.class) public class HoursWorkedView extends BeanValidationForm implements HasUrlParameter { private final DatePicker dateField = new DatePicker("Fecha"); private final ComboBox teamField = new ComboBox<>("Equipo"); private final ComboBox employeeField = new ComboBox<>("Empleado"); private final TextField activityField = new TextField("Actividad"); + private final TextField hoursField = new TextField("Horas"); private final HoursWorkedService hoursWorkedService; private final EmployeeService employeeService; @@ -55,28 +57,34 @@ public class HoursWorkedView extends BeanValidationForm implements } @Override - public void setParameter(BeforeEvent beforeEvent, String action) { + public void setParameter(BeforeEvent beforeEvent, final String action) { final RouteParameters params = beforeEvent.getRouteParameters(); - final String hoursWorkedId = params.get("hoursworkedId").orElse(null); + final String s = params.get("hours-workedId").orElse(null); if ("new".equals(action)) { setEntityWithEnabledSave(new HoursWorked()); - } else if (hoursWorkedId != null) { - UUID id = UUID.fromString(hoursWorkedId); - request = hoursWorkedService.findHoursWorked(id); - setEntity(request); - configureViewOrEditAction(action); + } 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); + } } } @Override protected List getFormComponents() { return List.of( - createEmployeeHeader(), dateField, teamField, employeeField, activityField, + hoursField, createCloseButton() ); } @@ -121,10 +129,11 @@ public class HoursWorkedView extends BeanValidationForm implements hoursWorked.setTeam(teamField.getValue()); hoursWorked.setEmployee(employeeField.getValue()); hoursWorked.setActividad(activityField.getValue()); + //hoursWorked.setHours(hoursField.; } private void closeForm() { - getUI().ifPresent(ui -> ui.navigate("hoursworked")); + getUI().ifPresent(ui -> ui.navigate("hours-workedId")); } private boolean isFormValid() { @@ -151,6 +160,5 @@ public class HoursWorkedView extends BeanValidationForm implements } private H3 createEmployeeHeader() { - return new H3("Empleado: " + (employee != null ? employee.getFirstName() + " " + employee.getLastName() : "")); - } + return new H3("Empleado: " + (employee != null ? employee.getFirstName() + " " + employee.getLastName() : ""));} } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/MainLayout.java b/src/main/java/com/primefactorsolutions/views/MainLayout.java index 62ca1fc..49404e3 100644 --- a/src/main/java/com/primefactorsolutions/views/MainLayout.java +++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java @@ -150,7 +150,7 @@ 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("Horas Trabajadas", HoursWorkedView.class, + timesheet.addItem(new SideNavItem("Hours Worked List View", HoursWorkedListView.class, LineAwesomeIcon.ID_CARD_SOLID.create())); timesheet.addItem(new SideNavItem("Reporte Horas Trabajadas", ReporteView.class, LineAwesomeIcon.ID_CARD_SOLID.create())); diff --git a/src/main/java/com/primefactorsolutions/views/TimesheestReportView.java b/src/main/java/com/primefactorsolutions/views/TimesheestReportView.java index a2e0ff8..f45be8d 100644 --- a/src/main/java/com/primefactorsolutions/views/TimesheestReportView.java +++ b/src/main/java/com/primefactorsolutions/views/TimesheestReportView.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Scope; @SpringComponent @Scope("prototype") @PageTitle("Timesheets") -@Route(value = "/timesheets", layout = MainLayout.class) +@Route(value = "/timesheets-report", layout = MainLayout.class) @PermitAll public class TimesheestReportView extends Main { } From 49ad9dbccad0c72be58cbf4e3a2eebb5d6a5df87 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Thu, 14 Nov 2024 20:53:17 -0400 Subject: [PATCH 09/11] Problema de routes --- pfs-intra.eml | 539 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 539 insertions(+) create mode 100644 pfs-intra.eml diff --git a/pfs-intra.eml b/pfs-intra.eml new file mode 100644 index 0000000..238063b --- /dev/null +++ b/pfs-intra.eml @@ -0,0 +1,539 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9d43cbbd299389f11cfbe26b6db3ba1f49bd60a0 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Fri, 15 Nov 2024 07:03:31 -0400 Subject: [PATCH 10/11] Formulario de registro de horas trabajadas --- .../model/HoursWorked.java | 27 ++- .../service/HoursWorkedService.java | 9 +- .../views/HoursWorkedListView.java | 217 +++++++++++++----- .../views/HoursWorkedView.java | 124 ++++++++-- .../views/MainLayout.java | 2 +- src/main/resources/data.sql | 3 + 6 files changed, 293 insertions(+), 89 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index 3f203b4..519f99c 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -15,22 +15,21 @@ import java.util.UUID; @NoArgsConstructor @EqualsAndHashCode(callSuper = true) public class HoursWorked extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private UUID id; - @ManyToOne - @JoinColumn(name = "employee_id", nullable = false) + @JoinColumn(name = "employee_id", nullable = true) private Employee employee; @ManyToOne - @JoinColumn(name = "team_id", nullable = false) + @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 Employee getEmployee() { @@ -88,5 +87,21 @@ public class HoursWorked extends BaseEntity { public void setTeam(Team team) { this.team = team; } + + public String getTareasEspecificas() { + return tareasEspecificas; + } + + public void setTareasEspecificas(String tareasEspecificas) { + this.tareasEspecificas = tareasEspecificas; + } + + public double getHorasTareasEspecificas() { + return horasTareasEspecificas; + } + + public void setHorasTareasEspecificas(double horasTareasEspecificas) { + this.tareasEspecificas = tareasEspecificas; + } } diff --git a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java index 25d7235..ed77e2e 100644 --- a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java +++ b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java @@ -72,13 +72,8 @@ public class HoursWorkedService { } public HoursWorked getHoursWorked(final UUID id) { - Optional registro = hoursWorkedRepository.findById(id); - HoursWorked hw = registro.orElse(null); - if (hw == null) { - System.out.println("No se encontró el registro de horas trabajadas"); - return null; - } - return hw; + final Optional hoursWorked = hoursWorkedRepository.findById(id); + return hoursWorked.get(); } } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java index dd526c9..fb20d2b 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java @@ -1,11 +1,19 @@ package com.primefactorsolutions.views; -import com.primefactorsolutions.model.HoursWorked; +import com.primefactorsolutions.model.Employee; +import com.primefactorsolutions.model.Team; +import com.primefactorsolutions.model.TimeOffRequest; +import com.primefactorsolutions.model.TimeOffRequestStatus; +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.grid.GridSortOrder; import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.Main; +import com.vaadin.flow.component.notification.Notification; +import com.vaadin.flow.component.orderedlayout.HorizontalLayout; import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; @@ -14,40 +22,125 @@ import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; import org.vaadin.firitin.components.grid.PagingGrid; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; @SpringComponent @PermitAll @Scope("prototype") -@PageTitle("HoursWorkedList") +@PageTitle("Registro de Horas Trabajadas") @Route(value = "/hours-worked-list", layout = MainLayout.class) +public class HoursWorkedListView extends Main { -public class HoursWorkedListView extends Main { private final HoursWorkedService hoursWorkedService; - private final PagingGrid table = new PagingGrid<>(HoursWorked.class); + private final EmployeeService employeeService; + private final TeamService teamService; + private final PagingGrid hoursWorkedGrid = new PagingGrid<>(); + private final PagingGrid table = new PagingGrid<>(Employee.class); + private List employees = Collections.emptyList(); + private ComboBox employeeFilter; + private ComboBox teamFilter; + private UUID selectedEmployeeId; - public HoursWorkedListView (final HoursWorkedService hoursWorkedService) { + + public HoursWorkedListView(final HoursWorkedService hoursWorkedService, + final EmployeeService employeeService, + final TeamService teamService) { this.hoursWorkedService = hoursWorkedService; - setupView(); - refreshGrid(); + this.employeeService = employeeService; + this.teamService = teamService; + this.employees = employeeService.findAllEmployees(); + + initializeView(); + refreshGridListHoursWorked(null, null); } - private void setupView() { - add(new H2("Lista de Horas trabajadas")); - configureTable(); - add(createAddHoursWorkedButton()); - add(table); + private void refreshGridListHoursWorked(final Employee employee, + final Team team) { + hoursWorkedGrid.setPagingDataProvider((page, pageSize) -> { + int start = (int) (page * hoursWorkedGrid.getPageSize()); + return fetchFilteredEmployees(start, pageSize, employee, team); + }); + hoursWorkedGrid.getDataProvider().refreshAll(); } - private void configureTable() { - table.setColumns("Actividad", "Lunes", "Martes", "Miercoles", "Jueves", "Viernes", "Sabado", "Domingo"); - addEditButtonColumn("View", this::navigateToHoursWorkedView); - addEditButtonColumn("Edit", this::navigateToEditView); - setupPagingGrid(); + private List fetchFilteredEmployees(final int start, + final int pageSize, + final Employee employee, + final Team team) { + List filteredEmployees = employeeService.findAllEmployees(); + + if (employee != null && !"TODOS".equals(employee.getFirstName())) { + filteredEmployees = filteredEmployees.stream() + .filter(emp -> emp.getId().equals(employee.getId())) + .collect(Collectors.toList()); + } + + if (team != null && !"TODOS".equals(team.getName())) { + filteredEmployees = filteredEmployees.stream() + .filter(emp -> emp.getTeam() != null && emp.getTeam().getId().equals(team.getId())) + .collect(Collectors.toList()); + } + + int end = Math.min(start + pageSize, filteredEmployees.size()); + return filteredEmployees.subList(start, end); } - private void addEditButtonColumn( final String label, final ButtonClickHandler handler) { - table.addComponentColumn(hoursWorked -> createButton(label, () -> handler.handle(hoursWorked))); + private void initializeView() { + setupFilters(); + add(createAddHoursWorked()); + setupListHoursWorkedGrid(); + add(hoursWorkedGrid); + add(createActionButtons()); + } + + private void setupFilters() { + add(createEmployeeFilter()); + add(createTeamFilter()); + } + + private void setupListHoursWorkedGrid() { + hoursWorkedGrid.addColumn(this::getEmployeeFullName).setHeader("Empleado"); + hoursWorkedGrid.addColumn(this::getTeamName).setHeader("Equipo"); + + hoursWorkedGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM); + hoursWorkedGrid.setPageSize(5); + hoursWorkedGrid.asSingleSelect().addValueChangeListener(event -> { + Employee selectedRequest = event.getValue(); + if (selectedRequest != null) { + selectedEmployeeId = selectedRequest.getId(); + } + }); + } + + private String getTeamName(final Employee employee) { + Team team = employee.getTeam(); + return team != null ? team.getName() : "Sin asignar"; + } + + private String getTeamLabel(final Team team) { + return "TODOS".equals(team.getName()) ? "TODOS" : team.getName(); + } + + + 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) { @@ -56,46 +149,66 @@ public class HoursWorkedListView extends Main { return button; } - private Button createAddHoursWorkedButton() { return createButton("Crear Actividad", this::navigateToAddHoursWorkedView);} - - private void navigateToEditView(final HoursWorked hoursWorked) { - getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, hoursWorked.getId().toString() + "/edit")); + private Button createAddHoursWorked() { + return createButton("Agregar Actividad", this::navigateToHours); } - private void navigateToHoursWorkedView(final HoursWorked hoursWorked) { - getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, hoursWorked.getId().toString() + "/view")); + private void navigateToHours() { getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));} + + private ComboBox createEmployeeFilter() { + employeeFilter = new ComboBox<>("Empleado"); + List 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 createTeamFilter() { + teamFilter = new ComboBox<>("Equipo"); + List 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 Employee createAllEmployeesOption() { + Employee allEmployeesOption = new Employee(); + allEmployeesOption.setFirstName("TODOS"); + return allEmployeesOption; + } + + private Team createAllTeamsOption() { + Team allTeamsOption = new Team(); + allTeamsOption.setName("TODOS"); + return allTeamsOption; } - private void navigateToAddHoursWorkedView() { getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));} private void setupPagingGrid() { table.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM); table.setPageSize(5); } - private void refreshGrid() { - table.setPagingDataProvider((page, pageSize) -> fetchHoursWorkeds((int) page, pageSize)); - } - - private List fetchHoursWorkeds(final int page, final int pageSize) { - int start = page * pageSize; - if (hasSortOrder()) { - return fetchSortedHoursWorkeds(start, pageSize); - } - return hoursWorkedService.findHoursWorkeds(start, pageSize); - } - - private boolean hasSortOrder() { return !table.getSortOrder().isEmpty(); } - - private List fetchSortedHoursWorkeds(final int start, final int pageSize) { - GridSortOrder sortOrder = table.getSortOrder().getFirst(); - return hoursWorkedService.findHoursWorkeds(start, pageSize, - sortOrder.getSorted().getKey(), - sortOrder.getDirection() == SortDirection.ASCENDING); - } - - @FunctionalInterface - private interface ButtonClickHandler { - void handle(HoursWorked hoursWorked); - } } diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 2a3cbdb..2c03fed 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -5,10 +5,9 @@ import com.primefactorsolutions.model.Team; import com.primefactorsolutions.service.EmployeeService; import com.primefactorsolutions.service.HoursWorkedService; import com.primefactorsolutions.service.TeamService; -import com.primefactorsolutions.service.TimeOffRequestService; import com.vaadin.flow.component.Component; -import com.vaadin.flow.component.datepicker.DatePicker; -import com.vaadin.flow.component.html.H3; +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.textfield.TextField; import com.vaadin.flow.component.button.Button; @@ -17,9 +16,12 @@ import com.vaadin.flow.router.*; import com.vaadin.flow.spring.annotation.SpringComponent; import jakarta.annotation.security.PermitAll; import org.springframework.context.annotation.Scope; +import org.vaadin.firitin.components.datepicker.VDatePicker; import org.vaadin.firitin.form.BeanValidationForm; -import java.awt.*; +import java.time.LocalDate; +import java.time.YearMonth; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -27,33 +29,42 @@ import java.util.UUID; @PermitAll @Scope("prototype") @PageTitle("Horas Trabajadas") -@Route(value = "/timesheets/listhw/:hours-worked?/me", layout = MainLayout.class) +@Route(value = "/hours-worked-list/:hours-workedId?/:action?", layout = MainLayout.class) public class HoursWorkedView extends BeanValidationForm implements HasUrlParameter { - private final DatePicker dateField = new DatePicker("Fecha"); + private final VDatePicker dateField = new VDatePicker("Fecha"); private final ComboBox teamField = new ComboBox<>("Equipo"); - private final ComboBox employeeField = new ComboBox<>("Empleado"); + private ComboBox employeeField; + private final ComboBox 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 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 HoursWorkedService hoursWorkedService; private final EmployeeService employeeService; private final TeamService teamService; - private HoursWorked request; + private HoursWorked hoursWorked; private Employee employee; private Button saveButton; public HoursWorkedView(HoursWorkedService hoursWorkedService, EmployeeService employeeService, - TeamService teamService, TimeOffRequestService timeOffRequestService) { + TeamService teamService) { super(HoursWorked.class); this.hoursWorkedService = hoursWorkedService; this.employeeService = employeeService; this.teamService = teamService; - // Initialize combo boxes + initializeDateField(); initializeTeamField(); initializeEmployeeField(); + configureTareasEspecificas(); + } @Override @@ -71,7 +82,6 @@ public class HoursWorkedView extends BeanValidationForm implements if ("edit".equals(action) && !s.isEmpty()) { saveButton.setVisible(true); } else if ("view".equals(action) && !s.isEmpty()) { - saveButton.setVisible(false); } } @@ -83,12 +93,35 @@ public class HoursWorkedView extends BeanValidationForm implements dateField, teamField, employeeField, + equipoLabel, activityField, hoursField, + empresaLabel, + tareasEspecificasDropdown, + tareaEspecificaInput, + horasTareaEspecificaField, createCloseButton() ); } + 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); + } + protected Button createSaveButton() { saveButton = new Button("Guardar"); saveButton.addClickListener(event -> saveHoursWorked()); @@ -102,23 +135,53 @@ public class HoursWorkedView extends BeanValidationForm implements } private void initializeTeamField() { + List teams = new ArrayList<>(teamService.findAllTeams()); teamField.setItems(teamService.findAllTeams()); teamField.setItemLabelGenerator(Team::getName); + teamField.setValue(teams.getFirst()); teamField.addValueChangeListener(event -> { - teamField.getValue(); - }); + if (teams != null) { + employeeField.getValue(); + event.getValue(); + } + } + ); } - private void initializeEmployeeField() { - employeeField.setItems(employeeService.findAllEmployees()); - employeeField.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName()); + private ComboBox initializeEmployeeField() { + employeeField = new ComboBox<>("Empleado"); + List 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.setLabel("Fecha"); } private void saveHoursWorked() { if (isFormValid()) { HoursWorked hoursWorked = getEntity(); setFieldValues(hoursWorked); - hoursWorkedService.saveHoursWorked(hoursWorked); + hoursWorkedService.save(hoursWorked); Notification.show("Horas trabajadas guardadas correctamente."); closeForm(); } @@ -129,11 +192,26 @@ public class HoursWorkedView extends BeanValidationForm implements hoursWorked.setTeam(teamField.getValue()); hoursWorked.setEmployee(employeeField.getValue()); hoursWorked.setActividad(activityField.getValue()); - //hoursWorked.setHours(hoursField.; + try { + 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())) { + // Maneja horas y actividad específica adicional + hoursWorked.setTareasEspecificas(tareaEspecificaInput.getValue()); + try { + double horasEspecifica = Double.parseDouble(horasTareaEspecificaField.getValue()); + hoursWorked.setHorasTareasEspecificas(horasEspecifica); + } catch (NumberFormatException e) { + Notification.show("Por favor, ingrese un número válido para las horas de la tarea específica."); + } + } } private void closeForm() { - getUI().ifPresent(ui -> ui.navigate("hours-workedId")); + getUI().ifPresent(ui -> ui.navigate("hours-worked-list/" + hoursWorked.getId().toString())); } private boolean isFormValid() { @@ -141,12 +219,13 @@ public class HoursWorkedView extends BeanValidationForm implements teamField.getValue() != null && employeeField.getValue() != null && !activityField.isEmpty(); + } private void configureViewOrEditAction(String action) { - if ("edit".equals(action) && request != null) { + if ("edit".equals(action) && hoursWorked != null) { setFieldsReadOnly(false); - } else if ("view".equals(action) && request != null) { + } else if ("view".equals(action) && hoursWorked != null) { setFieldsReadOnly(true); saveButton.setEnabled(false); } @@ -159,6 +238,5 @@ public class HoursWorkedView extends BeanValidationForm implements activityField.setReadOnly(readOnly); } - private H3 createEmployeeHeader() { - return new H3("Empleado: " + (employee != null ? employee.getFirstName() + " " + employee.getLastName() : ""));} + } \ No newline at end of file diff --git a/src/main/java/com/primefactorsolutions/views/MainLayout.java b/src/main/java/com/primefactorsolutions/views/MainLayout.java index 49404e3..9545c99 100644 --- a/src/main/java/com/primefactorsolutions/views/MainLayout.java +++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java @@ -150,7 +150,7 @@ 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 List View", HoursWorkedListView.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())); diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql index 5833a0e..9b52b2b 100644 --- a/src/main/resources/data.sql +++ b/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', 'PENDIENTE', 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, 0.0, 0, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa'); From 48e06fef1f9291ac79d1846e6d259acbfcccbbd1 Mon Sep 17 00:00:00 2001 From: Melina Gutierrez Date: Fri, 15 Nov 2024 07:25:19 -0400 Subject: [PATCH 11/11] Formulario de registro de horas trabajadas corregir formato --- .../primefactorsolutions/model/Actividad.java | 204 ------------------ .../model/ActividadesHours.java | 81 ------- .../primefactorsolutions/model/Employee.java | 6 +- .../model/HoursWorked.java | 19 +- .../ActividadesHoursRepository.java | 7 - .../service/HoursWorkedService.java | 4 +- .../views/EmployeeView.java | 6 +- .../views/HoursWorkedListView.java | 9 +- .../views/HoursWorkedMonthView.java | 161 -------------- .../views/HoursWorkedView.java | 26 ++- 10 files changed, 36 insertions(+), 487 deletions(-) delete mode 100644 src/main/java/com/primefactorsolutions/model/Actividad.java delete mode 100644 src/main/java/com/primefactorsolutions/model/ActividadesHours.java delete mode 100644 src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java delete mode 100644 src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java diff --git a/src/main/java/com/primefactorsolutions/model/Actividad.java b/src/main/java/com/primefactorsolutions/model/Actividad.java deleted file mode 100644 index 717e3aa..0000000 --- a/src/main/java/com/primefactorsolutions/model/Actividad.java +++ /dev/null @@ -1,204 +0,0 @@ -package com.primefactorsolutions.model; - -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.util.UUID; - -@Data -@Entity -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class Actividad extends BaseEntity { - @Id - @GeneratedValue(strategy = GenerationType.UUID) - private UUID id; - - private String nombre; - private double lunes; - private double martes; - private double miercoles; - private double jueves; - private double viernes; - private double sabado; - private double domingo; - private String tarea; - private double horas; - - public Actividad() {} - - 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; - this.tarea = builder.tarea; - this.horas = builder.horas; - } - - public String setNombre(final String nombre) { - this.nombre = nombre; - return nombre; - } - - public String getNombre() { - return nombre; - } - - public void setLunes(double lunes) { - this.lunes = lunes; - return; - } - - public void setMartes(double martes) { - this.martes = martes; - return; - } - - public void setMiercoles(double miercoles) { - this.miercoles = miercoles; - return; - } - - public void setJueves(double jueves) { - this.jueves = jueves; - return; - } - - public void setViernes(double viernes) { - this.viernes = viernes; - return; - } - - public void setSabado(double sabado) { - this.sabado = sabado; - return; - } - - public void setDomingo(double domingo) { - this.domingo = domingo; - return; - } - public void setTarea(String tarea) { - this.tarea = tarea; - return; - } - - public void setHoras(double horas) { - this.horas = horas; - return; - } - - 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; - } - - public String getTarea() { // Cambié aquí también - return tarea; - } - - public double getHoras() { - return horas; - } - - 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; - private String tarea; - private double horas; - - public Builder tarea(final String tarea, final double horas) { - this.tarea = tarea; - this.horas = horas; - return this; - } - - public Builder tarea(final String tarea) { - this.tarea = tarea; - return this; - } - - 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); - } - } -} diff --git a/src/main/java/com/primefactorsolutions/model/ActividadesHours.java b/src/main/java/com/primefactorsolutions/model/ActividadesHours.java deleted file mode 100644 index 5a93ec4..0000000 --- a/src/main/java/com/primefactorsolutions/model/ActividadesHours.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.primefactorsolutions.model; - -import jakarta.persistence.*; -import java.time.LocalDate; -import java.util.UUID; - -@Entity -@Table(name = "Actividades_hours") -public class ActividadesHours { - - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private UUID id; - - @ManyToOne - @JoinColumn(name = "employee_id", nullable = false) - private Employee employee; - - @ManyToOne - @JoinColumn(name = "actividad_id", nullable = false) - private Actividad actividad; - - @Column(nullable = false) - private double totalHours; - - @Column(nullable = false) - private int weekNumber; - - @Column(nullable = false) - private LocalDate fecha; - - // Getters y Setters - - public UUID getId() { - return id; - } - - public void setId(UUID id) { - this.id = id; - } - - public Employee getEmployee() { - return employee; - } - - public void setEmployee(Employee employee) { - this.employee = employee; - } - - public Actividad getActividad() { - return actividad; - } - - public void setActividad(Actividad actividad) { - this.actividad = actividad; - } - - public double getTotalHours() { - return totalHours; - } - - public void setTotalHours(double totalHours) { - this.totalHours = totalHours; - } - - public int getWeekNumber() { - return weekNumber; - } - - public void setWeekNumber(int weekNumber) { - this.weekNumber = weekNumber; - } - - public LocalDate getFecha() { - return fecha; - } - - public void setFecha(LocalDate fecha) { - this.fecha = fecha; - } -} diff --git a/src/main/java/com/primefactorsolutions/model/Employee.java b/src/main/java/com/primefactorsolutions/model/Employee.java index 4d06336..f4d3236 100644 --- a/src/main/java/com/primefactorsolutions/model/Employee.java +++ b/src/main/java/com/primefactorsolutions/model/Employee.java @@ -47,10 +47,12 @@ public class Employee extends BaseEntity implements UserDetails { @JoinColumn(name = "team_id", nullable = false) private Team team; - @Pattern(regexp = "^[a-zA-Z ]+$", message = "El nombre y apellido de contacto de emergencia solo debe contener letras") + @Pattern(regexp = "^[a-zA-Z ]+$", message = "El nombre y apellido de contacto" + + " de emergencia solo debe contener letras") private String emergencyCName; 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; diff --git a/src/main/java/com/primefactorsolutions/model/HoursWorked.java b/src/main/java/com/primefactorsolutions/model/HoursWorked.java index 519f99c..560a6eb 100644 --- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java +++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java @@ -7,7 +7,6 @@ import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import java.time.LocalDate; -import java.util.UUID; @Data @Entity @@ -36,7 +35,7 @@ public class HoursWorked extends BaseEntity { return employee; } - public void setEmployee(Employee employee) { + public void setEmployee(final Employee employee) { this.employee = employee; } @@ -44,7 +43,7 @@ public class HoursWorked extends BaseEntity { return weekNumber; } - public void setWeekNumber(int weekNumber) { + public void setWeekNumber(final int weekNumber) { this.weekNumber = weekNumber; } @@ -52,7 +51,7 @@ public class HoursWorked extends BaseEntity { return date; } - public void setDate(LocalDate date) { + public void setDate(final LocalDate date) { this.date = date; } @@ -60,7 +59,7 @@ public class HoursWorked extends BaseEntity { return actividad; } - public void setActividad(String actividad) { + public void setActividad(final String actividad) { this.actividad = actividad; } @@ -68,7 +67,7 @@ public class HoursWorked extends BaseEntity { return hours; } - public void setHours(double hours) { + public void setHours(final double hours) { this.hours = hours; } @@ -76,7 +75,7 @@ public class HoursWorked extends BaseEntity { return totalHours; } - public void setTotalHours(double totalHours) { + public void setTotalHours(final double totalHours) { this.totalHours = totalHours; } @@ -84,7 +83,7 @@ public class HoursWorked extends BaseEntity { return team; } - public void setTeam(Team team) { + public void setTeam(final Team team) { this.team = team; } @@ -92,7 +91,7 @@ public class HoursWorked extends BaseEntity { return tareasEspecificas; } - public void setTareasEspecificas(String tareasEspecificas) { + public void setTareasEspecificas(final String tareasEspecificas) { this.tareasEspecificas = tareasEspecificas; } @@ -100,7 +99,7 @@ public class HoursWorked extends BaseEntity { return horasTareasEspecificas; } - public void setHorasTareasEspecificas(double horasTareasEspecificas) { + public void setHorasTareasEspecificas(final double horasTareasEspecificas) { this.tareasEspecificas = tareasEspecificas; } } diff --git a/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java b/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java deleted file mode 100644 index 72a3013..0000000 --- a/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.primefactorsolutions.repositories; -import com.primefactorsolutions.model.ActividadesHours; -import org.springframework.data.jpa.repository.JpaRepository; -import java.util.UUID; - -public interface ActividadesHoursRepository extends JpaRepository { -} diff --git a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java index ed77e2e..dc1b220 100644 --- a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java +++ b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java @@ -1,6 +1,5 @@ package com.primefactorsolutions.service; -import com.primefactorsolutions.model.Employee; import com.primefactorsolutions.model.HoursWorked; import com.primefactorsolutions.repositories.HoursWorkedRepository; import org.apache.commons.beanutils.BeanComparator; @@ -9,7 +8,6 @@ import org.springframework.stereotype.Service; import java.time.LocalDate; import java.util.*; -import java.util.stream.Collectors; @Service public class HoursWorkedService { @@ -57,7 +55,7 @@ public class HoursWorkedService { int end = Math.min(start + pageSize, hoursWorkeds.size()); hoursWorkeds.sort(new BeanComparator<>(sortProperty)); - if(!asc) { + if (!asc) { Collections.reverse(hoursWorkeds); } diff --git a/src/main/java/com/primefactorsolutions/views/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/EmployeeView.java index a80ae9e..4e34abb 100644 --- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java +++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java @@ -64,9 +64,11 @@ public class EmployeeView extends BeanValidationForm implements HasUrl private final ComboBox 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 ejemplo: (Ciudad, País) ", 30, 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("Departamento y Provincia de Residencia ejemplo: (Departamento-Provincia)", 30, false); + private final TextField localAddress = createTextField("Departamento y Provincia de Residencia " + + " ejemplo: (Departamento-Provincia)", 30, false); private final ComboBox maritalStatus = createMaritalStatusComboBox(); private final TextField numberOfChildren = createTextField("Numero de Hijos", 2, false); private final TextField ci = createTextField("CI", 10, false); diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java index fb20d2b..26def46 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java @@ -2,19 +2,14 @@ package com.primefactorsolutions.views; import com.primefactorsolutions.model.Employee; import com.primefactorsolutions.model.Team; -import com.primefactorsolutions.model.TimeOffRequest; -import com.primefactorsolutions.model.TimeOffRequestStatus; 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.grid.GridSortOrder; -import com.vaadin.flow.component.html.H2; import com.vaadin.flow.component.html.Main; import com.vaadin.flow.component.notification.Notification; import com.vaadin.flow.component.orderedlayout.HorizontalLayout; -import com.vaadin.flow.data.provider.SortDirection; import com.vaadin.flow.router.PageTitle; import com.vaadin.flow.router.Route; import com.vaadin.flow.spring.annotation.SpringComponent; @@ -153,7 +148,9 @@ public class HoursWorkedListView extends Main { return createButton("Agregar Actividad", this::navigateToHours); } - private void navigateToHours() { getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));} + private void navigateToHours() { + getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new")); + } private ComboBox createEmployeeFilter() { employeeFilter = new ComboBox<>("Empleado"); diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java deleted file mode 100644 index 88d86e6..0000000 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java +++ /dev/null @@ -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 employeeComboBox = new ComboBox<>("Empleado"); - private final ComboBox equipoDropdown = new ComboBox<>("Equipo"); - private final Grid 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 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 obtenerActividadesDelMes(final LocalDate month) { -// LocalDate startOfMonth = month.with(TemporalAdjusters.firstDayOfMonth()); -// LocalDate endOfMonth = month.with(TemporalAdjusters.lastDayOfMonth()); -// -// List 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 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("")); - } -} diff --git a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java index 2c03fed..c325795 100644 --- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java +++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java @@ -52,9 +52,9 @@ public class HoursWorkedView extends BeanValidationForm implements private Button saveButton; - public HoursWorkedView(HoursWorkedService hoursWorkedService, - EmployeeService employeeService, - TeamService teamService) { + public HoursWorkedView(final HoursWorkedService hoursWorkedService, + final EmployeeService employeeService, + final TeamService teamService) { super(HoursWorked.class); this.hoursWorkedService = hoursWorkedService; this.employeeService = employeeService; @@ -68,7 +68,7 @@ public class HoursWorkedView extends BeanValidationForm implements } @Override - public void setParameter(BeforeEvent beforeEvent, final String action) { + public void setParameter(final BeforeEvent beforeEvent, final String action) { final RouteParameters params = beforeEvent.getRouteParameters(); final String s = params.get("hours-workedId").orElse(null); @@ -105,7 +105,8 @@ public class HoursWorkedView extends BeanValidationForm implements } private void configureTareasEspecificas() { - tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones", "Colaboraciones", "Aprendizajes", "Proyectos PFS", "Otros"); + tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones", + "Colaboraciones", "Aprendizajes", "Proyectos PFS", "Otros"); tareasEspecificasDropdown.setPlaceholder("Selecciona una tarea..."); tareasEspecificasDropdown.addValueChangeListener(event -> { @@ -187,7 +188,7 @@ public class HoursWorkedView extends BeanValidationForm implements } } - private void setFieldValues(HoursWorked hoursWorked) { + private void setFieldValues(final HoursWorked hoursWorked) { hoursWorked.setDate(dateField.getValue()); hoursWorked.setTeam(teamField.getValue()); hoursWorked.setEmployee(employeeField.getValue()); @@ -215,14 +216,17 @@ public class HoursWorkedView extends BeanValidationForm implements } private boolean isFormValid() { - return dateField.getValue() != null && - teamField.getValue() != null && - employeeField.getValue() != null && + return dateField.getValue() != null + && + teamField.getValue() != null + && + employeeField.getValue() != null + && !activityField.isEmpty(); } - private void configureViewOrEditAction(String action) { + private void configureViewOrEditAction(final String action) { if ("edit".equals(action) && hoursWorked != null) { setFieldsReadOnly(false); } else if ("view".equals(action) && hoursWorked != null) { @@ -231,7 +235,7 @@ public class HoursWorkedView extends BeanValidationForm implements } } - private void setFieldsReadOnly(boolean readOnly) { + private void setFieldsReadOnly(final boolean readOnly) { dateField.setReadOnly(readOnly); teamField.setReadOnly(readOnly); employeeField.setReadOnly(readOnly);