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

@@ -13,9 +13,13 @@ import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.data.value.ValueChangeMode;
-import com.vaadin.flow.router.*;
+import com.vaadin.flow.router.BeforeEvent;
+import com.vaadin.flow.router.HasUrlParameter;
+import com.vaadin.flow.router.PageTitle;
+import com.vaadin.flow.router.Route;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import jakarta.annotation.security.PermitAll;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.context.annotation.Scope;
 import org.vaadin.firitin.components.datepicker.VDatePicker;
 import org.vaadin.firitin.form.BeanValidationForm;
@@ -27,64 +31,167 @@ import java.util.UUID;
 @PermitAll
 @Scope("prototype")
 @PageTitle("Employee")
-@Route(value = "/employees/:action?/:employeeId?", layout = MainLayout.class)
+@Route(value = "/employees", layout = MainLayout.class)
 public class EmployeeView extends BeanValidationForm<Employee> implements HasUrlParameter<String> {
 
-    private static final String SAVE_BUTTON_TEXT = "Save";
-    private static final String NOTIFICATION_SAVE_SUCCESS = "Employee saved successfully.";
-    private static final String NOTIFICATION_VALIDATE_ERROR = "Please complete the required fields correctly.";
-    private static final String PHONE_NUMBER_ERROR_MESSAGE = "El teléfono debe contener solo números.";
-
     private final EmployeeService employeeService;
 
-    private final TextField firstName = createTextField("Nombres: ", 30, true);
+    private final TextField firstName;
-    private final TextField lastName = createTextField("Apellidos", 30, true);
+    private final TextField lastName;
-    private final ComboBox<Employee.Status> status = createStatusComboBox();
+    private final ComboBox<String> status;
-    private final VDatePicker birthday = new VDatePicker("Fecha de Nacimiento");
+    private final VDatePicker birthday;
-    private final TextField birthCity = createTextField("Ciudad y País de Nacimiento", 20, false);
+    private final TextField birthCity;
-    private final ComboBox<Employee.MaritalStatus> maritalStatus = createMaritalStatusComboBox();
+    private final ComboBox<String> maritalStatus;
-    private final TextField residenceAddress = createTextField("Dirección de Residencia", 50, false);
+    private final TextField residenceAddress;
-    private final TextField phoneNumber = createTextField("Teléfono", 8, false);
+    private final TextField phoneNumber;
-    private final EmailField personalEmail = createEmailField("E-mail");
+    private final EmailField personalEmail;
-    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 Button saveButton = new Button(SAVE_BUTTON_TEXT, e -> saveEmployee());
 
-    private final H2 mt = new H2("Información General del Empleado");
+    private final TextField emergencyCName;
-    private final H3 fs = new H3("Información Personal");
+    private final TextField emergencyCAddress;
-    private final H3 ss = new H3("Datos de Contacto de Emergencia");
+    private final TextField emergencyCPhone;
+    private final EmailField emergencyCEmail;
+
+    private final H2 mt;
+    private final H3 fs;
+    private final H3 ss;
 
     public EmployeeView(final EmployeeService employeeService) {
         super(Employee.class);
         this.employeeService = employeeService;
 
-        configureComponents();
+        mt = new H2("Información General del Empleado");
-        assembleLayout();
+        fs = new H3("Información Personal");
-    }
+        ss = new H3("Datos de Contacto de Emergencia");
 
-    private void configureComponents() {
+        final HorizontalLayout mainLayout = new HorizontalLayout();
+        final VerticalLayout sidebar = createSidebar();
+        final VerticalLayout contentLayout = createContentLayout();
+        final VerticalLayout contentLayout2 = createContentLayout();
+
+        firstName = new TextField("Nombres: ");
+        firstName.setWidthFull();
+        firstName.setMaxLength(30);
+        firstName.setRequired(true);
+
+        lastName = new TextField("Apellidos");
+        lastName.setWidthFull();
+        lastName.setMaxLength(30);
+        lastName.setRequired(true);
+
+        status = new ComboBox<>("Estado");
+        status.setItems(List.of("ACTIVE", "INACTIVE"));
+        lastName.setWidthFull();
+        lastName.setMaxLength(30);
+        status.setRequired(true);
+
+        birthday = new VDatePicker("Fecha de Nacimiento");
+        birthday.setWidthFull();
+
+        birthCity = new TextField("Ciudad y País de Nacimiento");
+        birthCity.setWidthFull();
+        birthCity.setMaxLength(20);
+
+        maritalStatus = new ComboBox<>("Estado Civil");
+        maritalStatus.setItems(List.of("Soltero", "Casado", "Viudo", "Divorciado"));
+        maritalStatus.setWidthFull();
+
+        residenceAddress = new TextField("Dirección de Residencia");
+        residenceAddress.setWidthFull();
+        residenceAddress.setMaxLength(50);
+
+        phoneNumber = new TextField("Teléfono");
+        phoneNumber.setWidthFull();
+        phoneNumber.setMaxLength(8);
         phoneNumber.setValueChangeMode(ValueChangeMode.EAGER);
-        phoneNumber.addValueChangeListener(e -> validatePhoneNumber(phoneNumber, e.getValue()));
+        phoneNumber.addValueChangeListener(e -> {
+            if (!e.getValue().matches("\\d*")) {
+                phoneNumber.setErrorMessage("El teléfono debe contener solo números.");
+            }
+        });
+
+        personalEmail = new EmailField("E-mail");
+        personalEmail.setWidthFull();
+        personalEmail.setMaxLength(30);
+
+        emergencyCName = new TextField("Nombres y Apellidos de Contacto");
+        emergencyCName.setWidthFull();
+        emergencyCName.setMaxLength(50);
+
+        emergencyCAddress = new TextField("Dirección de Contacto");
+        emergencyCAddress.setWidthFull();
+        emergencyCAddress.setMaxLength(50);
+
+        emergencyCPhone = new TextField("Teléfono de Contacto");
+        emergencyCPhone.setWidthFull();
+        emergencyCPhone.setMaxLength(8);
         emergencyCPhone.setValueChangeMode(ValueChangeMode.EAGER);
-        emergencyCPhone.addValueChangeListener(e -> validatePhoneNumber(emergencyCPhone, e.getValue()));
+        emergencyCPhone.addValueChangeListener(e -> {
+            if (!e.getValue().matches("\\d*")) {
+                emergencyCPhone.setErrorMessage("El teléfono debe contener solo números.");
+            }
+        });
 
-        saveButton.setVisible(true);
+        emergencyCEmail = new EmailField("Email de Contacto");
+        emergencyCEmail.setWidthFull();
+        emergencyCEmail.setMaxLength(30);
+
+        contentLayout.add(
+                mt, fs, firstName, lastName, status, birthday, birthCity, maritalStatus,
+                residenceAddress, phoneNumber, personalEmail);
+
+        contentLayout2.add(
+                ss, emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail);
+
+        setSavedHandler((SavedHandler<Employee>) employee -> {
+            if (validateForm()) {
+                final Employee saved = employeeService.createOrUpdate(employee);
+                Notification.show("Employee saved successfully.");
+                getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class));
+                setEntityWithEnabledSave(saved);
+            } else {
+                Notification.show("Please complete the required fields correctly.", 3000, Notification.Position.MIDDLE);
+            }
+        });
+
+        mainLayout.add(sidebar, contentLayout, contentLayout2);
+        addClassName("main-layout");
     }
 
-    private void validatePhoneNumber(final TextField textField, final String value) {
+    private boolean validateForm() {
-        if (!value.matches("\\d*")) {
+        return !firstName.isEmpty() && !lastName.isEmpty() && status.getValue() != null;
-            textField.setErrorMessage(PHONE_NUMBER_ERROR_MESSAGE);
+    }
+
+    private VerticalLayout createSidebar() {
+        VerticalLayout sidebar = new VerticalLayout();
+        sidebar.setWidth("250px");
+        sidebar.add(new Button("Información General", e -> navigateToSection("Información General")));
+        sidebar.add(new Button("Detalles Profesionales", e -> navigateToSection("Detalles Profesionales")));
+        return sidebar;
+    }
+
+    private void navigateToSection(final String section) {
+        Notification.show("Navigating to " + section);
+    }
+
+    private VerticalLayout createContentLayout() {
+        VerticalLayout contentLayout = new VerticalLayout();
+        contentLayout.setWidth("100%");
+        return contentLayout;
+    }
+
+    @Override
+    public void setParameter(final BeforeEvent beforeEvent, final String s) {
+        if (StringUtils.isNotBlank(s) && !"new".equals(s)) {
+            var employee = employeeService.getEmployee(UUID.fromString(s));
+            setEntityWithEnabledSave(employee);
+        } else {
+            setEntityWithEnabledSave(new Employee());
         }
     }
 
-    private void assembleLayout() {
+    @Override
-        HorizontalLayout mainLayout = new HorizontalLayout();
+    protected List<Component> getFormComponents() {
-        VerticalLayout contentLayout1 = createContentLayout();
+        return List.of(
-        VerticalLayout contentLayout2 = createContentLayout();
-
-        contentLayout1.add(
                 mt,
                 fs,
                 firstName,
@@ -95,115 +202,12 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
                 maritalStatus,
                 residenceAddress,
                 phoneNumber,
-                personalEmail);
+                personalEmail,
-        contentLayout2.add(ss, emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail, saveButton);
+                ss,
-
+                emergencyCName,
-        mainLayout.add(contentLayout1, contentLayout2);
+                emergencyCAddress,
-        addClassName("main-layout");
+                emergencyCPhone,
-    }
+                emergencyCEmail
-
-    private ComboBox<Employee.MaritalStatus> createMaritalStatusComboBox() {
-        ComboBox<Employee.MaritalStatus> comboBox = new ComboBox<>("Estado Civil");
-        comboBox.setItems(Employee.MaritalStatus.values());
-        comboBox.setItemLabelGenerator(Employee.MaritalStatus::name);
-        return comboBox;
-    }
-
-    private ComboBox<Employee.Status> createStatusComboBox() {
-        ComboBox<Employee.Status> comboBox = new ComboBox<>("Estado");
-        comboBox.setItems(Employee.Status.values());
-        comboBox.setItemLabelGenerator(Employee.Status::name);
-        comboBox.setRequiredIndicatorVisible(true);  // Indicador de campo requerido
-        return comboBox;
-    }
-
-    private VerticalLayout createContentLayout() {
-        VerticalLayout contentLayout = new VerticalLayout();
-        contentLayout.setWidth("100%");
-        return contentLayout;
-    }
-
-    private TextField createTextField(final String label, final int maxLength, final boolean required) {
-        TextField textField = new TextField(label);
-        textField.setWidthFull();
-        textField.setMaxLength(maxLength);
-        textField.setRequired(required);
-        return textField;
-    }
-
-    private EmailField createEmailField(final String label) {
-        EmailField emailField = new EmailField(label);
-        emailField.setWidthFull();
-        emailField.setMaxLength(30);
-        return emailField;
-    }
-
-    private <T> ComboBox<T> createComboBox(final String label, final T[] items) {
-        ComboBox<T> comboBox = new ComboBox<>(label);
-        comboBox.setItems(items);
-        comboBox.setItemLabelGenerator(Object::toString);
-        comboBox.setWidthFull();
-        return comboBox;
-    }
-
-    private boolean validateForm() {
-        return !firstName.isEmpty() && !lastName.isEmpty() && status.getValue() != null;
-    }
-
-    private void saveEmployee() {
-        if (validateForm()) {
-            Employee employee = getEntity();
-            employee.setStatus(status.getValue());
-            employeeService.createOrUpdate(employee);
-            Notification.show(NOTIFICATION_SAVE_SUCCESS);
-            getUI().ifPresent(ui -> ui.navigate(EmployeesListView.class));
-        } else {
-            Notification.show(NOTIFICATION_VALIDATE_ERROR, 3000, Notification.Position.MIDDLE);
-        }
-    }
-
-    @Override
-    public void setParameter(final BeforeEvent beforeEvent, final String s) {
-        RouteParameters params = beforeEvent.getRouteParameters();
-        String action = params.get("action").orElse("new");
-
-        if ("new".equals(action)) {
-            setEntityWithEnabledSave(new Employee());
-        } else {
-            UUID employeeId = UUID.fromString(s);
-            var employee = employeeService.getEmployee(employeeId);
-            setEntityWithEnabledSave(employee);
-            if ("edit".equals(action) && !s.isEmpty()) {
-                status.setValue(employee.getStatus());
-            } else if ("view".equals(action) && !s.isEmpty()) {
-                setFieldsReadOnly();
-                saveButton.setVisible(false);
-            }
-        }
-    }
-
-    private void setFieldsReadOnly() {
-        firstName.setReadOnly(true);
-        lastName.setReadOnly(true);
-        status.setReadOnly(true);
-        birthday.setReadOnly(true);
-        birthCity.setReadOnly(true);
-        maritalStatus.setReadOnly(true);
-        residenceAddress.setReadOnly(true);
-        phoneNumber.setReadOnly(true);
-        personalEmail.setReadOnly(true);
-        emergencyCName.setReadOnly(true);
-        emergencyCAddress.setReadOnly(true);
-        emergencyCPhone.setReadOnly(true);
-        emergencyCEmail.setReadOnly(true);
-    }
-
-    @Override
-    protected List<Component> getFormComponents() {
-        return List.of(
-                mt, fs, firstName, lastName, status, birthday, birthCity, maritalStatus,
-                residenceAddress, phoneNumber, personalEmail, ss, emergencyCName,
-                emergencyCAddress, emergencyCPhone, emergencyCEmail, saveButton
         );
     }
 }

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

@@ -42,7 +42,6 @@ public class EmployeesListView extends Main {
 
     private void configureTable() {
         table.setColumns("firstName", "lastName", "status");
-        addEditButtonColumn("View", this::navigateToEmployeeView);
         addEditButtonColumn("Edit", this::navigateToEditView);
         setupPagingGrid();
     }
@@ -68,11 +67,7 @@ public class EmployeesListView extends Main {
     }
 
     private void navigateToEditView(final Employee employee) {
-        getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, "edit/" + employee.getId().toString()));
+        getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, employee.getId().toString()));
-    }
-
-    private void navigateToEmployeeView(final Employee employee) {
-        getUI().ifPresent(ui -> ui.navigate(EmployeeView.class, "view/" + employee.getId().toString()));
     }
 
     private void navigateToAddEmployeeView() {