improve tables layout

change list page size
fix file upload
2024-11-17 17:15:58 -05:00 · 2024-11-17 16:37:57 -05:00 · 2024-11-17 16:15:08 -05:00 · 2024-11-15 11:42:46 -05:00 · 2024-11-15 16:40:49 +00:00 · 2024-11-15 12:34:43 -04:00
40 changed files with 1335 additions and 1380 deletions
--- a/package-lock.json
+++ b/package-lock.json
@ -8,7 +8,7 @@
      "license": "UNLICENSED",
      "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",
@ -23,30 +23,29 @@
        "@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",
-        "@preact/signals-react-transform": "0.4.0",
-        "@rollup/plugin-replace": "6.0.1",
-        "@rollup/pluginutils": "5.1.2",
-        "@types/react": "18.3.11",
-        "@types/react-dom": "18.3.1",
-        "@vitejs/plugin-react": "4.3.3",
-        "async": "3.2.6",
-        "glob": "10.4.5",
+        "@babel/preset-react": "7.24.7",
+        "@rollup/plugin-replace": "5.0.7",
+        "@rollup/pluginutils": "5.1.0",
+        "@types/react": "18.3.3",
+        "@types/react-dom": "18.3.0",
+        "@vitejs/plugin-react": "4.3.1",
+        "async": "3.2.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",
-        "vite": "5.4.9",
-        "vite-plugin-checker": "0.8.0",
+        "typescript": "5.4.5",
+        "vite": "5.3.3",
+        "vite-plugin-checker": "0.6.4",
        "workbox-build": "7.1.1",
        "workbox-core": "7.1.0",
        "workbox-precaching": "7.1.0"
@ -1810,18 +1809,17 @@
      }
    },
    "node_modules/@babel/preset-react": {
-      "version": "7.25.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.25.7.tgz",
-      "integrity": "sha512-GjV0/mUEEXpi1U5ZgDprMRRgajGMRW3G5FjMr5KLKD8nT2fTG8+h/klV3+6Dm5739QE+K5+2e91qFKAYI3pmRg==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.24.7.tgz",
+      "integrity": "sha512-AAH4lEkpmzFWrGVlHaxJB7RLH21uPQ9+He+eFLWHmF9IuFQVugz8eAsamaW0DXRrTfco5zj1wWtpdcXJUOfsag==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.7",
-        "@babel/helper-validator-option": "^7.25.7",
-        "@babel/plugin-transform-react-display-name": "^7.25.7",
-        "@babel/plugin-transform-react-jsx": "^7.25.7",
-        "@babel/plugin-transform-react-jsx-development": "^7.25.7",
-        "@babel/plugin-transform-react-pure-annotations": "^7.25.7"
+        "@babel/helper-plugin-utils": "^7.24.7",
+        "@babel/helper-validator-option": "^7.24.7",
+        "@babel/plugin-transform-react-display-name": "^7.24.7",
+        "@babel/plugin-transform-react-jsx": "^7.24.7",
+        "@babel/plugin-transform-react-jsx-development": "^7.24.7",
+        "@babel/plugin-transform-react-pure-annotations": "^7.24.7"
      },
      "engines": {
        "node": ">=6.9.0"
@ -2467,70 +2465,17 @@
      }
    },
    "node_modules/@polymer/polymer": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.5.2.tgz",
-      "integrity": "sha512-fWwImY/UH4bb2534DVSaX+Azs2yKg8slkMBHOyGeU2kKx7Xmxp6Lee0jP8p6B3d7c1gFUPB2Z976dTUtX81pQA==",
-      "license": "BSD-3-Clause",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/@polymer/polymer/-/polymer-3.5.1.tgz",
+      "integrity": "sha512-JlAHuy+1qIC6hL1ojEUfIVD58fzTpJAoCxFwV5yr0mYTXV1H8bz5zy0+rC963Cgr9iNXQ4T9ncSjC2fkF9BQfw==",
      "dependencies": {
        "@webcomponents/shadycss": "^1.9.1"
      }
    },
-    "node_modules/@preact/signals-core": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.8.0.tgz",
-      "integrity": "sha512-OBvUsRZqNmjzCZXWLxkZfhcgT+Fk8DDcT/8vD6a1xhDemodyy87UJRJfASMuSD8FaAIeGgGm85ydXhm7lr4fyA==",
-      "dev": true,
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      }
-    },
-    "node_modules/@preact/signals-react": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@preact/signals-react/-/signals-react-2.2.0.tgz",
-      "integrity": "sha512-EPYlhXqqcOUxz2gTQGt4rtK6X7Jr04517DcJVZ4I5a7Gxy39haK24uFeVWtiU/tnEReRFcxpQN6poYra1jf68A==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@preact/signals-core": "^1.7.0",
-        "use-sync-external-store": "^1.2.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      },
-      "peerDependencies": {
-        "react": "^16.14.0 || 17.x || 18.x"
-      }
-    },
-    "node_modules/@preact/signals-react-transform": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/@preact/signals-react-transform/-/signals-react-transform-0.4.0.tgz",
-      "integrity": "sha512-ZH8u5VrFPMmxggjAr7Rl9OLi3yvyDGi4lGQulftkszuiJB15jVy/MMraIfNvWKf2RfjtHLvp3K6Jk19xO/j7Tw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@babel/helper-module-imports": "^7.22.5",
-        "@babel/helper-plugin-utils": "^7.22.5",
-        "@preact/signals-react": "^2.1.0",
-        "debug": "^4.3.4",
-        "use-sync-external-store": "^1.2.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/preact"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "react": "^16.14.0 || 17.x || 18.x"
-      }
-    },
    "node_modules/@remix-run/router": {
-      "version": "1.19.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.19.2.tgz",
-      "integrity": "sha512-baiMx18+IMuD1yyvOGaHM9QrVUPGGG0jC+z+IPHnRJWUAUvaKuWKyE8gjDj2rzv3sz9zOGoRSPgeBVHRhZnBlA==",
-      "license": "MIT",
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.16.1.tgz",
+      "integrity": "sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==",
      "engines": {
        "node": ">=14.0.0"
      }
@ -2561,11 +2506,10 @@
      }
    },
    "node_modules/@rollup/plugin-replace": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-6.0.1.tgz",
-      "integrity": "sha512-2sPh9b73dj5IxuMmDAsQWVFT7mR+yoHweBaXG2W/R8vQ+IWZlnaI7BR7J6EguVQUp1hd8Z7XuozpDjEKQAAC2Q==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-5.0.7.tgz",
+      "integrity": "sha512-PqxSfuorkHz/SPpyngLyg5GCEkOcee9M1bkxiVDr41Pd61mqP1PLOoDPbpl44SB2mQGKwV/In74gqQmGITOhEQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@rollup/pluginutils": "^5.0.1",
        "magic-string": "^0.30.3"
@ -2605,11 +2549,10 @@
      }
    },
    "node_modules/@rollup/pluginutils": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.2.tgz",
-      "integrity": "sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.1.0.tgz",
+      "integrity": "sha512-XTIWOPPcpvyKI6L1NHo0lFlCyznUEyPmPY1mc3KpPVDYulHSTvyeLNVW00QTLIAFNhR3kYnJTQHeGqU4M3n09g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@types/estree": "^1.0.0",
        "estree-walker": "^2.0.2",
@ -2986,21 +2929,19 @@
      "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q=="
    },
    "node_modules/@types/react": {
-      "version": "18.3.11",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.11.tgz",
-      "integrity": "sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==",
-      "license": "MIT",
+      "version": "18.3.3",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz",
+      "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==",
      "dependencies": {
        "@types/prop-types": "*",
        "csstype": "^3.0.2"
      }
    },
    "node_modules/@types/react-dom": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.1.tgz",
-      "integrity": "sha512-qW1Mfv8taImTthu4KoXgDfLuk4bydU6Q/TkADnDWWHwi4NX4BR+LWfTp2sVmTqRrsHvyDDTelgelxJ+SsejKKQ==",
+      "version": "18.3.0",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz",
+      "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==",
      "devOptional": true,
-      "license": "MIT",
      "dependencies": {
        "@types/react": "*"
      }
@ -4499,15 +4440,14 @@
      }
    },
    "node_modules/@vitejs/plugin-react": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.3.tgz",
-      "integrity": "sha512-NooDe9GpHGqNns1i8XDERg0Vsg5SSYRhRxxyTGogUdkdNt47jal+fbuYi+Yfq6pzRCKXyoPcWisfxE6RIM3GKA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz",
+      "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/plugin-transform-react-jsx-self": "^7.24.7",
-        "@babel/plugin-transform-react-jsx-source": "^7.24.7",
+        "@babel/core": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-self": "^7.24.5",
+        "@babel/plugin-transform-react-jsx-source": "^7.24.1",
        "@types/babel__core": "^7.20.5",
        "react-refresh": "^0.14.2"
      },
@ -4684,11 +4624,10 @@
      }
    },
    "node_modules/async": {
-      "version": "3.2.6",
-      "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz",
-      "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==",
-      "dev": true,
-      "license": "MIT"
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz",
+      "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==",
+      "dev": true
    },
    "node_modules/at-least-node": {
      "version": "1.0.0",
@ -6114,22 +6053,23 @@
      }
    },
    "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.1.tgz",
+      "integrity": "sha512-2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==",
      "dev": true,
-      "license": "ISC",
      "dependencies": {
        "foreground-child": "^3.1.0",
        "jackspeak": "^3.1.2",
        "minimatch": "^9.0.4",
        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
        "path-scurry": "^1.11.1"
      },
      "bin": {
        "glob": "dist/esm/bin.mjs"
      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
      "funding": {
        "url": "https://github.com/sponsors/isaacs"
      }
@ -7072,14 +7012,13 @@
      "peer": true
    },
    "node_modules/lit": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/lit/-/lit-3.2.1.tgz",
-      "integrity": "sha512-1BBa1E/z0O9ye5fZprPtdqnc0BFzxIxTTOO/tQFmyC/hj1O3jL4TfmLBw0WEwjAokdLwpclkvGgDJwTIh0/22w==",
-      "license": "BSD-3-Clause",
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/lit/-/lit-3.1.4.tgz",
+      "integrity": "sha512-q6qKnKXHy2g1kjBaNfcoLlgbI3+aSOZ9Q4tiGa9bGYXq5RBXxkVTqTIVmP2VWMp29L4GyvCFm8ZQ2o56eUAMyA==",
      "dependencies": {
        "@lit/reactive-element": "^2.0.4",
-        "lit-element": "^4.1.0",
-        "lit-html": "^3.2.0"
+        "lit-element": "^4.0.4",
+        "lit-html": "^3.1.2"
      }
    },
    "node_modules/lit-element": {
@ -7629,13 +7568,6 @@
        "node": ">=6"
      }
    },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-      "dev": true,
-      "license": "BlueOak-1.0.0"
-    },
    "node_modules/pako": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/pako/-/pako-2.1.0.tgz",
@ -7938,12 +7870,11 @@
      }
    },
    "node_modules/react-router": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.26.2.tgz",
-      "integrity": "sha512-tvN1iuT03kHgOFnLPfLJ8V95eijteveqdOSk+srqfePtQvqCExB8eHOYnlilbOcyJyKnYkr1vJvf7YqotAJu1A==",
-      "license": "MIT",
+      "version": "6.23.1",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.23.1.tgz",
+      "integrity": "sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==",
      "dependencies": {
-        "@remix-run/router": "1.19.2"
+        "@remix-run/router": "1.16.1"
      },
      "engines": {
        "node": ">=14.0.0"
@ -7953,13 +7884,12 @@
      }
    },
    "node_modules/react-router-dom": {
-      "version": "6.26.2",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.26.2.tgz",
-      "integrity": "sha512-z7YkaEW0Dy35T3/QKPYB1LjMK2R1fxnHO8kWpUMTBdfVzZrWOiY9a7CtN8HqdWtDUWd5FY6Dl8HFsqVwH4uOtQ==",
-      "license": "MIT",
+      "version": "6.23.1",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.23.1.tgz",
+      "integrity": "sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==",
      "dependencies": {
-        "@remix-run/router": "1.19.2",
-        "react-router": "6.26.2"
+        "@remix-run/router": "1.16.1",
+        "react-router": "6.23.1"
      },
      "engines": {
        "node": ">=14.0.0"
@ -9115,11 +9045,10 @@
      }
    },
    "node_modules/typescript": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-      "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+      "version": "5.4.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
+      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
      "dev": true,
-      "license": "Apache-2.0",
      "bin": {
        "tsc": "bin/tsc",
        "tsserver": "bin/tsserver"
@ -9254,16 +9183,6 @@
        "punycode": "^2.1.0"
      }
    },
-    "node_modules/use-sync-external-store": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz",
-      "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==",
-      "dev": true,
-      "license": "MIT",
-      "peerDependencies": {
-        "react": "^16.8.0 || ^17.0.0 || ^18.0.0"
-      }
-    },
    "node_modules/validate-npm-package-license": {
      "version": "3.0.4",
      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
@ -9277,15 +9196,14 @@
      }
    },
    "node_modules/vite": {
-      "version": "5.4.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.9.tgz",
-      "integrity": "sha512-20OVpJHh0PAM0oSOELa5GaZNWeDjcAvQjGXy2Uyr+Tp+/D2/Hdz6NLgpJLsarPTA2QJ6v8mX2P1ZfbsSKvdMkg==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.3.tgz",
+      "integrity": "sha512-NPQdeCU0Dv2z5fu+ULotpuq5yfCS1BzKUIPhNbP3YBfAMGJXbt2nS+sbTFu+qchaqWTD+H3JK++nRwr6XIcp6A==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "esbuild": "^0.21.3",
-        "postcss": "^8.4.43",
-        "rollup": "^4.20.0"
+        "postcss": "^8.4.39",
+        "rollup": "^4.13.0"
      },
      "bin": {
        "vite": "bin/vite.js"
@ -9304,7 +9222,6 @@
        "less": "*",
        "lightningcss": "^1.21.0",
        "sass": "*",
-        "sass-embedded": "*",
        "stylus": "*",
        "sugarss": "*",
        "terser": "^5.4.0"
@ -9322,9 +9239,6 @@
        "sass": {
          "optional": true
        },
-        "sass-embedded": {
-          "optional": true
-        },
        "stylus": {
          "optional": true
        },
@ -9337,11 +9251,10 @@
      }
    },
    "node_modules/vite-plugin-checker": {
-      "version": "0.8.0",
-      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.8.0.tgz",
-      "integrity": "sha512-UA5uzOGm97UvZRTdZHiQVYFnd86AVn8EVaD4L3PoVzxH+IZSfaAw14WGFwX9QS23UW3lV/5bVKZn6l0w+q9P0g==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/vite-plugin-checker/-/vite-plugin-checker-0.6.4.tgz",
+      "integrity": "sha512-2zKHH5oxr+ye43nReRbC2fny1nyARwhxdm0uNYp/ERy4YvU9iZpNOsueoi/luXw5gnpqRSvjcEPxXbS153O2wA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@babel/code-frame": "^7.12.13",
        "ansi-escapes": "^4.3.0",
@ -9351,6 +9264,7 @@
        "fast-glob": "^3.2.7",
        "fs-extra": "^11.1.0",
        "npm-run-path": "^4.0.1",
+        "semver": "^7.5.0",
        "strip-ansi": "^6.0.0",
        "tiny-invariant": "^1.1.0",
        "vscode-languageclient": "^7.0.0",
@ -9362,7 +9276,6 @@
        "node": ">=14.16"
      },
      "peerDependencies": {
-        "@biomejs/biome": ">=1.7",
        "eslint": ">=7",
        "meow": "^9.0.0",
        "optionator": "^0.9.1",
@ -9371,12 +9284,9 @@
        "vite": ">=2.0.0",
        "vls": "*",
        "vti": "*",
-        "vue-tsc": "~2.1.6"
+        "vue-tsc": ">=1.3.9"
      },
      "peerDependenciesMeta": {
-        "@biomejs/biome": {
-          "optional": true
-        },
        "eslint": {
          "optional": true
        },
@ -9470,6 +9380,18 @@
        "node": ">=8"
      }
    },
+    "node_modules/vite-plugin-checker/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/vite-plugin-checker/node_modules/strip-ansi": {
      "version": "6.0.1",
      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
--- a/package.json
+++ b/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,29 @@
    "@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",
-    "@preact/signals-react-transform": "0.4.0",
-    "@rollup/plugin-replace": "6.0.1",
-    "@rollup/pluginutils": "5.1.2",
-    "@types/react": "18.3.11",
-    "@types/react-dom": "18.3.1",
-    "@vitejs/plugin-react": "4.3.3",
-    "async": "3.2.6",
-    "glob": "10.4.5",
+    "@babel/preset-react": "7.24.7",
+    "@rollup/plugin-replace": "5.0.7",
+    "@rollup/pluginutils": "5.1.0",
+    "@types/react": "18.3.3",
+    "@types/react-dom": "18.3.0",
+    "@vitejs/plugin-react": "4.3.1",
+    "async": "3.2.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",
-    "vite": "5.4.9",
-    "vite-plugin-checker": "0.8.0",
+    "typescript": "5.4.5",
+    "vite": "5.3.3",
+    "vite-plugin-checker": "0.6.4",
    "workbox-build": "7.1.1",
    "workbox-core": "7.1.0",
    "workbox-precaching": "7.1.0"
@ -50,7 +49,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,35 +64,34 @@
      "@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",
-      "@preact/signals-react-transform": "0.4.0",
-      "@rollup/plugin-replace": "6.0.1",
-      "@rollup/pluginutils": "5.1.2",
-      "@types/react": "18.3.11",
-      "@types/react-dom": "18.3.1",
-      "@vitejs/plugin-react": "4.3.3",
-      "async": "3.2.6",
-      "glob": "10.4.5",
+      "@babel/preset-react": "7.24.7",
+      "@rollup/plugin-replace": "5.0.7",
+      "@rollup/pluginutils": "5.1.0",
+      "@types/react": "18.3.3",
+      "@types/react-dom": "18.3.0",
+      "@vitejs/plugin-react": "4.3.1",
+      "async": "3.2.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",
-      "vite": "5.4.9",
-      "vite-plugin-checker": "0.8.0",
+      "typescript": "5.4.5",
+      "vite": "5.3.3",
+      "vite-plugin-checker": "0.6.4",
      "workbox-build": "7.1.1",
      "workbox-core": "7.1.0",
      "workbox-precaching": "7.1.0"
    },
-    "hash": "2dc40a4f634ae025081ca2239cba00b14a35fe94ab78ac0a4dd3023d882081d5"
+    "hash": "1a0f17d48b329307b5862bc57499307d1b89f7d89260121c2b7189f76957c436"
  },
  "overrides": {
    "@vaadin/bundles": "$@vaadin/bundles",
--- a/pom.xml
+++ b/pom.xml
@ -120,6 +120,11 @@
            <artifactId>commons-beanutils</artifactId>
            <version>1.9.4</version>
        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.17.0</version>
+        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-core</artifactId>
@ -265,11 +270,39 @@
            <artifactId>maven-surefire-plugin</artifactId>
            <version>3.3.1</version>
        </dependency>
+        <dependency>
+            <groupId>io.github.git-commit-id</groupId>
+            <artifactId>git-commit-id-maven-plugin</artifactId>
+            <version>9.0.1</version>
+        </dependency>
    </dependencies>

    <build>
        <defaultGoal>spring-boot:run</defaultGoal>
        <plugins>
+            <plugin>
+                <groupId>io.github.git-commit-id</groupId>
+                <artifactId>git-commit-id-maven-plugin</artifactId>
+                <version>9.0.1</version>
+                <executions>
+                    <execution>
+                        <id>get-the-git-infos</id>
+                        <goals>
+                            <goal>revision</goal>
+                        </goals>
+                        <phase>initialize</phase>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generateGitPropertiesFile>true</generateGitPropertiesFile>
+                    <generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
+                    <includeOnlyProperties>
+                        <includeOnlyProperty>^git.build.(time|version)$</includeOnlyProperty>
+                        <includeOnlyProperty>^git.commit.id.(abbrev|full)$</includeOnlyProperty>
+                    </includeOnlyProperties>
+                    <commitIdGenerationMode>full</commitIdGenerationMode>
+                </configuration>
+            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-checkstyle-plugin</artifactId>
--- a/src/main/bundles/prod.bundle
+++ b/src/main/bundles/prod.bundle
--- a/src/main/java/com/primefactorsolutions/Application.java
+++ b/src/main/java/com/primefactorsolutions/Application.java
@ -4,7 +4,6 @@ import com.vaadin.flow.component.page.AppShellConfigurator;
 import com.vaadin.flow.theme.Theme;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-
 /**
 * The entry point of the Spring Boot application.
 *
--- a/src/main/java/com/primefactorsolutions/config/PropertiesConfig.java
+++ b/src/main/java/com/primefactorsolutions/config/PropertiesConfig.java
@ -0,0 +1,19 @@
+package com.primefactorsolutions.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
+import org.springframework.core.io.ClassPathResource;
+
+@Configuration
+public class PropertiesConfig {
+    @Bean
+    public static PropertySourcesPlaceholderConfigurer placeholderConfigurer() {
+        final PropertySourcesPlaceholderConfigurer propsConfig = new PropertySourcesPlaceholderConfigurer();
+        propsConfig.setLocation(new ClassPathResource("git.properties"));
+        propsConfig.setIgnoreResourceNotFound(true);
+        propsConfig.setIgnoreUnresolvablePlaceholders(true);
+
+        return propsConfig;
+    }
+}
--- a/src/main/java/com/primefactorsolutions/model/Actividad.java
+++ b/src/main/java/com/primefactorsolutions/model/Actividad.java
@ -1,200 +0,0 @@
-package com.primefactorsolutions.model;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-
-import java.util.UUID;
-
-
-@Entity
-public class Actividad extends BaseEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
-    private String nombre;
-    private double lunes;
-    private double martes;
-    private double miercoles;
-    private double jueves;
-    private double viernes;
-    private double sabado;
-    private double domingo;
-    private String tarea;
-    private double horas;
-
-    public Actividad() {}
-
-    public Actividad(final Builder builder) {
-        this.nombre = builder.nombre;
-        this.lunes = builder.lunes;
-        this.martes = builder.martes;
-        this.miercoles = builder.miercoles;
-        this.jueves = builder.jueves;
-        this.viernes = builder.viernes;
-        this.sabado = builder.sabado;
-        this.domingo = builder.domingo;
-        this.tarea = builder.tarea;
-        this.horas = builder.horas;
-    }
-
-    public String setNombre(final String nombre) {
-        this.nombre = nombre;
-        return nombre;
-    }
-
-    public String getNombre() {
-        return nombre;
-    }
-
-    public void setLunes(double lunes) {
-        this.lunes = lunes;
-        return;
-    }
-
-    public void setMartes(double martes) {
-        this.martes = martes;
-        return;
-    }
-
-    public void setMiercoles(double miercoles) {
-        this.miercoles = miercoles;
-        return;
-    }
-
-    public void setJueves(double jueves) {
-        this.jueves = jueves;
-        return;
-    }
-
-    public void setViernes(double viernes) {
-        this.viernes = viernes;
-        return;
-    }
-
-    public void setSabado(double sabado) {
-        this.sabado = sabado;
-        return;
-    }
-
-    public void setDomingo(double domingo) {
-        this.domingo = domingo;
-        return;
-    }
-    public void setTarea(String tarea) {
-        this.tarea = tarea;
-        return;
-    }
-
-    public void setHoras(double horas) {
-        this.horas = horas;
-        return;
-    }
-
-    public double getLunes() {
-        return lunes;
-    }
-
-    public double getMartes() {
-        return martes;
-    }
-
-    public double getMiercoles() {
-        return miercoles;
-    }
-
-    public double getJueves() {
-        return jueves;
-    }
-
-    public double getViernes() {
-        return viernes;
-    }
-
-    public double getSabado() {
-        return sabado;
-    }
-
-    public double getDomingo() {
-        return domingo;
-    }
-
-    public String getTarea() { // Cambié aquí también
-        return tarea;
-    }
-
-    public double getHoras() {
-        return horas;
-    }
-
-    // Builder para crear instancias de Actividad
-    public static class Builder {
-        private String nombre;
-        private double lunes;
-        private double martes;
-        private double miercoles;
-        private double jueves;
-        private double viernes;
-        private double sabado;
-        private double domingo;
-        private String tarea; // Cambié 'tarea' por 'descripcion'
-        private double horas;
-
-        public Builder tarea(final String tarea, final double horas) {
-            this.tarea = tarea;
-            this.horas = horas;
-            return this;
-        }
-
-        public Builder tarea(final String tarea) {
-            this.tarea = tarea;
-            return this;
-        }
-
-        public Builder nombre(final String nombre) {
-            this.nombre = nombre;
-            return this;
-        }
-
-        public Builder lunes(final double horas) {
-            this.lunes = horas;
-            return this;
-        }
-
-        public Builder martes(final double horas) {
-            this.martes = horas;
-            return this;
-        }
-
-        public Builder miercoles(final double horas) {
-            this.miercoles = horas;
-            return this;
-        }
-
-        public Builder jueves(final double horas) {
-            this.jueves = horas;
-            return this;
-        }
-
-        public Builder viernes(final double horas) {
-            this.viernes = horas;
-            return this;
-        }
-
-        public Builder sabado(final double horas) {
-            this.sabado = horas;
-            return this;
-        }
-
-        public Builder domingo(final double horas) {
-            this.domingo = horas;
-            return this;
-        }
-
-        public Actividad build() {
-            return new Actividad(this);
-        }
-    }
-}
--- a/src/main/java/com/primefactorsolutions/model/ActividadesHours.java
+++ b/src/main/java/com/primefactorsolutions/model/ActividadesHours.java
@ -1,81 +0,0 @@
-package com.primefactorsolutions.model;
-
-import jakarta.persistence.*;
-import java.time.LocalDate;
-import java.util.UUID;
-
-@Entity
-@Table(name = "Actividades_hours")
-public class ActividadesHours {
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.AUTO)
-    private UUID id;
-
-    @ManyToOne
-    @JoinColumn(name = "employee_id", nullable = false)
-    private Employee employee;
-
-    @ManyToOne
-    @JoinColumn(name = "actividad_id", nullable = false)
-    private Actividad actividad;
-
-    @Column(nullable = false)
-    private double totalHours;
-
-    @Column(nullable = false)
-    private int weekNumber;
-
-    @Column(nullable = false)
-    private LocalDate fecha;
-
-    // Getters y Setters
-
-    public UUID getId() {
-        return id;
-    }
-
-    public void setId(UUID id) {
-        this.id = id;
-    }
-
-    public Employee getEmployee() {
-        return employee;
-    }
-
-    public void setEmployee(Employee employee) {
-        this.employee = employee;
-    }
-
-    public Actividad getActividad() {
-        return actividad;
-    }
-
-    public void setActividad(Actividad actividad) {
-        this.actividad = actividad;
-    }
-
-    public double getTotalHours() {
-        return totalHours;
-    }
-
-    public void setTotalHours(double totalHours) {
-        this.totalHours = totalHours;
-    }
-
-    public int getWeekNumber() {
-        return weekNumber;
-    }
-
-    public void setWeekNumber(int weekNumber) {
-        this.weekNumber = weekNumber;
-    }
-
-    public LocalDate getFecha() {
-        return fecha;
-    }
-
-    public void setFecha(LocalDate fecha) {
-        this.fecha = fecha;
-    }
-}
--- a/src/main/java/com/primefactorsolutions/model/Employee.java
+++ b/src/main/java/com/primefactorsolutions/model/Employee.java
@ -28,36 +28,42 @@ public class Employee extends BaseEntity implements UserDetails {
    @Pattern(regexp = "^[a-zA-Z ]+$", message = "El apellido solo debe contener letras")
    private String lastName;
    private LocalDate birthday;
-    @Pattern(regexp = "^[a-zA-Z ]+$", message = "La ciudad de nacimiento solo debe contener letras")
+    @Pattern(regexp = "^[a-zA-Z ,]+$", message = "La ciudad de nacimiento solo debe contener letras, espacios o comas")
    private String birthCity;
    private String age;
-    @Size(max = 100, message = "La dirección de residencia no debe exceder 100 caracteres")
+    @Size(max = 50, message = "La dirección de residencia no debe exceder 50 caracteres")
    private String residenceAddress;
-    @Size(max = 100, message = "La dirección local no debe exceder 100 caracteres")
+    @Size(max = 30, message = "La dirección local no debe exceder 100 caracteres")
+    @Pattern(regexp = "^[a-zA-Z -]+$", message = "La dirección local solo debe contener letras y guion")
    private String localAddress;
    @Pattern(regexp = "^[0-9]+$", message = "El número de teléfono debe contener solo números")
    private String phoneNumber;
    @Email(message = "El correo personal no tiene un formato válido")
    private String personalEmail;
+
    @Pattern(regexp = "^[a-zA-Z ]+$", message = "El cargo solo debe contener letras")
    private String position;
    @ManyToOne
    @JoinColumn(name = "team_id", nullable = false)
    private Team team;
-    @Size(max = 100, message = "El nombre de contacto de emergencia no debe exceder 100 caracteres")
+
+    @Pattern(regexp = "^[a-zA-Z ]+$", message = "El nombre y apellido de contacto"
+            + " de emergencia solo debe contener letras")
    private String emergencyCName;
-    @Size(max = 100, message = "La dirección de contacto de emergencia no debe exceder 100 caracteres")
    private String emergencyCAddress;
-    @Pattern(regexp = "^[0-9]+$", message = "El teléfono de contacto de emergencia debe contener solo números")
+    @Pattern(regexp = "^[0-9]+$", message = "El teléfono de contacto de emergencia "
+            + " debe contener solo números")
    private String emergencyCPhone;
    @Email(message = "El correo de contacto de emergencia no tiene un formato válido")
    private String emergencyCEmail;
+
+    @Max(value = 10, message = "El número de hijos no puede exceder a 10")
    @Pattern(regexp = "^[0-9]+$", message = "La cantidad de hijos debe contener solo números")
    private String numberOfChildren;
+
    @Pattern(regexp = "^[0-9]+$", message = "El CI debe contener solo números")
    private String ci;
    private String issuedIn;
-    @Size(max = 100, message = "El título no debe exceder 100 caracteres")
    private String pTitle1;
    private String pTitle2;
    private String pTitle3;
@ -70,9 +76,7 @@ public class Employee extends BaseEntity implements UserDetails {
    private String certification2;
    private String certification3;
    private String certification4;
-    @Size(max = 255, message = "El reconocimiento no debe exceder 255 caracteres")
    private String recognition;
-    @Size(max = 500, message = "Los logros no deben exceder 500 caracteres")
    private String achievements;

    private String language;
--- a/src/main/java/com/primefactorsolutions/model/HoursWorked.java
+++ b/src/main/java/com/primefactorsolutions/model/HoursWorked.java
@ -1,42 +1,48 @@
 package com.primefactorsolutions.model;

-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.CascadeType;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;

 import java.time.LocalDate;
 import java.time.temporal.WeekFields;
+import java.util.List;
 import java.util.Locale;
-import java.util.UUID;

+@Data
@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
 public class HoursWorked extends BaseEntity {
-    @Id
-    @GeneratedValue(strategy = GenerationType.UUID)
-    private UUID id;
-
    @ManyToOne
+    @JoinColumn(name = "employee_id", nullable = true)
    private Employee employee;

-    @ManyToOne(cascade = CascadeType.PERSIST)  // Añadimos cascade para que persista la actividad automáticamente
-    private Actividad actividad;
+    @ManyToOne
+    @JoinColumn(name = "team_id", nullable = true)
+    private Team team;

    private int weekNumber;
+    private LocalDate date;
+    private String actividad;
+    private String tareasEspecificas;
+    private double hours;
+    private double horasTareasEspecificas;
+    private double horaspendientes;
    private double totalHours;
-    private LocalDate fecha;

-    public HoursWorked() {}
-
-    // Getters y Setters
-    public UUID getId() {
-        return id;
+    public static double calculateTotalHours(final List<HoursWorked> activities) {
+        return activities.stream()
+                .mapToDouble(activity -> activity.hours + activity.horasTareasEspecificas)
+                .sum();
    }

-    public void setId(final UUID id) {
-        this.id = id;
+    public static double calculatePendingHours(final List<HoursWorked> activities) {
+        double totalHoursWorked = calculateTotalHours(activities);
+        return Math.max(0, 40 - totalHoursWorked);
    }

    public Employee getEmployee() {
@ -47,14 +53,6 @@ public class HoursWorked extends BaseEntity {
        this.employee = employee;
    }

-    public Actividad getActividad() {
-        return actividad;
-    }
-
-    public void setActividad(final Actividad actividad) {
-        this.actividad = actividad;
-    }
-
    public int getWeekNumber() {
        return weekNumber;
    }
@ -62,42 +60,90 @@ public class HoursWorked extends BaseEntity {
    public void setWeekNumber(final int weekNumber) {
        this.weekNumber = weekNumber;
    }
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public void setDate(final LocalDate date) {
+        this.date = date;
+        if (date != null) {
+            WeekFields weekFields = WeekFields.of(Locale.getDefault());
+            this.weekNumber = date.get(weekFields.weekOfWeekBasedYear());
+        }
+    }
+
+    public String getActividad() {
+        return actividad;
+    }
+
+    public void setActividad(final String actividad) {
+        this.actividad = actividad;
+    }
+
+    public double getHours() {
+        return hours;
+    }
+
+    public void setHours(final double hours) {
+        this.hours = hours;
+    }

    public double getTotalHours() {
-        return totalHours;
+        double total = this.getHours();
+        return totalHours + total;
    }

    public void setTotalHours(final double totalHours) {
        this.totalHours = totalHours;
    }

-    public LocalDate getFecha() {
-        return fecha;
+    public Team getTeam() {
+        return team;
    }

-    public void setFecha(final LocalDate fecha) {
-        this.fecha = fecha;
-        // Actualiza el número de semana automáticamente al establecer la fecha
-        if (fecha != null) {
-            this.weekNumber = calculateWeekNumber(fecha);
-        }
+    public void setTeam(final Team team) {
+        this.team = team;
    }

-    // Método adicional para calcular el número de semana basado en la fecha
-    private int calculateWeekNumber(LocalDate date) {
-        WeekFields weekFields = WeekFields.of(Locale.getDefault());
-        return date.get(weekFields.weekOfWeekBasedYear());
+    public String getTareasEspecificas() {
+        return tareasEspecificas;
    }

-    @Override
-    public String toString() {
-        return "HoursWorked{" +
-                "id=" + id +
-                ", employee=" + (employee != null ? employee.getFirstName() : "N/A") +
-                ", actividad=" + (actividad != null ? actividad.getNombre() : "N/A") +
-                ", weekNumber=" + weekNumber +
-                ", totalHours=" + totalHours +
-                ", fecha=" + fecha +
-                '}';
+    public void setTareasEspecificas(final String tareasEspecificas) {
+        this.tareasEspecificas = tareasEspecificas;
    }
+
+    public double getHorasTareasEspecificas() {
+        return horasTareasEspecificas;
+    }
+
+    public void setHorasTareasEspecificas(final double horasTareasEspecificas) {
+        this.tareasEspecificas = tareasEspecificas;
+    }
+    public double getHoraspendientes() {
+        //double horasTrabajadas = this.getTotalHours() + this.getHorasTareasEspecificas();
+        return 40;
+    }
+
+    public void setHoraspendientes(final double horaspendientes) {
+        this.horaspendientes = horaspendientes;
+    }
+
+    public double getHoursWorked() {
+        return hours;
+    }
+
+    public void setHoursWorked(final double hoursWorked) {
+        this.hours = hoursWorked;
+    }
+
+    public double getTotalHoursWorked() {
+        return totalHours;
+    }
+
+    public void setTotalHoursWorked(final double totalHoursWorked) {
+        this.totalHours = totalHoursWorked;
+    }
+
+
 }
--- a/src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java
+++ b/src/main/java/com/primefactorsolutions/model/TimeOffRequestStatus.java
@ -3,13 +3,14 @@ package com.primefactorsolutions.model;
 public enum TimeOffRequestStatus {
    TODOS,
    TOMADO,
-    SOLICITADO,
    APROBADO,
    EN_USO,
-    EN_REVISION,
    PENDIENTE,
    RECHAZADO,
+    VENCIDO,
+
+    SOLICITADO,
+    EN_REVISION,
    COMPLETADO,
    CANCELADO,
-    VENCIDO
 }
--- a/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java
+++ b/src/main/java/com/primefactorsolutions/repositories/ActividadesHoursRepository.java
@ -1,6 +0,0 @@
-package com.primefactorsolutions.repositories;
-import com.primefactorsolutions.model.ActividadesHours;
-import org.springframework.data.jpa.repository.JpaRepository;
-import java.util.UUID;
-public interface ActividadesHoursRepository extends JpaRepository<ActividadesHours,UUID> {
-}
--- a/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java
+++ b/src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java
@ -11,7 +11,7 @@ public interface EmployeeRepository extends JpaRepository<Employee, UUID> {
    Optional<Employee> findByUsername(String username);

    Optional<Employee> findByPersonalEmail(String personalEmail);
-    Optional<Employee> findByTeamIdAndLeadManagerTrue(UUID teamId);
+    Optional<Employee> findByTeamId(UUID teamId);

    List<Employee> findByTeamName(String teamName);
 }
--- a/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java
+++ b/src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java
@ -2,11 +2,15 @@ package com.primefactorsolutions.repositories;

 import com.primefactorsolutions.model.HoursWorked;
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;

+import java.time.LocalDate;
 import java.util.List;
+import java.util.UUID;

-@Repository
-public interface HoursWorkedRepository extends JpaRepository<HoursWorked, Long> {
+
+public interface HoursWorkedRepository extends JpaRepository<HoursWorked, UUID> {
    List<HoursWorked> findByWeekNumber(int weekNumber);
+    List<HoursWorked> findByDate(LocalDate date);
+    List<HoursWorked> findByEmployeeIdAndWeekNumber(UUID employeeId, int weekNumber);
 }
+
--- a/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java
+++ b/src/main/java/com/primefactorsolutions/repositories/TimeOffRequestRepository.java
@ -14,4 +14,5 @@ public interface TimeOffRequestRepository extends JpaRepository<TimeOffRequest,
    Optional<TimeOffRequest> findByEmployeeIdAndState(UUID employeeId, TimeOffRequestStatus state);
    List<TimeOffRequest> findByEmployeeIdAndCategory(UUID employeeId, TimeOffRequestType category);
    List<TimeOffRequest> findByState(TimeOffRequestStatus state);
+    void deleteByEmployeeIdAndCategory(UUID employeeId, TimeOffRequestType category);
 }
--- a/src/main/java/com/primefactorsolutions/service/EmployeeService.java
+++ b/src/main/java/com/primefactorsolutions/service/EmployeeService.java
@ -50,7 +50,7 @@ public class EmployeeService {

    public String getTeamLeadName(final UUID teamId) {
        // Encuentra al empleado con el rol de lead_manager en el equipo especificado
-        Optional<Employee> leadManager = employeeRepository.findByTeamIdAndLeadManagerTrue(teamId);
+        Optional<Employee> leadManager = employeeRepository.findByTeamId(teamId);

        return leadManager.map(employee -> employee.getFirstName() + " " + employee.getLastName())
                .orElse("No asignado");
@ -126,6 +126,4 @@ public class EmployeeService {
    public List<Employee> findEmployeesByTeam(final String teamName) {
        return employeeRepository.findByTeamName(teamName);
    }
-
-
 }
--- a/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
+++ b/src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
@ -2,10 +2,12 @@ package com.primefactorsolutions.service;

 import com.primefactorsolutions.model.HoursWorked;
 import com.primefactorsolutions.repositories.HoursWorkedRepository;
+import org.apache.commons.beanutils.BeanComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

-import java.util.List;
+import java.time.LocalDate;
+import java.util.*;

@Service
 public class HoursWorkedService {
@ -20,6 +22,20 @@ public class HoursWorkedService {
        return hoursWorkedRepository.findAll();
    }

+    public double getTotalHoursWorkedByEmployeeForWeek(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> hoursWorkedList = hoursWorkedRepository.findByWeekNumber(weekNumber);
+        return hoursWorkedList.stream()
+                .filter(hw -> hw.getEmployee().getId().equals(employeeId))
+                .mapToDouble(HoursWorked::getTotalHours)
+                .sum();
+    }
+
+    public HoursWorked findHoursWorked(final UUID id) {
+        Optional<HoursWorked> hoursWorked = hoursWorkedRepository.findById(id);
+        HoursWorked hw = hoursWorked.get();
+        return hw;
+    }
+
    public HoursWorked saveHoursWorked(final HoursWorked hoursWorked) {
        return hoursWorkedRepository.save(hoursWorked);
    }
@ -28,13 +44,56 @@ public class HoursWorkedService {
        return hoursWorkedRepository.save(hoursWorked);
    }

-    public void deleteHoursWorked(final Long id) {
-        hoursWorkedRepository.deleteById(id);
+    public double getTotalHoursForEmployee(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+        return HoursWorked.calculateTotalHours(activities);
+    }
+
+    public double getPendingHoursForEmployee(final UUID employeeId, final int weekNumber) {
+        List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+        return HoursWorked.calculatePendingHours(activities);
    }

    public List<HoursWorked> findByWeekNumber(final int weekNumber) {
        return hoursWorkedRepository.findByWeekNumber(weekNumber);
    }

-}
+    public List<HoursWorked> findByDate(final LocalDate date) {
+        return hoursWorkedRepository.findByDate(date);
+    }

+    public List<HoursWorked> findByDateAndWeekNumber(final LocalDate date, final int weekNumber) {
+        return hoursWorkedRepository.findByDate(date);
+    }
+
+    public List<HoursWorked> findHoursWorkeds(
+            final int start, final int pageSize, final String sortProperty, final boolean asc) {
+        List<HoursWorked> hoursWorkeds = hoursWorkedRepository.findAll();
+
+        int end = Math.min(start + pageSize, hoursWorkeds.size());
+        hoursWorkeds.sort(new BeanComparator<>(sortProperty));
+
+        if (!asc) {
+            Collections.reverse(hoursWorkeds);
+        }
+
+        return hoursWorkeds.subList(start, end);
+    }
+
+    public List<HoursWorked> findHoursWorkeds(final int start, final int pageSize) {
+        List<HoursWorked> hoursWorkeds = hoursWorkedRepository.findAll();
+
+        int end = Math.min(start + pageSize, hoursWorkeds.size());
+        return hoursWorkeds.subList(start, end);
+    }
+
+    public HoursWorked getHoursWorked(final UUID id) {
+        final Optional<HoursWorked> hoursWorked = hoursWorkedRepository.findById(id);
+        return hoursWorked.get();
+    }
+
+    public List<HoursWorked> findListHoursWorkedEmployee(final UUID employeeId, final int weekNumber) {
+        return hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
+    }
+
+}
--- a/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java
+++ b/src/main/java/com/primefactorsolutions/service/TimeOffRequestService.java
@ -5,6 +5,7 @@ import com.primefactorsolutions.repositories.TimeOffRequestRepository;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;

+import java.time.LocalDate;
 import java.util.List;
 import java.util.UUID;
 import java.util.Optional;
@ -18,6 +19,10 @@ public class TimeOffRequestService {
        timeOffRequestRepository.save(newTimeOffRequest);
    }

+    public void deleteTimeOffRequestByEmployeeAndCategory(final UUID employeeId, final TimeOffRequestType category) {
+        timeOffRequestRepository.deleteByEmployeeIdAndCategory(employeeId, category);
+    }
+
    public void saveAll(final List<TimeOffRequest> requests) {
        timeOffRequestRepository.saveAll(requests);
    }
@ -50,4 +55,34 @@ public class TimeOffRequestService {
    public List<TimeOffRequest> findByEmployeeAndCategory(final UUID employeeId, final TimeOffRequestType category) {
        return timeOffRequestRepository.findByEmployeeIdAndCategory(employeeId, category);
    }
+
+    public void updateRequestStatuses() {
+        List<TimeOffRequest> requests = findAllTimeOffRequests();
+        LocalDate now = LocalDate.now();
+        LocalDate startOfYear = LocalDate.of(now.getYear(), 1, 1);
+
+        for (TimeOffRequest request : requests) {
+            if (request.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL && now.isEqual(startOfYear)) {
+                deleteTimeOffRequestByEmployeeAndCategory(
+                        request.getEmployee().getId(),
+                        TimeOffRequestType.VACACION_GESTION_ANTERIOR
+                );
+                request.setCategory(TimeOffRequestType.VACACION_GESTION_ANTERIOR);
+            }
+
+            if (request.getState() == TimeOffRequestStatus.APROBADO
+                    || request.getState() == TimeOffRequestStatus.EN_USO) {
+                LocalDate startDate = request.getStartDate();
+                LocalDate endDate = request.getEndDate();
+
+                if (now.isAfter(endDate)) {
+                    request.setState(TimeOffRequestStatus.TOMADO);
+                } else if (now.isEqual(startDate) || (now.isAfter(startDate) && now.isBefore(endDate))) {
+                    request.setState(TimeOffRequestStatus.EN_USO);
+                }
+            }
+        }
+
+        saveAll(requests);
+    }
 }
--- a/src/main/java/com/primefactorsolutions/views/AssessmentsListView.java
+++ b/src/main/java/com/primefactorsolutions/views/AssessmentsListView.java
@ -37,7 +37,7 @@ public class AssessmentsListView extends Main {
        final HorizontalLayout hl = new HorizontalLayout();
        final Button addAssessment = new Button("Add Assessment");
        addAssessment.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(AssessmentView.class, "new");
+            this.getUI().flatMap(ui -> ui.navigate(AssessmentView.class, "new"));
        });
        hl.add(addAssessment);

@ -51,7 +51,7 @@ public class AssessmentsListView extends Main {

        grid.addComponentColumn((ValueProvider<Assessment, Component>) assessment -> {
            var result = new Button("Result", event ->
-                    this.getUI().get().navigate(SubmissionView.class, assessment.getId().toString())
+                    this.getUI().flatMap(ui -> ui.navigate(SubmissionView.class, assessment.getId().toString()))
            );
            result.setEnabled(assessment.isCompleted());

@ -95,6 +95,7 @@ public class AssessmentsListView extends Main {
                return assessmentService.getAssessments().size();
            }

+            @SuppressWarnings("unused")
            @Override
            public Stream<Assessment> fetch(final Query<Assessment, Object> query) {
                int limit = query.getLimit();
--- a/src/main/java/com/primefactorsolutions/views/BaseView.java
+++ b/src/main/java/com/primefactorsolutions/views/BaseView.java
@ -0,0 +1,16 @@
+package com.primefactorsolutions.views;
+
+import com.vaadin.flow.component.html.Main;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import lombok.Getter;
+
+@Getter
+public class BaseView extends Main {
+
+    private final VerticalLayout currentPageLayout;
+
+    public BaseView() {
+        currentPageLayout = new VerticalLayout();
+        add(currentPageLayout);
+    }
+}
--- a/src/main/java/com/primefactorsolutions/views/CandidatesListView.java
+++ b/src/main/java/com/primefactorsolutions/views/CandidatesListView.java
@ -28,15 +28,13 @@ import java.util.stream.Stream;
@Route(value = "/candidates", layout = MainLayout.class)
@PermitAll
 public class CandidatesListView extends Main {
-    private final CandidateService candidateService;

    public CandidatesListView(final CandidateService candidateService) {
-        this.candidateService = candidateService;

        final HorizontalLayout hl = new HorizontalLayout();
        final Button addCandidate = new Button("Add Candidate");
        addCandidate.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(CandidateView.class, "new");
+            this.getUI().flatMap(ui -> ui.navigate(CandidateView.class, "new"));
        });
        hl.add(addCandidate);

@ -46,7 +44,7 @@ public class CandidatesListView extends Main {
        grid.addComponentColumn((ValueProvider<Candidate, Component>) candidate -> {
            final Button edit = new Button("Edit");
            edit.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                    this.getUI().get().navigate(CandidateView.class, candidate.getId().toString()));
+                    this.getUI().flatMap(ui -> ui.navigate(CandidateView.class, candidate.getId().toString())));
            return edit;
        });

@ -61,6 +59,7 @@ public class CandidatesListView extends Main {
                return candidateService.getCandidates().size();
            }

+            @SuppressWarnings("unused")
            @Override
            public Stream<Candidate> fetch(final Query<Candidate, Object> query) {
                int limit = query.getLimit();
--- a/src/main/java/com/primefactorsolutions/views/Constants.java
+++ b/src/main/java/com/primefactorsolutions/views/Constants.java
@ -0,0 +1,5 @@
+package com.primefactorsolutions.views;
+
+public class Constants {
+    public static final int PAGE_SIZE = 10;
+}
--- a/src/main/java/com/primefactorsolutions/views/DocumentsListView.java
+++ b/src/main/java/com/primefactorsolutions/views/DocumentsListView.java
@ -9,8 +9,8 @@ import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
 import com.vaadin.flow.component.grid.GridSortOrder;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.data.provider.SortDirection;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
@ -24,13 +24,14 @@ import org.vaadin.firitin.components.grid.PagingGrid;
 import java.io.ByteArrayInputStream;
 import java.util.List;

+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;

@SpringComponent
@Scope("prototype")
@PageTitle("Documents")
@Route(value = "/documents", layout = MainLayout.class)
@PermitAll
-public class DocumentsListView extends Main {
+public class DocumentsListView extends BaseView {

    private final DocumentService documentService;
    private final EmployeeService employeeService;
@ -46,11 +47,16 @@ public class DocumentsListView extends Main {
    }

    private void initializeView() {
+        getCurrentPageLayout().add(createActionButton("Add Document", this::navigateToAddDocumentView));
+
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createDocumentTypeFilter());
+        hl.add(createEmployeeFilter());
+
+        getCurrentPageLayout().add(hl);
+
        configureDocumentGrid();
-        add(createActionButton("Add Document", this::navigateToAddDocumentView));
-        add(createDocumentTypeFilter());
-        add(createEmployeeFilter());
-        add(documentGrid);
+        getCurrentPageLayout().add(documentGrid);
    }

    private void configureDocumentGrid() {
@ -133,7 +139,7 @@ public class DocumentsListView extends Main {

    private void configurePagination() {
        documentGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        documentGrid.setPageSize(5);
+        documentGrid.setPageSize(PAGE_SIZE);
    }

    private void updateDocumentGrid(final DocumentType documentType, final Employee employee) {
--- a/src/main/java/com/primefactorsolutions/views/EmployeeView.java
+++ b/src/main/java/com/primefactorsolutions/views/EmployeeView.java
@ -56,7 +56,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
    private final TimeOffRequestService requestService;
    private final TeamService teamService;

-
    // 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);
    private final TextField firstName = createTextField("Nombres: ", 30, true);
@ -65,24 +64,21 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
    private final ComboBox<Employee.Gender> gender = createGenderComboBox();
    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     ejemplo: (Ciudad, País) ",
+            30, false);
    private final TextField residenceAddress = createTextField("Dirección de Residencia", 50, false);
-    private final TextField localAddress = createTextField("Dep/Provincia de Residencia", 10, false);
+    private final TextField localAddress = createTextField("Departamento y Provincia de Residencia   "
+            + "  ejemplo: (Departamento-Provincia)", 30, false);
    private final ComboBox<Employee.MaritalStatus> maritalStatus = createMaritalStatusComboBox();
-    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 numberOfChildren = createTextField("Numero de Hijos", 2, false);
+    private final TextField ci = createTextField("CI", 10, false);
+    private final TextField issuedIn = createTextField("Expedido en ", 10, false);
    private final TextField phoneNumber = createTextField("Teléfono", 8, false);
-    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 ComboBox<Team> team = new ComboBox<>("Equipo");
-    private final TextField leadManager =  createTextField("Lead/Manager", 30, false);
-    private final TextField project =  createTextField("Proyecto", 30, false);
+    private final EmailField personalEmail = createEmailField("E-mail      ejemplo: (ejemplo@gmail.com)");
    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 emergencyCPhone = createTextField("Teléfono de Contacto", 8, false);
-    private final EmailField emergencyCEmail = createEmailField("Email de Contacto");
+    private final EmailField emergencyCEmail = createEmailField("Email de Contacto     ejemplo: (ejemplo@gmail.com)");

    private final MemoryBuffer buffer = new MemoryBuffer();
    private final Upload upload = new Upload(buffer);
@ -101,10 +97,15 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
    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 language =  createTextField("Idioma", 50, false);
    private final TextField languageLevel =  createTextField("Nivel de Idioma", 30, false);

-    //INFORMACION DE CONTRATACION
+    //INFORMACION ADMINISTRATIVA
+    private final TextField cod =  createTextField("Codigo de Empleado", 20, false);
+    private final TextField position = createTextField("Cargo", 30, false);
+    private final ComboBox<Team> team = new ComboBox<>("Equipo");
+    private final TextField leadManager =  createTextField("Lead/Manager", 30, false);
+    private final TextField project =  createTextField("Proyecto", 30, false);
    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);
@ -141,7 +142,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
    //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 datBanc = new H3("Datos Bancarios");
    private final H3 datGest = new H3("Datos Gestora Pública y Seguro Social");

    public EmployeeView(final EmployeeService employeeService,
@ -176,6 +177,9 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
        editButton.setVisible(true);
        reportButton.setVisible(true);
        birthday.addValueChangeListener(event -> calculateAge());
+        birthday.setMax(java.time.LocalDate.now());
+        dateOfEntry.addValueChangeListener(event -> calculateSeniority());
+        dateOfEntry.addValueChangeListener(event -> calculateSeniority());

        reportButton.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
            var employee = getEntity();
@ -203,10 +207,30 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
            int birthYear = birthday.getValue().getYear();
            int ages = currentYear - birthYear;
            age.setValue(String.valueOf(ages));
+            if (ages < 18) {
+                birthday.setInvalid(true);
+                birthday.setErrorMessage("La edad no puede ser menor a 18 años.");
+                Notification.show("La edad ingresada no es válida, debe ser mayor o igual a 18 años.");
+            } else {
+                birthday.setInvalid(false);
+            }
            System.out.println(age);
        }
    }

+    private void calculateSeniority() {
+        LocalDate entryDate = dateOfEntry.getValue();
+        LocalDate exitDate = dateOfExit.getValue() != null ? dateOfExit.getValue() : LocalDate.now();
+
+        if (entryDate != null) {
+            long yearsOfService = ChronoUnit.YEARS.between(entryDate, exitDate);
+            String seniorityValue = yearsOfService + " años ";
+            seniority.setValue(seniorityValue);
+        } else {
+            seniority.setValue("No disponible");
+        }
+    }
+
    private void configureUpload() {
        upload.setAcceptedFileTypes("image/jpeg", "image/png");
        upload.setMaxFileSize(1024 * 1024);
@ -218,11 +242,15 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl

                getEntity().setProfileImage(base64Image);

-                profileImagePreview.setSrc("data:image/jpeg;base64," + base64Image);
+                profileImagePreview.setSrc("data:image/png;base64," + base64Image);
                profileImagePreview.setMaxWidth("150px");
                profileImagePreview.setMaxHeight("150px");
            } catch (IOException e) {
-                Notification.show("Error al subir la imagen.");
+                Notification.show("Error al subir la imagen: " + e.getMessage());
+                e.printStackTrace();
+            } catch (Exception e) {
+                Notification.show("Error en el servidor al procesar la imagen.");
+                e.printStackTrace();
            }
        });
    }
@ -393,12 +421,12 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
        if (employee.getProfileImage() != null && !employee.getProfileImage().isEmpty()) {
            profileImagePreview.setSrc("data:image/jpeg;base64," + employee.getProfileImage());
            profileImagePreview.setVisible(true);
-            profileImagePreview.setMaxWidth("150px");
-            profileImagePreview.setMaxHeight("150px");
+            profileImagePreview.setMaxWidth("250px");
+            profileImagePreview.setMaxHeight("250px");

-            upload.setVisible(false);
+            upload.setVisible(true);
        } else {
-            profileImagePreview.setVisible(false);
+            profileImagePreview.setVisible(true);
            upload.setVisible(true);
        }
    }
@ -478,6 +506,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
        emergencyCPhone.setReadOnly(false);
        emergencyCEmail.setReadOnly(false);
        upload.setVisible(false);
+        profileImagePreview.setVisible(true);
        age.setReadOnly(false);
        gender.setReadOnly(false);
        status.setReadOnly(false);
@ -525,7 +554,6 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
                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,
@ -533,6 +561,7 @@ public class EmployeeView extends BeanValidationForm<Employee> implements HasUrl
                logros, recognition, achievements,
                idioma, language, languageLevel,
                infoAdm,
+                cod, position, team, leadManager, project,
                infoCont, dateOfEntry, dateOfExit, contractType, seniority, salary,
                datBanc, bankName, accountNumber,
                datGest, gpss, sss, beneficiaries,
--- a/src/main/java/com/primefactorsolutions/views/EmployeesListView.java
+++ b/src/main/java/com/primefactorsolutions/views/EmployeesListView.java
@ -4,7 +4,6 @@ import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.service.EmployeeService;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.H2;
-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;
@ -16,13 +15,12 @@ import org.springframework.context.annotation.Scope;

 import java.util.List;

-
@SpringComponent
@Scope("prototype")
@PageTitle("Employees")
@Route(value = "/employees", layout = MainLayout.class)
@PermitAll
-public class EmployeesListView extends Main {
+public class EmployeesListView extends BaseView {

    private final EmployeeService employeeService;
    private final PagingGrid<Employee> table = new PagingGrid<>(Employee.class);
@ -34,10 +32,10 @@ public class EmployeesListView extends Main {
    }

    private void setupView() {
-        add(new H2("Employee List"));
+        getCurrentPageLayout().add(new H2("Employee List"));
        configureTable();
-        add(createAddEmployeeButton());
-        add(table);
+        getCurrentPageLayout().add(createAddEmployeeButton());
+        getCurrentPageLayout().add(table);
    }

    private void configureTable() {
@ -75,7 +73,7 @@ public class EmployeesListView extends Main {

    private void setupPagingGrid() {
        table.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        table.setPageSize(5);
+        table.setPageSize(Constants.PAGE_SIZE);
    }

    private void refreshGrid() {
--- a/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java
+++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java
@ -0,0 +1,256 @@
+package com.primefactorsolutions.views;
+
+import com.primefactorsolutions.model.Employee;
+import com.primefactorsolutions.model.HoursWorked;
+import com.primefactorsolutions.model.Team;
+import com.primefactorsolutions.service.EmployeeService;
+import com.primefactorsolutions.service.HoursWorkedService;
+import com.primefactorsolutions.service.TeamService;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+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;
+import org.vaadin.firitin.components.grid.PagingGrid;
+
+import java.time.LocalDate;
+import java.time.temporal.IsoFields;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
+@SpringComponent
+@PermitAll
+@Scope("prototype")
+@PageTitle("Registro de Horas Trabajadas")
+@Route(value = "/hours-worked-list", layout = MainLayout.class)
+public class HoursWorkedListView extends BaseView {
+
+    private final HoursWorkedService hoursWorkedService;
+    private final EmployeeService employeeService;
+    private final TeamService teamService;
+    private final PagingGrid<HoursWorked> hoursWorkedGrid = new PagingGrid<>();
+    private ComboBox<Employee> employeeFilter;
+    private ComboBox<Team> teamFilter;
+    private UUID selectedEmployeeId;
+
+
+    public HoursWorkedListView(final HoursWorkedService hoursWorkedService,
+                               final EmployeeService employeeService,
+                               final TeamService teamService) {
+        this.hoursWorkedService = hoursWorkedService;
+        this.employeeService = employeeService;
+        this.teamService = teamService;
+
+        initializeView();
+        refreshGridListHoursWorked(null, null);
+    }
+
+    private void refreshGridListHoursWorked(final Employee employee,
+                                            final Team team) {
+        hoursWorkedGrid.setPagingDataProvider((page, pageSize) -> {
+            int start = (int) (page * hoursWorkedGrid.getPageSize());
+            List<HoursWorked> hoursWorkedList = fetchFilteredHoursWorked(start, pageSize, employee, team);
+
+            double totalHours = hoursWorkedList.stream()
+                    .mapToDouble(HoursWorked::getTotalHours)
+                    .sum();
+
+            Notification.show("Total de horas trabajadas: " + totalHours,
+                    3000, Notification.Position.BOTTOM_CENTER);
+
+            return hoursWorkedList;
+        });
+        hoursWorkedGrid.getDataProvider().refreshAll();
+    }
+
+    private List<HoursWorked> fetchFilteredHoursWorked(final int start,
+                                                       final int pageSize,
+                                                       final Employee employee,
+                                                       final Team team) {
+        List<HoursWorked> filteredHoursWorked = hoursWorkedService.findAll();
+
+        if (employee != null && !"TODOS".equals(employee.getFirstName())) {
+            filteredHoursWorked = filteredHoursWorked.stream()
+                    .filter(hw -> hw.getEmployee().getId().equals(employee.getId()))
+                    .collect(Collectors.toList());
+        }
+
+        if (team != null && !"TODOS".equals(team.getName())) {
+            filteredHoursWorked = filteredHoursWorked.stream()
+                    .filter(hw -> hw.getEmployee().getTeam() != null
+                            && hw.getEmployee().getTeam().getId().equals(team.getId()))
+                    .collect(Collectors.toList());
+        }
+
+        for (HoursWorked hoursWorked : filteredHoursWorked) {
+            if (employee != null && hoursWorked.getEmployee().getId().equals(employee.getId())) {
+                LocalDate date = hoursWorked.getDate();
+                int currentWeek = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+
+                double totalWorkedInSameWeek = filteredHoursWorked.stream()
+                        .filter(hw -> hw.getEmployee().getId().equals(employee.getId())
+                                &&
+                                hw.getDate().get(IsoFields.WEEK_OF_WEEK_BASED_YEAR) == currentWeek)
+                        .mapToDouble(HoursWorked::getHours)
+                        .sum();
+
+                double updatedPendingHours = totalWorkedInSameWeek - hoursWorked.getHours();
+                hoursWorked.setHoraspendientes(updatedPendingHours);
+            }
+        }
+
+        int end = Math.min(start + pageSize, filteredHoursWorked.size());
+        return filteredHoursWorked.subList(start, end);
+    }
+
+    private void initializeView() {
+        getCurrentPageLayout().add(createAddHoursWorked());
+        setupFilters();
+        setupListHoursWorkedGrid();
+        getCurrentPageLayout().add(hoursWorkedGrid);
+        getCurrentPageLayout().add(createActionButtons());
+    }
+
+    private void setupFilters() {
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+
+        getCurrentPageLayout().add(hl);
+    }
+
+    private void setupListHoursWorkedGrid() {
+        hoursWorkedGrid.addColumn(hw -> hw.getDate() != null ? hw.getDate().toString() : "")
+                .setHeader("Fecha")
+                .setSortable(true);
+        hoursWorkedGrid.addColumn(HoursWorked::getWeekNumber)
+                .setHeader("Semana")
+                .setSortable(true);
+        hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getFirstName() + " " + hw.getEmployee().getLastName())
+                .setHeader("Empleado");
+        hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getTeam() != null ? hw.getEmployee().getTeam()
+                        .getName() : "Sin asignar")
+                .setHeader("Equipo");
+        hoursWorkedGrid.addColumn(HoursWorked::getActividad).setHeader("Actividad");
+        hoursWorkedGrid.addColumn(HoursWorked::getHours).setHeader("Total Horas").setSortable(true);
+        hoursWorkedGrid.addColumn(hw -> hw.getHoraspendientes() - calcularTotal(hw)).setHeader("Horas Pendientes")
+                .setSortable(true);
+
+        hoursWorkedGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
+        hoursWorkedGrid.setPageSize(PAGE_SIZE);
+        hoursWorkedGrid.asSingleSelect().addValueChangeListener(event -> {
+            HoursWorked selectedHoursWorked = event.getValue();
+            if (selectedHoursWorked != null) {
+                selectedEmployeeId = selectedHoursWorked.getEmployee().getId();
+            }
+        });
+    }
+
+    private double calcularTotal(final HoursWorked hoursWorked) {
+        List<HoursWorked> listHoursworkedemploye = hoursWorkedService.findListHoursWorkedEmployee(
+                hoursWorked.getEmployee().getId(), hoursWorked.getWeekNumber());
+        return calculateTotalUtilized(listHoursworkedemploye);
+    }
+
+    private double calculateTotalUtilized(final List<HoursWorked> employeeRequests) {
+        return employeeRequests.stream()
+                .filter(Objects::nonNull)
+                .mapToDouble(HoursWorked::getHours)
+                .sum();
+    }
+
+    private HorizontalLayout createActionButtons() {
+        Button viewButton = new Button("Ver", event -> {
+            if (selectedEmployeeId != null) {
+                navigateToHoursWorkedView(selectedEmployeeId);
+            } else {
+                Notification.show("Seleccione una solicitud.", 3000, Notification.Position.MIDDLE);
+            }
+        });
+        Button closeButton = new Button("Salir", event -> navigateToListView());
+        return new HorizontalLayout(viewButton, closeButton);
+    }
+
+    private void navigateToListView() {
+        getUI().ifPresent(ui -> ui.navigate(MainView.class));
+    }
+
+    private void navigateToHoursWorkedView(final UUID idEmployee) {
+        getUI().ifPresent(ui -> ui.navigate("hours-worked-list/" + idEmployee.toString()));
+    }
+
+    private Button createButton(final String label, final Runnable onClickAction) {
+        final Button button = new Button(label);
+        button.addClickListener(event -> onClickAction.run());
+
+        return button;
+    }
+
+    private Button createAddHoursWorked() {
+        return createButton("Agregar Actividad", this::navigateToHours);
+    }
+
+    private void navigateToHours() {
+        getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class, "new"));
+    }
+
+    private ComboBox<Employee> createEmployeeFilter() {
+        employeeFilter = new ComboBox<>("Empleado");
+        final List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
+        employees.addFirst(createAllEmployeesOption());
+        employeeFilter.setItems(employees);
+        employeeFilter.setItemLabelGenerator(this::getEmployeeFullName);
+        employeeFilter.setValue(employees.getFirst());
+        employeeFilter.addValueChangeListener(event ->
+                refreshGridListHoursWorked(
+                        event.getValue(),
+                        teamFilter.getValue()
+                )
+        );
+
+        return employeeFilter;
+    }
+
+    private String getEmployeeFullName(final Employee employee) {
+        return "TODOS".equals(employee.getFirstName())
+                ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
+    }
+
+    private ComboBox<Team> createTeamFilter() {
+        teamFilter = new ComboBox<>("Equipo");
+        List<Team> teams = new ArrayList<>(teamService.findAllTeams());
+        teams.addFirst(createAllTeamsOption());
+        teamFilter.setItems(teams);
+        teamFilter.setItemLabelGenerator(this::getTeamLabel);
+        teamFilter.setValue(teams.getFirst());
+        teamFilter.addValueChangeListener(event ->
+                refreshGridListHoursWorked(
+                        employeeFilter.getValue(),
+                        event.getValue()
+                )
+        );
+        return teamFilter;
+    }
+
+    private String getTeamLabel(final Team team) {
+        return team != null && !"TODOS".equals(team.getName()) ? team.getName() : "TODOS";
+    }
+
+    private Employee createAllEmployeesOption() {
+        Employee allEmployeesOption = new Employee();
+        allEmployeesOption.setFirstName("TODOS");
+        return allEmployeesOption;
+    }
+
+    private Team createAllTeamsOption() {
+        Team allTeamsOption = new Team();
+        allTeamsOption.setName("TODOS");
+        return allTeamsOption;
+    }
+}
--- a/src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java
+++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedMonthView.java
@ -1,161 +0,0 @@
-package com.primefactorsolutions.views;
-
-import com.primefactorsolutions.model.Employee;
-import com.primefactorsolutions.model.Actividad;
-import com.primefactorsolutions.service.EmployeeService;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.datepicker.DatePicker;
-import com.vaadin.flow.component.grid.Grid;
-import com.vaadin.flow.component.html.Label;
-import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-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.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Scope;
-
-import java.time.LocalDate;
-import java.util.List;
-
-@SpringComponent
-@PermitAll
-@Scope("prototype")
-@PageTitle("Hours Worked Month")
-@Route(value = "/hours-worked-month/me", layout = MainLayout.class)
-public class HoursWorkedMonthView extends VerticalLayout {
-    private final EmployeeService employeeService;
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Empleado");
-    private final ComboBox<String> equipoDropdown = new ComboBox<>("Equipo");
-    private final Grid<Actividad> grid = new Grid<>(Actividad.class);
-
-    private final Label totalCompletadoLabel = new Label();
-    private final Label horasPendientesLabel = new Label();
-    private final Label totalAcumuladasLabel = new Label();
-    private final Label horasAdeudadasLabel = new Label();
-    private final Button actualizarButton = new Button("Actualizar");
-    private final Button guardarButton = new Button("Guardar");
-    private final Button cerrarButton = new Button("Cerrar");
-
-    private LocalDate selectedMonth;
-
-    @Autowired
-    public HoursWorkedMonthView(final EmployeeService employeeService) {
-        this.employeeService = employeeService;
-        configurarVista();
-    }
-
-    private void configurarVista() {
-        DatePicker monthPicker = new DatePicker("Selecciona un mes");
-        monthPicker.setValue(LocalDate.now());
-        monthPicker.addValueChangeListener(event -> {
-            selectedMonth = event.getValue().withDayOfMonth(1);
-            //cargarDatosMes(selectedMonth);
-        });
-
-        equipoDropdown.setItems("Equipo 1", "Equipo 2", "Equipo 3");
-        equipoDropdown.setWidth("250px");
-
-        setEmployeeComboBoxProperties();
-
-        configurarGrid();
-
-        actualizarButton.addClickListener(event -> actualizarDatos());
-        guardarButton.addClickListener(event -> guardarActividades());
-        cerrarButton.addClickListener(event -> closeView());
-
-        HorizontalLayout headerLayout = new HorizontalLayout(monthPicker, equipoDropdown, employeeComboBox);
-        add(
-                headerLayout, grid, totalCompletadoLabel,
-                horasPendientesLabel, totalAcumuladasLabel,
-                horasAdeudadasLabel, actualizarButton,
-                guardarButton, cerrarButton);
-    }
-
-    private void setEmployeeComboBoxProperties() {
-        employeeComboBox.setWidth("250px");
-        employeeComboBox.setPlaceholder("Buscar empleado...");
-        employeeComboBox.setItems(employeeService.findAllEmployees());
-        employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
-    }
-
-    private void configurarGrid() {
-        grid.removeAllColumns();
-        grid.addColumn(Actividad::getLunes).setHeader("Lunes");
-        grid.addColumn(Actividad::getMartes).setHeader("Martes");
-        grid.addColumn(Actividad::getMiercoles).setHeader("Miércoles");
-        grid.addColumn(Actividad::getJueves).setHeader("Jueves");
-        grid.addColumn(Actividad::getViernes).setHeader("Viernes");
-        grid.addColumn(Actividad::getSabado).setHeader("Sábado");
-        grid.addColumn(Actividad::getDomingo).setHeader("Domingo");
-        grid.addColumn(this::calcularTotalPorDia).setHeader("Total Semanal").setKey("totalSemanal");
-    }
-
-//    private void cargarDatosMes(final LocalDate month) {
-//        List<Actividad> actividadesDelMes = obtenerActividadesDelMes(month);
-//        grid.setItems(actividadesDelMes);
-//
-//        double totalCompletado = calcularTotalCompletado(actividadesDelMes);
-//        double horasPendientes = calcularHorasPendientes(totalCompletado);
-//        double totalAcumuladas = 166;
-//        double horasAdeudadas = 2;
-//
-//        totalCompletadoLabel.setText("Prom. Hrs/Semana Completadas: " + totalCompletado);
-//        horasPendientesLabel.setText("Prom. Hrs/Semana Pendientes: " + horasPendientes);
-//        totalAcumuladasLabel.setText("Total Hrs./Mes Acumuladas: " + totalAcumuladas);
-//        horasAdeudadasLabel.setText("Total Hrs./Mes Adeudadas: " + horasAdeudadas);
-//    }
-
-//    private List<Actividad> obtenerActividadesDelMes(final LocalDate month) {
-//        LocalDate startOfMonth = month.with(TemporalAdjusters.firstDayOfMonth());
-//        LocalDate endOfMonth = month.with(TemporalAdjusters.lastDayOfMonth());
-//
-//        List<Actividad> actividadesDelMes = new ArrayList<>();
-//
-//        for (LocalDate date = startOfMonth; date.isBefore(endOfMonth.plusDays(1)); date = date.plusDays(1)) {
-//            Actividad actividad = new Actividad.Builder()
-//                    .lunes(0)
-//                    .martes(0)
-//                    .miercoles(0)
-//                    .jueves(0)
-//                    .viernes(0)
-//                    .sabado(0)
-//                    .domingo(0)
-//                    .build();
-//            actividadesDelMes.add(actividad);
-//        }
-//
-//        return actividadesDelMes;
-//    }
-
-    private double calcularTotalCompletado(final List<Actividad> actividades) {
-        return actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-    }
-
-    private double calcularTotalPorDia(final Actividad actividad) {
-        return actividad.getLunes() + actividad.getMartes() + actividad.getMiercoles()
-                + actividad.getJueves() + actividad.getViernes() + actividad.getSabado()
-                + actividad.getDomingo();
-    }
-
-    private double calcularHorasPendientes(final double totalCompletado) {
-        return 40 - totalCompletado;
-    }
-
-    private void actualizarDatos() {
-        Notification.show("Datos actualizados.");
-    }
-
-    private void guardarActividades() {
-        Notification.show("Actividades guardadas correctamente.");
-    }
-
-    private void closeView() {
-        getUI().ifPresent(ui -> ui.navigate(""));
-    }
-}
--- a/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
+++ b/src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
@ -1,523 +1,256 @@
 package com.primefactorsolutions.views;
-import com.primefactorsolutions.model.Actividad;
+
 import com.primefactorsolutions.model.Employee;
 import com.primefactorsolutions.model.HoursWorked;
-import com.primefactorsolutions.repositories.ActividadesHoursRepository;
+import com.primefactorsolutions.model.Team;
 import com.primefactorsolutions.service.EmployeeService;
 import com.primefactorsolutions.service.HoursWorkedService;
-import com.vaadin.flow.component.grid.Grid;
+import com.primefactorsolutions.service.TeamService;
+import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.html.H2;
+import com.vaadin.flow.component.html.Label;
 import com.vaadin.flow.component.notification.Notification;
-import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.orderedlayout.VerticalLayout;
-import com.vaadin.flow.router.PageTitle;
-import com.vaadin.flow.router.Route;
+import com.vaadin.flow.router.*;
 import com.vaadin.flow.spring.annotation.SpringComponent;
 import jakarta.annotation.security.PermitAll;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
-import com.vaadin.flow.component.html.Label;
 import org.vaadin.firitin.components.datepicker.VDatePicker;
+import org.vaadin.firitin.form.BeanValidationForm;

-
-import java.time.DayOfWeek;
 import java.time.LocalDate;
+import java.time.YearMonth;
 import java.time.temporal.IsoFields;
-import java.time.temporal.WeekFields;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Locale;
+import java.util.UUID;

@SpringComponent
@PermitAll
@Scope("prototype")
@PageTitle("Horas Trabajadas")
-@Route(value = "/hours-worked/me", layout = MainLayout.class)
-public class HoursWorkedView extends VerticalLayout {
-    private final List<Actividad> actividades = new ArrayList<>();
-    private final List<Actividad> actividadesEspecificas = new ArrayList<>(); // Nueva lista para tareas específicas
-    private final Grid<Actividad> grid = new Grid<>(Actividad.class);
-    private final Grid<Actividad> gridActividadesEspecificas = new Grid<>(Actividad.class);
-
-    private final ComboBox<Employee> employeeComboBox = new ComboBox<>("Empleado");
-    private final ComboBox<String> equipoDropdown = new ComboBox<>("Equipo");
-    private VDatePicker fechaPicker = new VDatePicker("Selecciona una fecha");
-
-
-    private final ComboBox<String> tareasEspecificasDropdown = new ComboBox<>("Tareas Específicas");
-    private final TextField tareaEspecificaInput = new TextField("Especificar Tarea");
-    private TextField horasTareaInput = crearCampoHora("Horas Tareas");
-
-    private LocalDate selectedStartOfWeek;
-    private int weekNumber;
-
-    @Autowired
-    private final EmployeeService employeeService;
-    @Autowired
-    private final HoursWorkedService hoursWorkedService;
-
-
-    @Autowired
-    private ActividadesHoursRepository actividadesHoursRepository;
-
+@Route(value = "/hours-worked-list/:hours-workedId?/:action?", layout = MainLayout.class)
+public class HoursWorkedView extends BeanValidationForm<HoursWorked> implements HasUrlParameter<String> {
+    private final VDatePicker dateField = new VDatePicker("Fecha");
+    private final ComboBox<Team> teamField = new ComboBox<>("Equipo");
+    private ComboBox<Employee> employeeField;
+    private final ComboBox<String> tareasEspecificasDropdown = new ComboBox<>("Tarea Específica");
+    private final TextField tareaEspecificaInput = new TextField("Otra Tarea Específica");
+    private final TextField horasTareaEspecificaField = new TextField("Horas Tarea Específica");
+    private final TextField activityField = new TextField("Actividad");
+    private final TextField hoursField = new TextField("Horas");

    private final H2 equipoLabel = new H2("Tareas del Cliente/Equipo");
    private final H2 empresaLabel = new H2("Tareas de la Empresa");
    private final Label totalCompletadoLabel = new Label();
-    private final Label horasPendientesLabel = new Label();

-    public HoursWorkedView(final EmployeeService employeeService, final HoursWorkedService hoursWorkedService) {
-        this.employeeService = employeeService;
+    private final HoursWorkedService hoursWorkedService;
+    private final EmployeeService employeeService;
+    private final TeamService teamService;
+    private HoursWorked hoursWorked;
+    private Employee employee;
+
+    private Button saveButton;
+
+    public HoursWorkedView(final HoursWorkedService hoursWorkedService,
+                           final EmployeeService employeeService,
+                           final TeamService teamService) {
+        super(HoursWorked.class);
        this.hoursWorkedService = hoursWorkedService;
-        configurarVista();
-        configurarGrid();
-        configurarGridActividadesEspecificas();
-        cargarDatos();
-        configurarTareasEspecificas();
+        this.employeeService = employeeService;
+        this.teamService = teamService;
+
+        initializeDateField();
+        initializeTeamField();
+        initializeEmployeeField();
+        configureTareasEspecificas();
+
    }

-    private void configurarTareasEspecificas() {
-        tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones", "Colaboraciones",
-                "Aprendizajes", "Proyectos PFS", "Otros");
+    @Override
+    public void setParameter(final BeforeEvent beforeEvent, final String action) {
+        final RouteParameters params = beforeEvent.getRouteParameters();
+        final String s = params.get("hours-workedId").orElse(null);
+
+        if ("new".equals(action)) {
+            setEntityWithEnabledSave(new HoursWorked());
+        } else {
+            UUID hoursWorkedId = UUID.fromString(s);
+            var hoursWorked = hoursWorkedService.getHoursWorked(hoursWorkedId);
+            setEntityWithEnabledSave(hoursWorked);
+
+            if ("edit".equals(action) && !s.isEmpty()) {
+                saveButton.setVisible(true);
+            } else if ("view".equals(action) && !s.isEmpty()) {
+                saveButton.setVisible(false);
+            }
+        }
+    }
+
+    @Override
+    protected List<Component> getFormComponents() {
+        return List.of(
+                dateField,
+                teamField,
+                employeeField,
+                equipoLabel,
+                activityField,
+                hoursField,
+                empresaLabel,
+                tareasEspecificasDropdown,
+                tareaEspecificaInput,
+                horasTareaEspecificaField,
+                createCloseButton()
+        );
+    }
+
+    private void configureTareasEspecificas() {
+        tareasEspecificasDropdown.setItems("Entrevistas", "Reuniones",
+                "Colaboraciones", "Aprendizajes", "Proyectos PFS", "Otros");
        tareasEspecificasDropdown.setPlaceholder("Selecciona una tarea...");

        tareasEspecificasDropdown.addValueChangeListener(event -> {
            String selected = event.getValue();
-            // Activa el campo de texto si la opción seleccionada es "Otros"
-            tareaEspecificaInput.setVisible("Otros".equals(selected));
-            if (!"Otros".equals(selected)) {
+            boolean isOtros = "Otros".equals(selected);
+            tareaEspecificaInput.setVisible(isOtros);
+            horasTareaEspecificaField.setVisible(true);
+            if (!isOtros) {
                tareaEspecificaInput.clear();
+                horasTareaEspecificaField.clear();
            }
        });
        tareaEspecificaInput.setVisible(false);
+        horasTareaEspecificaField.setVisible(false);
    }

-    private void cargarDatos() {
-        if (selectedStartOfWeek != null && weekNumber > 0) {
-            List<HoursWorked> listaDeHorasTrabajadas = obtenerDatos();
+    protected Button createSaveButton() {
+        saveButton = new Button("Guardar");
+        saveButton.addClickListener(event -> saveHoursWorked());
+        return saveButton;
+    }

-            for (HoursWorked hours : listaDeHorasTrabajadas) {
-                LocalDate activityDate = hours.getFecha();
-                int activityWeek = getWeekOfYear(activityDate);
-                if (activityWeek == weekNumber) {
-                    Actividad actividad = hours.getActividad();
-                    if (actividad != null) {
-                        DayOfWeek dayOfWeek = activityDate.getDayOfWeek();
-                        agregarOActualizarActividad(actividad, dayOfWeek, hours.getTotalHours());
+    protected Button createCloseButton() {
+        Button closeButton = new Button("Cerrar");
+        closeButton.addClickListener(event -> closeForm());
+        return closeButton;
+    }
+
+    private void initializeTeamField() {
+        List<Team> teams = new ArrayList<>(teamService.findAllTeams());
+        teamField.setItems(teamService.findAllTeams());
+        teamField.setItemLabelGenerator(Team::getName);
+        teamField.setValue(teams.getFirst());
+        teamField.addValueChangeListener(event -> {
+                    if (teams != null) {
+                        employeeField.getValue();
+                        event.getValue();
                    }
                }
-            }
-
-            grid.setItems(actividades);
-            gridActividadesEspecificas.setItems(actividadesEspecificas);
-            calcularTotalHoras(listaDeHorasTrabajadas);
-        }
-    }
-
-    private void setEmployeeComboBoxProperties() {
-        employeeComboBox.setWidth("250px");
-        employeeComboBox.setPlaceholder("Buscar empleado...");
-        employeeComboBox.setItems(employeeService.findAllEmployees());
-        employeeComboBox.setItemLabelGenerator(employee -> employee.getFirstName() + " " + employee.getLastName());
-        employeeComboBox.setAllowCustomValue(false);
-        employeeComboBox.addCustomValueSetListener(event ->
-                Notification.show("Selecciona un empleado válido de la lista.")
        );
-
-        employeeComboBox.addValueChangeListener(event -> {
-            Employee selectedEmployee = event.getValue();
-            if (selectedEmployee != null) {
-                Notification.show("Empleado seleccionado: "
-                        + selectedEmployee.getFirstName() + " "
-                        + selectedEmployee.getLastName());
-            }
-        });
    }

-    private int getWeekOfYear(final LocalDate date) {
-        return date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+    private ComboBox<Employee> initializeEmployeeField() {
+        employeeField = new ComboBox<>("Empleado");
+        List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
+        employeeField.setItems(employees);
+        employeeField.setItemLabelGenerator(this::getEmployeeFullName);
+        employeeField.setValue(employees.getFirst());
+        return employeeField;
    }

-    private void configurarVista() {
-        fechaPicker.setMax(LocalDate.now());
-        fechaPicker.addValueChangeListener(event -> {
+    private String getEmployeeFullName(final Employee employee) {
+        return "TODOS".equals(employee.getFirstName())
+                ? "TODOS" : employee.getFirstName() + " " + employee.getLastName();
+    }
+
+    private void initializeDateField() {
+        LocalDate today = LocalDate.now();
+        YearMonth currentMonth = YearMonth.of(today.getYear(), today.getMonth());
+
+        LocalDate startOfMonth = currentMonth.atDay(1);
+
+        LocalDate maxSelectableDate = today;
+
+        dateField.setMin(startOfMonth);
+        dateField.setMax(maxSelectableDate);
+        dateField.setValue(today);
+
+        dateField.addValueChangeListener(event -> {
            LocalDate selectedDate = event.getValue();
            if (selectedDate != null) {
-                selectedStartOfWeek = getStartOfWeek(selectedDate);
-                weekNumber = getWeekOfYear(selectedDate);
-                cargarDatos();
+                int weekNumber = selectedDate.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+                Notification.show("Número de la semana: " + weekNumber, 3000, Notification.Position.BOTTOM_CENTER);
+                if (hoursWorked != null) {
+                    hoursWorked.setWeekNumber(weekNumber);
+                }
            }
        });
-
-        Button verMesButton = new Button("Ver Mes", event -> {
-            getUI().ifPresent(ui -> ui.navigate(HoursWorkedMonthView.class));
-        });
-
-        equipoDropdown.setItems("ABC", "DEF", "XYZ");
-        equipoDropdown.setWidth("250px");
-
-        equipoDropdown.addValueChangeListener(event -> {
-            String selectedEquipo = event.getValue();
-            if (selectedEquipo != null) {
-                // Filtra la lista de empleados según el equipo seleccionado
-                List<Employee> filteredEmployees = employeeService.findEmployeesByTeam(selectedEquipo);
-                employeeComboBox.setItems(filteredEmployees);
-            }
-        });
-
-        setEmployeeComboBoxProperties();
-
-        HorizontalLayout filtersLayout = new HorizontalLayout(equipoDropdown, employeeComboBox);
-        filtersLayout.setSpacing(true);
-
-        HorizontalLayout actividadFormLayout = configurarFormularioActividades();
-        HorizontalLayout tareasEspecificasLayout = configurarTareasEspecificasLayout();
-
-
-        Button actualizarButton = new Button("Actualizar Totales", event -> actualizarTotales());
-        Button guardarButton = new Button("Guardar", event -> guardarActividades());
-        Button cerrarButton = new Button("Cerrar", event -> this.closeView());
-
-        HorizontalLayout buttonsLayout = new HorizontalLayout(actualizarButton, guardarButton,
-                cerrarButton, verMesButton);
-
-        VerticalLayout totalesLayout = new VerticalLayout(totalCompletadoLabel,
-                horasPendientesLabel);
-        totalesLayout.setSpacing(true);
-        totalesLayout.setPadding(true);
-
-        add(fechaPicker, filtersLayout, actividadFormLayout,
-                equipoLabel, grid, empresaLabel, tareasEspecificasLayout,
-                gridActividadesEspecificas, buttonsLayout, totalesLayout);
-        
    }

-    private void configurarGrid() {
-        grid.removeAllColumns();
-        grid.setItems(actividades);
-        grid.addColumn(Actividad::getNombre).setHeader("Actividad");
-        grid.addColumn(Actividad::getLunes).setHeader("Lunes");
-        grid.addColumn(Actividad::getMartes).setHeader("Martes");
-        grid.addColumn(Actividad::getMiercoles).setHeader("Miércoles");
-        grid.addColumn(Actividad::getJueves).setHeader("Jueves");
-        grid.addColumn(Actividad::getViernes).setHeader("Viernes");
-        grid.addColumn(Actividad::getSabado).setHeader("Sábado");
-        grid.addColumn(Actividad::getDomingo).setHeader("Domingo");
-        grid.addColumn(this::calcularTotalPorDia).setHeader("Total Día").setKey("totalDia");
-        grid.setItems(actividades);
+    private void saveHoursWorked() {
+        if (isFormValid()) {
+            HoursWorked hoursWorked = getEntity();
+            setFieldValues(hoursWorked);
+            hoursWorkedService.save(hoursWorked);
+            Notification.show("Horas trabajadas guardadas correctamente.");
+            closeForm();
+        }
    }

-    private void configurarGridActividadesEspecificas() {
-        gridActividadesEspecificas.removeAllColumns();
-        gridActividadesEspecificas.setItems(actividadesEspecificas);
-        gridActividadesEspecificas.addColumn(Actividad::getTarea).setHeader("Actividad");
-        gridActividadesEspecificas.addColumn(Actividad::getLunes).setHeader("Lunes");
-        gridActividadesEspecificas.addColumn(Actividad::getMartes).setHeader("Martes");
-        gridActividadesEspecificas.addColumn(Actividad::getMiercoles).setHeader("Miércoles");
-        gridActividadesEspecificas.addColumn(Actividad::getJueves).setHeader("Jueves");
-        gridActividadesEspecificas.addColumn(Actividad::getViernes).setHeader("Viernes");
-        gridActividadesEspecificas.addColumn(Actividad::getSabado).setHeader("Sábado");
-        gridActividadesEspecificas.addColumn(Actividad::getDomingo).setHeader("Domingo");
-        gridActividadesEspecificas.addColumn(this::calcularTotalPorDia).setHeader("Total Día Específico")
-                .setKey("totalDiaEspecifico");
-    }
-
-    private HorizontalLayout configurarFormularioActividades() {
-        TextField actividadNombre = new TextField("Actividad");
-        actividadNombre.setWidth("200px");
-
-        TextField horasInput = crearCampoHora("Horas");
-
-        Button agregarActividadButton = new Button("Agregar Actividad", e -> {
+    private void setFieldValues(final HoursWorked hoursWorked) {
+        hoursWorked.setDate(dateField.getValue());
+        hoursWorked.setTeam(teamField.getValue());
+        hoursWorked.setEmployee(employeeField.getValue());
+        hoursWorked.setActividad(activityField.getValue());
+        try {
+            double hours = Double.parseDouble(hoursField.getValue());
+            hoursWorked.setHours(hours);
+        } catch (NumberFormatException e) {
+            Notification.show("Por favor, ingrese un número válido para las horas.");
+        }
+        if ("Otros".equals(tareasEspecificasDropdown.getValue())) {
+            hoursWorked.setTareasEspecificas(tareaEspecificaInput.getValue());
            try {
-                LocalDate selectedDate = fechaPicker.getValue();
-                if (selectedDate == null) {
-                    Notification.show("Por favor, selecciona una fecha.");
-                    return;
-                }
-
-                int selectedWeekNumber = getWeekOfYear(selectedDate);
-                if (selectedWeekNumber != weekNumber) {
-                    Notification.show("Solo puedes agregar actividades dentro de la semana actual.");
-                    return;
-                }
-
-                DayOfWeek selectedDay = selectedDate.getDayOfWeek();
-
-                Actividad.Builder actividadBuilder = new Actividad.Builder()
-                        .nombre(actividadNombre.getValue());
-
-                double horas = parseHoras(horasInput.getValue());
-                switch (selectedDay) {
-                    case MONDAY -> actividadBuilder.lunes(horas);
-                    case TUESDAY -> actividadBuilder.martes(horas);
-                    case WEDNESDAY -> actividadBuilder.miercoles(horas);
-                    case THURSDAY -> actividadBuilder.jueves(horas);
-                    case FRIDAY -> actividadBuilder.viernes(horas);
-                    case SATURDAY -> actividadBuilder.sabado(horas);
-                    case SUNDAY -> actividadBuilder.domingo(horas);
-                    default -> throw new IllegalArgumentException("Día seleccionado no válido: " + selectedDay);
-                }
-
-                String tareaSeleccionada = tareasEspecificasDropdown.getValue();
-                double horasTarea = parseHoras(horasTareaInput.getValue());
-
-                if (tareaSeleccionada != null && !tareaSeleccionada.isEmpty()) {
-                    actividadBuilder.tarea(tareaSeleccionada).lunes(horasTarea);
-                    Actividad nuevaActividadEspecifica = actividadBuilder.build();
-                    actividadesEspecificas.add(nuevaActividadEspecifica);
-                    gridActividadesEspecificas.setItems(actividadesEspecificas);
-                } else {
-                    Actividad nuevaActividad = actividadBuilder.build();
-                    actividades.add(nuevaActividad);
-                    grid.setItems(actividades);
-                }
-
-                Actividad nuevaActividad = actividadBuilder.build();
-                agregarOActualizarActividad(nuevaActividad, selectedDay, horas);
-
-                actualizarTotales();
-                Notification.show("Actividad agregada correctamente");
-                actividadNombre.clear();
-                horasInput.clear();
-                tareasEspecificasDropdown.clear();
-                horasTareaInput.clear();
-            } catch (NumberFormatException ex) {
-                Notification.show("Error: Por favor ingresa números válidos para las horas.");
-            }
-        });
-
-        return new HorizontalLayout(actividadNombre, horasInput, agregarActividadButton);
-    }
-
-    private void agregarOActualizarActividad(final Actividad nuevaActividad, final DayOfWeek dia, final double horas) {
-        Actividad actividadExistente = actividades.stream()
-                .filter(a -> a.getNombre().equals(nuevaActividad.getNombre()))
-                .findFirst()
-                .orElse(null);
-
-        if (actividadExistente != null) {
-            // Si la actividad ya existe, actualiza las horas para el día correspondiente
-            switch (dia) {
-                case MONDAY -> actividadExistente.setLunes(horas);
-                case TUESDAY -> actividadExistente.setMartes(horas);
-                case WEDNESDAY -> actividadExistente.setMiercoles(horas);
-                case THURSDAY -> actividadExistente.setJueves(horas);
-                case FRIDAY -> actividadExistente.setViernes(horas);
-                case SATURDAY -> actividadExistente.setSabado(horas);
-                case SUNDAY -> actividadExistente.setDomingo(horas);
-                default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia);
-            }
-        } else {
-            // Si no existe, se agrega como nueva actividad
-            switch (dia) {
-                case MONDAY -> nuevaActividad.setLunes(horas);
-                case TUESDAY -> nuevaActividad.setMartes(horas);
-                case WEDNESDAY -> nuevaActividad.setMiercoles(horas);
-                case THURSDAY -> nuevaActividad.setJueves(horas);
-                case FRIDAY -> nuevaActividad.setViernes(horas);
-                case SATURDAY -> nuevaActividad.setSabado(horas);
-                case SUNDAY -> nuevaActividad.setDomingo(horas);
-                default -> throw new IllegalArgumentException("Día seleccionado no válido: " + dia);
-            }
-            actividades.add(nuevaActividad);
-        }
-
-        // Actualiza el Grid
-        grid.setItems(actividades);
-    }
-
-
-    private HorizontalLayout configurarTareasEspecificasLayout() {
-
-        Button agregarTareaButton = new Button("Agregar Tarea PFS", e -> {
-            try {
-                String tareaSeleccionada = tareasEspecificasDropdown.getValue();
-                String tareaNombre = "Otros"
-                        .equals(tareaSeleccionada) ? tareaEspecificaInput
-                        .getValue() : tareaSeleccionada;
-
-                if (tareaNombre == null || tareaNombre.isEmpty()) {
-                    Notification.show("Por favor, especifica la tarea.");
-                    return;
-                }
-
-                double horasTarea = parseHoras(horasTareaInput.getValue());
-                if (horasTarea <= 0) {
-                    Notification.show("Por favor, ingresa un número válido para las horas.");
-                    return;
-                }
-
-                if (tareaSeleccionada != null && !tareaSeleccionada.isEmpty() && horasTarea > 0) {
-                    LocalDate selectedDate = fechaPicker.getValue();
-                    if (selectedDate == null) {
-                        Notification.show("Selecciona una fecha para asignar la tarea.");
-                        return;
-                    }
-
-                    DayOfWeek selectedDay = selectedDate.getDayOfWeek();
-                    Actividad.Builder actividadBuilder = new Actividad.Builder().tarea(tareaNombre);
-
-                    switch (selectedDay) {
-                        case MONDAY -> actividadBuilder.lunes(horasTarea);
-                        case TUESDAY -> actividadBuilder.martes(horasTarea);
-                        case WEDNESDAY -> actividadBuilder.miercoles(horasTarea);
-                        case THURSDAY -> actividadBuilder.jueves(horasTarea);
-                        case FRIDAY -> actividadBuilder.viernes(horasTarea);
-                        case SATURDAY -> actividadBuilder.sabado(horasTarea);
-                        case SUNDAY -> actividadBuilder.domingo(horasTarea);
-                        default -> throw new IllegalArgumentException("Día seleccionado no válido: " + selectedDay);
-                    }
-
-                    Actividad nuevaActividadEspecifica = actividadBuilder.build();
-                    actividadesEspecificas.add(nuevaActividadEspecifica);
-
-                    gridActividadesEspecificas.setItems(actividadesEspecificas);
-                    actualizarTotales();
-
-                    tareasEspecificasDropdown.clear();
-                    tareaEspecificaInput.clear();
-                    horasTareaInput.clear();
-
-                    Notification.show("Tarea específica agregada correctamente");
-                } else {
-                    Notification.show("Selecciona una tarea y asegúrate de ingresar horas válidas.");
-                }
-            } catch (NumberFormatException ex) {
-                Notification.show("Error: Por favor ingresa un número válido para las horas.");
-            }
-        });
-
-        HorizontalLayout layout = new HorizontalLayout(tareasEspecificasDropdown,
-                tareaEspecificaInput, horasTareaInput, agregarTareaButton);
-        layout.setSpacing(true);
-        return layout;
-    }
-
-    private TextField crearCampoHora(final String placeholder) {
-        TextField field = new TextField(placeholder);
-        field.setWidth("80px");
-        field.setPlaceholder("0.0");
-        return field;
-    }
-
-    private double parseHoras(final String value) {
-        if (value == null || value.trim().isEmpty()) {
-            return 0.0;
-        }
-        return Double.parseDouble(value);
-    }
-
-    private LocalDate getStartOfWeek(final LocalDate date) {
-        WeekFields weekFields = WeekFields.of(Locale.getDefault());
-        return date.with(weekFields.dayOfWeek(), DayOfWeek.FRIDAY.getValue());
-    }
-
-    private double calcularTotalPorDia(final Actividad actividad) {
-        return actividad.getLunes() + actividad.getMartes() + actividad.getMiercoles()
-                + actividad.getJueves() + actividad.getViernes() + actividad.getSabado() + actividad.getDomingo();
-    }
-
-    private void actualizarTotales() {
-        double totalActividadesGenerales = actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-        double totalActividadesEspecificas = actividadesEspecificas.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-        double totalFinal = totalActividadesGenerales + totalActividadesEspecificas;
-        double horasPendientes = 40 - totalFinal;
-
-        totalCompletadoLabel.setText("Total Hrs/Semana Completadas: " + totalFinal);
-        horasPendientesLabel.setText("Horas Pendientes: " + horasPendientes);
-    }
-
-    private void guardarActividades() {
-        Employee selectedEmployee = employeeComboBox.getValue();
-        String selectedEquipo = equipoDropdown.getValue();
-
-        if (selectedEmployee == null || selectedEquipo == null) {
-            Notification.show("Por favor selecciona un equipo y un empleado.");
-            return;
-        }
-
-        // Verificar que hay actividades para guardar
-        if (actividades.isEmpty()) {
-            Notification.show("No hay actividades para guardar.");
-            return;
-        }
-
-        // Sumar el total de horas para la semana
-        double totalHorasSemana = actividades.stream()
-                .mapToDouble(this::calcularTotalPorDia)
-                .sum();
-
-        // Crear un objeto HoursWorked por cada actividad
-        List<HoursWorked> savedHoursWorked = new ArrayList<>(); // Para almacenar los objetos guardados
-
-        // Recorrer todas las actividades y guardar un registro para cada una
-        for (Actividad actividad : actividades) {
-            HoursWorked hoursWorked = new HoursWorked();
-            hoursWorked.setEmployee(selectedEmployee);
-            hoursWorked.setWeekNumber(weekNumber);
-            hoursWorked.setTotalHours(totalHorasSemana);
-
-            // Asignar cada actividad individualmente
-            hoursWorked.setActividad(actividad);
-            hoursWorked.setFecha(LocalDate.now()); // Establecer la fecha actual o la seleccionada si es otra
-
-            // Mostrar información de la actividad para depuración
-            System.out.println("Guardando actividad: " + actividad.getNombre() + " con " + totalHorasSemana + " horas.");
-
-            try {
-                // Guardar en el servicio
-                hoursWorkedService.saveHoursWorked(hoursWorked);
-                savedHoursWorked.add(hoursWorked); // Agregar a la lista de registros guardados
-                Notification.show("Actividad guardada correctamente: " + actividad.getNombre());
-            } catch (Exception e) {
-                Notification.show("Error al guardar la actividad: " + actividad.getNombre() + " - " + e.getMessage());
+                double horasEspecifica = Double.parseDouble(horasTareaEspecificaField.getValue());
+                hoursWorked.setHorasTareasEspecificas(horasEspecifica);
+                double totalHoras = hoursWorked.getHours() + horasEspecifica;
+                hoursWorked.setTotalHours(totalHoras);
+            } catch (NumberFormatException e) {
+                Notification.show("Por favor, ingrese un número válido para las horas de la tarea específica.");
            }
        }
+    }

-        // Mostrar los registros guardados
-        savedHoursWorked.forEach(hw -> System.out.println("Horas trabajadas guardadas: " + hw));
+    private void closeForm() {
+        getUI().ifPresent(ui -> ui.navigate("hours-worked-list/" + hoursWorked.getId().toString()));
+    }

-        // Crear el Grid
-        Grid<HoursWorked> grid = new Grid<>();
-
-// Configurar columnas para mostrar la información deseada
-        grid.addColumn(hw -> hw.getEmployee().getFirstName()).setHeader("Empleado");
-        grid.addColumn(hw -> hw.getEmployee().getId()).setHeader("ID Empleado");
-        grid.addColumn(hw -> hw.getActividad().getNombre()).setHeader("Actividad");
-        grid.addColumn(hw -> hw.getTotalHours()).setHeader("Horas Trabajadas");
-        grid.addColumn(hw -> hw.getWeekNumber()).setHeader("Número de Semana");
-        grid.addColumn(hw -> hw.getFecha().toString()).setHeader("Fecha");
-
-// Llenar el Grid con los datos de savedHoursWorked
-        grid.setItems(savedHoursWorked);
-
-// Agregar el Grid a la vista
-        add(grid);
+    private boolean isFormValid() {
+        return dateField.getValue() != null
+                &&
+                teamField.getValue() != null
+                &&
+                employeeField.getValue() != null
+                &&
+                !activityField.isEmpty();

    }

-
-
-
-    private double calcularTotalHoras(final List<HoursWorked> listaDeHorasTrabajadas) {
-        return listaDeHorasTrabajadas.stream()
-                .mapToDouble(HoursWorked::getTotalHours)
-                .sum();
+    private void configureViewOrEditAction(final String action) {
+        if ("edit".equals(action) && hoursWorked != null) {
+            setFieldsReadOnly(false);
+        } else if ("view".equals(action) && hoursWorked != null) {
+            setFieldsReadOnly(true);
+            saveButton.setEnabled(false);
+        }
    }

-    private List<HoursWorked> obtenerDatos() {
-        return new ArrayList<>();
-    }
-
-    private void closeView() {
-        getUI().ifPresent(ui -> ui.navigate(HoursWorkedView.class));
+    private void setFieldsReadOnly(final boolean readOnly) {
+        dateField.setReadOnly(readOnly);
+        teamField.setReadOnly(readOnly);
+        employeeField.setReadOnly(readOnly);
+        activityField.setReadOnly(readOnly);
    }
 }
--- a/src/main/java/com/primefactorsolutions/views/InitAccountView.java
+++ b/src/main/java/com/primefactorsolutions/views/InitAccountView.java
@ -13,6 +13,7 @@ import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.auth.AnonymousAllowed;

+@SuppressWarnings("unused")
@Route("init-account")
@PageTitle("PFS Intra")
@AnonymousAllowed
--- a/src/main/java/com/primefactorsolutions/views/LoginView.java
+++ b/src/main/java/com/primefactorsolutions/views/LoginView.java
@ -2,6 +2,7 @@ package com.primefactorsolutions.views;

 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.H1;
+import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.component.login.LoginForm;
 import com.vaadin.flow.component.orderedlayout.VerticalLayout;
 import com.vaadin.flow.router.BeforeEnterEvent;
@ -9,6 +10,9 @@ import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.theme.lumo.LumoUtility;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;

@Route("login")
@PageTitle("PFS Intra")
@ -17,7 +21,7 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {

    private final LoginForm login = new LoginForm();

-    public LoginView() {
+    public LoginView(@Autowired @Value("${git.commit.id.abbrev}") final String commitId) {
        addClassName("login-view");
        setSizeFull();
        setAlignItems(Alignment.CENTER);
@ -29,6 +33,10 @@ public class LoginView extends VerticalLayout implements BeforeEnterObserver {
        add(new H1("PFS Intra"));
        add(login);
        add(new Anchor("/password-recovery", "Reset password?"));
+
+        final Span version = new Span(String.format("v.%s", commitId));
+        version.addClassName(LumoUtility.FontSize.XSMALL);
+        add(version);
    }

    @Override
--- a/src/main/java/com/primefactorsolutions/views/MainLayout.java
+++ b/src/main/java/com/primefactorsolutions/views/MainLayout.java
@ -22,6 +22,8 @@ import com.vaadin.flow.component.sidenav.SideNavItem;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.spring.security.AuthenticationContext;
 import com.vaadin.flow.theme.lumo.LumoUtility;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.vaadin.lineawesome.LineAwesomeIcon;

@ -35,10 +37,11 @@ public class MainLayout extends AppLayout {

    private H1 viewTitle;

-    public MainLayout(final AuthenticationContext authContext) {
+    public MainLayout(final AuthenticationContext authContext,
+                      @Autowired @Value("${git.commit.id.abbrev}") final String commitId) {
        this.authContext = authContext;
        setPrimarySection(Section.DRAWER);
-        addDrawerContent();
+        addDrawerContent(commitId);
        addHeaderContent();
    }

@ -112,12 +115,12 @@ public class MainLayout extends AppLayout {
        return icon;
    }

-    private void addDrawerContent() {
+    private void addDrawerContent(final String commitId) {
        final Span appName = new Span("pfs-intra");
        appName.addClassNames(LumoUtility.FontWeight.SEMIBOLD, LumoUtility.FontSize.LARGE);
        final Header header = new Header(appName);
        final Scroller scroller = new Scroller(createNavigation());
-        addToDrawer(header, scroller, createFooter());
+        addToDrawer(header, scroller, createFooter(commitId));
    }

    private SideNav createNavigation() {
@ -150,7 +153,7 @@ public class MainLayout extends AppLayout {
                    LineAwesomeIcon.LIST_ALT.create()));
            SideNavItem timesheet = new SideNavItem("My Timesheet", TimesheetView.class,
                    LineAwesomeIcon.HOURGLASS_START_SOLID.create());
-            timesheet.addItem(new SideNavItem("Horas Trabajadas", HoursWorkedView.class,
+            timesheet.addItem(new SideNavItem("Registro de Horas Trabajadas", HoursWorkedListView.class,
                    LineAwesomeIcon.ID_CARD_SOLID.create()));
            timesheet.addItem(new SideNavItem("Reporte Horas Trabajadas", ReporteView.class,
                    LineAwesomeIcon.ID_CARD_SOLID.create()));
@ -169,8 +172,8 @@ public class MainLayout extends AppLayout {
        return nav;
    }

-    private Footer createFooter() {
-        return new Footer();
+    private Footer createFooter(final String commitId) {
+        return new Footer(new Text(String.format("v.%s", commitId)));
    }

    @Override
--- a/src/main/java/com/primefactorsolutions/views/MainView.java
+++ b/src/main/java/com/primefactorsolutions/views/MainView.java
@ -1,50 +1,17 @@
 package com.primefactorsolutions.views;

-import com.primefactorsolutions.model.TimeOffRequest;
-import com.primefactorsolutions.model.TimeOffRequestStatus;
-import com.primefactorsolutions.service.TimeOffRequestService;
 import com.vaadin.flow.component.Text;
 import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.router.PageTitle;
 import com.vaadin.flow.router.Route;
 import jakarta.annotation.security.PermitAll;

-import java.time.LocalDate;
-import java.util.List;
-
@PageTitle("Home")
@Route(value = "", layout = MainLayout.class)
@PermitAll
 public class MainView extends Main {

-    private final TimeOffRequestService requestService;
-
-    public MainView(final TimeOffRequestService requestService) {
-        this.requestService = requestService;
+    public MainView() {
        add(new Text("Welcome"));
-        updateRequestStatuses();
-    }
-
-    private void updateRequestStatuses() {
-        List<TimeOffRequest> requests = requestService.findAllTimeOffRequests();
-        LocalDate now = LocalDate.now();
-
-        for (TimeOffRequest request : requests) {
-            if (request.getState() == TimeOffRequestStatus.APROBADO) {
-                LocalDate expirationDate = request.getExpiration();
-                LocalDate startDate = request.getStartDate();
-                LocalDate endDate = request.getEndDate();
-
-                if (now.isAfter(expirationDate)) {
-                    request.setState(TimeOffRequestStatus.VENCIDO);
-                } else if (now.isAfter(endDate) && now.isBefore(expirationDate)) {
-                    request.setState(TimeOffRequestStatus.TOMADO);
-                } else if (now.isEqual(startDate) || now.isAfter(startDate) && now.isBefore(endDate)) {
-                    request.setState(TimeOffRequestStatus.EN_USO);
-                }
-            }
-        }
-
-        requestService.saveAll(requests);
    }
 }
--- a/src/main/java/com/primefactorsolutions/views/PendingRequestsListView.java
+++ b/src/main/java/com/primefactorsolutions/views/PendingRequestsListView.java
@ -6,7 +6,6 @@ import com.primefactorsolutions.service.TeamService;
 import com.primefactorsolutions.service.TimeOffRequestService;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.PageTitle;
@ -19,32 +18,31 @@ import org.vaadin.firitin.components.grid.PagingGrid;
 import java.util.*;
 import java.util.stream.Collectors;

+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
@SpringComponent
@Scope("prototype")
@PageTitle("PendingRequests")
@Route(value = "/pending-requests", layout = MainLayout.class)
@PermitAll
-public class PendingRequestsListView extends Main {
+public class PendingRequestsListView extends BaseView {

    private final TimeOffRequestService requestService;
    private final EmployeeService employeeService;
    private final TeamService teamService;
    private final PagingGrid<TimeOffRequest> pendingRequestsGrid = new PagingGrid<>();

-    private List<Employee> employees = Collections.emptyList();
    private ComboBox<Employee> employeeFilter;
    private ComboBox<Team> teamFilter;
    private ComboBox<TimeOffRequestType> categoryFilter;
    private UUID selectedRequestId;

-
    public PendingRequestsListView(final TimeOffRequestService requestService,
                                   final EmployeeService employeeService,
                                   final TeamService teamService) {
        this.requestService = requestService;
        this.employeeService = employeeService;
        this.teamService = teamService;
-        this.employees = employeeService.findAllEmployees();
        initializeView();
        refreshGeneralPendingRequestsGrid(null, null, null);
    }
@ -52,14 +50,16 @@ public class PendingRequestsListView extends Main {
    private void initializeView() {
        setupFilters();
        setupPendingRequestsGrid();
-        add(pendingRequestsGrid);
-        add(createActionButtons());
+        createActionButtons();
    }

    private void setupFilters() {
-        add(createEmployeeFilter());
-        add(createTeamFilter());
-        add(createCategoryFilter());
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+        hl.add(createCategoryFilter());
+
+        getCurrentPageLayout().add(hl);
    }

    private void setupPendingRequestsGrid() {
@ -68,20 +68,23 @@ public class PendingRequestsListView extends Main {
        pendingRequestsGrid.addColumn(this::getCategory).setHeader("Categoría");

        pendingRequestsGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        pendingRequestsGrid.setPageSize(5);
+        pendingRequestsGrid.setPageSize(PAGE_SIZE);
        pendingRequestsGrid.asSingleSelect().addValueChangeListener(event -> {
            TimeOffRequest selectedRequest = event.getValue();
            if (selectedRequest != null) {
                selectedRequestId = selectedRequest.getId();
            }
        });
+
+        getCurrentPageLayout().add(pendingRequestsGrid);
    }

-    private HorizontalLayout createActionButtons() {
-        Button approveButton = createActionButton("Aprobar", TimeOffRequestStatus.APROBADO);
-        Button rejectButton = createActionButton("Rechazar", TimeOffRequestStatus.RECHAZADO);
-        Button closeButton = new Button("Salir", event -> navigateToMainView());
-        return new HorizontalLayout(approveButton, rejectButton, closeButton);
+    private void createActionButtons() {
+        final Button approveButton = createActionButton("Aprobar", TimeOffRequestStatus.APROBADO);
+        final Button rejectButton = createActionButton("Rechazar", TimeOffRequestStatus.RECHAZADO);
+        final Button closeButton = new Button("Salir", event -> navigateToMainView());
+
+        getCurrentPageLayout().add(new HorizontalLayout(approveButton, rejectButton, closeButton));
    }

    private Button createActionButton(final String caption, final TimeOffRequestStatus status) {
@ -113,7 +116,7 @@ public class PendingRequestsListView extends Main {
                                                  final Team team,
                                                  final TimeOffRequestType category) {
        List<TimeOffRequest> filteredPendingRequests
-                = requestService.findRequestsByState(TimeOffRequestStatus.PENDIENTE);
+                = requestService.findRequestsByState(TimeOffRequestStatus.SOLICITADO);

        if (employee != null && !"TODOS".equals(employee.getFirstName())) {
            filteredPendingRequests = filteredPendingRequests.stream()
--- a/src/main/java/com/primefactorsolutions/views/QuestionsListView.java
+++ b/src/main/java/com/primefactorsolutions/views/QuestionsListView.java
@ -28,16 +28,13 @@ import java.util.stream.Stream;
@Route(value = "/questions", layout = MainLayout.class)
@PermitAll
 public class QuestionsListView extends Main {
-    private final QuestionService questionService;

    public QuestionsListView(final QuestionService questionService) {
-        this.questionService = questionService;

        final HorizontalLayout hl = new HorizontalLayout();
        final Button addQuestion = new Button("Add Question");
-        addQuestion.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent -> {
-            this.getUI().get().navigate(QuestionView.class, "new");
-        });
+        addQuestion.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
+                this.getUI().flatMap(ui -> ui.navigate(QuestionView.class, "new")));
        hl.add(addQuestion);

        final VGrid<Question> grid = new VGrid<>(Question.class);
@ -45,7 +42,7 @@ public class QuestionsListView extends Main {
        grid.addComponentColumn((ValueProvider<Question, Component>) question -> {
            final Button edit = new Button("Edit");
            edit.addClickListener((ComponentEventListener<ClickEvent<Button>>) buttonClickEvent ->
-                    this.getUI().get().navigate(QuestionView.class, question.getId().toString()));
+                    this.getUI().flatMap(ui -> ui.navigate(QuestionView.class, question.getId().toString())));
            return edit;
        });
        grid.setDataProvider(new DataProvider<>() {
@ -59,6 +56,7 @@ public class QuestionsListView extends Main {
                return questionService.getQuestions().size();
            }

+            @SuppressWarnings("unused")
            @Override
            public Stream<Question> fetch(final Query<Question, Object> query) {
                int limit = query.getLimit();
--- a/src/main/java/com/primefactorsolutions/views/ReporteView.java
+++ b/src/main/java/com/primefactorsolutions/views/ReporteView.java
@ -87,8 +87,6 @@ public class ReporteView extends VerticalLayout {
        add(headerLayout);
        updateHeaderLayout(null, null);

-        grid.addColumn(map -> map.get("ID")).setHeader("ID").getElement().getStyle().set("font-weight", "bold");
-        grid.addColumn(map -> map.get("Employee ID")).setHeader("Employee ID");
        grid.addColumn(map -> map.get("Empleado")).setHeader("Empleado");
        grid.addColumn(map -> map.get("Horas Trabajadas")).setHeader("Horas Trabajadas");
        grid.addColumn(map -> map.get("Horas Pendientes")).setHeader("Horas Pendientes");
@ -142,7 +140,9 @@ public class ReporteView extends VerticalLayout {
                        .getId()) && hw.getWeekNumber() == weekNumber)
                .collect(Collectors.toList());

+        System.out.println(hoursWorkedList);
        if (hoursWorkedList.isEmpty()) {
+
            Notification.show("No hay horas trabajadas disponibles para generar el reporte.",
                    3000, Notification.Position.MIDDLE);
            return;
@ -206,7 +206,7 @@ public class ReporteView extends VerticalLayout {

    private void generateExcelDownloadLink(final List<Map<String, Object>> data, final int weekNumber) {
        try {
-            List<String> headers = List.of("ID", "Employee ID", "Empleado",
+            List<String> headers = List.of("Empleado",
                    "Horas Trabajadas", "Horas Pendientes", "Observaciones");
            String selectedTeam = equipoComboBox.getValue().getName();
            byte[] excelBytes = reportService.writeAsExcel(
--- a/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java
+++ b/src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java
@ -23,11 +23,11 @@ import org.vaadin.firitin.components.grid.PagingGrid;

 import java.time.LocalDate;
 import java.time.Period;
-import java.util.Collections;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
 import java.util.stream.Collectors;

+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
@SpringComponent
@PermitAll
@Scope("prototype")
@ -54,6 +54,7 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
    }

    private void initializeView() {
+        requestService.updateRequestStatuses();
        setupFilters();
        setupGrid();
        add(requestGrid, createActionButtons(), createSummaryLayout());
@ -97,7 +98,7 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
        requestGrid.getColumnByKey("daysToBeTake").setHeader("Días a Tomar");

        requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
+        requestGrid.setPageSize(PAGE_SIZE);
        requestGrid.asSingleSelect().addValueChangeListener(event -> {
            TimeOffRequest selectedRequest = event.getValue();
            if (selectedRequest != null) {
@ -106,29 +107,98 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
        });
    }

-    private VerticalLayout createSummaryLayout() {
-        double totalHoliday = requests.stream()
-                .filter(this::verificationIsHoliday)
-                .mapToDouble(TimeOffRequest::getAvailableDays)
-                .sum();
-        double totalVacations = calculateVacationDays(employeeService.getEmployee(employeeId));
-        double totalPersonalDays = requests.stream()
-                .filter(req -> !verificationIsHoliday(req))
-                .filter(req -> !req.getCategory().name().startsWith("VACACION"))
-                .mapToDouble(TimeOffRequest::getAvailableDays)
-                .sum();
-
-        double totalAvailableDays = totalHoliday + totalVacations + totalPersonalDays;
-
-        return new VerticalLayout(
-                new Span("Total feriados: " + totalHoliday),
-                new Span("Total vacaciones: " + totalVacations),
-                new Span("Total días personales: " + totalPersonalDays),
-                new Span("Total general: " + totalAvailableDays)
+    private Set<TimeOffRequestType> getStandardExclusions() {
+        return Set.of(
+                TimeOffRequestType.MATERNIDAD,
+                TimeOffRequestType.PATERNIDAD,
+                TimeOffRequestType.MATRIMONIO,
+                TimeOffRequestType.DUELO_1ER_GRADO,
+                TimeOffRequestType.DUELO_2ER_GRADO,
+                TimeOffRequestType.DIA_DEL_PADRE,
+                TimeOffRequestType.DIA_DE_LA_MADRE
        );
    }

-    private double calculateVacationDays(final Employee employee) {
+    private Set<TimeOffRequestType> getMaleSpecificExclusions() {
+        return Set.of(
+                TimeOffRequestType.DIA_DE_LA_MUJER_INTERNACIONAL,
+                TimeOffRequestType.DIA_DE_LA_MUJER_NACIONAL
+        );
+    }
+
+    private VerticalLayout createSummaryLayout() {
+        Employee employee = employeeService.getEmployee(employeeId);
+        boolean isMale = employee.getGender() == Employee.Gender.MALE;
+        int currentYear = LocalDate.now().getYear();
+
+        List<Vacation> vacations = vacationService.findVacations();
+
+        double healthLicence = 2;
+        List<TimeOffRequest> healthRequests = requestService
+                .findByEmployeeAndCategory(employeeId, TimeOffRequestType.PERMISOS_DE_SALUD);
+        if (healthRequests != null && !healthRequests.isEmpty()) {
+            healthLicence = healthRequests.getLast().getDaysBalance();
+        }
+
+        double totalFixedAndMovableHolidays = calculateHolidayDays(vacations);
+        double totalPersonalDays = calculatePersonalDays(vacations, isMale);
+        List<Double> vacationDays = calculateVacationDays(employee);
+
+        double utilizedVacationCurrentDays = vacationDays.get(1);
+        List<TimeOffRequest> vacationCurrentRequests = requestService
+                .findByEmployeeAndCategory(employeeId, TimeOffRequestType.VACACION_GESTION_ACTUAL);
+        if (vacationCurrentRequests != null && !vacationCurrentRequests.isEmpty()) {
+            utilizedVacationCurrentDays = vacationCurrentRequests.getLast().getDaysBalance();
+        }
+        double totalVacationCurrentDays = vacationDays.get(1) - (vacationDays.get(1) - utilizedVacationCurrentDays);
+
+        double utilizedVacationPreviousDays = vacationDays.get(0);
+        List<TimeOffRequest> vacationPreviousRequests = requestService
+                .findByEmployeeAndCategory(employeeId, TimeOffRequestType.VACACION_GESTION_ANTERIOR);
+        if (vacationPreviousRequests != null && !vacationPreviousRequests.isEmpty()) {
+            utilizedVacationPreviousDays = vacationPreviousRequests.getLast().getDaysBalance();
+        }
+        double totalVacationPreviousDays = vacationDays.getFirst()
+                - (vacationDays.getFirst() - utilizedVacationPreviousDays);
+
+        double utilizedFixedAndMovableHolidays = calculateHolidayUtilizedDays(currentYear);
+        double utilizedPersonalDays = calculatePersonalDaysUtilized(isMale, currentYear);
+
+        double remainingHolidayDays = totalFixedAndMovableHolidays - utilizedFixedAndMovableHolidays;
+        double remainingPersonalDays = (totalPersonalDays - utilizedPersonalDays) + healthLicence;
+        double remainingVacationDays = totalVacationCurrentDays + totalVacationPreviousDays;
+
+        double totalAvailableDays = remainingHolidayDays + remainingPersonalDays + remainingVacationDays;
+
+        return new VerticalLayout(
+                new Span("Total feriados fijos y movibles: " + remainingHolidayDays),
+                new Span("Total días libres personales: " + remainingPersonalDays),
+                new Span("Total vacaciones pendientes de uso: " + remainingVacationDays),
+                new Span("TOTAL GENERAL DE DÍAS DISPONIBLES: " + totalAvailableDays)
+        );
+    }
+
+    private double calculateHolidayDays(final List<Vacation> vacations) {
+        return vacations.stream()
+                .filter(req -> req.getType() != Vacation.Type.OTHER)
+                .mapToDouble(Vacation::getDuration)
+                .sum();
+    }
+
+    private double calculatePersonalDays(final List<Vacation> vacations, final boolean isMale) {
+        return vacations.stream()
+                .filter(req -> req.getType() == Vacation.Type.OTHER)
+                .filter(req -> !getStandardExclusions().contains(req.getCategory()))
+                .filter(req -> !(isMale && getMaleSpecificExclusions().contains(req.getCategory())))
+                .filter(req -> !req.getCategory().name().startsWith("VACACION"))
+                .filter(req -> req.getCategory() != TimeOffRequestType.PERMISOS_DE_SALUD)
+                .mapToDouble(Vacation::getDuration)
+                .sum();
+    }
+
+    private List<Double> calculateVacationDays(final Employee employee) {
+        List<Double> vacationDays = new ArrayList<>();
+
        if (employee.getDateOfEntry() != null) {
            LocalDate entryDate = employee.getDateOfEntry();
            LocalDate today = LocalDate.now();
@ -164,11 +234,42 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
                );
            }

-            return calculateVacationDaysSinceEntry(entryDate, previousVacationYearDate)
-                    + calculateVacationDaysSinceEntry(entryDate, currentVacationYearDate);
+            vacationDays.add(calculateVacationDaysSinceEntry(entryDate, previousVacationYearDate));
+            vacationDays.add(calculateVacationDaysSinceEntry(entryDate, currentVacationYearDate));
        } else {
-            return 0.0;
+            vacationDays.add(0.0);
+            vacationDays.add(0.0);
        }
+        return vacationDays;
+    }
+
+    private double calculateHolidayUtilizedDays(final int year) {
+        return requests.stream()
+                .filter(this::verificationIsHoliday)
+                .filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
+                .filter(req -> getStartDateYear(req) == year)
+                .mapToDouble(TimeOffRequest::getDaysToBeTake)
+                .sum();
+    }
+
+    private double calculatePersonalDaysUtilized(final boolean isMale, final int year) {
+        return requests.stream()
+                .filter(req -> !verificationIsHoliday(req))
+                .filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
+                .filter(req -> !getStandardExclusions().contains(req.getCategory()))
+                .filter(req -> !(isMale && getMaleSpecificExclusions().contains(req.getCategory())))
+                .filter(req -> !req.getCategory().name().startsWith("VACACION"))
+                .filter(req -> req.getCategory() != TimeOffRequestType.PERMISOS_DE_SALUD)
+                .filter(req -> getStartDateYear(req) == year)
+                .mapToDouble(TimeOffRequest::getDaysToBeTake)
+                .sum();
+    }
+
+    private int getStartDateYear(final TimeOffRequest request) {
+        if (request.getStartDate() != null) {
+            return request.getStartDate().getYear();
+        }
+        return 0;
    }

    private double calculateVacationDaysSinceEntry(final LocalDate dateOfEntry, final LocalDate date) {
@ -236,7 +337,9 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
                                                              final int pageSize,
                                                              final TimeOffRequestType category,
                                                              final TimeOffRequestStatus state) {
+
        requests = requestService.findRequestsByEmployeeId(employeeId);
+        generateRequests();
        if (category != null && !"TODOS".equals(category.name())) {
            requests = requests.stream()
                    .filter(req -> req.getCategory().equals(category))
@ -251,6 +354,58 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
        return requests.subList(start, end);
    }

+    public void generateRequests() {
+        boolean isMale = isEmployeeMale();
+
+        for (TimeOffRequestType type : TimeOffRequestType.values()) {
+            if (shouldIncludeRequest(type) && isValidRequestType(type, isMale)) {
+                TimeOffRequest request = createRequest(type);
+                if (isVacationExpired(request)) {
+                    request.setState(TimeOffRequestStatus.VENCIDO);
+                } else {
+                    request.setState(TimeOffRequestStatus.PENDIENTE);
+                }
+                requests.add(request);
+            }
+        }
+    }
+
+    private boolean isEmployeeMale() {
+        return employeeService.getEmployee(employeeId).getGender() == Employee.Gender.MALE;
+    }
+
+    private boolean isValidRequestType(final TimeOffRequestType type, final boolean isMale) {
+        return !getStandardExclusions().contains(type)
+                && !(isMale && getMaleSpecificExclusions().contains(type))
+                && type != TimeOffRequestType.TODOS;
+    }
+
+    private TimeOffRequest createRequest(final TimeOffRequestType type) {
+        TimeOffRequest request = new TimeOffRequest();
+        request.setCategory(type);
+        return request;
+    }
+
+    private boolean isVacationExpired(final TimeOffRequest request) {
+        Vacation vacation = vacationService.findVacationByCategory(request.getCategory());
+
+        if (vacation != null && vacation.getMonthOfYear() != null && vacation.getDayOfMonth() != null) {
+            int vacationMonth = vacation.getMonthOfYear();
+            int vacationDay = vacation.getDayOfMonth();
+            int currentMonth = LocalDate.now().getMonthValue();
+            int currentDay = LocalDate.now().getDayOfMonth();
+
+            return vacationMonth < currentMonth || (vacationMonth == currentMonth && vacationDay < currentDay);
+        }
+
+        return false;
+    }
+
+    private boolean shouldIncludeRequest(final TimeOffRequestType type) {
+        List<TimeOffRequest> existingRequest = requestService.findByEmployeeAndCategory(employeeId, type);
+        return existingRequest.isEmpty();
+    }
+
    @Override
    public void setParameter(final BeforeEvent event, final String parameter) {
        employeeId = UUID.fromString(parameter);
--- a/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java
+++ b/src/main/java/com/primefactorsolutions/views/RequestRegisterView.java
@ -63,6 +63,7 @@ public class RequestRegisterView extends VerticalLayout {
    }

    private void initializeView() {
+        requestService.updateRequestStatuses();
        configureFormFields();
        configureButtons();
        configureBinder();
@ -84,8 +85,6 @@ public class RequestRegisterView extends VerticalLayout {
        employeeComboBox.setItemLabelGenerator(emp -> emp.getFirstName() + " " + emp.getLastName());
        employeeComboBox.addValueChangeListener(event -> {
            employee = event.getValue();
-            System.out.println("Clearing form..." + employee);
-
            handleEmployeeSelection(event.getValue());
        });
        categoryComboBox.addValueChangeListener(event -> {
@ -136,15 +135,39 @@ public class RequestRegisterView extends VerticalLayout {
        List<TimeOffRequestType> availableCategories = allCategories.stream()
                .filter(category -> isCategoryAvailable(employeeRequests, category))
                .filter(category -> isCategoryAllowedByGender(category, employee.getGender()))
-                .filter(category -> category != TimeOffRequestType.VACACION_GESTION_ANTERIOR
-                        && category != TimeOffRequestType.TODOS)
+                .filter(category -> category != TimeOffRequestType.TODOS)
+                .filter(category -> shouldIncludeVacationGestionActual(employeeRequests, category))
+                .filter(category -> shouldIncludeVacationGestionAnterior(employeeRequests, category))
                .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 boolean shouldIncludeVacationGestionAnterior(final List<TimeOffRequest> employeeRequests,
+                                                         final TimeOffRequestType category) {
+        if (category != TimeOffRequestType.VACACION_GESTION_ANTERIOR) {
+            return true;
+        }
+        return employeeRequests.stream()
+                .noneMatch(request -> request.getCategory() == TimeOffRequestType.VACACION_GESTION_ANTERIOR
+                        && request.getDaysBalance() == 0);
+    }
+
    private void onCategoryChange(final TimeOffRequestType selectedCategory) {
-        if (selectedCategory == TimeOffRequestType.VACACION_GESTION_ACTUAL) {
+        if (selectedCategory == TimeOffRequestType.VACACION_GESTION_ACTUAL
+            || selectedCategory == TimeOffRequestType.VACACION_GESTION_ANTERIOR) {
            startDatePicker.setEnabled(true);
            endDatePicker.setEnabled(true);
        } else {
@ -167,13 +190,21 @@ public class RequestRegisterView extends VerticalLayout {
                .max(Comparator.comparing(TimeOffRequest::getStartDate))
                .orElse(null);

-        if (category == TimeOffRequestType.PERMISOS_DE_SALUD
+        boolean isSpecialCategory = 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);
+                || category == TimeOffRequestType.VACACION_GESTION_ANTERIOR;
+
+        if (isSpecialCategory) {
+            return (latestRequest.getState() == TimeOffRequestStatus.TOMADO
+                    && latestRequest.getDaysBalance() > 0)
+                    || latestRequest.getState() == TimeOffRequestStatus.RECHAZADO
+                    || (latestRequest.getState() == TimeOffRequestStatus.TOMADO
+                        && latestRequest.getDaysBalance() == 0
+                        && latestRequest.getExpiration().isBefore(LocalDate.now()));
        } else {
-            return latestRequest.getState() == TimeOffRequestStatus.VENCIDO;
+            return (latestRequest.getState() == TimeOffRequestStatus.TOMADO
+                    && latestRequest.getExpiration().isBefore(LocalDate.now()))
+                    || latestRequest.getState() == TimeOffRequestStatus.RECHAZADO;
        }
    }

@ -199,30 +230,40 @@ public class RequestRegisterView extends VerticalLayout {
        vacation = vacationService.findVacationByCategory(selectedCategory);
        UUID employeeId = employeeComboBox.getValue().getId();
        List<TimeOffRequest> requests = requestService.findByEmployeeAndCategory(employeeId, selectedCategory);
+
        if (vacation != null) {
            TimeOffRequest requestWithBalance = requests.stream()
                    .filter(request -> request.getDaysBalance() > 0
-                            && request.getState() != TimeOffRequestStatus.VENCIDO)
+                            && request.getState() != TimeOffRequestStatus.VENCIDO
+                            && request.getState() != TimeOffRequestStatus.RECHAZADO)
                    .max(Comparator.comparing(TimeOffRequest::getStartDate))
                    .orElse(null);
+
            if (requestWithBalance != null) {
-                if (requestWithBalance.getState() == TimeOffRequestStatus.TOMADO) {
+                if (requestWithBalance.getState() == TimeOffRequestStatus.TOMADO
+                        && requestWithBalance.getDaysBalance() > 0) {
                    availableDaysField.setValue(requestWithBalance.getDaysBalance());
-                } else if (requestWithBalance.getState() == TimeOffRequestStatus.VENCIDO) {
+                } else {
                    availableDaysField.setValue(vacation.getDuration());
                }
-            } else if (vacation.getCategory() == TimeOffRequestType.VACACION_GESTION_ACTUAL) {
+            } else if (selectedCategory == TimeOffRequestType.VACACION_GESTION_ACTUAL
+                    || selectedCategory == TimeOffRequestType.VACACION_GESTION_ANTERIOR) {
                LocalDate dateOfEntry = employeeComboBox.getValue().getDateOfEntry();
                LocalDate currentDate = LocalDate.now();
                long yearsOfService = ChronoUnit.YEARS.between(dateOfEntry, currentDate);
+
+                if (selectedCategory == TimeOffRequestType.VACACION_GESTION_ANTERIOR) {
+                    yearsOfService -= 1;
+                }
+
                if (yearsOfService > 10) {
-                    availableDaysField.setValue((double) 30);
+                    availableDaysField.setValue(30.0);
                } else if (yearsOfService > 5) {
-                    availableDaysField.setValue((double) 20);
+                    availableDaysField.setValue(20.0);
                } else if (yearsOfService > 1) {
-                    availableDaysField.setValue((double) 15);
+                    availableDaysField.setValue(15.0);
                } else {
-                    availableDaysField.setValue((double) 0);
+                    availableDaysField.setValue(0.0);
                }
            } else {
                availableDaysField.setValue(vacation.getDuration());
@ -248,7 +289,11 @@ public class RequestRegisterView extends VerticalLayout {
        }

        if (startDate != null) {
-            endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1);
+            if (vacation.getExpiration() != null) {
+                endDate = startDate.plusDays(vacation.getExpiration().intValue() - 1);
+            } else {
+                endDate = LocalDate.of(startDate.getYear(), 12, 31);
+            }
        } else {
            startDate = LocalDate.now();
        }
@ -267,19 +312,23 @@ public class RequestRegisterView extends VerticalLayout {
                .map(request -> request.getStartDate().getYear())
                .orElse(LocalDate.now().getYear());

+        if (previousRequests.getLast().getState() != TimeOffRequestStatus.RECHAZADO) {
+            lastRequestYear = lastRequestYear + 1;
+        }
+
        int currentYear = LocalDate.now().getYear();
-        return Math.max(lastRequestYear + 1, currentYear);
+        return Math.max(lastRequestYear, currentYear);
    }

    private LocalDate determineStartDate(final Vacation vacation, final int startYear) {
-        if (vacation.getMonthOfYear() != null && vacation.getDayOfMonth() != null) {
-            return LocalDate.of(startYear, vacation.getMonthOfYear().intValue(), vacation.getDayOfMonth().intValue());
-        }
-
        if (vacation.getCategory() == TimeOffRequestType.CUMPLEAÑOS && employee.getBirthday() != null) {
            return LocalDate.of(startYear, employee.getBirthday().getMonth(), employee.getBirthday().getDayOfMonth());
        }

+        if (vacation.getMonthOfYear() != null && vacation.getDayOfMonth() != null) {
+            return LocalDate.of(startYear, vacation.getMonthOfYear().intValue(), vacation.getDayOfMonth().intValue());
+        }
+
        if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD) {
            return LocalDate.now();
        }
@ -291,7 +340,9 @@ public class RequestRegisterView extends VerticalLayout {
        startDatePicker.setValue(startDate);

        if ((vacation.getDuration() != null && vacation.getDuration() == 0.5)
-                || vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD) {
+                || vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD
+                || vacation.getCategory() == TimeOffRequestType.CUMPLEAÑOS) {
+
            endDatePicker.setValue(startDate);
        } else {
            int durationDays = (vacation.getDuration() != null ? vacation.getDuration().intValue() - 1 : 0);
@ -330,7 +381,7 @@ public class RequestRegisterView extends VerticalLayout {
            double balanceDays = calculateBalanceDays(availableDays, daysToBeTakenField.getValue());
            balanceDaysField.setValue(balanceDays);

-            if (balanceDays < 0) {
+            if (balanceDays < 0.0) {
                clearFields();
            }
        }
@ -345,7 +396,12 @@ public class RequestRegisterView extends VerticalLayout {
    }

    private void setDaysToBeTakenField(final double daysToBeTaken) {
-        if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD) {
+        if (vacation.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD
+                || vacation.getCategory() == TimeOffRequestType.CUMPLEAÑOS
+                || vacation.getCategory() == TimeOffRequestType.DIA_DEL_PADRE
+                || vacation.getCategory() == TimeOffRequestType.DIA_DE_LA_MADRE
+                || vacation.getCategory() == TimeOffRequestType.DIA_DE_LA_MUJER_INTERNACIONAL
+                || vacation.getCategory() == TimeOffRequestType.DIA_DE_LA_MUJER_NACIONAL) {
            daysToBeTakenField.setValue(0.5);
        } else {
            daysToBeTakenField.setValue(daysToBeTaken);
@ -410,7 +466,7 @@ public class RequestRegisterView extends VerticalLayout {
        request.setStartDate(startDatePicker.getValue());
        request.setAvailableDays(availableDaysField.getValue());
        request.setExpiration(endDate != null ? endDate : endDatePicker.getValue());
-        request.setState(TimeOffRequestStatus.PENDIENTE);
+        request.setState(TimeOffRequestStatus.SOLICITADO);
        return request;
    }

@ -418,7 +474,10 @@ public class RequestRegisterView extends VerticalLayout {
        List<TimeOffRequest> existingRequests =
                requestService.findByEmployeeAndCategory(employee.getId(), request.getCategory());

-        int maxRequests = request.getCategory() == TimeOffRequestType.PERMISOS_DE_SALUD ? 4 : 2;
+        int maxRequests = request.getCategory() != TimeOffRequestType.PERMISOS_DE_SALUD
+                && !request.getCategory().name().startsWith("VACACION")
+                && request.getCategory() != TimeOffRequestType.CUMPLEAÑOS
+                ? 2 : 1;

        if (existingRequests.size() >= maxRequests) {
            existingRequests.stream()
--- a/src/main/java/com/primefactorsolutions/views/RequestsListView.java
+++ b/src/main/java/com/primefactorsolutions/views/RequestsListView.java
@ -7,7 +7,6 @@ import com.primefactorsolutions.service.TimeOffRequestService;
 import com.primefactorsolutions.service.VacationService;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.combobox.ComboBox;
-import com.vaadin.flow.component.html.Main;
 import com.vaadin.flow.component.notification.Notification;
 import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
 import com.vaadin.flow.router.PageTitle;
@ -22,12 +21,14 @@ import java.time.Period;
 import java.util.*;
 import java.util.stream.Collectors;

+import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
+
@SpringComponent
@Scope("prototype")
@PageTitle("Requests")
@Route(value = "/requests", layout = MainLayout.class)
@PermitAll
-public class RequestsListView extends Main {
+public class RequestsListView extends BaseView {

    private final TimeOffRequestService requestService;
    private final EmployeeService employeeService;
@ -35,10 +36,8 @@ public class RequestsListView extends Main {
    private final VacationService vacationService;
    private final PagingGrid<Employee> requestGrid = new PagingGrid<>();

-    private List<Employee> employees = Collections.emptyList();
    private ComboBox<Employee> employeeFilter;
    private ComboBox<Team> teamFilter;
-    private ComboBox<TimeOffRequestType> categoryFilter;
    private ComboBox<Status> stateFilter;
    private UUID selectedEmployeeId;

@ -51,22 +50,25 @@ public class RequestsListView extends Main {
        this.employeeService = employeeService;
        this.teamService = teamService;
        this.vacationService = vacationService;
-        this.employees = employeeService.findAllEmployees();
        initializeView();
        refreshGeneralRequestGrid(null, null, null);
    }

    private void initializeView() {
+        requestService.updateRequestStatuses();
        setupFilters();
        setupRequestGrid();
-        add(requestGrid);
-        add(createActionButtons());
+        getCurrentPageLayout().add(requestGrid);
+        getCurrentPageLayout().add(createActionButtons());
    }

    private void setupFilters() {
-        add(createEmployeeFilter());
-        add(createTeamFilter());
-        add(createStateFilter());
+        final HorizontalLayout hl = new HorizontalLayout();
+        hl.add(createEmployeeFilter());
+        hl.add(createTeamFilter());
+        hl.add(createStateFilter());
+
+        getCurrentPageLayout().add(hl);
    }

    private void setupRequestGrid() {
@ -76,7 +78,7 @@ public class RequestsListView extends Main {
        requestGrid.addColumn(this::getGeneralTotal).setHeader("Total general");

        requestGrid.setPaginationBarMode(PagingGrid.PaginationBarMode.BOTTOM);
-        requestGrid.setPageSize(5);
+        requestGrid.setPageSize(PAGE_SIZE);
        requestGrid.asSingleSelect().addValueChangeListener(event -> {
            Employee selectedRequest = event.getValue();
            if (selectedRequest != null) {
@ -163,8 +165,29 @@ public class RequestsListView extends Main {
    private String getGeneralTotal(final Employee employee) {
        List<TimeOffRequest> employeeRequests = requestService.findRequestsByEmployeeId(employee.getId());
        List<Vacation> vacations = vacationService.findVacations();
+
+        List<Double> vacationDays = calculateVacationDays(employee);
+
+        double utilizedVacationCurrentDays = vacationDays.get(1);
+        List<TimeOffRequest> vacationCurrentRequests = requestService
+                .findByEmployeeAndCategory(employee.getId(), TimeOffRequestType.VACACION_GESTION_ACTUAL);
+        if (vacationCurrentRequests != null && !vacationCurrentRequests.isEmpty()) {
+            utilizedVacationCurrentDays = vacationCurrentRequests.getLast().getDaysBalance();
+        }
+        double totalVacationCurrentDays = vacationDays.get(1) - (vacationDays.get(1) - utilizedVacationCurrentDays);
+
+        double utilizedVacationPreviousDays = vacationDays.get(0);
+        List<TimeOffRequest> vacationPreviousRequests = requestService
+                .findByEmployeeAndCategory(employee.getId(), TimeOffRequestType.VACACION_GESTION_ANTERIOR);
+        if (vacationPreviousRequests != null && !vacationPreviousRequests.isEmpty()) {
+            utilizedVacationPreviousDays = vacationPreviousRequests.getLast().getDaysBalance();
+        }
+        double totalVacationPreviousDays = vacationDays.getFirst()
+                - (vacationDays.getFirst() - utilizedVacationPreviousDays);
+
+
        double totalUtilized = calculateTotalUtilized(employeeRequests);
-        double totalVacations = calculateVacationDays(employee);
+        double totalVacations = totalVacationCurrentDays + totalVacationPreviousDays;
        double totalAvailable = calculateTotalAvailable(vacations, employeeRequests, employee);

        double generalTotal = totalAvailable + totalVacations - totalUtilized;
@ -191,13 +214,24 @@ public class RequestsListView extends Main {
    }

    private double calculateTotalUtilized(final List<TimeOffRequest> employeeRequests) {
+        int currentYear = LocalDate.now().getYear();
        return employeeRequests.stream()
                .filter(Objects::nonNull)
+                .filter(request -> request.getCategory() != TimeOffRequestType.PERMISOS_DE_SALUD)
+                .filter(request -> request.getCategory() != TimeOffRequestType.VACACION_GESTION_ACTUAL)
+                .filter(request -> request.getCategory() != TimeOffRequestType.VACACION_GESTION_ANTERIOR)
+                .filter(request -> request.getStartDate() != null && (
+                        request.getStartDate().getYear() == currentYear
+                                || (request.getCategory().name().startsWith("VACACION")
+                                && request.getStartDate().getYear() == currentYear - 1)
+                ))
                .mapToDouble(request -> request.getDaysToBeTake() != null ? request.getDaysToBeTake() : 0.0)
                .sum();
    }

-    private double calculateVacationDays(final Employee employee) {
+    private List<Double> calculateVacationDays(final Employee employee) {
+        List<Double> vacationDays = new ArrayList<>();
+
        if (employee.getDateOfEntry() != null) {
            LocalDate entryDate = employee.getDateOfEntry();
            LocalDate today = LocalDate.now();
@ -233,11 +267,13 @@ public class RequestsListView extends Main {
                );
            }

-            return calculateVacationDaysSinceEntry(entryDate, previousVacationYearDate)
-                    + calculateVacationDaysSinceEntry(entryDate, currentVacationYearDate);
+            vacationDays.add(calculateVacationDaysSinceEntry(entryDate, previousVacationYearDate));
+            vacationDays.add(calculateVacationDaysSinceEntry(entryDate, currentVacationYearDate));
        } else {
-            return 0.0;
+            vacationDays.add(0.0);
+            vacationDays.add(0.0);
        }
+        return vacationDays;
    }

    private double calculateTotalAvailable(final List<Vacation> vacations, final List<TimeOffRequest> employeeRequests,
@ -248,8 +284,16 @@ public class RequestsListView extends Main {
                .map(TimeOffRequest::getCategory)
                .collect(Collectors.toSet());

-        return vacations.stream()
+        double healthLicence = 2;
+        List<TimeOffRequest> healthRequests = requestService
+                .findByEmployeeAndCategory(employee.getId(), TimeOffRequestType.PERMISOS_DE_SALUD);
+        if (healthRequests != null && !healthRequests.isEmpty()) {
+            healthLicence = healthRequests.getLast().getDaysBalance();
+        }
+
+        double totalAvailable = vacations.stream()
                .filter(Objects::nonNull)
+                .filter(vacation -> vacation.getCategory() != TimeOffRequestType.PERMISOS_DE_SALUD)
                .filter(vacation -> shouldIncludeVacation(
                        vacation,
                        excludedCategories,
@ -258,6 +302,8 @@ public class RequestsListView extends Main {
                ))
                .mapToDouble(vacation -> vacation.getDuration() != null ? vacation.getDuration() : 0.0)
                .sum();
+
+        return totalAvailable + healthLicence;
    }

    private double calculateVacationDaysSinceEntry(final LocalDate dateOfEntry, final LocalDate date) {
@ -283,10 +329,8 @@ public class RequestsListView extends Main {
                && !employeeRequestCategories.contains(vacation.getCategory())) {
            return false;
        }
-        if (!isFemale(employee) && genderSpecificExclusions.contains(vacation.getCategory())) {
-            return false;
-        }
-        return true;
+
+        return isFemale(employee) || !genderSpecificExclusions.contains(vacation.getCategory());
    }

    private boolean isFemale(final Employee employee) {
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@ -32,7 +32,7 @@ INSERT INTO vacation (id, version, category, month_of_year, day_of_month, durati
 INSERT INTO vacation (id, version, category, month_of_year, day_of_month, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400b', 1, 'DIA_DE_TODOS_LOS_DIFUNTOS', 11, 2, 1, 30, 'MOVABLE');


-INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400c', 1, 'CUMPLEAÑOS', 0.5, 365, 'OTHER');
+INSERT INTO vacation (id, version, category, month_of_year, day_of_month, duration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400c', 1, 'CUMPLEAÑOS', 12, 31, 0.5, 'OTHER');
 INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400d', 1, 'MATERNIDAD', 90, 90, 'OTHER');
 INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400e', 1, 'PATERNIDAD', 3, 3, 'OTHER');
 INSERT INTO vacation (id, version, category, duration, expiration, type) VALUES ('c23e4567-e89b-12d3-a456-42661417400f', 1, 'MATRIMONIO', 3, 3, 'OTHER');
@ -68,25 +68,28 @@ insert into employee (id, version, username, first_name, last_name, status, team


 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-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'PATERNIDAD', 'VENCIDO', 3, '2024-10-03', '2024-10-01', '2024-10-03', 3, 0);
+values ('9d6f12ba-e341-4e7a-b8a6-cab0982bd8c1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'PATERNIDAD', 'APROBADO', 3, '2024-10-03', '2024-10-01', '2024-10-03', 3, 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 ('9a6f12ba-e111-4e7a-b8a6-caa0982bd8a1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'AÑO_NUEVO', 'VENCIDO', 1, '2024-01-01', '2024-01-01', '2024-01-01', 1, 0);
+values ('9a6f12ba-e111-4e7a-b8a6-caa0982bd8a1', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'AÑO_NUEVO', 'APROBADO', 1, '2024-01-01', '2024-01-01', '2024-01-01', 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 ('9b6f12ba-e222-4e7a-b8a6-caa0982bd8b2', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'LUNES_CARNAVAL', 'APROBADO', 1, '2025-02-12', '2025-02-12', '2025-02-12', 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 ('9c6f12ba-e333-4e7a-b8a6-caa0982bd8c3', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'MARTES_CARNAVAL', 'EN_REVISION', 1, '2025-02-13', '2025-02-13', '2025-02-13', 1, 0);
+values ('9c6f12ba-e333-4e7a-b8a6-caa0982bd8c3', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'MARTES_CARNAVAL', 'SOLICITADO', 1, '2025-02-13', '2025-02-13', '2025-02-13', 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 ('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, '2024-11-01', '2022-11-01', '2022-11-30', 30, 0);
+values ('9e6f12ba-e555-4e7a-b8a6-caa0982bd8e5', 1, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'VACACION_GESTION_ANTERIOR', 'APROBADO', 20, '2024-11-01', '2022-11-01', '2022-11-30', 20, 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);
 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 ('fb9d9d75-b2ab-4ea4-b8b3-0a8f89e5c123', 1, '2e2293b1-3f9a-4f3d-abc8-32639b0a5e15', 'DIA_DE_LA_INDEPENDENCIA', 'APROBADO', 1, '2024-08-06', '2024-08-06', '2024-08-06', 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 ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'DIA_DE_TODOS_LOS_DIFUNTOS', 'PENDIENTE', 1, '2025-12-01', '2025-11-02', '2025-11-02', 1, 0);
+values ('6fdc47a8-127b-41c4-8d12-7fc12098ab12', 1, 'b2436b82-7b9f-4f0d-9463-f2c3173a45c3', 'DIA_DE_TODOS_LOS_DIFUNTOS', 'SOLICITADO', 1, '2025-12-01', '2025-11-02', '2025-11-02', 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 ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'AÑO_NUEVO', 'PENDIENTE', 1, '2025-01-01', '2025-01-01', '2025-01-01', 1, 0);
+values ('12ec8b74-983d-4a17-b67e-134f45ae904c', 1, '5c1a7b82-832d-4f24-8377-54b77b91b6a8', 'AÑO_NUEVO', 'SOLICITADO', 1, '2025-01-01', '2025-01-01', '2025-01-01', 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 ('89bc4b2a-943f-487c-a9f3-bacf78145e67', 1, 'cba3efb7-32bc-44be-9fdc-fc5e4f211254', 'LUNES_CARNAVAL', 'APROBADO', 1, '2024-02-12', '2024-02-12', '2024-02-12', 1, 0);
+
+INSERT INTO HOURS_WORKED (ID, VERSION, ACTIVIDAD, DATE, HORAS_TAREAS_ESPECIFICAS, HORASPENDIENTES, HOURS, TAREAS_ESPECIFICAS, TOTAL_HOURS, WEEK_NUMBER, EMPLOYEE_ID, TEAM_ID)
+VALUES ('6d6b3a71-9b11-4526-8335-b089627a8cd6', 0, 'Scrum Meeting', '2024-11-15', 0.0, 0.0, 2.0, NULL, 8, 46, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
Author	SHA1	Message	Date
Alex Prudencio	54ff167124	improve tables layout All checks were successful Builder / Build-Project (push) Successful in 2m44s Details	2024-11-17 17:15:58 -05:00
Alex Prudencio	2a561a925c	change list page size All checks were successful Builder / Build-Project (push) Successful in 2m45s Details	2024-11-17 16:37:57 -05:00
Alex Prudencio	0695223c31	fix file upload All checks were successful Builder / Build-Project (push) Successful in 2m43s Details	2024-11-17 16:15:08 -05:00
Alex Prudencio	4de84d7320	fix packages.json All checks were successful Builder / Build-Project (push) Successful in 2m47s Details	2024-11-15 11:42:46 -05:00
alex	1857dcb5a9	Merge pull request 'registro-horas' (#76 ) from registro-horas into main Some checks failed Builder / Build-Project (push) Has been cancelled Details Reviewed-on: #76 Reviewed-by: alex <alex@primefactorsolutions.com>	2024-11-15 16:40:49 +00:00
Melina Gutierrez	7b4953a3aa	Añadir correcion de service y repository All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m44s Details	2024-11-15 12:34:43 -04:00
Melina Gutierrez	03146b1b9b	Añadir correcion de formato Some checks failed PR Builder / Build-PR (pull_request) Failing after 2m40s Details	2024-11-15 12:26:47 -04:00
Melina Gutierrez	e8612aa5df	Añadir correcion a Employee repository y service Some checks failed PR Builder / Build-PR (pull_request) Failing after 24s Details	2024-11-15 12:18:44 -04:00
Melina Gutierrez	f46d2cac03	Añadir correcion a Employee	2024-11-15 12:08:06 -04:00
Melina Gutierrez	886a19f2cf	Añadir correcion a Employee	2024-11-15 11:54:52 -04:00
Melina Gutierrez	c58b37bbaf	Formulario de registro de horas trabajadas mas el formulario	2024-11-15 11:51:32 -04:00
Alex Prudencio	50fd791449	add version in login page All checks were successful Builder / Build-Project (push) Successful in 2m47s Details	2024-11-14 23:15:17 -05:00
Alex Prudencio	b9320a3d6a	adding git version in build All checks were successful Builder / Build-Project (push) Successful in 2m50s Details	2024-11-14 22:47:11 -05:00
alex	439eab3541	Merge pull request 'correcciones' (#73 ) from En-desarrollo into main All checks were successful Builder / Build-Project (push) Successful in 2m46s Details Reviewed-on: #73 Reviewed-by: alex <alex@primefactorsolutions.com>	2024-11-15 02:52:45 +00:00
ricardo051199	005f0235fa	correcciones vacacion gestion anterior All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m42s Details	2024-11-14 22:42:42 -04:00
ricardo051199	305a5c53f3	correcciones All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m38s Details	2024-11-14 22:31:29 -04:00
ricardo051199	97b9e515bf	correcciones All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m38s Details	2024-11-14 22:19:43 -04:00
alex	1c93e9c20c	Merge pull request 'solicitud vacaciones priorizar primero de gestion anterior' (#72 ) from En-desarrollo into main All checks were successful Builder / Build-Project (push) Successful in 2m44s Details Reviewed-on: #72 Reviewed-by: alex <alex@primefactorsolutions.com>	2024-11-15 01:15:32 +00:00
ricardo051199	ddefc54e9e	solicitud vacaciones priorizar primero de gestion anterior All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m38s Details	2024-11-14 20:58:17 -04:00
alex	bdfaa7da85	Merge pull request 'En-desarrollo' (#71 ) from En-desarrollo into main All checks were successful Builder / Build-Project (push) Successful in 2m45s Details Reviewed-on: #71	2024-11-15 00:24:15 +00:00
ricardo051199	5ba432079b	Resolver errores de checkstyle All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m36s Details	2024-11-14 04:15:29 -04:00
ricardo051199	1c638ff27b	Lista de Solicitudes de empleado - actualizar resumen Some checks failed PR Builder / Build-PR (pull_request) Failing after 24s Details	2024-11-14 04:09:26 -04:00
ricardo051199	a3e94040ff	correcciones All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m38s Details	2024-11-14 03:17:26 -04:00
ricardo051199	b1e95cf8a5	Resolver errores de checkstyle All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m36s Details	2024-11-13 19:58:33 -04:00
ricardo051199	8e1f0fdd7d	Lista de Solicitudes de empleado - actualizar solicitudes permisos de salud Some checks failed PR Builder / Build-PR (pull_request) Failing after 22s Details	2024-11-13 19:54:36 -04:00
ricardo051199	9579b33acc	Lista de Solicitudes de empleado - Actualizar resumen de empleado	2024-11-13 18:34:42 -04:00
ricardo051199	efca245c1d	Corregir datos de prueba All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m40s Details	2024-11-13 14:47:28 -04:00
ricardo051199	ca5fb122fb	Lista de Solicitudes de empleado - Actualizar estado All checks were successful PR Builder / Build-PR (pull_request) Successful in 2m40s Details	2024-11-13 14:10:09 -04:00
ricardo051199	6d60fd00cc	Lista de Solicitudes de empleado - Refactorizar	2024-11-13 12:38:25 -04:00
ricardo051199	51a1d22be9	Lista de Solicitudes de empleado - Calcular total disponibilidad de dias	2024-11-12 21:54:28 -04:00