From c0cc1e86de5b85a22330c57b45a8191d34ad21ae Mon Sep 17 00:00:00 2001 From: ricardo051199 Date: Thu, 31 Oct 2024 01:42:33 -0400 Subject: [PATCH] =?UTF-8?q?Categoria=20vacaciones=20-=20traducirlo=20al=20?= =?UTF-8?q?espa=C3=B1ol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/TimeOffRequestType.java | 46 +++++++++---------- .../views/RequestRegisterView.java | 34 +++++++------- .../views/RequestsListView.java | 14 +++--- 3 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/primefactorsolutions/model/TimeOffRequestType.java b/src/main/java/com/primefactorsolutions/model/TimeOffRequestType.java index 32277b8..0b9d245 100644 --- a/src/main/java/com/primefactorsolutions/model/TimeOffRequestType.java +++ b/src/main/java/com/primefactorsolutions/model/TimeOffRequestType.java @@ -1,29 +1,29 @@ package com.primefactorsolutions.model; public enum TimeOffRequestType { - ALL, - NEW_YEAR, - MONDAY_CARNIVAL, - TUESDAY_CARNIVAL, - GOOD_FRIDAY, - LABOR_DAY, - INDEPENDENCE_DAY, - CHRISTMAS, - PRURINATIONAL_STATE_DAY, + TODOS, + AÑO_NUEVO, + LUNES_CARNAVAL, + MARTES_CARNAVAL, + VIERNES_SANTO, + DIA_DEL_TRABAJADOR, + DIA_DE_LA_INDEPENDENCIA, + NAVIDAD, + DIA_DEL_ESTADO_PLURINACIONAL, CORPUS_CHRISTI, - ANDEAN_NEW_YEAR, - DEPARTMENTAL_ANNIVERSARY, - ALL_SOULS_DAY, + AÑO_NUEVO_ANDINO, + ANIVERSARIO_DEPARTAMENTAL, + DIA_DE_TODOS_LOS_DIFUNTOS, - BIRTHDAY, - MATERNITY, - PATERNITY, - MARRIAGE, - FATHERS_DAY, - MOTHERS_DAY, - INTERNATIONAL_WOMENS_DAY, - NATIONAL_WOMENS_DAY, - HEALTH_PERMIT, - VACATION_CURRENT_MANAGEMENT, - VACATION_PREVIOUS_MANAGEMENT, + CUMPLEAÑOS, + MATERNIDAD, + PATERNIDAD, + MATRIMONIO, + DIA_DEL_PADRE, + DIA_DE_LA_MADRE, + DIA_DE_LA_MUJER_INTERNACIONAL, + DIA_DE_LA_MUJER_NACIONAL, + PERMISOS_DE_SALUD, + VACACION_GESTION_ACTUAL, + VACACION_GESTION_ANTERIOR, } diff --git a/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java b/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java index 304b84f..fcb1d66 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java @@ -145,9 +145,9 @@ public class RequestRegisterView extends VerticalLayout { .max(Comparator.comparing(TimeOffRequest::getStartDate)) .orElse(null); - if (category == TimeOffRequestType.HEALTH_PERMIT - || category == TimeOffRequestType.VACATION_CURRENT_MANAGEMENT - || category == TimeOffRequestType.VACATION_PREVIOUS_MANAGEMENT) { + if (category == TimeOffRequestType.PERMISOS_DE_SALUD + || category == TimeOffRequestType.VACACION_GESTION_ACTUAL + || category == TimeOffRequestType.VACACION_GESTION_ANTERIOR) { return latestRequest.getState() == TimeOffRequestStatus.VENCIDO || (latestRequest.getState() == TimeOffRequestStatus.TOMADO && latestRequest.getDaysBalance() > 0); } else { @@ -157,13 +157,13 @@ public class RequestRegisterView extends VerticalLayout { private boolean isCategoryAllowedByGender(final TimeOffRequestType category, final Employee.Gender gender) { if (gender == Employee.Gender.MALE) { - return category != TimeOffRequestType.MATERNITY - && category != TimeOffRequestType.MOTHERS_DAY - && category != TimeOffRequestType.INTERNATIONAL_WOMENS_DAY - && category != TimeOffRequestType.NATIONAL_WOMENS_DAY; + return category != TimeOffRequestType.MATERNIDAD + && category != TimeOffRequestType.DIA_DE_LA_MADRE + && category != TimeOffRequestType.DIA_DE_LA_MUJER_INTERNACIONAL + && category != TimeOffRequestType.DIA_DE_LA_MUJER_NACIONAL; } else { - return category != TimeOffRequestType.FATHERS_DAY - && category != TimeOffRequestType.PATERNITY; + return category != TimeOffRequestType.DIA_DEL_PADRE + && category != TimeOffRequestType.PATERNIDAD; } } @@ -190,7 +190,7 @@ public class RequestRegisterView extends VerticalLayout { } else if (requestWithBalance.getState() == TimeOffRequestStatus.VENCIDO) { availableDaysField.setValue(vacation.getDuration()); } - } else if (vacation.getCategory() == TimeOffRequestType.VACATION_CURRENT_MANAGEMENT) { + } else if (vacation.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL) { LocalDate dateOfEntry = employeeComboBox.getValue().getDateOfEntry(); LocalDate currentDate = LocalDate.now(); long yearsOfService = ChronoUnit.YEARS.between(dateOfEntry, currentDate); @@ -244,13 +244,13 @@ public class RequestRegisterView extends VerticalLayout { vacation.getDayOfMonth().intValue()); endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1); } else { - if (vacation.getCategory() == TimeOffRequestType.BIRTHDAY && employee.getBirthday() != null) { + if (vacation.getCategory() == TimeOffRequestType.CUMPLEAÑOS && employee.getBirthday() != null) { startDate = LocalDate.of( startYear, employee.getBirthday().getMonth(), employee.getBirthday().getDayOfMonth()); endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1); - } else if (vacation.getCategory() == TimeOffRequestType.HEALTH_PERMIT) { + } else if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD) { startDate = LocalDate.now(); endDate = LocalDate.of(startYear, 12, 31); } else { @@ -260,7 +260,7 @@ public class RequestRegisterView extends VerticalLayout { startDatePicker.setValue(startDate); if ((vacation.getDuration() != null && vacation.getDuration() == 0.5) - || vacation.getCategory() == TimeOffRequestType.HEALTH_PERMIT) { + || vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD) { endDatePicker.setValue(startDate); } else { int durationDays = (vacation.getDuration() != null ? vacation.getDuration().intValue() - 1 : 0); @@ -291,7 +291,7 @@ public class RequestRegisterView extends VerticalLayout { if (startDate != null && endDate != null) { double daysToBeTaken = java.time.temporal.ChronoUnit.DAYS.between(startDate, endDate) + 1; - if (vacation.getCategory() == TimeOffRequestType.HEALTH_PERMIT || vacation.getDuration() == 0.5) { + if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD || vacation.getDuration() == 0.5) { daysToBeTakenField.setValue(0.5); } else { daysToBeTakenField.setValue(daysToBeTaken); @@ -335,7 +335,7 @@ public class RequestRegisterView extends VerticalLayout { List existingRequests = requestService.findByEmployeeAndCategory(employee.getId(), request.getCategory()); - int maxRequests = request.getCategory() == TimeOffRequestType.HEALTH_PERMIT ? 4 : 2; + int maxRequests = request.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD ? 4 : 2; if (existingRequests.size() >= maxRequests) { existingRequests.stream() @@ -355,8 +355,8 @@ public class RequestRegisterView extends VerticalLayout { List requests = requestService.findByEmployeeAndCategory( newRequest.getEmployee().getId(), newRequest.getCategory()); - if (vacation.getCategory() == TimeOffRequestType.HEALTH_PERMIT - && vacation.getCategory() == TimeOffRequestType.VACATION_CURRENT_MANAGEMENT) { + if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD + && vacation.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL) { for (TimeOffRequest request : requests) { double newBalance = request.getDaysBalance() - newRequest.getDaysToBeTake(); request.setDaysBalance(newBalance); diff --git a/src/main/java/com/primefactorsolutions/views/RequestsListView.java b/src/main/java/com/primefactorsolutions/views/RequestsListView.java index 7721c1c..facfb69 100644 --- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java +++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java @@ -170,18 +170,18 @@ public class RequestsListView extends Main { private Set getExcludedCategories() { return Set.of( - TimeOffRequestType.MATERNITY, - TimeOffRequestType.PATERNITY, - TimeOffRequestType.MARRIAGE, - TimeOffRequestType.FATHERS_DAY, - TimeOffRequestType.MOTHERS_DAY + TimeOffRequestType.MATERNIDAD, + TimeOffRequestType.PATERNIDAD, + TimeOffRequestType.MATRIMONIO, + TimeOffRequestType.DIA_DEL_PADRE, + TimeOffRequestType.DIA_DE_LA_MADRE ); } private Set getGenderSpecificExclusions() { return Set.of( - TimeOffRequestType.INTERNATIONAL_WOMENS_DAY, - TimeOffRequestType.NATIONAL_WOMENS_DAY + TimeOffRequestType.DIA_DE_LA_MUJER_INTERNACIONAL, + TimeOffRequestType.DIA_DE_LA_MUJER_NACIONAL ); }