Merge pull request 'solicitud vacaciones priorizar primero de gestion anterior' (#72) from En-desarrollo into main

Reviewed-on: #72
Reviewed-by: alex <alex@primefactorsolutions.com>

package.json

@@ -4,7 +4,7 @@
   "type": "module",
   "dependencies": {
     "@f0rce/ace-widget": "1.0.2",
-    "@polymer/polymer": "3.5.2",
+    "@polymer/polymer": "3.5.1",
     "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
     "@vaadin/bundles": "24.5.1",
     "@vaadin/common-frontend": "0.0.19",
@@ -19,30 +19,30 @@
     "@vaadin/vaadin-usage-statistics": "2.1.3",
     "construct-style-sheets-polyfill": "3.1.0",
     "date-fns": "2.29.3",
-    "lit": "3.2.1",
+    "lit": "3.1.4",
     "print-js": "1.6.0",
     "proj4": "2.12.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.26.2"
+    "react-router-dom": "6.23.1"
   },
   "devDependencies": {
-    "@babel/preset-react": "7.25.7",
+    "@babel/preset-react": "7.24.7",
     "@preact/signals-react-transform": "0.4.0",
-    "@rollup/plugin-replace": "6.0.1",
+    "@rollup/plugin-replace": "5.0.7",
-    "@rollup/pluginutils": "5.1.2",
+    "@rollup/pluginutils": "5.1.0",
-    "@types/react": "18.3.11",
+    "@types/react": "18.3.3",
-    "@types/react-dom": "18.3.1",
+    "@types/react-dom": "18.3.0",
-    "@vitejs/plugin-react": "4.3.3",
+    "@vitejs/plugin-react": "4.3.1",
-    "async": "3.2.6",
+    "async": "3.2.5",
-    "glob": "10.4.5",
+    "glob": "10.4.1",
     "rollup-plugin-brotli": "3.1.0",
     "rollup-plugin-visualizer": "5.12.0",
     "strip-css-comments": "5.0.0",
     "transform-ast": "2.4.4",
-    "typescript": "5.6.3",
+    "typescript": "5.4.5",
-    "vite": "5.4.9",
+    "vite": "5.3.3",
-    "vite-plugin-checker": "0.8.0",
+    "vite-plugin-checker": "0.6.4",
     "workbox-build": "7.1.1",
     "workbox-core": "7.1.0",
     "workbox-precaching": "7.1.0"
@@ -50,7 +50,7 @@
   "vaadin": {
     "dependencies": {
       "@f0rce/ace-widget": "1.0.2",
-      "@polymer/polymer": "3.5.2",
+      "@polymer/polymer": "3.5.1",
       "@vaadin-component-factory/vcf-pdf-viewer": "2.0.1",
       "@vaadin/bundles": "24.5.1",
       "@vaadin/common-frontend": "0.0.19",
@@ -65,30 +65,30 @@
       "@vaadin/vaadin-usage-statistics": "2.1.3",
       "construct-style-sheets-polyfill": "3.1.0",
       "date-fns": "2.29.3",
-      "lit": "3.2.1",
+      "lit": "3.1.4",
       "print-js": "1.6.0",
       "proj4": "2.12.1",
       "react": "18.3.1",
       "react-dom": "18.3.1",
-      "react-router-dom": "6.26.2"
+      "react-router-dom": "6.23.1"
     },
     "devDependencies": {
-      "@babel/preset-react": "7.25.7",
+      "@babel/preset-react": "7.24.7",
       "@preact/signals-react-transform": "0.4.0",
-      "@rollup/plugin-replace": "6.0.1",
+      "@rollup/plugin-replace": "5.0.7",
-      "@rollup/pluginutils": "5.1.2",
+      "@rollup/pluginutils": "5.1.0",
-      "@types/react": "18.3.11",
+      "@types/react": "18.3.3",
-      "@types/react-dom": "18.3.1",
+      "@types/react-dom": "18.3.0",
-      "@vitejs/plugin-react": "4.3.3",
+      "@vitejs/plugin-react": "4.3.1",
-      "async": "3.2.6",
+      "async": "3.2.5",
-      "glob": "10.4.5",
+      "glob": "10.4.1",
       "rollup-plugin-brotli": "3.1.0",
       "rollup-plugin-visualizer": "5.12.0",
       "strip-css-comments": "5.0.0",
       "transform-ast": "2.4.4",
-      "typescript": "5.6.3",
+      "typescript": "5.4.5",
-      "vite": "5.4.9",
+      "vite": "5.3.3",
-      "vite-plugin-checker": "0.8.0",
+      "vite-plugin-checker": "0.6.4",
       "workbox-build": "7.1.1",
       "workbox-core": "7.1.0",
       "workbox-precaching": "7.1.0"

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

@@ -136,11 +136,24 @@ public class RequestRegisterView extends VerticalLayout {
                 .filter(category -> isCategoryAvailable(employeeRequests, category))
                 .filter(category -> isCategoryAllowedByGender(category, employee.getGender()))
                 .filter(category -> category != TimeOffRequestType.TODOS)
+                .filter(category -> shouldIncludeVacationGestionActual(employeeRequests, category)) // Nueva condición
                 .toList();
 
         categoryComboBox.setItems(availableCategories);
     }
 
+
+    private boolean shouldIncludeVacationGestionActual(final List<TimeOffRequest> employeeRequests,
+                                                       final TimeOffRequestType category) {
+        if (category != TimeOffRequestType.VACACION_GESTION_ACTUAL) {
+            return true;
+        }
+        return employeeRequests.stream()
+                .anyMatch(request -> request.getCategory() == TimeOffRequestType.VACACION_GESTION_ANTERIOR
+                        && request.getDaysBalance() == 0
+                        && request.getState() == TimeOffRequestStatus.TOMADO);
+    }
+
     private void onCategoryChange(final TimeOffRequestType selectedCategory) {
         if (selectedCategory == TimeOffRequestType.VACACION_GESTION_ACTUAL
             || selectedCategory == TimeOffRequestType.VACACION_GESTION_ANTERIOR) {

src/main/resources/data.sql

@@ -78,7 +78,7 @@ values ('9c6f12ba-e333-4e7a-b8a6-caa0982bd8c3', 1, '5c6f11fe-c341-4be7-a9a6-bba0
 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-e444-4e7a-b8a6-caa0982bd8d4', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VIERNES_SANTO', 'APROBADO', 1, '2024-03-29', '2024-03-29', '2024-03-29', 1, 0);
 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 ('9e6f12ba-e555-4e7a-b8a6-caa0982bd8e5', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VACACION_GESTION_ACTUAL', 'APROBADO', 30, '2025-11-01', '2023-11-01', '2023-11-30', 30, 0);
+values ('9e6f12ba-e555-4e7a-b8a6-caa0982bd8e5', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VACACION_GESTION_ANTERIOR', 'APROBADO', 30, '2024-11-01', '2022-11-01', '2022-11-30', 30, 0);
 
 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', 'DIA_DEL_TRABAJADOR', 'APROBADO', 1, '2024-05-01', '2024-05-01', '2024-05-01', 1, 0);