This commit is contained in:
parent
368b176892
commit
9188913cf4
Binary file not shown.
@ -221,7 +221,8 @@ public class ReportService {
|
|||||||
employee.getMaritalStatus().toString(), String.valueOf(employee.getNumberOfChildren()),
|
employee.getMaritalStatus().toString(), String.valueOf(employee.getNumberOfChildren()),
|
||||||
employee.getCi(),
|
employee.getCi(),
|
||||||
employee.getIssuedIn(), employee.getPhoneNumber(), employee.getPersonalEmail(),
|
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.getEmergencyCAddress(), employee.getEmergencyCPhone(), employee.getEmergencyCEmail(),
|
||||||
employee.getCod(), employee.getPosition(), employee.getTeam().getName(), employee.getLeadManager(),
|
employee.getCod(), employee.getPosition(), employee.getTeam().getName(), employee.getLeadManager(),
|
||||||
employee.getDateOfEntry().toString(), employee.getDateOfExit() != null ? employee.getDateOfExit()
|
employee.getDateOfEntry().toString(), employee.getDateOfExit() != null ? employee.getDateOfExit()
|
||||||
|
@ -83,8 +83,10 @@ public class EmployeeView extends BaseEntityForm<Employee> implements HasUrlPara
|
|||||||
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();
|
||||||
private final ElementCollectionField<Certification> educationTitles = new ElementCollectionField<>(Certification.class);
|
private final ElementCollectionField<Certification> educationTitles =
|
||||||
private final ElementCollectionField<Certification> certifications = new ElementCollectionField<>(Certification.class);
|
new ElementCollectionField<>(Certification.class);
|
||||||
|
private final ElementCollectionField<Certification> certifications =
|
||||||
|
new ElementCollectionField<>(Certification.class);
|
||||||
private final TextField recognition = createTextField("Reconocimientos", 30, false);
|
private final TextField recognition = createTextField("Reconocimientos", 30, false);
|
||||||
private final TextField achievements = createTextField("Logros Profesionales", 30, false);
|
private final TextField achievements = createTextField("Logros Profesionales", 30, false);
|
||||||
private final ElementCollectionField<Language> languages = new ElementCollectionField<>(Language.class);
|
private final ElementCollectionField<Language> languages = new ElementCollectionField<>(Language.class);
|
||||||
|
@ -40,7 +40,6 @@ import java.io.ByteArrayOutputStream;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.UncheckedIOException;
|
import java.io.UncheckedIOException;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.ZoneId;
|
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@ -218,7 +217,8 @@ public class TimeOffRequestsListView extends BaseView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private String getUpdated(final TimeOffRequest request) {
|
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<Employee> createEmployeeFilter() {
|
private ComboBox<Employee> createEmployeeFilter() {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user