#46 Perfil de Empleado - Registro Semanal mas reporte, falta mejorar el reporte semanal

.gitea/workflows/build.yaml

@@ -1,16 +1,14 @@
-name: Builder
+name: PR Builder
-run-name: ${{ gitea.actor }} building
+run-name: ${{ gitea.actor }} building PR
-on:
+on: [pull_request]
-  push:
-    branches:
-      - main
 
 jobs:
-  Build-Project:
+  Build-PR:
     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 }}."
+      - 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 package
+      - name: Build PR
+        if: gitea.base_ref == 'main'
         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
+          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 }}."

.gitignore

@@ -19,4 +19,3 @@ drivers/
 # Error screenshots generated by TestBench for failed integration tests
 error-screenshots/
 webpack.generated.js
-*.env

package.json

@@ -6,22 +6,22 @@
     "@f0rce/ace-widget": "1.0.2",
     "@polymer/polymer": "3.5.1",
     "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
-    "@vaadin/bundles": "24.5.1",
+    "@vaadin/bundles": "24.4.2",
     "@vaadin/common-frontend": "0.0.19",
-    "@vaadin/polymer-legacy-adapter": "24.5.1",
+    "@vaadin/polymer-legacy-adapter": "24.4.2",
-    "@vaadin/react-components": "24.5.1",
+    "@vaadin/react-components": "24.4.2",
-    "@vaadin/react-components-pro": "24.5.1",
+    "@vaadin/react-components-pro": "24.4.2",
-    "@vaadin/router": "2.0.0",
+    "@vaadin/router": "1.7.5",
     "@vaadin/vaadin-development-mode-detector": "2.0.7",
-    "@vaadin/vaadin-lumo-styles": "24.5.1",
+    "@vaadin/vaadin-lumo-styles": "24.4.2",
-    "@vaadin/vaadin-material-styles": "24.5.1",
+    "@vaadin/vaadin-material-styles": "24.4.2",
-    "@vaadin/vaadin-themable-mixin": "24.5.1",
+    "@vaadin/vaadin-themable-mixin": "24.4.2",
-    "@vaadin/vaadin-usage-statistics": "2.1.3",
+    "@vaadin/vaadin-usage-statistics": "2.1.2",
     "construct-style-sheets-polyfill": "3.1.0",
     "date-fns": "2.29.3",
     "lit": "3.1.4",
     "print-js": "1.6.0",
-    "proj4": "2.12.1",
+    "proj4": "2.11.0",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "react-router-dom": "6.23.1"
@@ -51,22 +51,22 @@
       "@f0rce/ace-widget": "1.0.2",
       "@polymer/polymer": "3.5.1",
       "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
-      "@vaadin/bundles": "24.5.1",
+      "@vaadin/bundles": "24.4.2",
       "@vaadin/common-frontend": "0.0.19",
-      "@vaadin/polymer-legacy-adapter": "24.5.1",
+      "@vaadin/polymer-legacy-adapter": "24.4.2",
-      "@vaadin/react-components": "24.5.1",
+      "@vaadin/react-components": "24.4.2",
-      "@vaadin/react-components-pro": "24.5.1",
+      "@vaadin/react-components-pro": "24.4.2",
-      "@vaadin/router": "2.0.0",
+      "@vaadin/router": "1.7.5",
       "@vaadin/vaadin-development-mode-detector": "2.0.7",
-      "@vaadin/vaadin-lumo-styles": "24.5.1",
+      "@vaadin/vaadin-lumo-styles": "24.4.2",
-      "@vaadin/vaadin-material-styles": "24.5.1",
+      "@vaadin/vaadin-material-styles": "24.4.2",
-      "@vaadin/vaadin-themable-mixin": "24.5.1",
+      "@vaadin/vaadin-themable-mixin": "24.4.2",
-      "@vaadin/vaadin-usage-statistics": "2.1.3",
+      "@vaadin/vaadin-usage-statistics": "2.1.2",
       "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.29.3",
       "lit": "3.1.4",
       "print-js": "1.6.0",
-      "proj4": "2.12.1",
+      "proj4": "2.11.0",
       "react": "18.3.1",
       "react-dom": "18.3.1",
       "react-router-dom": "6.23.1"
@@ -91,7 +91,7 @@
       "workbox-core": "7.1.0",
       "workbox-precaching": "7.1.0"
     },
-    "hash": "1a0f17d48b329307b5862bc57499307d1b89f7d89260121c2b7189f76957c436"
+    "hash": "0962b593830d75a70657cde2e956e8c49b704d39c45bfd150cda9fdac99f1c6e"
   },
   "overrides": {
     "@vaadin/bundles": "$@vaadin/bundles",

pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <!-- Project from https://start.vaadin.com/project/6f77deb3-8326-4444-8c05-0398f79d7fee -->
     <groupId>com.primefactorsolutions</groupId>
@@ -11,8 +11,7 @@
 
     <properties>
         <java.version>21</java.version>
-        <vaadin.version>24.5.1</vaadin.version>
+        <vaadin.version>24.4.6</vaadin.version>
-        <vaadin-maven-plugin.version>24.4.6</vaadin-maven-plugin.version>
     </properties>
 
     <parent>
@@ -120,10 +119,6 @@
             <artifactId>commons-beanutils</artifactId>
             <version>1.9.4</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -196,6 +191,11 @@
             <artifactId>poi-ooxml-schemas</artifactId>
             <version>4.1.2</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
+        </dependency>
         <dependency>
             <groupId>com.flowingcode.addons</groupId>
             <artifactId>simple-timer</artifactId>
@@ -255,11 +255,6 @@
             <artifactId>freemarker</artifactId>
             <version>2.3.32</version>
         </dependency>
-        <dependency>
-            <groupId>com.auth0</groupId>
-            <artifactId>java-jwt</artifactId>
-            <version>4.4.0</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
@@ -299,7 +294,7 @@
             <plugin>
                 <groupId>com.vaadin</groupId>
                 <artifactId>vaadin-maven-plugin</artifactId>
-                <version>${vaadin-maven-plugin.version}</version>
+                <version>${vaadin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -360,7 +355,7 @@
                     <plugin>
                         <groupId>com.vaadin</groupId>
                         <artifactId>vaadin-maven-plugin</artifactId>
-                        <version>${vaadin-maven-plugin.version}</version>
+                        <version>${vaadin.version}</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -400,22 +395,8 @@
                     </plugin>
 
                     <!-- Runs the integration tests (*IT) after the server is started -->
-                    <plugin>
+
-                        <groupId>org.apache.maven.plugins</groupId>
+
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <trimStackTrace>false</trimStackTrace>
-                            <enableAssertions>true</enableAssertions>
-                        </configuration>
-                    </plugin>
                 </plugins>
             </build>
         </profile>

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

@@ -1,144 +1,147 @@
-package com.primefactorsolutions.model;
+    package com.primefactorsolutions.model;
+    import com.google.common.collect.Lists;
+    import jakarta.persistence.*;
+    import lombok.AllArgsConstructor;
+    import lombok.Data;
+    import lombok.EqualsAndHashCode;
+    import lombok.NoArgsConstructor;
+    import org.springframework.security.core.GrantedAuthority;
+    import org.springframework.security.core.userdetails.UserDetails;
 
-import com.google.common.collect.Lists;
+    import java.time.LocalDate;
-import jakarta.persistence.*;
+    import java.util.Collection;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.springframework.security.core.GrantedAuthority;
-import org.springframework.security.core.userdetails.UserDetails;
 
-import java.time.LocalDate;
+    @Data
-import java.util.Collection;
+    @Entity
+    @AllArgsConstructor
+    @NoArgsConstructor
+    @EqualsAndHashCode(callSuper = true)
+    public class Employee extends BaseEntity implements UserDetails {
+        private String username;
+        private String firstName;
+        private String lastName;
+        private LocalDate birthday;
+        private String birthCity;
+        private String age;
 
-@Data
+        private String residenceAddress;
-@Entity
+        private String localAddress;
-@AllArgsConstructor
+        private String phoneNumber;
-@NoArgsConstructor
+        private String personalEmail;
-@EqualsAndHashCode(callSuper = true)
+        private String position;
-public class Employee extends BaseEntity implements UserDetails {
+        @ManyToOne
-    private String username;
+        @JoinColumn(name = "team_id", nullable = false)
-    private String firstName;
+        private Team team;
-    private String lastName;
+        private String emergencyCName;
-    private LocalDate birthday;
+        private String emergencyCAddress;
-    private String birthCity;
+        private String emergencyCPhone;
-    private String age;
+        private String emergencyCEmail;
+        private String numberOfChildren;
 
-    private String residenceAddress;
+        private String ci;
-    private String localAddress;
+        private String issuedIn;
-    private String phoneNumber;
-    private String personalEmail;
-    private String position;
-    @ManyToOne
-    @JoinColumn(name = "team_id", nullable = false)
-    private Team team;
-    private String emergencyCName;
-    private String emergencyCAddress;
-    private String emergencyCPhone;
-    private String emergencyCEmail;
-    private String numberOfChildren;
 
-    private String ci;
+        private String pTitle1;
-    private String issuedIn;
+        private String pTitle2;
+        private String pTitle3;
 
-    private String pTitle1;
+        private String pStudy1;
-    private String pTitle2;
+        private String pStudy2;
-    private String pTitle3;
+        private String pStudy3;
 
-    private String pStudy1;
+        private String certification1;
-    private String pStudy2;
+        private String certification2;
-    private String pStudy3;
+        private String certification3;
+        private String certification4;
 
-    private String certification1;
+        private String recognition;
-    private String certification2;
+        private String achievements;
-    private String certification3;
-    private String certification4;
 
-    private String recognition;
+        private String language;
-    private String achievements;
+        private String languageLevel;
 
-    private String language;
+        private String cod;
-    private String languageLevel;
+        private String leadManager;
+        private String project;
 
-    private String cod;
+        private LocalDate dateOfEntry;
-    private String leadManager;
+        private LocalDate dateOfExit;
-    private String project;
 
-    private LocalDate dateOfEntry;
+        private String contractType;
-    private LocalDate dateOfExit;
+        private String seniority;
+        private String salary;
 
-    private String contractType;
+        private String bankName;
-    private String seniority;
+        private String accountNumber;
-    private String salary;
 
-    private String bankName;
+        private String gpss;
-    private String accountNumber;
+        private String sss;
+        private String beneficiaries;
 
-    private String gpss;
+        @Column(columnDefinition = "TEXT")
-    private String sss;
+        private String profileImage;
-    private String beneficiaries;
+        @Enumerated(EnumType.STRING)
+        private Status status;
 
-    @Column(columnDefinition = "TEXT")
+        @Override
-    private String profileImage;
+        public Collection<? extends GrantedAuthority> getAuthorities() {
-    @Enumerated(EnumType.STRING)
+            return Lists.newArrayList();
-    private Status status;
+        }
 
-    @Override
+        @Override
-    public Collection<? extends GrantedAuthority> getAuthorities() {
+        public String getPassword() {
-        return Lists.newArrayList();
+            return null;
+        }
+
+        @Override
+        public String getUsername() {
+            return this.username;
+        }
+
+        @Override
+        public boolean isAccountNonExpired() {
+            return true;
+        }
+
+        @Override
+        public boolean isAccountNonLocked() {
+            return true;
+        }
+
+        @Override
+        public boolean isCredentialsNonExpired() {
+            return true;
+        }
+
+        @Override
+        public boolean isEnabled() {
+            return true;
+        }
+
+        public enum Status {
+            ACTIVE,
+            INACTIVE
+        }
+        @Enumerated(EnumType.STRING)
+        private MaritalStatus maritalStatus;
+        public enum MaritalStatus {
+            SINGLE,
+            MARRIED,
+            WIDOWED,
+            DIVORCED
+        }
+        @Enumerated(EnumType.STRING)
+        private Gender gender;
+        public enum Gender {
+            MALE,
+            FEMALE
+        }
+
+        public Status getStatus() {
+
+            return status;
+        }
+        public void setStatus(final Status status) {
+            this.status = status;
+        }
     }
-
-    @Override
-    public String getPassword() {
-        return null;
-    }
-
-    @Override
-    public String getUsername() {
-        return this.username;
-    }
-
-    @Override
-    public boolean isAccountNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isAccountNonLocked() {
-        return true;
-    }
-
-    @Override
-    public boolean isCredentialsNonExpired() {
-        return true;
-    }
-
-    @Override
-    public boolean isEnabled() {
-        return true;
-    }
-
-    public enum Status {
-        ACTIVE,
-        INACTIVE
-    }
-
-    @Enumerated(EnumType.STRING)
-    private MaritalStatus maritalStatus;
-
-    public enum MaritalStatus {
-        SINGLE,
-        MARRIED,
-        WIDOWED,
-        DIVORCED
-    }
-
-    @Enumerated(EnumType.STRING)
-    private Gender gender;
-
-    public enum Gender {
-        MALE,
-        FEMALE
-    }
-}

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

@@ -2,28 +2,9 @@ package com.primefactorsolutions.model;
 
 public enum TimeOffRequestType {
     ALL,
-    NEW_YEAR,
+    VACATION,
-    MONDAY_CARNIVAL,
-    TUESDAY_CARNIVAL,
-    GOOD_FRIDAY,
-    LABOR_DAY,
-    INDEPENDENCE_DAY,
-    CHRISTMAS,
-    PRURINATIONAL_STATE_DAY,
-    CORPUS_CHRISTI,
-    ANDEAN_NEW_YEAR,
-    DEPARTMENTAL_ANNIVERSARY,
-    ALL_SOULS_DAY,
-
-    BIRTHDAY,
     MATERNITY,
-    PATERNITY,
+    BIRTHDAY,
-    MARRIAGE,
+    FIXED_HOLIDAY,
-    FATHERS_DAY,
+    OTHER
-    MOTHERS_DAY,
-    INTERNATIONAL_WOMENS_DAY,
-    NATIONAL_WOMENS_DAY,
-    HEALTH_PERMIT,
-    VACATION_CURRENT_MANAGEMENT,
-    VACATION_PREVIOUS_MANAGEMENT,
 }

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

@@ -1,31 +0,0 @@
-package com.primefactorsolutions.model;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.time.LocalDate;
-
-@Data
-@Entity
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class Vacation extends BaseEntity {
-    @Enumerated(EnumType.STRING)
-    private TimeOffRequestType category;
-    private LocalDate vacationDate;
-    private Double duration;
-    private Double expiration;
-    @Enumerated(EnumType.STRING)
-    private Type type;
-    public enum Type {
-        FIXED,
-        MOVABLE,
-        OTHER
-    }
-}

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

@@ -2,12 +2,12 @@ package com.primefactorsolutions.repositories;
 
 import com.primefactorsolutions.model.Employee;
 import org.springframework.data.jpa.repository.JpaRepository;
-
+import org.springframework.stereotype.Repository;
 import java.util.Optional;
 import java.util.UUID;
 
+@Repository
 public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
-    Optional<Employee> findByUsername(String username);
 
-    Optional<Employee> findByPersonalEmail(String personalEmail);
+    Optional<Employee> findByUsername(String username);
-}
+}

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

@@ -1,11 +0,0 @@
-package com.primefactorsolutions.repositories;
-
-import com.primefactorsolutions.model.TimeOffRequestType;
-import com.primefactorsolutions.model.Vacation;
-import org.springframework.data.jpa.repository.JpaRepository;
-
-import java.util.UUID;
-
-public interface VacationRepository extends JpaRepository<Vacation, UUID> {
-    Vacation findByCategory(TimeOffRequestType category);
-}

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

@@ -1,101 +0,0 @@
-package com.primefactorsolutions.service;
-
-import com.auth0.jwt.JWT;
-import com.auth0.jwt.algorithms.Algorithm;
-import com.auth0.jwt.exceptions.JWTCreationException;
-import com.auth0.jwt.exceptions.JWTVerificationException;
-import com.auth0.jwt.interfaces.DecodedJWT;
-import com.auth0.jwt.interfaces.JWTVerifier;
-import com.primefactorsolutions.model.Employee;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-
-@Service
-@Slf4j
-public class AccountService {
-    private final EmailService emailService;
-    private final EmployeeService employeeService;
-    private final String secret;
-
-    public AccountService(final EmailService emailService, final EmployeeService employeeService,
-                           @Value("${application.jwtSecret}") final String secret) {
-        this.emailService = emailService;
-        this.employeeService = employeeService;
-        this.secret = secret;
-    }
-
-    public void sendResetPasswordEmail(final String personalEmail) {
-        final Employee employee = employeeService.getEmployeeByPersonalEmail(personalEmail);
-
-        if (employee == null) {
-            log.warn("Could not find employee for email {}", personalEmail);
-            return;
-        }
-
-        final String link = createResetPasswordLink(employee.getUsername());
-        final String content = "Visit this link to reset your password: " + link;
-        emailService.sendEmail(personalEmail, "PFS - Reset Password", content);
-    }
-
-    public void resetPassword(final String username, final String newPassword, final String token) {
-        DecodedJWT decodedJWT;
-
-        try {
-            Algorithm algorithm = Algorithm.HMAC512(secret);
-            JWTVerifier verifier = JWT.require(algorithm)
-                    .withIssuer("pfs")
-                    .build();
-
-            decodedJWT = verifier.verify(token);
-            final Instant expiry = decodedJWT.getExpiresAtAsInstant();
-            final String claim = decodedJWT.getClaim("username").asString();
-
-            if (expiry.isBefore(Instant.now())
-                    || !username.equals(claim)) {
-                log.warn("token invalid {} {} {}", username, claim, expiry);
-                return;
-            }
-        } catch (JWTVerificationException e) {
-            log.warn("error updating password", e);
-            return;
-        }
-
-        final Employee employee = employeeService.getDetachedEmployeeByUsername(username);
-
-        if (employee == null) {
-            log.warn("Could not find employee for username {}", username);
-            return;
-        }
-
-        if (StringUtils.isBlank(newPassword) || newPassword.length() < 8) {
-            throw new IllegalArgumentException("New password should be at least 8 chars long");
-        }
-
-        employeeService.updatePassword(employee, newPassword);
-
-        log.info("updated password for {}", username);
-    }
-
-    private String createResetPasswordLink(final String username) {
-        String token = "";
-
-        try {
-            Algorithm algorithm = Algorithm.HMAC512(secret);
-            token = JWT.create()
-                    .withIssuer("pfs")
-                    .withClaim("username", username)
-                    .withExpiresAt(Instant.now().plus(1, ChronoUnit.HOURS))
-                    .sign(algorithm);
-        } catch (JWTCreationException e) {
-            throw new RuntimeException(e);
-        }
-
-        return String.format("https://intra.primefactorsolutions.com/reset-password?username=%s&token=%s", username,
-                token);
-    }
-}

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

@@ -1,32 +0,0 @@
-package com.primefactorsolutions.service;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.mail.SimpleMailMessage;
-import org.springframework.mail.javamail.JavaMailSender;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-@Slf4j
-public class EmailService {
-    public static final String NO_REPLY_PRIMEFACTORSOLUTIONS_COM = "no-reply@primefactorsolutions.com";
-    private final JavaMailSender emailSender;
-
-    public void sendEmail(final String email, final String title, final String messageContent) {
-        try {
-            final SimpleMailMessage message = new SimpleMailMessage();
-            message.setFrom(NO_REPLY_PRIMEFACTORSOLUTIONS_COM);
-            message.setBcc(NO_REPLY_PRIMEFACTORSOLUTIONS_COM);
-            message.setTo(email);
-            message.setSubject(title);
-            message.setText(messageContent);
-
-            emailSender.send(message);
-            log.info("Sent email to {}", email);
-        } catch (Exception e) {
-            log.error("Error sending email to {}", email, e);
-            throw e;
-        }
-    }
-}

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

@@ -18,18 +18,12 @@ import java.util.Collections;
 @Service
 @AllArgsConstructor
 public class EmployeeService {
-    private static final String USERPASSWORD = "userPassword";
-    private static final String OBJECTCLASS = "objectclass";
-    private static final String ORGANIZATIONAL_PERSON = "organizationalPerson";
-    private static final String INET_ORG_PERSON = "inetOrgPerson";
-    private static final String TOP = "top";
-    private static final String PERSON = "person";
-    public static final String BASE_DN = "dc=primefactorsolutions,dc=com";
-
     private final EmployeeRepository employeeRepository;
     private final LdapTemplate ldapTemplate;
     private final EntityManager entityManager;
 
+    public static final String BASE_DN = "dc=primefactorsolutions,dc=com";
+
     protected Name buildDn(final Employee employee) {
         return LdapNameBuilder.newInstance(BASE_DN)
                 .add("ou", "users")
@@ -69,10 +63,6 @@ public class EmployeeService {
         return employees.subList(start, end);
     }
 
-    public Employee getEmployeeByPersonalEmail(final String email) {
-        return employeeRepository.findByPersonalEmail(email).orElse(null);
-    }
-
     public Employee createOrUpdate(final Employee employee) {
         if (employee.getId() == null) {
             final Name dn = buildDn(employee);
@@ -84,29 +74,28 @@ public class EmployeeService {
     }
 
     public Employee getEmployee(final UUID id) {
-        final Optional<Employee> employee = employeeRepository.findById(id);
+        Optional<Employee> employee = employeeRepository.findById(id);
-
         return employee.orElse(null);
     }
 
     private Attributes buildAttributes(final Employee employee) {
         final Attributes attrs = new BasicAttributes();
-        final BasicAttribute ocattr = new BasicAttribute(OBJECTCLASS);
+        final BasicAttribute ocattr = new BasicAttribute("objectclass");
-        ocattr.add(TOP);
+        ocattr.add("top");
-        ocattr.add(PERSON);
+        ocattr.add("person");
-        ocattr.add(ORGANIZATIONAL_PERSON);
+        ocattr.add("organizationalPerson");
-        ocattr.add(INET_ORG_PERSON);
+        ocattr.add("inetOrgPerson");
         attrs.put(ocattr);
         attrs.put("cn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
         attrs.put("sn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
         attrs.put("uid", employee.getUsername());
-        attrs.put(USERPASSWORD, String.format("%s%s", employee.getUsername(), 123));
+        attrs.put("userpassword", String.format("%s%s", employee.getUsername(), 123));
 
         return attrs;
     }
 
-    public void updatePassword(final Employee employee, final String newPassword) {
+    public void updatePassword(final Employee employee) {
-        final Attribute attr = new BasicAttribute(USERPASSWORD, newPassword);
+        final Attribute attr = new BasicAttribute("userpassword", employee.getUsername() + "123");
         final ModificationItem item = new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
 
         ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});

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

@@ -1,30 +1,22 @@
 package com.primefactorsolutions.service;
 
-import com.openhtmltopdf.pdfboxout.PdfBoxRenderer;
-import com.openhtmltopdf.pdfboxout.PdfRendererBuilder;
 import com.primefactorsolutions.repositories.HoursWorkedRepository;
-import freemarker.template.Configuration;
-import freemarker.template.DefaultObjectWrapper;
-import freemarker.template.Template;
-import freemarker.template.TemplateExceptionHandler;
-import lombok.SneakyThrows;
-import org.apache.pdfbox.io.MemoryUsageSetting;
-import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.jetbrains.annotations.NotNull;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.io.*;
+import java.io.ByteArrayOutputStream;
-import java.nio.charset.StandardCharsets;
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
-import java.util.TimeZone;
 
 @Service
 public class ReportService {
+
     private final HoursWorkedRepository hoursWorkedRepository;
 
+    @Autowired
     public ReportService(final HoursWorkedRepository hoursWorkedRepository) {
         this.hoursWorkedRepository = hoursWorkedRepository;
     }
@@ -64,12 +56,12 @@ public class ReportService {
                 for (String key : headers) {
                     Cell cell = dataRow.createCell(cellIndex++);
                     Object value = rowData.get(key);
-                    switch (value) {
+                    if (value instanceof String) {
-                        case String s -> cell.setCellValue(s);
+                        cell.setCellValue((String) value);
-                        case Number number -> cell.setCellValue(number.doubleValue());
+                    } else if (value instanceof Number) {
-                        case null -> cell.setCellValue(""); // Manejo de valores nulos
+                        cell.setCellValue(((Number) value).doubleValue());
-                        default -> {
+                    } else if (value == null) {
-                        }
+                        cell.setCellValue(""); // Manejo de valores nulos
                     }
                 }
             }
@@ -81,55 +73,4 @@ public class ReportService {
             throw e; // Propagar la excepción después de registrarla
         }
     }
-
-    @SneakyThrows
-    public byte[] writeAsPdf(final String reportName, final Object model) {
-        try (var os = new ByteArrayOutputStream()) {
-            writeAsPdf(reportName, model, os);
-
-            return os.toByteArray();
-        }
-    }
-
-    @SneakyThrows
-    public void writeAsPdf(final String reportName, final Object model, final OutputStream out) {
-        var in = getTemplate(reportName);
-        final Configuration cfg = getConfiguration();
-        final Reader reader = new InputStreamReader(in);
-        final Template temp = new Template(reportName, reader, cfg);
-
-        var wrapper = new DefaultObjectWrapper(Configuration.VERSION_2_3_32);
-        ByteArrayOutputStream oo = new ByteArrayOutputStream();
-        Writer outTemplate = new OutputStreamWriter(oo);
-
-        temp.process(wrapper.wrap(model), outTemplate);
-
-        var builder = new PdfRendererBuilder();
-        builder.usePDDocument(new PDDocument(MemoryUsageSetting.setupMixed(1000000)));
-        builder.withHtmlContent(oo.toString(StandardCharsets.UTF_8), "/test");
-        builder.toStream(out);
-
-        try (PdfBoxRenderer pdfBoxRenderer = builder.buildPdfRenderer()) {
-            pdfBoxRenderer.layout();
-            pdfBoxRenderer.createPDF();
-        }
-    }
-
-    public static InputStream getTemplate(final String reportName) {
-        return ReportService.class.getResourceAsStream(String.format("/reports/%s.html", reportName));
-    }
-
-
-    @NotNull
-    private static Configuration getConfiguration() {
-        final Configuration cfg = new Configuration(Configuration.VERSION_2_3_32);
-        cfg.setDefaultEncoding("UTF-8");
-        cfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
-        cfg.setLogTemplateExceptions(false);
-        cfg.setWrapUncheckedExceptions(true);
-        cfg.setFallbackOnNullLoopVariable(false);
-        cfg.setSQLDateAndTimeTimeZone(TimeZone.getDefault());
-
-        return cfg;
-    }
 }

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

@@ -1,18 +0,0 @@
-package com.primefactorsolutions.service;
-
-import com.primefactorsolutions.model.TimeOffRequestType;
-import com.primefactorsolutions.model.Vacation;
-import com.primefactorsolutions.repositories.VacationRepository;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-@Service
-@AllArgsConstructor
-public class VacationService {
-    private final VacationRepository vacationRepository;
-
-    public Vacation findVacationByCategory(final TimeOffRequestType category) {
-        return vacationRepository.findByCategory(category);
-    }
-
-}

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

@@ -1,13 +1,10 @@
 package com.primefactorsolutions.views;
 
 import com.primefactorsolutions.model.Employee;
-import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.ReportService;
 import com.vaadin.componentfactory.pdfviewer.PdfViewer;
-import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
 import com.vaadin.flow.component.combobox.ComboBox;
@@ -23,19 +20,14 @@ import com.vaadin.flow.component.textfield.EmailField;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.component.upload.Upload;
 import com.vaadin.flow.component.upload.receivers.MemoryBuffer;
-import com.vaadin.flow.data.binder.Result;
-import com.vaadin.flow.data.binder.ValueContext;
-import com.vaadin.flow.data.converter.Converter;
 import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.router.*;
-import com.vaadin.flow.server.StreamResource;
 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.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Base64;
@@ -147,18 +139,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
 
         configureComponents();
         addClassName("main-layout");
-
-        getBinder().setConverter("team", new Converter<Object, Object>() {
-            @Override
-            public Result<Object> convertToModel(final Object o, final ValueContext valueContext) {
-                return Result.ok(new Team((String) o));
-            }
-
-            @Override
-            public Object convertToPresentation(final Object o, final ValueContext valueContext) {
-                return ((Team) o).getName();
-            }
-        });
     }
 
     private void configureComponents() {
@@ -172,13 +152,13 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
         reportButton.setVisible(true);
         birthday.addValueChangeListener(event -> calculateAge());
 
-        reportButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
+        // reportButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            var employee = getEntity();
+        //    var employee = getEntity();
-            byte[] pdfContent = reportService.writeAsPdf("ficha", employee);
+        //    byte[] pdfContent = reportService.writeAsPdf("ficha", employee);
-            var resource = new StreamResource("ficha.pdf", () -> new ByteArrayInputStream(pdfContent));
+        //    var resource = new StreamResource("ficha.pdf", () -> new ByteArrayInputStream(pdfContent));
-            pdfViewer.setSrc(resource);
+        //     pdfViewer.setSrc(resource);
-            dialog.open();
+        //     dialog.open();
-        });
+        //  });
 
         initDialog();
     }

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

@@ -196,6 +196,7 @@ public class EvaluationView extends Main implements HasUrlParameter<String> {
         final MenuBar navMenuBar = new MenuBar();
         prev = navMenuBar.addItem("Anterior pregunta",
                 (ComponentEventListener<ClickEvent<MenuItem>>) menuItemClickEvent -> {
+            log.info(">>> prev");
             this.currSubmission.setResponse(this.questionEditor.getValue());
             this.assessmentService.saveSubmission(assessment.getId(), this.currSubmission);
             this.currSubmission = this.assessmentService.getPrevSubmission(assessment.getId(), this.currSubmission);
@@ -252,6 +253,7 @@ public class EvaluationView extends Main implements HasUrlParameter<String> {
         start = new Button("Empezar");
         start.addThemeVariants(ButtonVariant.LUMO_PRIMARY, ButtonVariant.LUMO_SUCCESS);
         start.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
+            log.info(">>> start");
             this.assessment = this.assessmentService.startAssessment(this.assessment.getId());
 
             if (tf.getValue().trim().equalsIgnoreCase(this.assessment.getCandidate().getEmail())) {
@@ -316,6 +318,7 @@ public class EvaluationView extends Main implements HasUrlParameter<String> {
     }
 
     private void goToNext() {
+        log.info(">>> next");
         Submission found = this.assessmentService.getNextSubmission(assessment.getId(),
                 this.currSubmission.getId());
 

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

@@ -1,53 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.formlayout.FormLayout;
-import com.vaadin.flow.component.html.H3;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.PasswordField;
-import com.vaadin.flow.router.BeforeEnterEvent;
-import com.vaadin.flow.router.BeforeEnterObserver;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-
-@Route("init-account")
-@PageTitle("PFS Intra")
-@AnonymousAllowed
-public class InitAccountView extends VerticalLayout implements BeforeEnterObserver {
-
-    public InitAccountView() {
-        setSizeFull();
-        setAlignItems(Alignment.CENTER);
-        setJustifyContentMode(JustifyContentMode.CENTER);
-
-        final VerticalLayout vl = new VerticalLayout();
-        vl.setJustifyContentMode(JustifyContentMode.CENTER);
-        vl.setWidth("400px");
-
-        final PasswordField password = new PasswordField("Password");
-        final PasswordField confirmPassword = new PasswordField("Confirm Password");
-
-        final FormLayout formLayout = new FormLayout(password, confirmPassword);
-        formLayout.setColspan(password, 3);
-        formLayout.setColspan(confirmPassword, 3);
-
-        final Button primaryButton = new Button("Submit");
-        primaryButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
-
-        final Button secondaryButton = new Button("Cancel");
-        HorizontalLayout hl = new HorizontalLayout(secondaryButton, primaryButton);
-
-        vl.add(new H3("Set Account Password"));
-        vl.add(formLayout);
-        vl.add(hl);
-
-        add(vl);
-    }
-
-    @Override
-    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
-    }
-}

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

@@ -1,6 +1,5 @@
 package com.primefactorsolutions.views;
 
-import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.H1;
 import com.vaadin.flow.component.login.LoginForm;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
@@ -24,11 +23,9 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
         setJustifyContentMode(JustifyContentMode.CENTER);
 
         login.setAction("login");
-        login.setForgotPasswordButtonVisible(false);
 
         add(new H1("PFS Intra"));
         add(login);
-        add(new Anchor("/password-recovery", "Reset password?"));
     }
 
     @Override

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

@@ -1,7 +1,6 @@
 package com.primefactorsolutions.views;
 
 import com.primefactorsolutions.model.Employee;
-import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.applayout.AppLayout;
 import com.vaadin.flow.component.applayout.DrawerToggle;
@@ -17,6 +16,7 @@ import com.vaadin.flow.component.menubar.MenuBarVariant;
 import com.vaadin.flow.component.orderedlayout.FlexComponent;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.orderedlayout.Scroller;
+import com.vaadin.flow.component.shared.Tooltip;
 import com.vaadin.flow.component.sidenav.SideNav;
 import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.PageTitle;
@@ -51,6 +51,18 @@ public class MainLayout extends AppLayout {
 
         final HorizontalLayout header = authContext.getAuthenticatedUser(UserDetails.class)
                 .map(user -> {
+                    final Avatar loggedUser = new Avatar(user.getUsername());
+                    loggedUser.getStyle().set("display", "block");
+                    loggedUser.getElement().setAttribute("tabindex", "-1");
+                    final MenuBar menuBar = new MenuBar();
+                    menuBar.addThemeVariants(MenuBarVariant.LUMO_ICON);
+                    final MenuItem actions = createIconItem(menuBar, VaadinIcon.ELLIPSIS_V, null, "",
+                            false);
+                    final SubMenu actionsSubMenu = actions.getSubMenu();
+                    final MenuItem signOutMenuItem = createIconItem(actionsSubMenu, VaadinIcon.EXIT, "Sign-out",
+                            null, true);
+                    signOutMenuItem.addClickListener(c -> this.authContext.logout());
+
                     String employeeId = "N/A";
 
                     if (user instanceof Employee) {
@@ -61,19 +73,11 @@ public class MainLayout extends AppLayout {
                         }
                     }
 
-                    final Avatar loggedUser = new Avatar(user.getUsername());
+                    final Tooltip tooltip = Tooltip.forComponent(loggedUser)
-                    loggedUser.getStyle().set("display", "block");
+                            .withText("Employee id: " + employeeId)
-                    loggedUser.getElement().setAttribute("tabindex", "-1");
+                            .withPosition(Tooltip.TooltipPosition.TOP_START);
 
-                    final MenuBar menuBar = new MenuBar();
+                    final HorizontalLayout hl = new HorizontalLayout(loggedUser, menuBar);
-                    menuBar.addThemeVariants(MenuBarVariant.LUMO_TERTIARY_INLINE);
-                    final MenuItem actions = createIconItem(menuBar, loggedUser, null, employeeId);
-                    final SubMenu actionsSubMenu = actions.getSubMenu();
-                    final MenuItem signOutMenuItem = createIconItem(actionsSubMenu,
-                            createIcon(VaadinIcon.EXIT, true), "Sign-out", null);
-                    signOutMenuItem.addClickListener(c -> this.authContext.logout());
-
-                    final HorizontalLayout hl = new HorizontalLayout(menuBar);
                     hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
 
                     return hl;
@@ -84,9 +88,17 @@ public class MainLayout extends AppLayout {
         addToNavbar(true, toggle, viewTitle, header);
     }
 
-    private MenuItem createIconItem(final HasMenuItems menu, final Component component,
+    private MenuItem createIconItem(final HasMenuItems menu, final VaadinIcon iconName,
-                                    final String label, final String ariaLabel) {
+                                    final String label, final String ariaLabel, final boolean isChild) {
-        final MenuItem item = menu.addItem(component, e -> {
+        final Icon icon = new Icon(iconName);
+
+        if (isChild) {
+            icon.getStyle().set("width", "var(--lumo-icon-size-s)");
+            icon.getStyle().set("height", "var(--lumo-icon-size-s)");
+            icon.getStyle().set("marginRight", "var(--lumo-space-s)");
+        }
+
+        final MenuItem item = menu.addItem(icon, e -> {
         });
 
         if (ariaLabel != null) {
@@ -100,18 +112,6 @@ public class MainLayout extends AppLayout {
         return item;
     }
 
-    private Icon createIcon(final VaadinIcon iconName, final boolean isChild) {
-        final Icon icon = new Icon(iconName);
-
-        if (isChild) {
-            icon.getStyle().set("width", "var(--lumo-icon-size-s)");
-            icon.getStyle().set("height", "var(--lumo-icon-size-s)");
-            icon.getStyle().set("marginRight", "var(--lumo-space-s)");
-        }
-
-        return icon;
-    }
-
     private void addDrawerContent() {
         final Span appName = new Span("pfs-intra");
         appName.addClassNames(LumoUtility.FontWeight.SEMIBOLD, LumoUtility.FontSize.LARGE);
@@ -124,8 +124,8 @@ public class MainLayout extends AppLayout {
         final SideNav nav = new SideNav();
 
         authContext.getAuthenticatedUser(UserDetails.class).ifPresent(u -> {
-            SideNavItem recruiting = new SideNavItem("Recruiting");
+            SideNavItem recruiting = new SideNavItem("Recruiting", MainView.class,
-            recruiting.setPrefixComponent(LineAwesomeIcon.BUSINESS_TIME_SOLID.create());
+                    LineAwesomeIcon.BUSINESS_TIME_SOLID.create());
             recruiting.addItem(new SideNavItem("Assessments", AssessmentsListView.class,
                     LineAwesomeIcon.RIBBON_SOLID.create()));
             recruiting.addItem(new SideNavItem("Candidates", CandidatesListView.class,
@@ -133,8 +133,8 @@ public class MainLayout extends AppLayout {
             recruiting.addItem(new SideNavItem("Questions", QuestionsListView.class,
                     LineAwesomeIcon.QUESTION_SOLID.create()));
 
-            SideNavItem admin = new SideNavItem("Admin");
+            SideNavItem admin = new SideNavItem("Admin", MainView.class,
-            admin.setPrefixComponent(LineAwesomeIcon.BUILDING.create());
+                    LineAwesomeIcon.BUILDING.create());
             admin.addItem(new SideNavItem("Employees", EmployeesListView.class,
                     LineAwesomeIcon.USER_EDIT_SOLID.create()));
             admin.addItem(new SideNavItem("Documents", DocumentsListView.class,
@@ -144,12 +144,12 @@ public class MainLayout extends AppLayout {
                     LineAwesomeIcon.PLANE_DEPARTURE_SOLID.create());
             timeOff.addItem(new SideNavItem("Vacations", RequestsListView.class,
                     LineAwesomeIcon.SUN.create()));
-            timeOff.addItem(new SideNavItem("Add Vacation", RequestRegisterView.class,
-                    LineAwesomeIcon.SUN.create()));
             SideNavItem timesheet = new SideNavItem("My Timesheet", TimesheetView.class,
                     LineAwesomeIcon.HOURGLASS_START_SOLID.create());
             timesheet.addItem(new SideNavItem("Hours Worked", HoursWorkedView.class,
                     LineAwesomeIcon.ID_CARD_SOLID.create()));
+//            timesheet.addItem(new SideNavItem("Reporte", ReportHoursWorkedView.class,
+//                    LineAwesomeIcon.CAR_ALT_SOLID.create()));
 
             SideNavItem profile = new SideNavItem("My Profile", ProfileView.class,
                     LineAwesomeIcon.USER_EDIT_SOLID.create());

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

@@ -11,6 +11,6 @@ import jakarta.annotation.security.PermitAll;
 @PermitAll
 public class MainView extends Main {
     public MainView() {
-        add(new Text("Welcome to PFS Intra."));
+        add(new Text("welcome"));
     }
 }

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

@@ -1,67 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.service.AccountService;
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.ComponentEventListener;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.formlayout.FormLayout;
-import com.vaadin.flow.component.html.H3;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.EmailField;
-import com.vaadin.flow.router.BeforeEnterEvent;
-import com.vaadin.flow.router.BeforeEnterObserver;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-
-@Route("password-recovery")
-@PageTitle("PFS Intra")
-@AnonymousAllowed
-public class PasswordRecoveryView extends VerticalLayout implements BeforeEnterObserver {
-
-    public PasswordRecoveryView(final AccountService accountService) {
-        setSizeFull();
-        setAlignItems(Alignment.CENTER);
-        setJustifyContentMode(JustifyContentMode.CENTER);
-
-        final VerticalLayout vl = new VerticalLayout();
-        vl.setJustifyContentMode(JustifyContentMode.CENTER);
-        vl.setWidth("400px");
-
-        final EmailField personalEmail = new EmailField("Personal Email");
-        personalEmail.setRequired(true);
-
-        final EmailField confirmPersonalEmail = new EmailField("Confirm Personal Email");
-        confirmPersonalEmail.setRequired(true);
-
-        final FormLayout formLayout = new FormLayout(personalEmail, confirmPersonalEmail);
-        formLayout.setColspan(personalEmail, 3);
-        formLayout.setColspan(confirmPersonalEmail, 3);
-
-        final Button primaryButton = new Button("Submit");
-        primaryButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
-        primaryButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            if (personalEmail.getValue().equals(confirmPersonalEmail.getValue())) {
-                accountService.sendResetPasswordEmail(personalEmail.getValue());
-                getUI().ifPresent(ui -> ui.navigate(MainView.class));
-            }
-        });
-
-        final Button secondaryButton = new Button("Cancel");
-        final HorizontalLayout hl = new HorizontalLayout(secondaryButton, primaryButton);
-        secondaryButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                getUI().ifPresent(ui -> ui.navigate(MainView.class)));
-
-        vl.add(new H3("PFS - Password Recovery"));
-        vl.add(formLayout);
-        vl.add(hl);
-
-        add(vl);
-    }
-
-    @Override
-    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
-    }
-}

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

@@ -20,7 +20,6 @@ import com.vaadin.flow.spring.annotation.SpringComponent;
 import jakarta.annotation.security.PermitAll;
 import org.springframework.context.annotation.Scope;
 
-import java.time.Year;
 import java.util.Collections;
 import java.util.List;
 import java.util.UUID;
@@ -45,6 +44,7 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     public RequestEmployeeView(final TimeOffRequestService requestService, final EmployeeService employeeService) {
         this.requestService = requestService;
         this.employeeService = employeeService;
+        initializeView();
     }
 
     private void initializeView() {
@@ -97,17 +97,9 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
     }
 
     private VerticalLayout createSummaryLayout() {
-        int currentYear = Year.now().getValue();
+        int totalVacations = 15;
-        String yearCategory = "YEAR_" + currentYear;
+        int totalTimeOff = 2;
-        double totalVacations = requests.stream()
+        int totalAvailableDays = totalVacations + totalTimeOff;
-                .filter(req -> req.getCategory().name().equals(yearCategory))
-                .mapToDouble(TimeOffRequest::getAvailableDays)
-                .sum();
-        double totalTimeOff = requests.stream()
-                .filter(req -> !req.getCategory().name().startsWith("YEAR"))
-                .mapToDouble(TimeOffRequest::getDaysBalance)
-                .sum();
-        double totalAvailableDays = totalVacations + totalTimeOff;
         return new VerticalLayout(
                 new Span("TOTAL HOLIDAYS: " + totalVacations),
                 new Span("TOTAL TIME OFF: " + totalTimeOff),
@@ -184,7 +176,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
         requests = requestService.findRequestsByEmployeeId(employeeId);
         setViewTitle(employee.getFirstName() + " " + employee.getLastName(), employee.getTeam().getName());
         requestGrid.setItems(requests);
-        initializeView();
     }
 
     private void setViewTitle(final String employeeName, final String employeeTeam) {

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

@@ -1,256 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.model.*;
-import com.primefactorsolutions.service.EmployeeService;
-import com.primefactorsolutions.service.TimeOffRequestService;
-import com.primefactorsolutions.service.VacationService;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.combobox.ComboBox;
-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.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.NumberField;
-import com.vaadin.flow.data.binder.Binder;
-import com.vaadin.flow.router.*;
-import com.vaadin.flow.spring.annotation.SpringComponent;
-import jakarta.annotation.security.PermitAll;
-import org.springframework.context.annotation.Scope;
-
-import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.List;
-
-@SpringComponent
-@PermitAll
-@Scope("prototype")
-@PageTitle("Request")
-@Route(value = "/requests/new", layout = MainLayout.class)
-public class RequestRegisterView extends VerticalLayout {
-
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Employee");
-    private final ComboBox<TimeOffRequestType> categoryComboBox = new ComboBox<>("Category");
-    private final NumberField availableDaysField = new NumberField("Available Days");
-    private final DatePicker startDatePicker = new DatePicker("Start Date");
-    private final DatePicker endDatePicker = new DatePicker("End Date");
-    private final NumberField daysToBeTakenField = new NumberField("Days To Be Taken");
-    private final NumberField balanceDaysField = new NumberField("Balance Days");
-
-    private final TimeOffRequestService requestService;
-    private final EmployeeService employeeService;
-    private final VacationService vacationService;
-
-    private final Binder<TimeOffRequest> binder;
-    private Vacation vacation;
-    private LocalDate endDate;
-
-    private Button saveButton;
-    private Button closeButton;
-
-    public RequestRegisterView(final TimeOffRequestService requestService,
-                               final EmployeeService employeeService,
-                               final VacationService vacationService) {
-        this.requestService = requestService;
-        this.employeeService = employeeService;
-        this.vacationService = vacationService;
-        this.binder = new Binder<>(TimeOffRequest.class);
-
-        configureFormFields();
-        configureButtons();
-        configureBinder();
-        setupFormLayout();
-    }
-
-    private void configureFormFields() {
-        employeeComboBox.setItems(employeeService.findAllEmployees());
-        employeeComboBox.setItemLabelGenerator(emp -> emp.getFirstName() + " " + emp.getLastName());
-        employeeComboBox.addValueChangeListener(event -> handleEmployeeSelection(event.getValue()));
-        categoryComboBox.setEnabled(false);
-        categoryComboBox.addValueChangeListener(event -> handleCategorySelection(event.getValue()));
-        startDatePicker.addValueChangeListener(event -> updateDatePickerMinValues());
-        endDatePicker.addValueChangeListener(event -> calculateDays());
-        availableDaysField.setReadOnly(true);
-        daysToBeTakenField.setReadOnly(true);
-        balanceDaysField.setReadOnly(true);
-    }
-
-    private void configureBinder() {
-        binder.forField(employeeComboBox)
-                .asRequired("Employee is required")
-                .bind(TimeOffRequest::getEmployee, TimeOffRequest::setEmployee);
-
-        binder.forField(categoryComboBox)
-                .asRequired("Category is required")
-                .bind(TimeOffRequest::getCategory, TimeOffRequest::setCategory);
-
-        binder.forField(availableDaysField)
-                .bind(TimeOffRequest::getAvailableDays, TimeOffRequest::setAvailableDays);
-
-        binder.forField(startDatePicker)
-                .asRequired("Start date is required")
-                .bind(TimeOffRequest::getStartDate, TimeOffRequest::setStartDate);
-
-        binder.forField(endDatePicker)
-                .asRequired("End date is required")
-                .bind(TimeOffRequest::getEndDate, TimeOffRequest::setEndDate);
-
-        binder.forField(daysToBeTakenField)
-                .bind(TimeOffRequest::getDaysToBeTake, TimeOffRequest::setDaysToBeTake);
-
-        binder.forField(balanceDaysField)
-                .bind(TimeOffRequest::getDaysBalance, TimeOffRequest::setDaysBalance);
-
-        binder.setBean(new TimeOffRequest());
-    }
-
-    private void handleEmployeeSelection(final Employee selectedEmployee) {
-        clearForm();
-        if (selectedEmployee != null) {
-            categoryComboBox.setEnabled(true);
-            filterCategories(selectedEmployee);
-        }
-    }
-
-    private void filterCategories(final Employee employee) {
-        List<TimeOffRequest> employeeRequests = requestService.findRequestsByEmployeeId(employee.getId());
-        List<TimeOffRequestType> requestedCategories = employeeRequests.stream()
-                .map(TimeOffRequest::getCategory)
-                .toList();
-        List<TimeOffRequestType> availableCategories = Arrays.stream(TimeOffRequestType.values())
-                .filter(category -> !requestedCategories.contains(category))
-                .filter(category -> {
-                    if (employee.getGender() == Employee.Gender.MALE) {
-                        return category != TimeOffRequestType.MATERNITY
-                                && category != TimeOffRequestType.MOTHERS_DAY
-                                && category != TimeOffRequestType.INTERNATIONAL_WOMENS_DAY
-                                && category != TimeOffRequestType.NATIONAL_WOMENS_DAY;
-                    } else {
-                        return category != TimeOffRequestType.FATHERS_DAY
-                                && category != TimeOffRequestType.PATERNITY;
-                    }
-                })
-                .toList();
-        categoryComboBox.setItems(availableCategories);
-    }
-
-    private void handleCategorySelection(final TimeOffRequestType selectedCategory) {
-        clearForm();
-        if (selectedCategory != null) {
-            updateAvailableDays(selectedCategory);
-        }
-    }
-
-    private void updateAvailableDays(final TimeOffRequestType selectedCategory) {
-        vacation = vacationService.findVacationByCategory(selectedCategory);
-        if (vacation != null) {
-            availableDaysField.setValue(vacation.getDuration());
-            setDatePickerLimits(vacation);
-        }
-    }
-
-    private void setDatePickerLimits(final Vacation vacation) {
-        LocalDate startDate;
-        if (vacation.getVacationDate() != null) {
-            startDate = vacation.getVacationDate();
-            endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1);
-        } else {
-            startDate = LocalDate.now();
-            endDate = null;
-        }
-        startDatePicker.setMin(startDate);
-        startDatePicker.setMax(endDate);
-        endDatePicker.setMin(startDate);
-        endDatePicker.setMax(endDate);
-
-    }
-
-    private void updateDatePickerMinValues() {
-        LocalDate startDate = startDatePicker.getValue();
-        if (vacation.getVacationDate() == null) {
-            endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1);
-        }
-        if (startDate != null) {
-            endDatePicker.setMin(startDate);
-            endDatePicker.setMax(startDate.plusDays(vacation.getExpiration().intValue() - 1));
-            if (vacation.getDuration() == 0.5) {
-                endDatePicker.setValue(startDate.plusDays(0));
-            } else {
-                endDatePicker.setValue(startDate.plusDays(vacation.getDuration().intValue() - 1));
-            }
-            calculateDays();
-        }
-    }
-
-    private void calculateDays() {
-        LocalDate startDate = startDatePicker.getValue();
-        LocalDate endDate = endDatePicker.getValue();
-        Double availableDays = availableDaysField.getValue();
-
-        if (startDate != null && endDate != null) {
-            if (startDate.isAfter(endDate)) {
-                endDatePicker.clear();
-                return;
-            }
-
-            double daysToBeTaken = java.time.temporal.ChronoUnit.DAYS.between(startDate, endDate) + 1;
-            if (daysToBeTaken == 1 && vacation.getDuration() == 0.5) {
-                daysToBeTaken = 0.5;
-            }
-            daysToBeTakenField.setValue(daysToBeTaken);
-
-            double balanceDays = availableDays - daysToBeTaken;
-            if (balanceDays < 0) {
-                endDatePicker.clear();
-                daysToBeTakenField.clear();
-                balanceDaysField.clear();
-            } else {
-                balanceDaysField.setValue(balanceDays);
-            }
-        }
-    }
-
-    private void configureButtons() {
-        saveButton = new Button("Save", event -> saveRequest());
-        closeButton = new Button("Close", event -> closeForm());
-    }
-
-    private void setupFormLayout() {
-        add(
-                new H3("Add Vacation Request"),
-                employeeComboBox,
-                categoryComboBox,
-                availableDaysField,
-                startDatePicker,
-                endDatePicker,
-                daysToBeTakenField,
-                balanceDaysField,
-                new HorizontalLayout(saveButton, closeButton)
-        );
-    }
-
-    private void saveRequest() {
-        if (binder.validate().isOk()) {
-            TimeOffRequest request = binder.getBean();
-            request.setExpiration(endDate);
-            request.setState(TimeOffRequestStatus.REQUESTED);
-            requestService.saveTimeOffRequest(request);
-            Notification.show("Request saved successfully.");
-            closeForm();
-        } else {
-            Notification.show("Please fill all required fields correctly.");
-        }
-    }
-
-    private void closeForm() {
-        getUI().ifPresent(ui -> ui.navigate(RequestsListView.class));
-    }
-
-    private void clearForm() {
-        availableDaysField.clear();
-        startDatePicker.clear();
-        endDatePicker.clear();
-        daysToBeTakenField.clear();
-        balanceDaysField.clear();
-    }
-}

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

@@ -1,71 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.service.AccountService;
-import com.vaadin.flow.component.ClickEvent;
-import com.vaadin.flow.component.ComponentEventListener;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.button.ButtonVariant;
-import com.vaadin.flow.component.formlayout.FormLayout;
-import com.vaadin.flow.component.html.H3;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.component.textfield.PasswordField;
-import com.vaadin.flow.router.*;
-import com.vaadin.flow.server.auth.AnonymousAllowed;
-
-import java.util.List;
-
-@Route("reset-password")
-@PageTitle("PFS Intra")
-@AnonymousAllowed
-public class ResetPasswordView extends VerticalLayout implements BeforeEnterObserver {
-    private String username;
-    private String token;
-
-    public ResetPasswordView(final AccountService accountService) {
-        setSizeFull();
-        setAlignItems(Alignment.CENTER);
-        setJustifyContentMode(JustifyContentMode.CENTER);
-
-        final VerticalLayout vl = new VerticalLayout();
-        vl.setJustifyContentMode(JustifyContentMode.CENTER);
-        vl.setWidth("400px");
-
-        final PasswordField password = new PasswordField("Password");
-        final PasswordField confirmPassword = new PasswordField("Confirm Password");
-
-        final FormLayout formLayout = new FormLayout(password, confirmPassword);
-        formLayout.setColspan(password, 3);
-        formLayout.setColspan(confirmPassword, 3);
-
-        final Button primaryButton = new Button("Submit");
-        primaryButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
-        primaryButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            accountService.resetPassword(username, password.getValue(), token);
-            getUI().ifPresent(ui -> ui.navigate(MainView.class));
-        });
-
-        final Button secondaryButton = new Button("Cancel");
-        secondaryButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                getUI().ifPresent(ui -> ui.navigate(MainView.class)));
-
-        HorizontalLayout hl = new HorizontalLayout(secondaryButton, primaryButton);
-
-        vl.add(new H3("PFS - Reset Password"));
-        vl.add(formLayout);
-        vl.add(hl);
-
-        add(vl);
-    }
-
-    @Override
-    public void beforeEnter(final BeforeEnterEvent beforeEnterEvent) {
-        final Location location = beforeEnterEvent.getLocation();
-        final QueryParameters queryParameters = location.getQueryParameters();
-
-        this.username = queryParameters.getParameters().getOrDefault("username", List.of()).stream()
-                .findFirst().orElse(null);
-        this.token = queryParameters.getParameters().getOrDefault("token", List.of()).stream()
-                .findFirst().orElse(null);
-    }
-}

src/main/resources/application-test.properties

@@ -1,3 +1,2 @@
 spring.ldap.url=ldap://localhost:8391
 spring.ldap.embedded.port=8391
-application.jwtSecret=test123

src/main/resources/application.properties

@@ -44,5 +44,3 @@ spring.sql.init.mode=${SQL_INIT:embedded}
 
 spring.h2.console.enabled=true
 spring.h2.console.settings.web-allow-others=true
-
-application.jwtSecret=${JWT_SECRET}

src/main/resources/data.sql

@@ -16,82 +16,53 @@ INSERT INTO team (id, version, name) VALUES ('c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3
 INSERT INTO team (id, version, name) VALUES ('8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 1, 'GHI');
 
 
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('123e4567-e89b-12d3-a456-426614174000', 1, 'NEW_YEAR', '2024-01-01', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 1, 'bob', 'Bob', 'Test', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('223e4567-e89b-12d3-a456-426614174001', 1, 'MONDAY_CARNIVAL', '2024-02-12', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('cba3efb7-32bc-44be-9fdc-fc5e4f211254', 1, 'ben', 'Ben', 'Test', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('323e4567-e89b-12d3-a456-426614174002', 1, 'TUESDAY_CARNIVAL', '2024-02-13', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('423e4567-e89b-12d3-a456-426614174003', 1, 'GOOD_FRIDAY', '2024-03-29', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('523e4567-e89b-12d3-a456-426614174004', 1, 'LABOR_DAY', '2024-05-01', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('623e4567-e89b-12d3-a456-426614174005', 1, 'INDEPENDENCE_DAY', '2024-08-06', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('723e4567-e89b-12d3-a456-426614174006', 1, 'CHRISTMAS', '2024-12-25', 1, 1, 'FIXED');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3');
-
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe');
-
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('823e4567-e89b-12d3-a456-426614174007', 1, 'PRURINATIONAL_STATE_DAY', '2024-01-21', 3, 30, 'MOVABLE');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('923e4567-e89b-12d3-a456-426614174008', 1, 'CORPUS_CHRISTI', '2024-05-30', 1, 30, 'MOVABLE');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('a23e4567-e89b-12d3-a456-426614174009', 1, 'ANDEAN_NEW_YEAR', '2024-06-21', 1, 30, 'MOVABLE');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('b23e4567-e89b-12d3-a456-42661417400a', 1, 'DEPARTMENTAL_ANNIVERSARY', '2024-09-14', 1, 30, 'MOVABLE');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400b', 1, 'ALL_SOULS_DAY', '2024-11-02', 1, 30, 'MOVABLE');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28');
-
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3');
-
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe');
-INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400c', 1, 'BIRTHDAY', 0.5, 365, 'OTHER');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
-INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400d', 1, 'MATERNITY', 90, 90, 'OTHER');
+insert into employee (id, version, username, first_name, last_name, status, team_id) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28');
-INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400e', 1, 'PATERNITY', 3, 3, 'OTHER');
-INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400f', 1, 'MARRIAGE', 3, 3, 'OTHER');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417401a', 1, 'FATHERS_DAY', '2024-03-19', 0.5, 30, 'OTHER');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417401b', 1, 'MOTHERS_DAY', '2024-05-27', 0.5, 30, 'OTHER');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417401c', 1, 'INTERNATIONAL_WOMENS_DAY', '2024-03-08', 0.5, 30, 'OTHER');
-INSERT INTO vacation (id, version, category, vacation_date, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417401d', 1, 'NATIONAL_WOMENS_DAY', '2024-10-11', 0.5, 30, 'OTHER');
-INSERT INTO vacation (id, version, category, duration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417401e', 1, 'HEALTH_PERMIT', 2, 'OTHER');
-INSERT INTO vacation (id, version, category, expiration, type) VALUES ('490e5fbe-895b-42f8-b914-95437f7b39c0', 1, 'VACATION_CURRENT_MANAGEMENT', 730, 'OTHER');
-INSERT INTO vacation (id, version, category, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-4266141740ff', 1, 'VACATION_PREVIOUS_MANAGEMENT', 730, 'OTHER');
-
-
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 1, 'bob', 'Bob', 'Test', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('cba3efb7-32bc-44be-9fdc-fc5e4f211254', 1, 'ben', 'Ben', 'Test', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE', 'c3a8a7b1-f2d9-48c0-86ea-f215c2e6b3a3', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE', '8f6b61e7-efb2-4de7-b8ed-7438c9d8babe', 'FEMALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE','b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa', 'MALE');
-insert into employee (id, version, username, first_name, last_name, status, team_id, gender) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE', '6d63bc15-3f8b-46f7-9cf1-7e9b0b9a2b28', 'FEMALE');
 
 
 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 ('9d6f12ba-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'PATERNITY', 'TAKEN', 15, '2025-12-31', '2024-10-01', '2024-10-10', 5, 10);
+values ('9d6f12ba-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VACATION', 'TAKEN', 15, '2025-12-31', '2024-10-01', '2024-10-10', 5, 10);
 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 ('2fa314bc-f547-4b12-a8b6-bb789feabc12', 1, '19b5a76e-d7b1-4b76-8b02-4d0748e85809', 'BIRTHDAY', 'APPROVED', 15, '2025-12-31', '2024-12-01', '2024-12-15', 7, 8);
 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 ('d5f6341a-913d-4e7f-a0b2-cfe0786acd34', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'HEALTH_PERMIT', 'IN_USE', 20, '2025-11-30', '2024-11-10', '2024-11-20', 10, 10);
+values ('d5f6341a-913d-4e7f-a0b2-cfe0786acd34', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'FIXED_HOLIDAY', 'IN_USE', 20, '2025-11-30', '2024-11-10', '2024-11-20', 10, 10);
 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 ('4f913b23-ff23-4527-bcd6-adfe01234567', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'MATERNITY', 'IN_USE', 18, '2025-06-30', '2024-07-01', '2024-07-15', 10, 8);
 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 ('8c653f2a-f9a3-4d67-b3b6-12ad98fe0983', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'LABOR_DAY', 'REQUESTED', 10, '2025-10-31', '2024-09-15', '2024-09-20', 5, 5);
+values ('8c653f2a-f9a3-4d67-b3b6-12ad98fe0983', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'VACATION', 'REQUESTED', 10, '2025-10-31', '2024-09-15', '2024-09-20', 5, 5);
 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 ('fb9d9d75-b2ab-4ea4-b8b3-0a8f89e5c123', 1, '2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 'INDEPENDENCE_DAY', 'IN_USE', 12, '2025-08-31', '2024-08-05', '2024-08-15', 6, 6);
+values ('fb9d9d75-b2ab-4ea4-b8b3-0a8f89e5c123', 1, '2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 'FIXED_HOLIDAY', 'IN_USE', 12, '2025-08-31', '2024-08-05', '2024-08-15', 6, 6);
 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 ('1c913a12-46e9-47b7-9e31-ab903fedc789', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'BIRTHDAY', 'APPROVED', 14, '2025-12-31', '2024-10-20', '2024-10-25', 5, 9);
 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 ('b1249d3a-cc34-4954-88d9-1e4f67fe2436', 1, 'afc5c741-f70a-4394-853b-39d51b118927', 'MATERNITY', 'APPROVED', 20, '2025-11-30', '2024-11-05', '2024-11-12', 7, 13);
 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 ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'ALL_SOULS_DAY', 'PENDING', 18, '2025-06-30', '2024-07-10', '2024-07-20', 8, 10);
+values ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'VACATION', 'PENDING', 18, '2025-06-30', '2024-07-10', '2024-07-20', 8, 10);
 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 ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'NEW_YEAR', 'PENDING', 15, '2025-12-31', '2024-09-01', '2024-09-05', 4, 11);
+values ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'FIXED_HOLIDAY', 'PENDING', 15, '2025-12-31', '2024-09-01', '2024-09-05', 4, 11);
 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', 'MONDAY_CARNIVAL', 'APPROVED', 20, '2025-11-30', '2024-10-25', '2024-11-05', 9, 11);
+values ('89bc4b2a-943f-487c-a9f3-bacf78145e67', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'VACATION', 'APPROVED', 20, '2025-11-30', '2024-10-25', '2024-11-05', 9, 11);
 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 ('37adfc2a-7463-4b2d-a7c1-fae04567cdef', 1, 'e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 'BIRTHDAY', 'REQUESTED', 18, '2025-06-30', '2024-06-01', '2024-06-10', 6, 12);
 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 ('2bc138ea-12db-4b89-a0b4-78e045e34b4e', 1, 'f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 'MATERNITY', 'REQUESTED', 10, '2025-10-31', '2024-10-01', '2024-10-10', 3, 7);
 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 ('14de1a56-6893-4e12-90f3-4faec457f002', 1, 'cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 'HEALTH_PERMIT', 'PENDING', 22, '2025-08-31', '2024-07-15', '2024-07-25', 8, 14);
+values ('14de1a56-6893-4e12-90f3-4faec457f002', 1, 'cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 'FIXED_HOLIDAY', 'PENDING', 22, '2025-08-31', '2024-07-15', '2024-07-25', 8, 14);
 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 ('fb08a6c9-cd17-42e8-b9e2-734ec834cae2', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'HEALTH_PERMIT', 'PENDING', 16, '2025-12-31', '2024-09-30', '2024-10-05', 4, 12);
+values ('fb08a6c9-cd17-42e8-b9e2-734ec834cae2', 1, '4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 'VACATION', 'PENDING', 16, '2025-12-31', '2024-09-30', '2024-10-05', 4, 12);