Compare commits
17 Commits
b7a63b8c78
...
cf06837224
Author | SHA1 | Date | |
---|---|---|---|
cf06837224 | |||
5690879792 | |||
76d2a99758 | |||
e9d46848c7 | |||
439c1f135d | |||
5c903ba360 | |||
16a9a91790 | |||
ff2db18f0a | |||
9c4a7fc45c | |||
8cb8915434 | |||
ddd0f9e0ce | |||
fc2784b728 | |||
c1fb36591a | |||
ab0059b0d2 | |||
db4c43d35e | |||
23e633cc5f | |||
451242bea4 |
14
.gitea/workflows/build-pr.yaml
Normal file
14
.gitea/workflows/build-pr.yaml
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
name: PR Builder
|
||||||
|
run-name: ${{ gitea.actor }} building PR
|
||||||
|
on: [pull_request]
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Build-PR:
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch ${{ gitea.head_ref }} and ref is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||||
|
- name: Build PR
|
||||||
|
if: gitea.base_ref == 'main'
|
||||||
|
run: |
|
||||||
|
git clone --single-branch --branch ${{ gitea.head_ref }} https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction
|
||||||
|
- run: echo "This job's status is ${{ job.status }}."
|
16
.gitea/workflows/build.yaml
Normal file
16
.gitea/workflows/build.yaml
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
name: Builder
|
||||||
|
run-name: ${{ gitea.actor }} building
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
Build-Project:
|
||||||
|
runs-on: ubuntu-22.04
|
||||||
|
steps:
|
||||||
|
- run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
|
||||||
|
- name: Build package
|
||||||
|
run: |
|
||||||
|
git clone --single-branch --branch main https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction && unlink /home/ubuntu/pfs-intra/app.jar && cp target/*.jar /home/ubuntu/pfs-intra/app.jar && sudo systemctl restart pfs-intra
|
||||||
|
- run: echo "This job's status is ${{ job.status }}."
|
@ -1,20 +1,32 @@
|
|||||||
package com.primefactorsolutions.config;
|
package com.primefactorsolutions.config;
|
||||||
|
|
||||||
|
import com.primefactorsolutions.model.Employee;
|
||||||
|
import com.primefactorsolutions.service.EmployeeService;
|
||||||
import com.primefactorsolutions.views.LoginView;
|
import com.primefactorsolutions.views.LoginView;
|
||||||
import com.vaadin.flow.spring.security.VaadinWebSecurity;
|
import com.vaadin.flow.spring.security.VaadinWebSecurity;
|
||||||
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
|
import org.springframework.ldap.core.DirContextOperations;
|
||||||
import org.springframework.security.authentication.AuthenticationManager;
|
import org.springframework.security.authentication.AuthenticationManager;
|
||||||
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
|
||||||
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
|
||||||
import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory;
|
import org.springframework.security.config.ldap.LdapBindAuthenticationManagerFactory;
|
||||||
|
import org.springframework.security.core.GrantedAuthority;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
|
import org.springframework.security.ldap.DefaultSpringSecurityContextSource;
|
||||||
|
import org.springframework.security.ldap.userdetails.LdapUserDetailsMapper;
|
||||||
|
import org.springframework.security.ldap.userdetails.UserDetailsContextMapper;
|
||||||
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
|
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
|
||||||
|
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
@EnableWebSecurity
|
@EnableWebSecurity
|
||||||
@Configuration
|
@Configuration
|
||||||
public class SecurityConfig extends VaadinWebSecurity {
|
public class SecurityConfig extends VaadinWebSecurity {
|
||||||
|
@Value("${spring.ldap.url}")
|
||||||
|
private String ldapUrl;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void configure(final HttpSecurity http) throws Exception {
|
protected void configure(final HttpSecurity http) throws Exception {
|
||||||
@ -37,13 +49,28 @@ public class SecurityConfig extends VaadinWebSecurity {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
public AuthenticationManager authenticationManager() {
|
public AuthenticationManager authenticationManager(final UserDetailsContextMapper userDetailsContextMapper) {
|
||||||
DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
|
final DefaultSpringSecurityContextSource contextSource = new DefaultSpringSecurityContextSource(
|
||||||
"ldap://localhost:8389/dc=primefactorsolutions,dc=com");
|
String.format("%s/dc=primefactorsolutions,dc=com", ldapUrl));
|
||||||
contextSource.setCacheEnvironmentProperties(false);
|
contextSource.setCacheEnvironmentProperties(false);
|
||||||
LdapBindAuthenticationManagerFactory factory = new LdapBindAuthenticationManagerFactory(contextSource);
|
final LdapBindAuthenticationManagerFactory factory = new LdapBindAuthenticationManagerFactory(contextSource);
|
||||||
factory.setUserDnPatterns("uid={0},ou=users");
|
factory.setUserDnPatterns("uid={0},ou=users");
|
||||||
|
factory.setUserDetailsContextMapper(userDetailsContextMapper);
|
||||||
|
|
||||||
return factory.createAuthenticationManager();
|
return factory.createAuthenticationManager();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Bean
|
||||||
|
public UserDetailsContextMapper userDetailsContextMapper(final EmployeeService employeeService) {
|
||||||
|
return new LdapUserDetailsMapper() {
|
||||||
|
@Override
|
||||||
|
public UserDetails mapUserFromContext(final DirContextOperations ctx, final String username,
|
||||||
|
final Collection<? extends GrantedAuthority> authorities) {
|
||||||
|
final UserDetails details = super.mapUserFromContext(ctx, username, authorities);
|
||||||
|
final Employee employee = employeeService.getDetachedEmployeeByUsername(details.getUsername());
|
||||||
|
|
||||||
|
return employee == null ? details : employee;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,25 +1,29 @@
|
|||||||
package com.primefactorsolutions.model;
|
package com.primefactorsolutions.model;
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
import jakarta.persistence.*;
|
import jakarta.persistence.*;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import lombok.EqualsAndHashCode;
|
import lombok.EqualsAndHashCode;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
import org.springframework.security.core.GrantedAuthority;
|
||||||
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
import java.util.Collection;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
@Entity
|
@Entity
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@EqualsAndHashCode(callSuper = true)
|
@EqualsAndHashCode(callSuper = true)
|
||||||
public class Employee extends BaseEntity {
|
public class Employee extends BaseEntity implements UserDetails {
|
||||||
private String userName;
|
private String username;
|
||||||
private String firstName;
|
private String firstName;
|
||||||
private String lastName;
|
private String lastName;
|
||||||
private LocalDate birthday;
|
private LocalDate birthday;
|
||||||
private String birthCity;
|
private String birthCity;
|
||||||
@Enumerated(EnumType.STRING)
|
private String age;
|
||||||
private MaritalStatus maritalStatus;
|
|
||||||
private String residenceAddress;
|
private String residenceAddress;
|
||||||
private String phoneNumber;
|
private String phoneNumber;
|
||||||
private String personalEmail;
|
private String personalEmail;
|
||||||
@ -29,20 +33,108 @@
|
|||||||
private String emergencyCAddress;
|
private String emergencyCAddress;
|
||||||
private String emergencyCPhone;
|
private String emergencyCPhone;
|
||||||
private String emergencyCEmail;
|
private String emergencyCEmail;
|
||||||
|
private String numberOfChildren;
|
||||||
|
private String departmentAndProvinceResidence;
|
||||||
|
|
||||||
|
private String ci;
|
||||||
|
private String issuedIn;
|
||||||
|
|
||||||
|
private String pTitle1;
|
||||||
|
private String pTitle2;
|
||||||
|
private String pTitle3;
|
||||||
|
|
||||||
|
private String pStudy1;
|
||||||
|
private String pStudy2;
|
||||||
|
private String pStudy3;
|
||||||
|
|
||||||
|
private String certification1;
|
||||||
|
private String certification2;
|
||||||
|
private String certification3;
|
||||||
|
private String certification4;
|
||||||
|
|
||||||
|
private String recognition;
|
||||||
|
private String achievements;
|
||||||
|
|
||||||
|
private String language;
|
||||||
|
private String languageLevel;
|
||||||
|
|
||||||
|
private String cod;
|
||||||
|
private String leadManager;
|
||||||
|
private String project;
|
||||||
|
|
||||||
|
private LocalDate dateOfEntry;
|
||||||
|
private LocalDate dateOfExit;
|
||||||
|
|
||||||
|
private String contractType;
|
||||||
|
private Integer seniority;
|
||||||
|
private Double salary;
|
||||||
|
|
||||||
|
private String bankName;
|
||||||
|
private String accountNumber;
|
||||||
|
|
||||||
|
private String gpss;
|
||||||
|
private String sss;
|
||||||
|
private String beneficiaries;
|
||||||
|
|
||||||
@Column(columnDefinition = "TEXT")
|
@Column(columnDefinition = "TEXT")
|
||||||
private String profileImage;
|
private String profileImage;
|
||||||
@Enumerated(EnumType.STRING)
|
@Enumerated(EnumType.STRING)
|
||||||
private Status status;
|
private Status status;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Collection<? extends GrantedAuthority> getAuthorities() {
|
||||||
|
return Lists.newArrayList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@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 {
|
public enum Status {
|
||||||
ACTIVE,
|
ACTIVE,
|
||||||
INACTIVE
|
INACTIVE
|
||||||
}
|
}
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
private MaritalStatus maritalStatus;
|
||||||
public enum MaritalStatus {
|
public enum MaritalStatus {
|
||||||
SINGLE,
|
SINGLE,
|
||||||
MARRIED,
|
MARRIED,
|
||||||
WIDOWED,
|
WIDOWED,
|
||||||
DIVORCED
|
DIVORCED
|
||||||
}
|
}
|
||||||
|
@Enumerated(EnumType.STRING)
|
||||||
|
private Gender gender;
|
||||||
|
public enum Gender {
|
||||||
|
MALE,
|
||||||
|
FEMALE
|
||||||
|
}
|
||||||
|
|
||||||
public Status getStatus() {
|
public Status getStatus() {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
@ -3,7 +3,9 @@ package com.primefactorsolutions.repositories;
|
|||||||
import com.primefactorsolutions.model.Employee;
|
import com.primefactorsolutions.model.Employee;
|
||||||
import org.springframework.data.jpa.repository.JpaRepository;
|
import org.springframework.data.jpa.repository.JpaRepository;
|
||||||
|
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
|
public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
|
||||||
|
Optional<Employee> findByUsername(String username);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
package com.primefactorsolutions.service;
|
package com.primefactorsolutions.service;
|
||||||
import com.primefactorsolutions.model.Employee;
|
import com.primefactorsolutions.model.Employee;
|
||||||
|
import jakarta.persistence.EntityManager;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import org.apache.commons.beanutils.BeanComparator;
|
import org.apache.commons.beanutils.BeanComparator;
|
||||||
import com.primefactorsolutions.repositories.EmployeeRepository;
|
import com.primefactorsolutions.repositories.EmployeeRepository;
|
||||||
@ -19,16 +20,28 @@ import java.util.Collections;
|
|||||||
public class EmployeeService {
|
public class EmployeeService {
|
||||||
private final EmployeeRepository employeeRepository;
|
private final EmployeeRepository employeeRepository;
|
||||||
private final LdapTemplate ldapTemplate;
|
private final LdapTemplate ldapTemplate;
|
||||||
|
private final EntityManager entityManager;
|
||||||
|
|
||||||
public static final String BASE_DN = "dc=primefactorsolutions,dc=com";
|
public static final String BASE_DN = "dc=primefactorsolutions,dc=com";
|
||||||
|
|
||||||
protected Name buildDn(final Employee employee) {
|
protected Name buildDn(final Employee employee) {
|
||||||
return LdapNameBuilder.newInstance(BASE_DN)
|
return LdapNameBuilder.newInstance(BASE_DN)
|
||||||
.add("ou", "users")
|
.add("ou", "users")
|
||||||
.add("uid", employee.getUserName())
|
.add("uid", employee.getUsername())
|
||||||
.build();
|
.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Employee getDetachedEmployeeByUsername(final String username) {
|
||||||
|
final Employee employee = employeeRepository.findByUsername(username).orElse(null);
|
||||||
|
|
||||||
|
if (employee != null) {
|
||||||
|
entityManager.detach(employee);
|
||||||
|
return employee;
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
public List<Employee> findEmployees(
|
public List<Employee> findEmployees(
|
||||||
final int start, final int pageSize, final String sortProperty, final boolean asc) {
|
final int start, final int pageSize, final String sortProperty, final boolean asc) {
|
||||||
List<Employee> employees = employeeRepository.findAll();
|
List<Employee> employees = employeeRepository.findAll();
|
||||||
@ -75,14 +88,14 @@ public class EmployeeService {
|
|||||||
attrs.put(ocattr);
|
attrs.put(ocattr);
|
||||||
attrs.put("cn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
|
attrs.put("cn", String.format("%s %s", employee.getFirstName(), employee.getLastName()));
|
||||||
attrs.put("sn", 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("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;
|
return attrs;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updatePassword(final Employee employee) {
|
public void updatePassword(final Employee employee) {
|
||||||
final Attribute attr = new BasicAttribute("userpassword", employee.getUserName() + "123");
|
final Attribute attr = new BasicAttribute("userpassword", employee.getUsername() + "123");
|
||||||
final ModificationItem item = new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
|
final ModificationItem item = new ModificationItem(DirContext.REPLACE_ATTRIBUTE, attr);
|
||||||
|
|
||||||
ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});
|
ldapTemplate.modifyAttributes(buildDn(employee), new ModificationItem[] {item});
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.vaadin.flow.component.html.Main;
|
||||||
|
import com.vaadin.flow.router.PageTitle;
|
||||||
|
import com.vaadin.flow.router.Route;
|
||||||
|
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||||
|
import jakarta.annotation.security.PermitAll;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
|
||||||
|
@SpringComponent
|
||||||
|
@PermitAll
|
||||||
|
@Scope("prototype")
|
||||||
|
@PageTitle("CorporateDocuments")
|
||||||
|
@Route(value = "/corporate-documents/me", layout = MainLayout.class)
|
||||||
|
public class CorporateDocumentsView extends Main {
|
||||||
|
}
|
@ -36,44 +36,94 @@ import java.util.UUID;
|
|||||||
@PageTitle("Employee")
|
@PageTitle("Employee")
|
||||||
@Route(value = "/employees/:employeeId?/:action?", layout = MainLayout.class)
|
@Route(value = "/employees/:employeeId?/:action?", layout = MainLayout.class)
|
||||||
public class EmployeeView extends BeanValidationForm<Employee> implements HasUrlParameter<String> {
|
public class EmployeeView extends BeanValidationForm<Employee> implements HasUrlParameter<String> {
|
||||||
|
|
||||||
private static final String SAVE_BUTTON_TEXT = "Save";
|
|
||||||
private static final String EDIT_BUTTON_TEXT = "Edit";
|
|
||||||
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 EmployeeService employeeService;
|
||||||
|
|
||||||
// TODO: campo usado para registrar al empleado en LDAP. Este campo podria estar en otro form eventualmente.
|
// TODO: campo usado para registrar al empleado en LDAP. Este campo podria estar en otro form eventualmente.
|
||||||
private final TextField userName = createTextField("Username: ", 30, true);
|
// INFORMACION PERSONAL
|
||||||
|
private final TextField username = createTextField("Username: ", 30, true);
|
||||||
private final TextField firstName = createTextField("Nombres: ", 30, true);
|
private final TextField firstName = createTextField("Nombres: ", 30, true);
|
||||||
private final TextField lastName = createTextField("Apellidos", 30, true);
|
private final TextField lastName = createTextField("Apellidos", 30, true);
|
||||||
private final ComboBox<Employee.Status> status = createStatusComboBox();
|
private final ComboBox<Employee.Status> status = createStatusComboBox();
|
||||||
|
private final ComboBox<Employee.Gender> gender = createGenderComboBox();
|
||||||
private final VDatePicker birthday = new VDatePicker("Fecha de Nacimiento");
|
private final VDatePicker birthday = new VDatePicker("Fecha de Nacimiento");
|
||||||
|
private final TextField age = createTextField("Edad", 3, false);
|
||||||
private final TextField birthCity = createTextField("Ciudad y País de Nacimiento", 20, false);
|
private final TextField birthCity = createTextField("Ciudad y País de Nacimiento", 20, false);
|
||||||
|
private final TextField residenceAddress = createTextField("Dirección de Domicilio Actual", 50, false);
|
||||||
|
private final TextField localAddress = createTextField("Dep/Provincia de Residencia", 10, false);
|
||||||
private final ComboBox<Employee.MaritalStatus> maritalStatus = createMaritalStatusComboBox();
|
private final ComboBox<Employee.MaritalStatus> maritalStatus = createMaritalStatusComboBox();
|
||||||
private final TextField residenceAddress = createTextField("Dirección de Residencia", 50, false);
|
private final TextField numberOfChildren = createTextField("Numero de Hijos", 3, false);
|
||||||
|
private final TextField ci = createTextField("CI", 30, false);
|
||||||
|
private final TextField issuedIn = createTextField("Expedido en ", 30, false);
|
||||||
private final TextField phoneNumber = createTextField("Teléfono", 8, false);
|
private final TextField phoneNumber = createTextField("Teléfono", 8, false);
|
||||||
private final EmailField personalEmail = createEmailField("E-mail");
|
private final EmailField personalEmail = createEmailField("E-mail");
|
||||||
|
private final TextField cod = createTextField("Codigo de Empleado", 30, false);
|
||||||
private final TextField position = createTextField("Cargo", 30, false);
|
private final TextField position = createTextField("Cargo", 30, false);
|
||||||
private final TextField team = createTextField("Equipo", 30, false);
|
private final TextField team = createTextField("Equipo", 30, false);
|
||||||
|
private final TextField leadManager = createTextField("Lead/Manager", 30, false);
|
||||||
|
private final TextField project = createTextField("Proyecto", 30, false);
|
||||||
private final TextField emergencyCName = createTextField("Nombres y Apellidos de Contacto", 50, false);
|
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 emergencyCAddress = createTextField("Dirección de Contacto", 50, false);
|
||||||
private final TextField emergencyCPhone = createTextField("Teléfono de Contacto", 8, false);
|
private final TextField emergencyCPhone = createTextField("Teléfono de Contacto", 8, false);
|
||||||
private final EmailField emergencyCEmail = createEmailField("Email de Contacto");
|
private final EmailField emergencyCEmail = createEmailField("Email de Contacto");
|
||||||
|
|
||||||
private final MemoryBuffer buffer = new MemoryBuffer();
|
private final MemoryBuffer buffer = new MemoryBuffer();
|
||||||
private final Upload upload = new Upload(buffer);
|
private final Upload upload = new Upload(buffer);
|
||||||
private final Image profileImagePreview = new Image();
|
private final Image profileImagePreview = new Image();
|
||||||
|
|
||||||
|
//INFORMACION PROFESIONAL
|
||||||
|
private final TextField pTitle1 = createTextField("Título 1", 30, false);
|
||||||
|
private final TextField pTitle2 = createTextField("Título 2", 30, false);
|
||||||
|
private final TextField pTitle3 = createTextField("Título 3", 30, false);
|
||||||
|
private final TextField pStudy1 = createTextField("Estudio 1", 30, false);
|
||||||
|
private final TextField pStudy2 = createTextField("Estudio 2", 30, false);
|
||||||
|
private final TextField pStudy3 = createTextField("Estudio 3", 30, false);
|
||||||
|
private final TextField certification1 = createTextField("Certificación 1", 30, false);
|
||||||
|
private final TextField certification2 = createTextField("Certificación 2", 30, false);
|
||||||
|
private final TextField certification3 = createTextField("Certificación 3", 30, false);
|
||||||
|
private final TextField certification4 = createTextField("Certificación 4", 30, false);
|
||||||
|
private final TextField recognition = createTextField("Reconocimientos", 30, false);
|
||||||
|
private final TextField achievements = createTextField("Logros Profesionales", 30, false);
|
||||||
|
private final TextField language = createTextField("Idioma", 30, false);
|
||||||
|
private final TextField languageLevel = createTextField("Nivel de Idioma", 30, false);
|
||||||
|
|
||||||
|
//INFORMACION DE CONTRATACION
|
||||||
|
private final VDatePicker dateOfEntry = new VDatePicker("Fecha de Ingreso");
|
||||||
|
private final VDatePicker dateOfExit = new VDatePicker("Fecha de Retiro");
|
||||||
|
private final TextField contractType = createTextField("Tipo de Contratación", 30, false);
|
||||||
|
private final TextField seniority = createTextField("Antiguedad", 30, false);
|
||||||
|
private final TextField salary = createTextField("Salario", 30, false);
|
||||||
|
private final TextField bankName = createTextField("Banco", 30, false);
|
||||||
|
private final TextField accountNumber = createTextField("Nro. de Cuenta", 30, false);
|
||||||
|
private final TextField gpss = createTextField("Código Único de Asegurado (GPSS)", 30, false);
|
||||||
|
private final TextField sss = createTextField("Matricula de Asegurado (SSS)", 30, false);
|
||||||
|
private final TextField beneficiaries = createTextField("Derechohabientes", 30, false);
|
||||||
|
|
||||||
|
//TITULOS PARA INFORMACION PERSONAL
|
||||||
|
private final H2 infoPer = new H2("Información Personal");
|
||||||
|
private final H3 infoGenr = new H3("Información General");
|
||||||
|
private final H3 contEmerg = new H3("Contacto de Emergencia");
|
||||||
|
//TITULOS PARA INFORMACIÓN PROFESIONAL
|
||||||
|
private final H2 infProf = new H2("Información Profesional");
|
||||||
|
private final H3 titulos = new H3("Titulos Profesionales y Estudios Realizados");
|
||||||
|
private final H3 certif = new H3("Certificaciones Profesionales");
|
||||||
|
private final H3 logros = new H3("Otros Logros y Reconocimientos");
|
||||||
|
private final H3 idioma = new H3("Dominio de Idiomas");
|
||||||
|
//TITULOS PARA INFORMACIÓN ADMINISTRATIVA
|
||||||
|
private final H2 infoAdm = new H2("Información Administrativa");
|
||||||
|
private final H3 infoCont = new H3("Información de Contratación");
|
||||||
|
private final H3 datBanc = new H3("Datos Bancados");
|
||||||
|
private final H3 datGest = new H3("Datos Gestora Pública y Seguro Social");
|
||||||
|
|
||||||
|
//BOTONES
|
||||||
|
private static final String SAVE_BUTTON_TEXT = "Save";
|
||||||
|
private static final String EDIT_BUTTON_TEXT = "Edit";
|
||||||
private final Button saveButton = new Button(SAVE_BUTTON_TEXT, e -> saveEmployee());
|
private final Button saveButton = new Button(SAVE_BUTTON_TEXT, e -> saveEmployee());
|
||||||
private final Button editButton = new Button(EDIT_BUTTON_TEXT, e -> enableEditMode());
|
private final Button editButton = new Button(EDIT_BUTTON_TEXT, e -> enableEditMode());
|
||||||
|
|
||||||
private final H2 mt = new H2("Información General del Empleado");
|
//ALERTAS
|
||||||
private final H3 fs = new H3("Información Personal");
|
private static final String NOTIFICATION_SAVE_SUCCESS = "Employee saved successfully.";
|
||||||
private final H3 ss = new H3("Datos de Contacto de Emergencia");
|
private static final String NOTIFICATION_VALIDATE_ERROR = "Please complete the required fields correctly.";
|
||||||
private final H3 si = new H3("Foto del Empleado");
|
private static final String PHONE_NUMBER_ERROR_MESSAGE = "El teléfono debe contener solo números.";
|
||||||
|
|
||||||
|
|
||||||
public EmployeeView(final EmployeeService employeeService) {
|
public EmployeeView(final EmployeeService employeeService) {
|
||||||
super(Employee.class);
|
super(Employee.class);
|
||||||
@ -92,6 +142,18 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
|
|||||||
configureUpload();
|
configureUpload();
|
||||||
saveButton.setVisible(true);
|
saveButton.setVisible(true);
|
||||||
editButton.setVisible(true);
|
editButton.setVisible(true);
|
||||||
|
|
||||||
|
birthday.addValueChangeListener(event -> calculateAge());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private void calculateAge() {
|
||||||
|
if (birthday.getValue() != null) {
|
||||||
|
int currentYear = java.time.LocalDate.now().getYear();
|
||||||
|
int birthYear = birthday.getValue().getYear();
|
||||||
|
int ages = currentYear - birthYear;
|
||||||
|
age.setValue(String.valueOf(ages));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void configureUpload() {
|
private void configureUpload() {
|
||||||
@ -124,27 +186,62 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
|
|||||||
HorizontalLayout mainLayout = new HorizontalLayout();
|
HorizontalLayout mainLayout = new HorizontalLayout();
|
||||||
VerticalLayout contentLayout1 = createContentLayout();
|
VerticalLayout contentLayout1 = createContentLayout();
|
||||||
VerticalLayout contentLayout2 = createContentLayout();
|
VerticalLayout contentLayout2 = createContentLayout();
|
||||||
|
VerticalLayout contentLayout3 = createContentLayout();
|
||||||
|
|
||||||
contentLayout1.add(
|
contentLayout1.add(
|
||||||
mt,
|
infoPer,
|
||||||
fs,
|
infoGenr,
|
||||||
firstName,
|
upload, profileImagePreview,
|
||||||
lastName,
|
firstName, lastName,
|
||||||
status,
|
gender, status,
|
||||||
birthday,
|
birthday, age,
|
||||||
birthCity,
|
birthCity, residenceAddress, localAddress,
|
||||||
maritalStatus,
|
maritalStatus, ci, issuedIn, numberOfChildren,
|
||||||
residenceAddress,
|
phoneNumber, personalEmail,
|
||||||
phoneNumber,
|
cod, position, team, leadManager, project,
|
||||||
personalEmail,
|
contEmerg,
|
||||||
position,
|
emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail);
|
||||||
team);
|
|
||||||
contentLayout2.add(
|
contentLayout2.add(
|
||||||
ss, emergencyCName, emergencyCAddress,
|
infProf,
|
||||||
emergencyCPhone, emergencyCEmail, si, upload,
|
titulos,
|
||||||
profileImagePreview, saveButton, editButton);
|
pTitle1, pTitle2, pTitle3,
|
||||||
|
pStudy1, pStudy2, pStudy3,
|
||||||
|
certif,
|
||||||
|
certification1, certification2, certification3, certification4,
|
||||||
|
logros,
|
||||||
|
recognition, achievements,
|
||||||
|
idioma,
|
||||||
|
language, languageLevel
|
||||||
|
);
|
||||||
|
contentLayout3.add(
|
||||||
|
infoAdm,
|
||||||
|
infoCont,
|
||||||
|
dateOfEntry, dateOfExit,
|
||||||
|
contractType, seniority, salary,
|
||||||
|
datBanc,
|
||||||
|
bankName, accountNumber,
|
||||||
|
datGest,
|
||||||
|
gpss, sss, beneficiaries
|
||||||
|
);
|
||||||
|
|
||||||
mainLayout.add(contentLayout1, contentLayout2);
|
mainLayout.add(contentLayout1, infProf,
|
||||||
|
titulos,
|
||||||
|
pTitle1, pTitle2, pTitle3,
|
||||||
|
pStudy1, pStudy2, pStudy3,
|
||||||
|
certif,
|
||||||
|
certification1, certification2, certification3, certification4,
|
||||||
|
logros,
|
||||||
|
recognition, achievements,
|
||||||
|
idioma,
|
||||||
|
language, languageLevel,
|
||||||
|
infoAdm,
|
||||||
|
infoCont,
|
||||||
|
dateOfEntry, dateOfExit,
|
||||||
|
contractType, seniority, salary,
|
||||||
|
datBanc,
|
||||||
|
bankName, accountNumber,
|
||||||
|
datGest,
|
||||||
|
gpss, sss, beneficiaries, saveButton, editButton);
|
||||||
addClassName("main-layout");
|
addClassName("main-layout");
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,7 +256,15 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
|
|||||||
ComboBox<Employee.Status> comboBox = new ComboBox<>("Estado");
|
ComboBox<Employee.Status> comboBox = new ComboBox<>("Estado");
|
||||||
comboBox.setItems(Employee.Status.values());
|
comboBox.setItems(Employee.Status.values());
|
||||||
comboBox.setItemLabelGenerator(Employee.Status::name);
|
comboBox.setItemLabelGenerator(Employee.Status::name);
|
||||||
comboBox.setRequiredIndicatorVisible(true); // Indicador de campo requerido
|
comboBox.setRequiredIndicatorVisible(true);
|
||||||
|
return comboBox;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ComboBox<Employee.Gender> createGenderComboBox() {
|
||||||
|
ComboBox<Employee.Gender> comboBox = new ComboBox<>("Genero");
|
||||||
|
comboBox.setItems(Employee.Gender.values());
|
||||||
|
comboBox.setItemLabelGenerator(Employee.Gender::name);
|
||||||
|
comboBox.setRequiredIndicatorVisible(true);
|
||||||
return comboBox;
|
return comboBox;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -277,6 +382,38 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
|
|||||||
emergencyCEmail.setReadOnly(true);
|
emergencyCEmail.setReadOnly(true);
|
||||||
upload.setVisible(true);
|
upload.setVisible(true);
|
||||||
profileImagePreview.setVisible(true);
|
profileImagePreview.setVisible(true);
|
||||||
|
age.setReadOnly(true);
|
||||||
|
gender.setReadOnly(true);
|
||||||
|
status.setReadOnly(true);
|
||||||
|
ci.setReadOnly(true);
|
||||||
|
issuedIn.setReadOnly(true);
|
||||||
|
pTitle1.setReadOnly(true);
|
||||||
|
pTitle2.setReadOnly(true);
|
||||||
|
pTitle3.setReadOnly(true);
|
||||||
|
pStudy1.setReadOnly(true);
|
||||||
|
pStudy2.setReadOnly(true);
|
||||||
|
pStudy3.setReadOnly(true);
|
||||||
|
certification1.setReadOnly(true);
|
||||||
|
certification2.setReadOnly(true);
|
||||||
|
certification3.setReadOnly(true);
|
||||||
|
certification4.setReadOnly(true);
|
||||||
|
recognition.setReadOnly(true);
|
||||||
|
achievements.setReadOnly(true);
|
||||||
|
language.setReadOnly(true);
|
||||||
|
languageLevel.setReadOnly(true);
|
||||||
|
cod.setReadOnly(true);
|
||||||
|
leadManager.setReadOnly(true);
|
||||||
|
project.setReadOnly(true);
|
||||||
|
dateOfEntry.setReadOnly(true);
|
||||||
|
dateOfExit.setReadOnly(true);
|
||||||
|
contractType.setReadOnly(true);
|
||||||
|
seniority.setReadOnly(true);
|
||||||
|
salary.setReadOnly(true);
|
||||||
|
bankName.setReadOnly(true);
|
||||||
|
accountNumber.setReadOnly(true);
|
||||||
|
gpss.setReadOnly(true);
|
||||||
|
sss.setReadOnly(true);
|
||||||
|
beneficiaries.setReadOnly(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setFieldsEditable() {
|
private void setFieldsEditable() {
|
||||||
@ -296,14 +433,64 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
|
|||||||
emergencyCPhone.setReadOnly(false);
|
emergencyCPhone.setReadOnly(false);
|
||||||
emergencyCEmail.setReadOnly(false);
|
emergencyCEmail.setReadOnly(false);
|
||||||
upload.setVisible(true);
|
upload.setVisible(true);
|
||||||
|
age.setReadOnly(false);
|
||||||
|
gender.setReadOnly(false);
|
||||||
|
status.setReadOnly(false);
|
||||||
|
ci.setReadOnly(false);
|
||||||
|
issuedIn.setReadOnly(false);
|
||||||
|
pTitle1.setReadOnly(false);
|
||||||
|
pTitle2.setReadOnly(false);
|
||||||
|
pTitle3.setReadOnly(false);
|
||||||
|
pStudy1.setReadOnly(false);
|
||||||
|
pStudy2.setReadOnly(false);
|
||||||
|
pStudy3.setReadOnly(false);
|
||||||
|
certification1.setReadOnly(false);
|
||||||
|
certification2.setReadOnly(false);
|
||||||
|
certification3.setReadOnly(false);
|
||||||
|
certification4.setReadOnly(false);
|
||||||
|
recognition.setReadOnly(false);
|
||||||
|
achievements.setReadOnly(false);
|
||||||
|
language.setReadOnly(false);
|
||||||
|
languageLevel.setReadOnly(false);
|
||||||
|
cod.setReadOnly(false);
|
||||||
|
leadManager.setReadOnly(false);
|
||||||
|
project.setReadOnly(false);
|
||||||
|
dateOfEntry.setReadOnly(false);
|
||||||
|
dateOfExit.setReadOnly(false);
|
||||||
|
contractType.setReadOnly(false);
|
||||||
|
seniority.setReadOnly(false);
|
||||||
|
salary.setReadOnly(false);
|
||||||
|
bankName.setReadOnly(false);
|
||||||
|
accountNumber.setReadOnly(false);
|
||||||
|
gpss.setReadOnly(false);
|
||||||
|
sss.setReadOnly(false);
|
||||||
|
beneficiaries.setReadOnly(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected List<Component> getFormComponents() {
|
protected List<Component> getFormComponents() {
|
||||||
return List.of(
|
return List.of(
|
||||||
mt, fs, userName, firstName, lastName, status, birthday, birthCity, maritalStatus,
|
username,
|
||||||
residenceAddress, phoneNumber, personalEmail, position, team, ss, emergencyCName,
|
infoPer,
|
||||||
emergencyCAddress, emergencyCPhone, emergencyCEmail, si, upload, profileImagePreview,
|
infoGenr,
|
||||||
|
upload, profileImagePreview,
|
||||||
|
firstName, lastName,
|
||||||
|
gender, status,
|
||||||
|
birthday, age,
|
||||||
|
birthCity, residenceAddress, localAddress,
|
||||||
|
maritalStatus, ci, issuedIn, numberOfChildren,
|
||||||
|
phoneNumber, personalEmail,
|
||||||
|
cod, position, team, leadManager, project,
|
||||||
|
contEmerg, emergencyCName, emergencyCAddress, emergencyCPhone, emergencyCEmail,
|
||||||
|
infProf,
|
||||||
|
titulos, pTitle1, pTitle2, pTitle3, pStudy1, pStudy2, pStudy3,
|
||||||
|
certif, certification1, certification2, certification3, certification4,
|
||||||
|
logros, recognition, achievements,
|
||||||
|
idioma, language, languageLevel,
|
||||||
|
infoAdm,
|
||||||
|
infoCont, dateOfEntry, dateOfExit, contractType, seniority, salary,
|
||||||
|
datBanc, bankName, accountNumber,
|
||||||
|
datGest, gpss, sss, beneficiaries,
|
||||||
saveButton, editButton
|
saveButton, editButton
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.vaadin.flow.component.html.Main;
|
||||||
|
import com.vaadin.flow.router.PageTitle;
|
||||||
|
import com.vaadin.flow.router.Route;
|
||||||
|
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||||
|
import jakarta.annotation.security.PermitAll;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
|
||||||
|
@SpringComponent
|
||||||
|
@PermitAll
|
||||||
|
@Scope("prototype")
|
||||||
|
@PageTitle("GovernmentDocumentsView")
|
||||||
|
@Route(value = "/government-documents/me", layout = MainLayout.class)
|
||||||
|
public class GovernmentDocumentsView extends Main {
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
package com.primefactorsolutions.views;
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.primefactorsolutions.model.Employee;
|
||||||
import com.vaadin.flow.component.applayout.AppLayout;
|
import com.vaadin.flow.component.applayout.AppLayout;
|
||||||
import com.vaadin.flow.component.applayout.DrawerToggle;
|
import com.vaadin.flow.component.applayout.DrawerToggle;
|
||||||
import com.vaadin.flow.component.button.Button;
|
import com.vaadin.flow.component.button.Button;
|
||||||
@ -10,6 +11,7 @@ import com.vaadin.flow.component.html.Span;
|
|||||||
import com.vaadin.flow.component.orderedlayout.FlexComponent;
|
import com.vaadin.flow.component.orderedlayout.FlexComponent;
|
||||||
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
|
import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
|
||||||
import com.vaadin.flow.component.orderedlayout.Scroller;
|
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.SideNav;
|
||||||
import com.vaadin.flow.component.sidenav.SideNavItem;
|
import com.vaadin.flow.component.sidenav.SideNavItem;
|
||||||
import com.vaadin.flow.router.PageTitle;
|
import com.vaadin.flow.router.PageTitle;
|
||||||
@ -18,6 +20,8 @@ import com.vaadin.flow.theme.lumo.LumoUtility;
|
|||||||
import org.springframework.security.core.userdetails.UserDetails;
|
import org.springframework.security.core.userdetails.UserDetails;
|
||||||
import org.vaadin.lineawesome.LineAwesomeIcon;
|
import org.vaadin.lineawesome.LineAwesomeIcon;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The main view is a top-level placeholder for other views.
|
* The main view is a top-level placeholder for other views.
|
||||||
*/
|
*/
|
||||||
@ -44,10 +48,25 @@ public class MainLayout extends AppLayout {
|
|||||||
header =
|
header =
|
||||||
authContext.getAuthenticatedUser(UserDetails.class)
|
authContext.getAuthenticatedUser(UserDetails.class)
|
||||||
.map(user -> {
|
.map(user -> {
|
||||||
Button logout = new Button("Logout", click -> this.authContext.logout());
|
final Button logout = new Button("Logout", click -> this.authContext.logout());
|
||||||
Span loggedUser = new Span("Welcome " + user.getUsername());
|
final Span loggedUser = new Span("Welcome " + user.getUsername());
|
||||||
HorizontalLayout hl = new HorizontalLayout(loggedUser, logout);
|
String employeeId = "N/A";
|
||||||
|
|
||||||
|
if (user instanceof Employee) {
|
||||||
|
final UUID uuid = ((Employee) user).getId();
|
||||||
|
|
||||||
|
if (uuid != null) {
|
||||||
|
employeeId = uuid.toString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final Tooltip tooltip = Tooltip.forComponent(loggedUser)
|
||||||
|
.withText("Employee id: " + employeeId)
|
||||||
|
.withPosition(Tooltip.TooltipPosition.TOP_START);
|
||||||
|
|
||||||
|
final HorizontalLayout hl = new HorizontalLayout(loggedUser, logout);
|
||||||
hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
|
hl.setJustifyContentMode(FlexComponent.JustifyContentMode.END);
|
||||||
|
|
||||||
return hl;
|
return hl;
|
||||||
}).orElseGet(HorizontalLayout::new);
|
}).orElseGet(HorizontalLayout::new);
|
||||||
header.setAlignItems(FlexComponent.Alignment.STRETCH);
|
header.setAlignItems(FlexComponent.Alignment.STRETCH);
|
||||||
@ -88,17 +107,29 @@ public class MainLayout extends AppLayout {
|
|||||||
admin.addItem(new SideNavItem("Employees", EmployeesListView.class,
|
admin.addItem(new SideNavItem("Employees", EmployeesListView.class,
|
||||||
LineAwesomeIcon.USER_EDIT_SOLID.create()));
|
LineAwesomeIcon.USER_EDIT_SOLID.create()));
|
||||||
|
|
||||||
|
SideNavItem documents = new SideNavItem("Documents", MainView.class,
|
||||||
|
LineAwesomeIcon.FILE_ALT_SOLID.create());
|
||||||
|
documents.addItem(new SideNavItem("Personal Documents", PersonalDocumentsView.class,
|
||||||
|
LineAwesomeIcon.ID_CARD_SOLID.create()));
|
||||||
|
documents.addItem(new SideNavItem("Professional Documents", ProfessionalDocumentsView.class,
|
||||||
|
LineAwesomeIcon.BRIEFCASE_SOLID.create()));
|
||||||
|
documents.addItem(new SideNavItem("Work Documents", WorkDocumentsView.class,
|
||||||
|
LineAwesomeIcon.FOLDER_OPEN_SOLID.create()));
|
||||||
|
documents.addItem(new SideNavItem("Corporate Documents", CorporateDocumentsView.class,
|
||||||
|
LineAwesomeIcon.BUILDING_SOLID.create()));
|
||||||
|
documents.addItem(new SideNavItem("Government Documents", GovernmentDocumentsView.class,
|
||||||
|
LineAwesomeIcon.BALANCE_SCALE_SOLID.create()));
|
||||||
|
|
||||||
SideNavItem timeOff = new SideNavItem("My Time-off", TimeoffView.class,
|
SideNavItem timeOff = new SideNavItem("My Time-off", TimeoffView.class,
|
||||||
LineAwesomeIcon.PLANE_DEPARTURE_SOLID.create());
|
LineAwesomeIcon.PLANE_DEPARTURE_SOLID.create());
|
||||||
SideNavItem timesheet = new SideNavItem("My Timesheet", TimesheetView.class,
|
SideNavItem timesheet = new SideNavItem("My Timesheet", TimesheetView.class,
|
||||||
LineAwesomeIcon.HOURGLASS_START_SOLID.create());
|
LineAwesomeIcon.HOURGLASS_START_SOLID.create());
|
||||||
SideNavItem profile = new SideNavItem("My Profile", ProfileView.class,
|
SideNavItem profile = new SideNavItem("My Profile", ProfileView.class,
|
||||||
LineAwesomeIcon.USER_EDIT_SOLID.create());
|
LineAwesomeIcon.USER_EDIT_SOLID.create());
|
||||||
SideNavItem documents = new SideNavItem("My Documents", DocumentsView.class,
|
|
||||||
LineAwesomeIcon.SUITCASE_SOLID.create());
|
|
||||||
|
|
||||||
nav.addItem(new SideNavItem("Home", MainView.class, LineAwesomeIcon.HOME_SOLID.create()));
|
nav.addItem(new SideNavItem("Home", MainView.class, LineAwesomeIcon.HOME_SOLID.create()));
|
||||||
nav.addItem(admin);
|
nav.addItem(admin);
|
||||||
|
nav.addItem(documents);
|
||||||
nav.addItem(recruiting);
|
nav.addItem(recruiting);
|
||||||
nav.addItem(profile);
|
nav.addItem(profile);
|
||||||
nav.addItem(timesheet);
|
nav.addItem(timesheet);
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.vaadin.flow.component.html.Main;
|
||||||
|
import com.vaadin.flow.router.PageTitle;
|
||||||
|
import com.vaadin.flow.router.Route;
|
||||||
|
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||||
|
import jakarta.annotation.security.PermitAll;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
|
||||||
|
@SpringComponent
|
||||||
|
@PermitAll
|
||||||
|
@Scope("prototype")
|
||||||
|
@PageTitle("PersonalDocuments")
|
||||||
|
@Route(value = "/personal-documents/me", layout = MainLayout.class)
|
||||||
|
public class PersonalDocumentsView extends Main {
|
||||||
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.vaadin.flow.component.html.Main;
|
||||||
|
import com.vaadin.flow.router.PageTitle;
|
||||||
|
import com.vaadin.flow.router.Route;
|
||||||
|
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||||
|
import jakarta.annotation.security.PermitAll;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
|
||||||
|
@SpringComponent
|
||||||
|
@PermitAll
|
||||||
|
@Scope("prototype")
|
||||||
|
@PageTitle("ProfessionalDocuments")
|
||||||
|
@Route(value = "/professional-documents/me", layout = MainLayout.class)
|
||||||
|
public class ProfessionalDocumentsView extends Main {
|
||||||
|
}
|
@ -0,0 +1,16 @@
|
|||||||
|
package com.primefactorsolutions.views;
|
||||||
|
|
||||||
|
import com.vaadin.flow.component.html.Main;
|
||||||
|
import com.vaadin.flow.router.PageTitle;
|
||||||
|
import com.vaadin.flow.router.Route;
|
||||||
|
import com.vaadin.flow.spring.annotation.SpringComponent;
|
||||||
|
import jakarta.annotation.security.PermitAll;
|
||||||
|
import org.springframework.context.annotation.Scope;
|
||||||
|
|
||||||
|
@SpringComponent
|
||||||
|
@PermitAll
|
||||||
|
@Scope("prototype")
|
||||||
|
@PageTitle("WorkDocuments")
|
||||||
|
@Route(value = "/work-documents/me", layout = MainLayout.class)
|
||||||
|
public class WorkDocumentsView extends Main {
|
||||||
|
}
|
2
src/main/resources/application-test.properties
Normal file
2
src/main/resources/application-test.properties
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
spring.ldap.url=ldap://localhost:8391
|
||||||
|
spring.ldap.embedded.port=8391
|
@ -9,19 +9,21 @@ insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-
|
|||||||
|
|
||||||
insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-23fd-462f-8430-fbe67b83caab', '8a4b213c-ca81-4c38-b56d-d7028c2dde88');
|
insert into ASSESSMENT_QUESTIONS (assessment_id, question_id) values ('46b153f4-23fd-462f-8430-fbe67b83caab', '8a4b213c-ca81-4c38-b56d-d7028c2dde88');
|
||||||
|
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 1, 'bob', 'Bob', 'Test', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('cba3efb7-32bc-44be-9fdc-fc5e4f211254', 1, 'ben', 'Ben', 'Test', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('e99b7af5-7d3a-4c0f-b8bc-e8d0388d8fc4', 1, 'jperez', 'Juan', 'Perez Condori', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('f6ab3c6d-7078-45f6-9b22-4e37637bfec6', 1, 'agarcia', 'Ana', 'Garcia Rojas', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 1, 'clopez', 'Carlos', 'Lopez Mendoza', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('4b1c6c35-4627-4b35-b6e9-dc75c68b2c31', 1, 'mfernandez', 'Maria', 'Fernandez Villca', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('afc5c741-f70a-4394-853b-39d51b118927', 1, 'lgutierrez', 'Luis', 'Gutierrez Mamani', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 1, 'lmartinez', 'Laura', 'Martinez Paredes', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('6e6a8a4e-9f6b-44eb-8c69-40acfdc86756', 1, 'rsantos', 'Roberto', 'Santos Escobar', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('36b0d1c6-bdc0-4d98-94bb-08b9bce3f0d5', 1, 'vmorales', 'Valeria', 'Morales Ochoa', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('5a1c6d80-58b3-43e3-a5a5-24b4a2d1d54a', 1, 'jramirez', 'Jorge', 'Ramirez Tapia', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('9d6a5b2e-6d0b-4b89-8d6a-d3f3d1bfc047', 1, 'storres', 'Sandra', 'Torres Huanca', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('f8b3e0c0-0d5a-4e5c-bf9d-207b9b5e8279', 1, 'fquispe', 'Felipe', 'Quispe Huanca', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('cd80e1d0-9a08-44a6-bd63-2c63eaa003d4', 1, 'grivas', 'Gabriela', 'Rivas Arana', 'ACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('62d3c1b7-815e-4e96-8d7e-f8c4236bca55', 1, 'oflores', 'Oscar', 'Flores Quiroga', 'INACTIVE');
|
||||||
insert into employee (id, version, user_name, first_name, last_name, status) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE');
|
insert into employee (id, version, username, first_name, last_name, status) values ('f20b7c5a-5a67-44f0-9ec1-4c1b8e80de05', 1, 'mvargas', 'Marta', 'Vargas Soria', 'ACTIVE');
|
||||||
|
insert into employee (id, version, username, first_name, last_name, status) values ('19b5a76e-d7b1-4b76-8b02-4d0748e85809', 1, 'aespinoza', 'Andres', 'Espinoza Chura', 'INACTIVE');
|
||||||
|
insert into employee (id, version, username, first_name, last_name, status) values ('5c1a7b82-832d-4f24-8377-54b77b91b6a8', 1, 'cvillanueva', 'Carla', 'Villanueva Arce', 'ACTIVE');
|
||||||
|
@ -14,21 +14,19 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.boot.test.context.SpringBootTest;
|
import org.springframework.boot.test.context.SpringBootTest;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
||||||
import org.springframework.security.core.GrantedAuthority;
|
|
||||||
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
import org.springframework.security.core.authority.SimpleGrantedAuthority;
|
||||||
import org.springframework.security.core.context.SecurityContext;
|
import org.springframework.security.core.context.SecurityContext;
|
||||||
import org.springframework.security.core.context.SecurityContextHolder;
|
import org.springframework.security.core.context.SecurityContextHolder;
|
||||||
|
|
||||||
import com.github.mvysny.kaributesting.v10.MockVaadin;
|
|
||||||
import com.github.mvysny.kaributesting.v10.Routes;
|
import com.github.mvysny.kaributesting.v10.Routes;
|
||||||
import org.springframework.security.core.userdetails.User;
|
import org.springframework.security.core.userdetails.User;
|
||||||
import org.springframework.security.core.userdetails.UserDetails;
|
import org.springframework.test.context.ActiveProfiles;
|
||||||
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@SpringBootTest
|
@SpringBootTest
|
||||||
|
@ActiveProfiles(value = "test")
|
||||||
public class AbstractAppTests {
|
public class AbstractAppTests {
|
||||||
private static final Routes routes = new Routes().autoDiscoverViews("com.primefactorsolutions");
|
private static final Routes routes = new Routes().autoDiscoverViews("com.primefactorsolutions");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user