diff --git a/src/main/bundles/prod.bundle b/src/main/bundles/prod.bundle index 29159b1..20b94e3 100644 Binary files a/src/main/bundles/prod.bundle and b/src/main/bundles/prod.bundle differ diff --git a/src/main/java/com/primefactorsolutions/service/ReportService.java b/src/main/java/com/primefactorsolutions/service/ReportService.java index 5a42b96..c6c07eb 100644 --- a/src/main/java/com/primefactorsolutions/service/ReportService.java +++ b/src/main/java/com/primefactorsolutions/service/ReportService.java @@ -221,7 +221,8 @@ public class ReportService { employee.getMaritalStatus().toString(), String.valueOf(employee.getNumberOfChildren()), employee.getCi(), employee.getIssuedIn(), employee.getPhoneNumber(), employee.getPersonalEmail(), - employee.getPhoneNumberProfessional(), employee.getProfessionalEmail(), employee.getEmergencyCName(), + employee.getPhoneNumberProfessional(), employee.getProfessionalEmail(), + employee.getEmergencyCName(), employee.getEmergencyCAddress(), employee.getEmergencyCPhone(), employee.getEmergencyCEmail(), employee.getCod(), employee.getPosition(), employee.getTeam().getName(), employee.getLeadManager(), employee.getDateOfEntry().toString(), employee.getDateOfExit() != null ? employee.getDateOfExit() diff --git a/src/main/java/com/primefactorsolutions/views/employee/EmployeeView.java b/src/main/java/com/primefactorsolutions/views/employee/EmployeeView.java index d6ccd97..05c880a 100644 --- a/src/main/java/com/primefactorsolutions/views/employee/EmployeeView.java +++ b/src/main/java/com/primefactorsolutions/views/employee/EmployeeView.java @@ -83,8 +83,10 @@ public class EmployeeView extends BaseEntityForm implements HasUrlPara private final MemoryBuffer buffer = new MemoryBuffer(); private final Upload upload = new Upload(buffer); private final Image profileImagePreview = new Image(); - private final ElementCollectionField educationTitles = new ElementCollectionField<>(Certification.class); - private final ElementCollectionField certifications = new ElementCollectionField<>(Certification.class); + private final ElementCollectionField educationTitles = + new ElementCollectionField<>(Certification.class); + private final ElementCollectionField certifications = + new ElementCollectionField<>(Certification.class); private final TextField recognition = createTextField("Reconocimientos", 30, false); private final TextField achievements = createTextField("Logros Profesionales", 30, false); private final ElementCollectionField languages = new ElementCollectionField<>(Language.class); diff --git a/src/main/java/com/primefactorsolutions/views/timeoff/TimeOffRequestsListView.java b/src/main/java/com/primefactorsolutions/views/timeoff/TimeOffRequestsListView.java index 006f9e3..c4e51fc 100644 --- a/src/main/java/com/primefactorsolutions/views/timeoff/TimeOffRequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/timeoff/TimeOffRequestsListView.java @@ -40,7 +40,6 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UncheckedIOException; import java.time.LocalDate; -import java.time.ZoneId; import java.time.ZoneOffset; import java.time.format.DateTimeFormatter; import java.util.*; @@ -218,7 +217,8 @@ public class TimeOffRequestsListView extends BaseView { } private String getUpdated(final TimeOffRequest request) { - return DateTimeFormatter.ofPattern("yyyy/dd/MM hh:mm").format(request.getUpdated().atOffset(ZoneOffset.ofHours(-5))); + return DateTimeFormatter.ofPattern("yyyy/dd/MM hh:mm") + .format(request.getUpdated().atOffset(ZoneOffset.ofHours(-5))); } private ComboBox createEmployeeFilter() {