PFS/pfs-intra
4
0
Fork 0
Code Issues 32 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

Compare commits

base: PFS:hoursworked
Branches Tags
PFS:main
PFS:registro-horas
PFS:hoursworked
PFS:En-desarrollo
PFS:actividadHoursWorked
PFS:Vacaciones
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo
..
compare: PFS:main
Branches Tags
PFS:main
PFS:registro-horas
PFS:hoursworked
PFS:En-desarrollo
PFS:actividadHoursWorked
PFS:Vacaciones
PFS:Listado-General-Vacaciones
PFS:Perfil-Empleado-Administrativo-Documentacion
PFS:#17-Perfil-Personal-Administrativo
PFS:#4-Registrar-empleado
PFS:Rama-Ricardo

11 Commits
hoursworke ... main

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
32 changed files with 355 additions and 683 deletions
Show Stats Expand all files Collapse all files

14
.gitea/workflows/build-pr.yaml Normal file
View File

@ -0,0 +1,14 @@
name: PR Builder
run-name: ${{ gitea.actor }} building PR
on: [pull_request]
jobs:
Build-PR:
runs-on: ubuntu-22.04
steps:
- run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch ${{ gitea.head_ref }} and ref is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
- name: Build PR
if: gitea.base_ref == 'main'
run: |
git clone --single-branch --branch "${{ gitea.head_ref }}" https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction
- run: echo "This job's status is ${{ job.status }}."

16
.gitea/workflows/build.yaml Normal file
View File

@ -0,0 +1,16 @@
name: Builder
run-name: ${{ gitea.actor }} building
on:
push:
branches:
- main
jobs:
Build-Project:
runs-on: ubuntu-22.04
steps:
- run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event on branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
- name: Build package
run: |
git clone --single-branch --branch main https://git.primefactorsolutions.com/PFS/pfs-intra.git && cd pfs-intra && ./mvnw clean package -Pproduction && unlink /home/ubuntu/pfs-intra/app.jar && cp target/*.jar /home/ubuntu/pfs-intra/app.jar && sudo systemctl restart pfs-intra
- run: echo "This job's status is ${{ job.status }}."

118
.mvn/wrapper/MavenWrapperDownloader.java vendored Normal file
View File

@ -0,0 +1,118 @@
/*
* Copyright 2007-present the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.io.*;
import java.net.*;
import java.nio.channels.*;
import java.util.Properties;
public class MavenWrapperDownloader {
private static final String WRAPPER_VERSION = "0.5.6";
/**
* Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is
* provided.
*/
private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+ WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
/**
* Path to the maven-wrapper.properties file, which might contain a downloadUrl
* property to use instead of the default one.
*/
private static final String MAVEN_WRAPPER_PROPERTIES_PATH = ".mvn/wrapper/maven-wrapper.properties";
/**
* Path where the maven-wrapper.jar will be saved to.
*/
private static final String MAVEN_WRAPPER_JAR_PATH = ".mvn/wrapper/maven-wrapper.jar";
/**
* Name of the property which should be used to override the default download
* url for the wrapper.
*/
private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
public static void main(String args[]) {
System.out.println("- Downloader started");
File baseDirectory = new File(args[0]);
System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
// If the maven-wrapper.properties exists, read it and check if it contains a
// custom
// wrapperUrl parameter.
File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
String url = DEFAULT_DOWNLOAD_URL;
if (mavenWrapperPropertyFile.exists()) {
FileInputStream mavenWrapperPropertyFileInputStream = null;
try {
mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
Properties mavenWrapperProperties = new Properties();
mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
} catch (IOException e) {
System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
} finally {
try {
if (mavenWrapperPropertyFileInputStream != null) {
mavenWrapperPropertyFileInputStream.close();
}
} catch (IOException e) {
// Ignore ...
}
}
}
System.out.println("- Downloading from: " + url);
File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
if (!outputFile.getParentFile().exists()) {
if (!outputFile.getParentFile().mkdirs()) {
System.out.println(
"- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
}
}
System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
try {
downloadFileFromURL(url, outputFile);
System.out.println("Done");
System.exit(0);
} catch (Throwable e) {
System.out.println("- Error downloading");
e.printStackTrace();
System.exit(1);
}
}
private static void downloadFileFromURL(String urlString, File destination) throws Exception {
if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
String username = System.getenv("MVNW_USERNAME");
char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
Authenticator.setDefault(new Authenticator() {
@Override
protected PasswordAuthentication getPasswordAuthentication() {
return new PasswordAuthentication(username, password);
}
});
}
URL website = new URL(urlString);
ReadableByteChannel rbc;
rbc = Channels.newChannel(website.openStream());
FileOutputStream fos = new FileOutputStream(destination);
fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
fos.close();
rbc.close();
}
}

BIN
.mvn/wrapper/maven-wrapper.jar vendored Normal file
View File

Binary file not shown.

18
.mvn/wrapper/maven-wrapper.properties vendored Normal file
View File

@ -0,0 +1,18 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar

60
package.json
View File

@ -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",

539
pfs-intra.eml
View File

@ -1,539 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<component LANGUAGE_LEVEL="JDK_21" inheritJdk="true">
<output-test url="file://$MODULE_DIR$/target/test-classes"/>
<contentEntry url="file://$MODULE_DIR$">
<testFolder url="file://$MODULE_DIR$/src/test/java"/>
<testFolder url="file://$MODULE_DIR$/src/test/resources"/>
<excludeFolder url="file://$MODULE_DIR$/target"/>
</contentEntry>
<lib name="Maven: io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.1.20" scope="RUNTIME"/>
<lib name="Maven: io.netty.incubator:netty-incubator-codec-native-quic:linux-x86_64:0.0.63.Final" scope="RUNTIME"/>
<lib name="Maven: io.netty.incubator:netty-incubator-codec-classes-quic:0.0.63.Final" scope="RUNTIME"/>
<lib name="Maven: com.h2database:h2:2.2.224" scope="RUNTIME"/>
<lib name="Maven: org.glassfish.jaxb:jaxb-runtime:4.0.5" scope="RUNTIME"/>
<lib name="Maven: org.glassfish.jaxb:jaxb-core:4.0.5" scope="RUNTIME"/>
<lib name="Maven: org.glassfish.jaxb:txw2:4.0.5" scope="RUNTIME"/>
<lib name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" scope="RUNTIME"/>
<lib name="Maven: jakarta.inject:jakarta.inject-api:2.0.1" scope="RUNTIME"/>
<lib name="Maven: org.eclipse.angus:angus-activation:2.0.2" scope="RUNTIME"/>
<lib name="Maven: org.springframework.boot:spring-boot-starter-test:3.2.7" scope="TEST"/>
<lib name="Maven: org.springframework.boot:spring-boot-test:3.2.7" scope="TEST"/>
<lib name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:3.2.7" scope="TEST"/>
<lib name="Maven: com.jayway.jsonpath:json-path:2.9.0" scope="TEST"/>
<lib name="Maven: net.minidev:json-smart:2.5.1" scope="TEST"/>
<lib name="Maven: net.minidev:accessors-smart:2.5.1" scope="TEST"/>
<lib name="Maven: org.awaitility:awaitility:4.2.1" scope="TEST"/>
<lib name="Maven: org.hamcrest:hamcrest:2.2" scope="TEST"/>
<lib name="Maven: org.junit.jupiter:junit-jupiter:5.10.2" scope="TEST"/>
<lib name="Maven: org.junit.jupiter:junit-jupiter-api:5.10.2" scope="TEST"/>
<lib name="Maven: org.opentest4j:opentest4j:1.3.0" scope="TEST"/>
<lib name="Maven: org.junit.platform:junit-platform-commons:1.10.2" scope="TEST"/>
<lib name="Maven: org.apiguardian:apiguardian-api:1.1.2" scope="TEST"/>
<lib name="Maven: org.junit.jupiter:junit-jupiter-params:5.10.2" scope="TEST"/>
<lib name="Maven: org.junit.jupiter:junit-jupiter-engine:5.10.2" scope="TEST"/>
<lib name="Maven: org.mockito:mockito-junit-jupiter:5.7.0" scope="TEST"/>
<lib name="Maven: org.skyscreamer:jsonassert:1.5.1" scope="TEST"/>
<lib name="Maven: org.springframework:spring-test:6.1.10" scope="TEST"/>
<lib name="Maven: org.xmlunit:xmlunit-core:2.9.1" scope="TEST"/>
<lib name="Maven: org.objenesis:objenesis:3.3" scope="RUNTIME"/>
<lib name="Maven: com.github.mvysny.kaributesting:karibu-testing-v10-spring:2.1.8" scope="TEST"/>
<lib name="Maven: org.apache.lucene:lucene-memory:9.9.2" scope="RUNTIME"/>
<lib name="Maven: com.vaadin:vaadin-testbench-junit5:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-testbench-core-junit5:9.3.5" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-remote-driver:4.25.0" scope="TEST"/>
<lib name="Maven: com.google.auto.service:auto-service-annotations:1.1.1" scope="TEST"/>
<lib name="Maven: io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-api:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-context:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-exporter-logging:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-common:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-api-events:1.31.0-alpha" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-trace:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-metrics:1.31.0" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha" scope="TEST"/>
<lib name="Maven: io.opentelemetry:opentelemetry-sdk-logs:1.31.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-api:4.25.0" scope="TEST"/>
<lib name="Maven: org.jspecify:jspecify:1.0.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-http:4.25.0" scope="TEST"/>
<lib name="Maven: dev.failsafe:failsafe:3.3.2" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-json:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-manager:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-os:4.25.0" scope="TEST"/>
<lib name="Maven: org.apache.commons:commons-exec:1.4.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-java:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-chromium-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-devtools-v127:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-devtools-v128:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-devtools-v129:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-devtools-v85:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-edge-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-ie-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-safari-driver:4.25.0" scope="TEST"/>
<lib name="Maven: org.seleniumhq.selenium:selenium-support:4.25.0" scope="TEST"/>
<lib name="Maven: org.junit.platform:junit-platform-engine:1.10.2" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-testbench-unit-junit5:9.3.5" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-testbench-unit-shared:9.3.5" scope="TEST"/>
<lib name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.9.24" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-testbench-shared:9.3.5" scope="TEST"/>
<lib name="Maven: com.vaadin:flow-html-components-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-accordion-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-app-layout-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-avatar-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-board-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-button-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-charts-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-checkbox-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-combo-box-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-confirm-dialog-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-context-menu-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-cookie-consent-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-crud-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-custom-field-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-date-picker-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-date-time-picker-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-details-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-dialog-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-form-layout-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-grid-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-grid-pro-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-icons-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-virtual-list-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-list-box-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-login-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-menu-bar-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-messages-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-notification-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-ordered-layout-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-popover-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-progress-bar-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-radio-button-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-rich-text-editor-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-select-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-side-nav-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-split-layout-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-tabs-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-text-field-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-time-picker-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: com.vaadin:vaadin-upload-testbench:24.5.1" scope="TEST"/>
<lib name="Maven: org.assertj:assertj-core:3.25.3" scope="TEST"/>
<levels>
<level name="Maven: com.vaadin:vaadin-core:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-core-internal:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-server:24.5.1" value="project"/>
<level name="Maven: com.vaadin.servletdetector:throw-if-servlet3:1.0.2" value="project"/>
<level name="Maven: org.apache.commons:commons-fileupload2-jakarta:2.0.0-M1" value="project"/>
<level name="Maven: org.apache.commons:commons-fileupload2-core:2.0.0-M1" value="project"/>
<level name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.4" value="project"/>
<level name="Maven: org.jsoup:jsoup:1.18.1" value="project"/>
<level name="Maven: com.helger:ph-css:7.0.2" value="project"/>
<level name="Maven: com.helger.commons:ph-commons:11.1.5" value="project"/>
<level name="Maven: org.ow2.asm:asm:9.7" value="project"/>
<level name="Maven: com.vaadin.external:gentyref:1.2.0.vaadin1" value="project"/>
<level name="Maven: com.vaadin:flow-lit-template:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-react:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-push:24.5.1" value="project"/>
<level name="Maven: com.vaadin.external.atmosphere:atmosphere-runtime:3.0.5.slf4jvaadin1" value="project"/>
<level name="Maven: com.vaadin:flow-client:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-html-components:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-data:24.5.1" value="project"/>
<level name="Maven: com.vaadin:flow-dnd:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-lumo-theme:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-material-theme:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-accordion-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-avatar-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-flow-components-base:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-button-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-checkbox-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-combo-box-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-confirm-dialog-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-custom-field-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-date-picker-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-date-time-picker-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-details-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-time-picker-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-select-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-side-nav-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-dialog-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-form-layout-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-field-highlighter-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-grid-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-icons-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-virtual-list-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-list-box-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-login-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-messages-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-ordered-layout-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-progress-bar-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-popover-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-radio-button-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-renderer-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-split-layout-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-tabs-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-text-field-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-upload-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-notification-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-app-layout-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-context-menu-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-menu-bar-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:collaboration-engine:6.3.0" value="project"/>
<level name="Maven: com.vaadin:vaadin-dev:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-dev-server:24.5.1" value="project"/>
<level name="Maven: com.vaadin:open:8.5.0.3" value="project"/>
<level name="Maven: com.github.javaparser:javaparser-core:3.26.2" value="project"/>
<level name="Maven: io.methvin:directory-watcher:0.18.0" value="project"/>
<level name="Maven: com.vaadin:vaadin-dev-bundle:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-dev:24.5.1" value="project"/>
<level name="Maven: com.vaadin:copilot:24.5.1" value="project"/>
<level name="Maven: io.projectreactor.netty:reactor-netty:1.1.20" value="project"/>
<level name="Maven: io.projectreactor.netty:reactor-netty-core:1.1.20" value="project"/>
<level name="Maven: io.netty:netty-handler:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-common:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-resolver:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-buffer:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-transport:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-transport-native-unix-common:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-codec:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-handler-proxy:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-codec-socks:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-resolver-dns:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-codec-dns:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-resolver-dns-native-macos:osx-x86_64:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-resolver-dns-classes-macos:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-transport-native-epoll:linux-x86_64:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-transport-classes-epoll:4.1.111.Final" value="project"/>
<level name="Maven: io.projectreactor.netty:reactor-netty-http:1.1.20" value="project"/>
<level name="Maven: io.netty:netty-codec-http:4.1.111.Final" value="project"/>
<level name="Maven: io.netty:netty-codec-http2:4.1.111.Final" value="project"/>
<level name="Maven: io.projectreactor.netty.incubator:reactor-netty-incubator-quic:0.1.20" value="project"/>
<level name="Maven: io.netty.incubator:netty-incubator-codec-native-quic:linux-x86_64:0.0.63.Final" value="project"/>
<level name="Maven: io.netty.incubator:netty-incubator-codec-classes-quic:0.0.63.Final" value="project"/>
<level name="Maven: org.apache.commons:commons-configuration2:2.11.0" value="project"/>
<level name="Maven: org.apache.commons:commons-text:1.12.0" value="project"/>
<level name="Maven: com.github.javaparser:javaparser-symbol-solver-core:3.26.2" value="project"/>
<level name="Maven: com.vaadin:ui-tests:1.0.0" value="project"/>
<level name="Maven: com.vaadin:vaadin-spring-boot-starter:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-spring:24.5.1" value="project"/>
<level name="Maven: org.springframework:spring-webmvc:6.1.10" value="project"/>
<level name="Maven: org.springframework:spring-websocket:6.1.10" value="project"/>
<level name="Maven: org.reflections:reflections:0.10.2" value="project"/>
<level name="Maven: org.javassist:javassist:3.30.2-GA" value="project"/>
<level name="Maven: com.vaadin:hilla:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-endpoint:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-engine-core:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-core:24.5.1" value="project"/>
<level name="Maven: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.15.4" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-plugin-backbone:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-plugin-nonnull:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-plugin-subtypes:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-plugin-model:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-plugin-transfertypes:24.5.1" value="project"/>
<level name="Maven: io.projectreactor:reactor-core:3.6.7" value="project"/>
<level name="Maven: org.reactivestreams:reactive-streams:1.0.4" value="project"/>
<level name="Maven: com.fasterxml.jackson.module:jackson-module-parameter-names:2.15.4" value="project"/>
<level name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.4" value="project"/>
<level name="Maven: com.vaadin:hilla-parser-jvm-utils:24.5.1" value="project"/>
<level name="Maven: io.swagger.core.v3:swagger-core:2.2.22" value="project"/>
<level name="Maven: io.swagger.core.v3:swagger-annotations:2.2.22" value="project"/>
<level name="Maven: io.swagger.core.v3:swagger-models:2.2.22" value="project"/>
<level name="Maven: com.vaadin:hilla-runtime-plugin-transfertypes:24.5.1" value="project"/>
<level name="Maven: com.vaadin:hilla-engine-runtime:24.5.1" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-web:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-json:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-tomcat:3.2.7" value="project"/>
<level name="Maven: org.apache.tomcat.embed:tomcat-embed-core:10.1.25" value="project"/>
<level name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:10.1.25" value="project"/>
<level name="Maven: org.springframework:spring-web:6.1.10" value="project"/>
<level name="Maven: org.parttio:line-awesome:2.0.0" value="project"/>
<level name="Maven: com.h2database:h2:2.2.224" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-data-jpa:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-aop:3.2.7" value="project"/>
<level name="Maven: org.aspectj:aspectjweaver:1.9.22" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-jdbc:3.2.7" value="project"/>
<level name="Maven: com.zaxxer:HikariCP:5.0.1" value="project"/>
<level name="Maven: org.springframework:spring-jdbc:6.1.10" value="project"/>
<level name="Maven: org.hibernate.orm:hibernate-core:6.4.9.Final" value="project"/>
<level name="Maven: org.glassfish.jaxb:jaxb-runtime:4.0.5" value="project"/>
<level name="Maven: org.glassfish.jaxb:jaxb-core:4.0.5" value="project"/>
<level name="Maven: org.glassfish.jaxb:txw2:4.0.5" value="project"/>
<level name="Maven: com.sun.istack:istack-commons-runtime:4.1.2" value="project"/>
<level name="Maven: jakarta.inject:jakarta.inject-api:2.0.1" value="project"/>
<level name="Maven: org.antlr:antlr4-runtime:4.13.0" value="project"/>
<level name="Maven: org.springframework.data:spring-data-jpa:3.2.7" value="project"/>
<level name="Maven: org.springframework.data:spring-data-commons:3.2.7" value="project"/>
<level name="Maven: org.springframework:spring-orm:6.1.10" value="project"/>
<level name="Maven: jakarta.annotation:jakarta.annotation-api:2.1.1" value="project"/>
<level name="Maven: org.springframework:spring-aspects:6.1.10" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-mail:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-logging:3.2.7" value="project"/>
<level name="Maven: ch.qos.logback:logback-classic:1.4.14" value="project"/>
<level name="Maven: ch.qos.logback:logback-core:1.4.14" value="project"/>
<level name="Maven: org.apache.logging.log4j:log4j-to-slf4j:2.21.1" value="project"/>
<level name="Maven: org.slf4j:jul-to-slf4j:2.0.13" value="project"/>
<level name="Maven: org.yaml:snakeyaml:2.2" value="project"/>
<level name="Maven: org.springframework:spring-context-support:6.1.10" value="project"/>
<level name="Maven: org.eclipse.angus:jakarta.mail:2.0.3" value="project"/>
<level name="Maven: jakarta.activation:jakarta.activation-api:2.1.3" value="project"/>
<level name="Maven: org.eclipse.angus:angus-activation:2.0.2" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-security:3.2.7" value="project"/>
<level name="Maven: org.springframework:spring-aop:6.1.10" value="project"/>
<level name="Maven: org.springframework.security:spring-security-config:6.2.5" value="project"/>
<level name="Maven: org.springframework.security:spring-security-web:6.2.5" value="project"/>
<level name="Maven: org.springframework:spring-expression:6.1.10" value="project"/>
<level name="Maven: org.springframework.ldap:spring-ldap-core:3.2.4" value="project"/>
<level name="Maven: org.springframework:spring-core:6.1.10" value="project"/>
<level name="Maven: org.springframework:spring-jcl:6.1.10" value="project"/>
<level name="Maven: org.springframework:spring-beans:6.1.10" value="project"/>
<level name="Maven: org.springframework:spring-tx:6.1.10" value="project"/>
<level name="Maven: org.slf4j:slf4j-api:2.0.13" value="project"/>
<level name="Maven: org.springframework.security:spring-security-ldap:6.2.5" value="project"/>
<level name="Maven: org.springframework.security:spring-security-core:6.2.5" value="project"/>
<level name="Maven: org.springframework.security:spring-security-crypto:6.2.5" value="project"/>
<level name="Maven: io.micrometer:micrometer-observation:1.12.7" value="project"/>
<level name="Maven: io.micrometer:micrometer-commons:1.12.7" value="project"/>
<level name="Maven: org.springframework:spring-context:6.1.10" value="project"/>
<level name="Maven: com.unboundid:unboundid-ldapsdk:6.0.11" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-validation:3.2.7" value="project"/>
<level name="Maven: org.apache.tomcat.embed:tomcat-embed-el:10.1.25" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-data-ldap:3.2.7" value="project"/>
<level name="Maven: org.springframework.data:spring-data-ldap:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-devtools:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-autoconfigure:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-starter-test:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-test:3.2.7" value="project"/>
<level name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:3.2.7" value="project"/>
<level name="Maven: com.jayway.jsonpath:json-path:2.9.0" value="project"/>
<level name="Maven: jakarta.xml.bind:jakarta.xml.bind-api:4.0.2" value="project"/>
<level name="Maven: net.minidev:json-smart:2.5.1" value="project"/>
<level name="Maven: net.minidev:accessors-smart:2.5.1" value="project"/>
<level name="Maven: org.awaitility:awaitility:4.2.1" value="project"/>
<level name="Maven: org.hamcrest:hamcrest:2.2" value="project"/>
<level name="Maven: org.junit.jupiter:junit-jupiter:5.10.2" value="project"/>
<level name="Maven: org.junit.jupiter:junit-jupiter-api:5.10.2" value="project"/>
<level name="Maven: org.opentest4j:opentest4j:1.3.0" value="project"/>
<level name="Maven: org.junit.platform:junit-platform-commons:1.10.2" value="project"/>
<level name="Maven: org.apiguardian:apiguardian-api:1.1.2" value="project"/>
<level name="Maven: org.junit.jupiter:junit-jupiter-params:5.10.2" value="project"/>
<level name="Maven: org.junit.jupiter:junit-jupiter-engine:5.10.2" value="project"/>
<level name="Maven: org.mockito:mockito-junit-jupiter:5.7.0" value="project"/>
<level name="Maven: org.skyscreamer:jsonassert:1.5.1" value="project"/>
<level name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" value="project"/>
<level name="Maven: org.springframework:spring-test:6.1.10" value="project"/>
<level name="Maven: org.xmlunit:xmlunit-core:2.9.1" value="project"/>
<level name="Maven: commons-beanutils:commons-beanutils:1.9.4" value="project"/>
<level name="Maven: commons-logging:commons-logging:1.2" value="project"/>
<level name="Maven: commons-collections:commons-collections:3.2.2" value="project"/>
<level name="Maven: com.fasterxml.jackson.core:jackson-core:2.15.4" value="project"/>
<level name="Maven: org.mockito:mockito-core:5.12.0" value="project"/>
<level name="Maven: net.bytebuddy:byte-buddy:1.14.17" value="project"/>
<level name="Maven: net.bytebuddy:byte-buddy-agent:1.14.17" value="project"/>
<level name="Maven: org.objenesis:objenesis:3.3" value="project"/>
<level name="Maven: com.github.mvysny.kaributesting:karibu-testing-v23:2.1.8" value="project"/>
<level name="Maven: com.github.mvysny.kaributesting:karibu-testing-v10:2.1.8" value="project"/>
<level name="Maven: com.github.mvysny.fake-servlet:fake-servlet5:1.1" value="project"/>
<level name="Maven: jakarta.servlet:jakarta.servlet-api:6.0.0" value="project"/>
<level name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24" value="project"/>
<level name="Maven: org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24" value="project"/>
<level name="Maven: com.github.mvysny.karibu-tools:karibu-tools:0.21" value="project"/>
<level name="Maven: org.jetbrains.kotlin:kotlin-test:1.9.24" value="project"/>
<level name="Maven: io.github.classgraph:classgraph:4.8.151" value="project"/>
<level name="Maven: com.github.mvysny.karibu-tools:karibu-tools-23:0.21" value="project"/>
<level name="Maven: org.jetbrains.kotlin:kotlin-stdlib:1.9.24" value="project"/>
<level name="Maven: org.jetbrains:annotations:13.0" value="project"/>
<level name="Maven: com.github.mvysny.kaributesting:karibu-testing-v10-spring:2.1.8" value="project"/>
<level name="Maven: org.hibernate.validator:hibernate-validator:8.0.1.Final" value="project"/>
<level name="Maven: jakarta.validation:jakarta.validation-api:3.0.2" value="project"/>
<level name="Maven: org.jboss.logging:jboss-logging:3.5.3.Final" value="project"/>
<level name="Maven: com.fasterxml:classmate:1.6.0" value="project"/>
<level name="Maven: org.hibernate.search:hibernate-search-mapper-orm:7.1.1.Final" value="project"/>
<level name="Maven: org.hibernate.search:hibernate-search-engine:7.1.1.Final" value="project"/>
<level name="Maven: org.hibernate.search:hibernate-search-mapper-pojo-base:7.1.1.Final" value="project"/>
<level name="Maven: org.hibernate.search:hibernate-search-util-common:7.1.1.Final" value="project"/>
<level name="Maven: jakarta.persistence:jakarta.persistence-api:3.1.0" value="project"/>
<level name="Maven: jakarta.transaction:jakarta.transaction-api:2.0.1" value="project"/>
<level name="Maven: org.hibernate.common:hibernate-commons-annotations:6.0.6.Final" value="project"/>
<level name="Maven: io.smallrye:jandex:3.1.2" value="project"/>
<level name="Maven: org.hibernate.search:hibernate-search-backend-lucene:7.1.1.Final" value="project"/>
<level name="Maven: org.apache.lucene:lucene-analysis-common:9.9.2" value="project"/>
<level name="Maven: org.apache.lucene:lucene-join:9.9.2" value="project"/>
<level name="Maven: org.apache.lucene:lucene-facet:9.9.2" value="project"/>
<level name="Maven: com.carrotsearch:hppc:0.9.1" value="project"/>
<level name="Maven: org.apache.lucene:lucene-highlighter:9.9.2" value="project"/>
<level name="Maven: org.apache.lucene:lucene-memory:9.9.2" value="project"/>
<level name="Maven: com.vaadin:vaadin-testbench-junit5:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-testbench-core-junit5:9.3.5" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-remote-driver:4.25.0" value="project"/>
<level name="Maven: com.google.auto.service:auto-service-annotations:1.1.1" value="project"/>
<level name="Maven: io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-api:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-context:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-exporter-logging:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-common:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-api-events:1.31.0-alpha" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-trace:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-metrics:1.31.0" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-extension-incubator:1.31.0-alpha" value="project"/>
<level name="Maven: io.opentelemetry:opentelemetry-sdk-logs:1.31.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-api:4.25.0" value="project"/>
<level name="Maven: org.jspecify:jspecify:1.0.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-http:4.25.0" value="project"/>
<level name="Maven: dev.failsafe:failsafe:3.3.2" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-json:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-manager:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-os:4.25.0" value="project"/>
<level name="Maven: org.apache.commons:commons-exec:1.4.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-java:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-chrome-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-chromium-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-devtools-v127:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-devtools-v128:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-devtools-v129:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-devtools-v85:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-edge-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-firefox-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-ie-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-safari-driver:4.25.0" value="project"/>
<level name="Maven: org.seleniumhq.selenium:selenium-support:4.25.0" value="project"/>
<level name="Maven: org.junit.platform:junit-platform-engine:1.10.2" value="project"/>
<level name="Maven: com.vaadin:license-checker:1.13.0" value="project"/>
<level name="Maven: com.github.oshi:oshi-core:6.4.10" value="project"/>
<level name="Maven: net.java.dev.jna:jna:5.14.0" value="project"/>
<level name="Maven: net.java.dev.jna:jna-platform:5.14.0" value="project"/>
<level name="Maven: com.nimbusds:nimbus-jose-jwt:9.37.3" value="project"/>
<level name="Maven: org.lucee:jcip-annotations:1.0.0" value="project"/>
<level name="Maven: com.vaadin.external.gwt:gwt-elemental:2.8.2.vaadin2" value="project"/>
<level name="Maven: com.vaadin:vaadin-testbench-unit-junit5:9.3.5" value="project"/>
<level name="Maven: com.vaadin:vaadin-testbench-unit-shared:9.3.5" value="project"/>
<level name="Maven: org.jetbrains.kotlin:kotlin-reflect:1.9.24" value="project"/>
<level name="Maven: com.vaadin:vaadin-testbench-shared:9.3.5" value="project"/>
<level name="Maven: com.vaadin:flow-html-components-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-accordion-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-app-layout-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-avatar-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-board-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-button-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-charts-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-checkbox-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-combo-box-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-confirm-dialog-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-context-menu-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-cookie-consent-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-cookie-consent-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-crud-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-custom-field-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-date-picker-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-date-time-picker-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-details-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-dialog-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-form-layout-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-grid-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-grid-pro-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-icons-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-virtual-list-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-list-box-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-login-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-menu-bar-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-messages-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-notification-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-ordered-layout-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-popover-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-progress-bar-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-radio-button-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-rich-text-editor-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-select-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-side-nav-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-split-layout-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-tabs-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-text-field-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-time-picker-testbench:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-upload-testbench:24.5.1" value="project"/>
<level name="Maven: org.assertj:assertj-core:3.25.3" value="project"/>
<level name="Maven: net.openhft:compiler:2.26ea0" value="project"/>
<level name="Maven: com.hilerio:ace-widget:2.0.0" value="project"/>
<level name="Maven: io.hypersistence:hypersistence-utils-hibernate-63:3.7.3" value="project"/>
<level name="Maven: io.hypersistence:hypersistence-tsid:2.1.1" value="project"/>
<level name="Maven: in.virit:viritin:2.8.22" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-ast:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-builder:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-collection:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-data:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-dependency:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-format:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-html:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-misc:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-sequence:0.64.8" value="project"/>
<level name="Maven: com.vladsch.flexmark:flexmark-util-visitor:0.64.8" value="project"/>
<level name="Maven: org.apache.poi:poi-ooxml:5.2.3" value="project"/>
<level name="Maven: org.apache.poi:poi:5.2.3" value="project"/>
<level name="Maven: commons-codec:commons-codec:1.16.1" value="project"/>
<level name="Maven: org.apache.commons:commons-math3:3.6.1" value="project"/>
<level name="Maven: com.zaxxer:SparseBitSet:1.2" value="project"/>
<level name="Maven: org.apache.poi:poi-ooxml-lite:5.2.3" value="project"/>
<level name="Maven: org.apache.xmlbeans:xmlbeans:5.1.1" value="project"/>
<level name="Maven: org.apache.commons:commons-compress:1.21" value="project"/>
<level name="Maven: commons-io:commons-io:2.11.0" value="project"/>
<level name="Maven: com.github.virtuald:curvesapi:1.07" value="project"/>
<level name="Maven: org.apache.logging.log4j:log4j-api:2.21.1" value="project"/>
<level name="Maven: org.apache.commons:commons-collections4:4.4" value="project"/>
<level name="Maven: org.apache.poi:poi-ooxml-schemas:4.1.2" value="project"/>
<level name="Maven: com.flowingcode.addons:simple-timer:2.2.0" value="project"/>
<level name="Maven: org.vaadin.addons.stefan:clipboard:1.0.3" value="project"/>
<level name="Maven: com.vaadin:vaadin:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-internal:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-board-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-charts-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-crud-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-grid-pro-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-map-flow:24.5.1" value="project"/>
<level name="Maven: com.vaadin:vaadin-rich-text-editor-flow:24.5.1" value="project"/>
<level name="Maven: org.projectlombok:lombok:1.18.32" value="project"/>
<level name="Maven: org.mapstruct:mapstruct:1.5.5.Final" value="project"/>
<level name="Maven: org.mapstruct:mapstruct-processor:1.5.5.Final" value="project"/>
<level name="Maven: org.apache.lucene:lucene-core:9.10.0" value="project"/>
<level name="Maven: org.apache.lucene:lucene-queryparser:9.10.0" value="project"/>
<level name="Maven: org.apache.lucene:lucene-queries:9.10.0" value="project"/>
<level name="Maven: org.apache.lucene:lucene-sandbox:9.10.0" value="project"/>
<level name="Maven: com.google.guava:guava:33.1.0-jre" value="project"/>
<level name="Maven: com.google.guava:failureaccess:1.0.2" value="project"/>
<level name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" value="project"/>
<level name="Maven: com.google.code.findbugs:jsr305:3.0.2" value="project"/>
<level name="Maven: org.checkerframework:checker-qual:3.42.0" value="project"/>
<level name="Maven: com.google.errorprone:error_prone_annotations:2.26.1" value="project"/>
<level name="Maven: com.google.j2objc:j2objc-annotations:3.0.0" value="project"/>
<level name="Maven: org.apache.commons:commons-lang3:3.14.0" value="project"/>
<level name="Maven: org.vaadin.addons.componentfactory:vcf-pdf-viewer:2.8.1" value="project"/>
<level name="Maven: com.openhtmltopdf:openhtmltopdf-pdfbox:1.0.10" value="project"/>
<level name="Maven: org.apache.pdfbox:pdfbox:2.0.24" value="project"/>
<level name="Maven: org.apache.pdfbox:fontbox:2.0.24" value="project"/>
<level name="Maven: org.apache.pdfbox:xmpbox:2.0.24" value="project"/>
<level name="Maven: com.openhtmltopdf:openhtmltopdf-core:1.0.10" value="project"/>
<level name="Maven: de.rototor.pdfbox:graphics2d:0.32" value="project"/>
<level name="Maven: org.freemarker:freemarker:2.3.32" value="project"/>
<level name="Maven: com.auth0:java-jwt:4.4.0" value="project"/>
<level name="Maven: com.fasterxml.jackson.core:jackson-databind:2.15.4" value="project"/>
<level name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.15.4" value="project"/>
<level name="Maven: org.apache.maven.plugins:maven-surefire-plugin:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-api:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-logger-api:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-shared-utils:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-extensions-api:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:maven-surefire-common:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-booter:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.surefire:surefire-extensions-spi:3.3.1" value="project"/>
<level name="Maven: org.apache.maven.resolver:maven-resolver-util:1.4.1" value="project"/>
<level name="Maven: org.apache.maven.resolver:maven-resolver-api:1.4.1" value="project"/>
<level name="Maven: org.apache.maven.shared:maven-common-artifact-filters:3.4.0" value="project"/>
<level name="Maven: org.codehaus.plexus:plexus-java:1.2.0" value="project"/>
<level name="Maven: com.thoughtworks.qdox:qdox:2.0.3" value="project"/>
</levels>
</component>

5
pom.xml
View File

@ -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>

BIN
src/main/bundles/prod.bundle
View File

Binary file not shown.

12
src/main/java/com/primefactorsolutions/model/HoursWorked.java
View File

@ -34,13 +34,13 @@ public class HoursWorked extends BaseEntity {
private double horaspendientes;
private double totalHours;
public static double calculateTotalHours(List<HoursWorked> activities) {
public static double calculateTotalHours(final List<HoursWorked> activities) {
return activities.stream()
.mapToDouble(activity -> activity.hours + activity.horasTareasEspecificas)
.sum();
}
public static double calculatePendingHours(List<HoursWorked> activities) {
public static double calculatePendingHours(final List<HoursWorked> activities) {
double totalHoursWorked = calculateTotalHours(activities);
return Math.max(0, 40 - totalHoursWorked);
}
@ -89,7 +89,8 @@ public class HoursWorked extends BaseEntity {
}
public double getTotalHours() {
return totalHours;
double total = this.getHours();
return totalHours + total;
}
public void setTotalHours(final double totalHours) {
@ -120,8 +121,8 @@ public class HoursWorked extends BaseEntity {
this.tareasEspecificas = tareasEspecificas;
}
public double getHoraspendientes() {
double horasTrabajadas = this.getTotalHours() + this.getHorasTareasEspecificas();
return 40 - horasTrabajadas;
//double horasTrabajadas = this.getTotalHours() + this.getHorasTareasEspecificas();
return 40;
}
public void setHoraspendientes(final double horaspendientes) {
@ -146,4 +147,3 @@ public class HoursWorked extends BaseEntity {
}

4
src/main/java/com/primefactorsolutions/repositories/EmployeeRepository.java
View File

@ -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);
}
}

3
src/main/java/com/primefactorsolutions/repositories/HoursWorkedRepository.java
View File

@ -12,4 +12,5 @@ public interface HoursWorkedRepository extends JpaRepository<HoursWorked, UUID>
List<HoursWorked> findByWeekNumber(int weekNumber);
List<HoursWorked> findByDate(LocalDate date);
List<HoursWorked> findByEmployeeIdAndWeekNumber(UUID employeeId, int weekNumber);
}
}

4
src/main/java/com/primefactorsolutions/service/EmployeeService.java
View File

@ -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);
}
}

12
src/main/java/com/primefactorsolutions/service/HoursWorkedService.java
View File

@ -22,7 +22,7 @@ public class HoursWorkedService {
return hoursWorkedRepository.findAll();
}
public double getTotalHoursWorkedByEmployeeForWeek(UUID employeeId, int weekNumber) {
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))
@ -44,12 +44,12 @@ public class HoursWorkedService {
return hoursWorkedRepository.save(hoursWorked);
}
public double getTotalHoursForEmployee(UUID employeeId, int weekNumber) {
public double getTotalHoursForEmployee(final UUID employeeId, final int weekNumber) {
List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
return HoursWorked.calculateTotalHours(activities);
}
public double getPendingHoursForEmployee(UUID employeeId, int weekNumber) {
public double getPendingHoursForEmployee(final UUID employeeId, final int weekNumber) {
List<HoursWorked> activities = hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
return HoursWorked.calculatePendingHours(activities);
}
@ -92,4 +92,8 @@ public class HoursWorkedService {
return hoursWorked.get();
}
}
public List<HoursWorked> findListHoursWorkedEmployee(final UUID employeeId, final int weekNumber) {
return hoursWorkedRepository.findByEmployeeIdAndWeekNumber(employeeId, weekNumber);
}
}

2
src/main/java/com/primefactorsolutions/service/ReportService.java
View File

@ -174,4 +174,4 @@ public class ReportService {
return cfg;
}
}
}

5
src/main/java/com/primefactorsolutions/views/AssessmentsListView.java
View File

@ -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();

16
src/main/java/com/primefactorsolutions/views/BaseView.java Normal file
View File

@ -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);
}
}

7
src/main/java/com/primefactorsolutions/views/CandidatesListView.java
View File

@ -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();

5
src/main/java/com/primefactorsolutions/views/Constants.java Normal file
View File

@ -0,0 +1,5 @@
package com.primefactorsolutions.views;
public class Constants {
public static final int PAGE_SIZE = 10;
}

20
src/main/java/com/primefactorsolutions/views/DocumentsListView.java
View File

@ -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) {

12
src/main/java/com/primefactorsolutions/views/EmployeesListView.java
View File

@ -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() {

65
src/main/java/com/primefactorsolutions/views/HoursWorkedListView.java
View File

@ -8,14 +8,12 @@ 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.html.Main;
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.joda.time.Hours;
import org.springframework.context.annotation.Scope;
import org.vaadin.firitin.components.grid.PagingGrid;
@ -24,18 +22,19 @@ 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 Main {
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 List<Employee> employees = Collections.emptyList();
private ComboBox<Employee> employeeFilter;
private ComboBox<Team> teamFilter;
private UUID selectedEmployeeId;
@ -47,7 +46,6 @@ public class HoursWorkedListView extends Main {
this.hoursWorkedService = hoursWorkedService;
this.employeeService = employeeService;
this.teamService = teamService;
this.employees = employeeService.findAllEmployees();
initializeView();
refreshGridListHoursWorked(null, null);
@ -63,7 +61,8 @@ public class HoursWorkedListView extends Main {
.mapToDouble(HoursWorked::getTotalHours)
.sum();
Notification.show("Total de horas trabajadas: " + totalHours, 3000, Notification.Position.BOTTOM_CENTER);
Notification.show("Total de horas trabajadas: " + totalHours,
3000, Notification.Position.BOTTOM_CENTER);
return hoursWorkedList;
});
@ -84,7 +83,8 @@ public class HoursWorkedListView extends Main {
if (team != null && !"TODOS".equals(team.getName())) {
filteredHoursWorked = filteredHoursWorked.stream()
.filter(hw -> hw.getEmployee().getTeam() != null && hw.getEmployee().getTeam().getId().equals(team.getId()))
.filter(hw -> hw.getEmployee().getTeam() != null
&& hw.getEmployee().getTeam().getId().equals(team.getId()))
.collect(Collectors.toList());
}
@ -94,7 +94,8 @@ public class HoursWorkedListView extends Main {
int currentWeek = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
double totalWorkedInSameWeek = filteredHoursWorked.stream()
.filter(hw -> hw.getEmployee().getId().equals(employee.getId()) &&
.filter(hw -> hw.getEmployee().getId().equals(employee.getId())
&&
hw.getDate().get(IsoFields.WEEK_OF_WEEK_BASED_YEAR) == currentWeek)
.mapToDouble(HoursWorked::getHours)
.sum();
@ -109,35 +110,40 @@ public class HoursWorkedListView extends Main {
}
private void initializeView() {
getCurrentPageLayout().add(createAddHoursWorked());
setupFilters();
add(createAddHoursWorked());
setupListHoursWorkedGrid();
add(hoursWorkedGrid);
add(createActionButtons());
getCurrentPageLayout().add(hoursWorkedGrid);
getCurrentPageLayout().add(createActionButtons());
}
private void setupFilters() {
add(createEmployeeFilter());
add(createTeamFilter());
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(hw -> hw.getWeekNumber())
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")
hoursWorkedGrid.addColumn(hw -> hw.getEmployee().getTeam() != null ? hw.getEmployee().getTeam()
.getName() : "Sin asignar")
.setHeader("Equipo");
hoursWorkedGrid.addColumn(HoursWorked::getActividad).setHeader("Actividad");
hoursWorkedGrid.addColumn(hw -> hw.getHours()).setHeader("Total Horas").setSortable(true);
hoursWorkedGrid.addColumn(hw -> hw.getHoraspendientes()).setHeader("Horas Pendientes").setSortable(true);
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(5);
hoursWorkedGrid.setPageSize(PAGE_SIZE);
hoursWorkedGrid.asSingleSelect().addValueChangeListener(event -> {
HoursWorked selectedHoursWorked = event.getValue();
if (selectedHoursWorked != null) {
@ -146,6 +152,19 @@ public class HoursWorkedListView extends Main {
});
}
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) {
@ -167,8 +186,9 @@ public class HoursWorkedListView extends Main {
}
private Button createButton(final String label, final Runnable onClickAction) {
Button button = new Button(label);
final Button button = new Button(label);
button.addClickListener(event -> onClickAction.run());
return button;
}
@ -182,7 +202,7 @@ public class HoursWorkedListView extends Main {
private ComboBox<Employee> createEmployeeFilter() {
employeeFilter = new ComboBox<>("Empleado");
List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
final List<Employee> employees = new ArrayList<>(employeeService.findAllEmployees());
employees.addFirst(createAllEmployeesOption());
employeeFilter.setItems(employees);
employeeFilter.setItemLabelGenerator(this::getEmployeeFullName);
@ -193,6 +213,7 @@ public class HoursWorkedListView extends Main {
teamFilter.getValue()
)
);
return employeeFilter;
}
@ -206,7 +227,7 @@ public class HoursWorkedListView extends Main {
List<Team> teams = new ArrayList<>(teamService.findAllTeams());
teams.addFirst(createAllTeamsOption());
teamFilter.setItems(teams);
teamFilter.setItemLabelGenerator(team -> getTeamLabel(team));
teamFilter.setItemLabelGenerator(this::getTeamLabel);
teamFilter.setValue(teams.getFirst());
teamFilter.addValueChangeListener(event ->
refreshGridListHoursWorked(
@ -232,4 +253,4 @@ public class HoursWorkedListView extends Main {
allTeamsOption.setName("TODOS");
return allTeamsOption;
}
}
}

7
src/main/java/com/primefactorsolutions/views/HoursWorkedView.java
View File

@ -1,4 +1,5 @@
package com.primefactorsolutions.views;
import com.primefactorsolutions.model.Employee;
import com.primefactorsolutions.model.HoursWorked;
import com.primefactorsolutions.model.Team;
@ -252,8 +253,4 @@ public class HoursWorkedView extends BeanValidationForm<HoursWorked> implements
employeeField.setReadOnly(readOnly);
activityField.setReadOnly(readOnly);
}
}
}

1
src/main/java/com/primefactorsolutions/views/InitAccountView.java
View File

@ -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

35
src/main/java/com/primefactorsolutions/views/PendingRequestsListView.java
View File

@ -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) {

10
src/main/java/com/primefactorsolutions/views/QuestionsListView.java
View File

@ -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();

4
src/main/java/com/primefactorsolutions/views/ReporteView.java
View File

@ -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");
@ -208,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(

9
src/main/java/com/primefactorsolutions/views/RequestEmployeeView.java
View File

@ -26,6 +26,8 @@ import java.time.Period;
import java.util.*;
import java.util.stream.Collectors;
import static com.primefactorsolutions.views.Constants.PAGE_SIZE;
@SpringComponent
@PermitAll
@Scope("prototype")
@ -96,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) {
@ -244,9 +246,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
private double calculateHolidayUtilizedDays(final int year) {
return requests.stream()
.filter(this::verificationIsHoliday)
.filter(this::verificationIsHoliday)
.filter(req -> req.getState() == TimeOffRequestStatus.APROBADO)
.filter(req -> req.getState() == TimeOffRequestStatus.EN_USO)
.filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
.filter(req -> getStartDateYear(req) == year)
.mapToDouble(TimeOffRequest::getDaysToBeTake)
@ -256,8 +255,6 @@ public class RequestEmployeeView extends Div implements HasUrlParameter<String>
private double calculatePersonalDaysUtilized(final boolean isMale, final int year) {
return requests.stream()
.filter(req -> !verificationIsHoliday(req))
.filter(req -> req.getState() == TimeOffRequestStatus.APROBADO)
.filter(req -> req.getState() == TimeOffRequestStatus.EN_USO)
.filter(req -> req.getState() == TimeOffRequestStatus.TOMADO)
.filter(req -> !getStandardExclusions().contains(req.getCategory()))
.filter(req -> !(isMale && getMaleSpecificExclusions().contains(req.getCategory())))

29
src/main/java/com/primefactorsolutions/views/RequestsListView.java
View File

@ -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,7 +50,6 @@ public class RequestsListView extends Main {
this.employeeService = employeeService;
this.teamService = teamService;
this.vacationService = vacationService;
this.employees = employeeService.findAllEmployees();
initializeView();
refreshGeneralRequestGrid(null, null, null);
}
@ -60,14 +58,17 @@ public class RequestsListView extends Main {
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() {
@ -77,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) {
@ -328,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) {

2
src/main/java/com/primefactorsolutions/views/TimesheestReportView.java
View File

@ -10,7 +10,7 @@ import org.springframework.context.annotation.Scope;
@SpringComponent
@Scope("prototype")
@PageTitle("Timesheets")
@Route(value = "/timesheets-report", layout = MainLayout.class)
@Route(value = "/timesheets", layout = MainLayout.class)
@PermitAll
public class TimesheestReportView extends Main {
}

2
src/main/java/com/primefactorsolutions/views/TimesheetView.java
View File

@ -11,7 +11,7 @@ import org.springframework.context.annotation.Scope;
@PermitAll
@Scope("prototype")
@PageTitle("Timesheet")
@Route(value = "/timesheets", layout = MainLayout.class)
@Route(value = "/timesheets/me", layout = MainLayout.class)
public class TimesheetView extends Main {
}

2
src/main/resources/data.sql
View File

@ -92,4 +92,4 @@ insert into time_off_request (id, version, employee_id, category, state, availab
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, 0.0, 46, '5c6f11fe-c341-4be7-a9a6-bba0081ad7c6', 'b0e8f394-78c1-4d8a-9c57-dc6e8b36a5fa');
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');