victor
/
GestEmpresa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolviendo errores y ajustando las tablas, los elemntos keywords y skills. He encontrado fallo de renovar datos de empresa, insisted que cambiamos los id id de empresa por algun la pero no puede encotrar por donde como al guardar el id es correcto.

Browse Source
master
vicsash 8 months ago
parent 31eed8f958
commit af0e7f5c69
30 changed files with 161 additions and 161 deletions
Show Stats Download Patch File Download Diff File

4
src/main/java/com/example/proyectofinal/controllers/BuscadorController.java
Unescape View File

@ -199,8 +199,6 @@ public class BuscadorController {
@RequestParam(defaultValue = "asc") String sortDir, @RequestParam(defaultValue = "asc") String sortDir,
@RequestParam(defaultValue = "") String secondaryOption, @RequestParam(defaultValue = "") String secondaryOption,
Model model) throws ParseException { Model model) throws ParseException {
System.out.println("Query: TEST " + query);
System.out.println("SecondaryOption: TEST " + secondaryOption);
String[] queryMultiWord = query.split(","); String[] queryMultiWord = query.split(",");
List<String> queryList = new ArrayList<>(); List<String> queryList = new ArrayList<>();
for (String queryForList : queryMultiWord) { for (String queryForList : queryMultiWord) {
@ -237,7 +235,6 @@ public class BuscadorController {
@RequestParam(defaultValue = "asc") String sortDir, @RequestParam(defaultValue = "asc") String sortDir,
@RequestParam(defaultValue = "") String secondaryOption, @RequestParam(defaultValue = "") String secondaryOption,
Model model) { Model model) {
String[] word = query.split("\\b(y|o)\\b|[,/]");
List<Integer> itemsPage = Arrays.asList(5, 10, 15, 20, 25, 50); List<Integer> itemsPage = Arrays.asList(5, 10, 15, 20, 25, 50);
Map<String, Object> attributes = new HashMap<>(); Map<String, Object> attributes = new HashMap<>();
if (secondaryOption.equalsIgnoreCase("Todo")){ if (secondaryOption.equalsIgnoreCase("Todo")){
@ -260,7 +257,6 @@ public class BuscadorController {
@RequestParam(defaultValue = "asc") String sortDir, @RequestParam(defaultValue = "asc") String sortDir,
@RequestParam(defaultValue = "") String secondaryOption, @RequestParam(defaultValue = "") String secondaryOption,
Model model) throws ParseException { Model model) throws ParseException {
System.out.println("Query: TEST " + query);
String[] queryMultiWord = query.split(","); String[] queryMultiWord = query.split(",");
List<String> queryList = new ArrayList<>(); List<String> queryList = new ArrayList<>();
for (String queryForList : queryMultiWord) { for (String queryForList : queryMultiWord) {

3
src/main/java/com/example/proyectofinal/controllers/LogOutController.java
Unescape View File

@ -19,9 +19,6 @@ import java.util.Optional;
@Controller @Controller
public class LogOutController { public class LogOutController {
@Autowired
private UsuarioService usuarioService;
@Autowired @Autowired
private UserRepository userRepository; private UserRepository userRepository;

3
src/main/java/com/example/proyectofinal/controllers/modelControllers/ContactoController.java
Unescape View File

@ -66,7 +66,6 @@ public class ContactoController {
} }
} }
@RolesAllowed({"ADMIN"})
@GetMapping("/admin/contacto/update/{id}") @GetMapping("/admin/contacto/update/{id}")
public String showUpdateForm(Model model, @PathVariable Long id,Authentication authentication) { public String showUpdateForm(Model model, @PathVariable Long id,Authentication authentication) {
Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities(); Collection<? extends GrantedAuthority> authorities = authentication.getAuthorities();
@ -111,7 +110,7 @@ public class ContactoController {
throw new ResponseStatusException(HttpStatus.FORBIDDEN, "No tienes permisos para acceder a esta página"); throw new ResponseStatusException(HttpStatus.FORBIDDEN, "No tienes permisos para acceder a esta página");
} }
try{ try{
empresaService.deleteById(id); contactosService.deleteById(id);
return new ResponseEntity<>("El contacto ha sido eliminado", HttpStatus.OK); return new ResponseEntity<>("El contacto ha sido eliminado", HttpStatus.OK);
}catch (Exception e){ }catch (Exception e){
return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR); return new ResponseEntity<>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);

7
src/main/java/com/example/proyectofinal/controllers/modelControllers/EmpressaController.java
Unescape View File

@ -112,10 +112,17 @@ public class EmpressaController {
empresa.setKeywords(keywords); empresa.setKeywords(keywords);
Sector existingSector = sectorService.findById(sectorId); Sector existingSector = sectorService.findById(sectorId);
if(existingSector != null) { if(existingSector != null) {
System.out.println("TEST UPDATE: EX-SEC " + existingSector.getNombre());
System.out.println("TEST UPDATE: EX-SEC " + existingSector.getId());
empresa.setSector(existingSector); empresa.setSector(existingSector);
System.out.println("TEST UPDATE: EMPRESA-NOMBRE " + empresa.getNombre());
System.out.println("TEST UPDATE: EMPRESA-ID " + empresa.getId());
System.out.println("TEST UPDATE: EMPRESA-SEC " + empresa.getSector().getNombre());
System.out.println("TEST UPDATE: EMPRESA-SEC-ID " + empresa.getSector().getId());
} else { } else {
return new ResponseEntity<>("Sector no encontrado", HttpStatus.BAD_REQUEST); return new ResponseEntity<>("Sector no encontrado", HttpStatus.BAD_REQUEST);
} }
empresaService.save(empresa); empresaService.save(empresa);
return new ResponseEntity<>("Los datos de la empresa fue renovados con exito", HttpStatus.OK); return new ResponseEntity<>("Los datos de la empresa fue renovados con exito", HttpStatus.OK);
}catch (Exception e) { }catch (Exception e) {

7
src/main/java/com/example/proyectofinal/repositories/empresas/EmpressaRepository.java
Unescape View File

@ -7,9 +7,11 @@ import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query; import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param; import org.springframework.data.repository.query.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -60,6 +62,11 @@ public interface EmpressaRepository extends JpaRepository<Empresa, Long>, JpaSpe
@Query("SELECT e FROM Empresa e WHERE e.keywords LIKE %:query%") @Query("SELECT e FROM Empresa e WHERE e.keywords LIKE %:query%")
ArrayList<Empresa> findEmpresasByKeywordsCust(String query); ArrayList<Empresa> findEmpresasByKeywordsCust(String query);
@Modifying
@Transactional
@Query("UPDATE Empresa e SET e.nombre = :nombre, e.cif = :cif, e.correo = :correo, e.telefono = :telefono, e.keywords = :keywords, e.sector.id = :sectorId WHERE e.id = :id")
void saveManualy(@Param("id") Long id, @Param("nombre") String nombre, @Param("cif") String cif, @Param("correo") String correo, @Param("telefono") String telefono, @Param("keywords") String keywords, @Param("sectorId") Long sectorId);
// @Query() // @Query()
// List<Empresa> findByQueryAndSecondaryOption(String query, String secondaryQuery); // List<Empresa> findByQueryAndSecondaryOption(String query, String secondaryQuery);

11
src/main/java/com/example/proyectofinal/repositories/empresas/OfertaRepository.java
Unescape View File

@ -56,7 +56,7 @@ public interface OfertaRepository extends JpaRepository<Oferta, Long> {
Page<Oferta> findOfertaByEmpresa(@Param("query") String query, Pageable pageable); Page<Oferta> findOfertaByEmpresa(@Param("query") String query, Pageable pageable);
@Query(value = "SELECT * FROM ofertas o WHERE YEAR(o.fecha) = :yearQuery", nativeQuery = true) @Query(value = "SELECT * FROM ofertas o WHERE YEAR(o.fecha) = :yearQuery", nativeQuery = true)
Page<Oferta> findOfertaByFechaAnyo(@Param("yearQuery") Integer yearQuery, Pageable pageable); Page<Oferta> findOfertaByFechaAnyo(@Param("yearQuery") String yearQuery, Pageable pageable);
@Query("SELECT o FROM Oferta o WHERE lower(o.nombre) IN :queryList") @Query("SELECT o FROM Oferta o WHERE lower(o.nombre) IN :queryList")
Page<Oferta> findOfertasByNombres(@Param("queryList") String queryList, Pageable pageable); Page<Oferta> findOfertasByNombres(@Param("queryList") String queryList, Pageable pageable);
@ -76,9 +76,12 @@ public interface OfertaRepository extends JpaRepository<Oferta, Long> {
@Query("SELECT o FROM Oferta o JOIN o.skills s WHERE s.nombre LIKE %:query%") @Query("SELECT o FROM Oferta o JOIN o.skills s WHERE s.nombre LIKE %:query%")
Collection<Oferta> ofertasBySkillCust(@Param("query") String query); Collection<Oferta> ofertasBySkillCust(@Param("query") String query);
@Query(value = "SELECT * FROM ofertas o WHERE YEAR(o.fecha) = YEAR(:dateQuery)", nativeQuery = true)
Collection<? extends Oferta> ofertasByFechaAnyoCust(Date dateQuery);
@Query(value = "SELECT DISTINCT YEAR(o.fecha) FROM ofertas o", nativeQuery = true) @Query(value = "SELECT DISTINCT YEAR(o.fecha) FROM ofertas o", nativeQuery = true)
List<Integer> findDistinctYears(); List<Integer> findDistinctYears();
@Query(value = "SELECT * FROM ofertas o WHERE o.fecha >= CURRENT_DATE - INTERVAL 3 MONTH", nativeQuery = true)
Page<Oferta> findOfertaByFechaUltimos3Meses(Pageable pageable);
@Query(value = "SELECT * FROM ofertas o WHERE o.fecha >= CURRENT_DATE - INTERVAL 6 MONTH", nativeQuery = true)
Page<Oferta> findOfertaByFechaUltimos6Meses(Pageable pageable);
} }

7
src/main/java/com/example/proyectofinal/servicios/empresa/EmpresaService.java
Unescape View File

@ -56,7 +56,6 @@ public class EmpresaService implements IEmpresa {
public Empresa save(Empresa empresa) { public Empresa save(Empresa empresa) {
return empresaRepository.save(empresa); return empresaRepository.save(empresa);
} }
@Transactional @Transactional
@Override @Override
public void deleteById(Long id) { public void deleteById(Long id) {
@ -156,5 +155,11 @@ public class EmpresaService implements IEmpresa {
listEmpPrime.retainAll(listEmpSec); listEmpPrime.retainAll(listEmpSec);
return listEmpPrime; return listEmpPrime;
} }
@Override
public void saveManualy(long id, String nombre, String cif, String correo, String telefono, String keywords, long id1) {
empresaRepository.saveManualy( id, nombre, cif, correo, telefono, keywords, id1);
}
} }

29
src/main/java/com/example/proyectofinal/servicios/empresa/OfertaService.java
Unescape View File

@ -108,19 +108,20 @@ public class OfertaService implements IOferta {
} }
@Override @Override
public Page<Oferta> getPage(int pageNum, int size, String sortField, String sortDir, String query, String secondaryOption) throws ParseException { public Page<Oferta> getPage(int pageNum, int size, String sortField, String sortDir, String query, String secondaryOption) throws ParseException {
Integer yearQuery = null;
if(isYear(query)){
yearQuery = Integer.parseInt(query);
System.out.println("Year query TEST: " + yearQuery);
}
if(secondaryOption.equalsIgnoreCase("Todo")){ if(secondaryOption.equalsIgnoreCase("Todo")){
return findAllPaginated(pageNum, size, sortField, sortDir); return findAllPaginated(pageNum, size, sortField, sortDir);
}else if (secondaryOption.equals("Skill")) { }else if (secondaryOption.equals("Skill")) {
return ofertaRepository.findOfertaBySkill(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending())); return ofertaRepository.findOfertaBySkill(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
} else if(secondaryOption.equals("Nombre")) { } else if(secondaryOption.equals("Nombre")) {
return ofertaRepository.findOfertaByNombre(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending())); return ofertaRepository.findOfertaByNombre(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
} else if(secondaryOption.equals("Año")) { } else if(secondaryOption.equals("Este Año")) {
return ofertaRepository.findOfertaByFechaAnyo(yearQuery, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending())); String year = new SimpleDateFormat("yyyy").format(new Date());
return ofertaRepository.findOfertaByFechaAnyo(year, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
}else if(secondaryOption.equals("Ultimos 3 meses")){
return ofertaRepository.findOfertaByFechaUltimos3Meses(PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
}else if(secondaryOption.equals("Ultimos 6 meses")){
return ofertaRepository.findOfertaByFechaUltimos6Meses(PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
} else if(secondaryOption.equals("Empresa")) { } else if(secondaryOption.equals("Empresa")) {
return ofertaRepository.findOfertaByEmpresa(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending())); return ofertaRepository.findOfertaByEmpresa(query, PageRequest.of(pageNum - 1, size, Sort.by(sortField).ascending()));
} else { } else {
@ -174,13 +175,13 @@ public class OfertaService implements IOferta {
listEmpPrime.addAll(ofertaRepository.ofertasByEmpresaCust(query)); listEmpPrime.addAll(ofertaRepository.ofertasByEmpresaCust(query));
} else if (secondaryOption.equals("Skill")) { } else if (secondaryOption.equals("Skill")) {
listEmpPrime.addAll(ofertaRepository.ofertasBySkillCust(query)); listEmpPrime.addAll(ofertaRepository.ofertasBySkillCust(query));
}else if(secondaryOption.equals("Año")){ } else if (secondaryOption.equals("Este Año")) {
try { String year = new SimpleDateFormat("yyyy").format(new Date());
Date dateQuery = new SimpleDateFormat("yyyy-MM-dd").parse(query); listEmpPrime.addAll(ofertaRepository.findOfertaByFechaAnyo(year, PageRequest.of(0, 1000, Sort.by("fecha").ascending())).getContent());
listEmpPrime.addAll(ofertaRepository.ofertasByFechaAnyoCust(dateQuery)); } else if (secondaryOption.equals("Ultimos 3 meses")) {
} catch (ParseException e) { listEmpPrime.addAll(ofertaRepository.findOfertaByFechaUltimos3Meses(PageRequest.of(0, 1000, Sort.by("fecha").ascending())).getContent());
e.printStackTrace(); } else if (secondaryOption.equals("Ultimos 6 meses")) {
} listEmpPrime.addAll(ofertaRepository.findOfertaByFechaUltimos6Meses(PageRequest.of(0, 1000, Sort.by("fecha").ascending())).getContent());
} }
} }
} }

2
src/main/java/com/example/proyectofinal/servicios/implemetations/empresas/IEmpresa.java
Unescape View File

@ -28,5 +28,7 @@ public interface IEmpresa extends IPagination<Empresa> {
List<Empresa> searchCustom(String querySearchBar, String query,String secondaryOption); List<Empresa> searchCustom(String querySearchBar, String query,String secondaryOption);
void saveManualy(long id, String nombre, String cif, String correo, String telefono, String keywords, long id1);
// List<Empresa> getEmpresasByQueryAndSecondaryOption(String query, String secondaryQuery); // List<Empresa> getEmpresasByQueryAndSecondaryOption(String query, String secondaryQuery);
} }

25
src/main/resources/static/style.css
Unescape View File

@ -41,28 +41,27 @@ h1 {
.table { .table {
width: 100%; width: 100%;
} }
.table td, .table th { .table th, .table td.keywords-cell {
overflow: visible; width: 200px; /* Adjust this value to your needs */
white-space: nowrap;
} }
.table thead th { .table thead th {
position: sticky; position: sticky;
top: 0; top: 0;
background: #fff; background: #fff;
z-index: 10; z-index: 10;
width: 200px; /* Set a specific width */
overflow: auto; /* Add overflow */
} }
.table td { .table td.keywords-cell {
width: 100px; display: inline-block !important;
overflow: hidden; overflow-x: auto !important;
text-overflow: ellipsis; text-overflow: clip !important;
white-space: nowrap; border: 1px solid #ddd;
} }
.table tr td:first-child { .table-header, .keywords-cell {
width: 50px; width: 200px; /* Adjust this value as needed */
overflow: hidden;
text-overflow: ellipsis;
} }
.table tr th:first-child { .table tr td:first-child {
width: 50px; width: 50px;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;

2
src/main/resources/templates/admin/alumno/create.html
Unescape View File

@ -170,7 +170,7 @@
</div> </div>
<div class="skills-container"> <div class="skills-container">
<h2>Select Skills</h2> <h2>Elige Skills</h2>
<select id="skills" multiple> <select id="skills" multiple>
<option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}"></option> <option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}"></option>
</select> </select>

2
src/main/resources/templates/admin/alumno/update.html
Unescape View File

@ -169,7 +169,7 @@
</div> </div>
<div class="skills-container"> <div class="skills-container">
<h2>Select Skills</h2> <h2>Elige Skills</h2>
<select id="skills" multiple> <select id="skills" multiple>
<option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${alumno.skills.contains(skill)}"></option> <option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${alumno.skills.contains(skill)}"></option>
</select> </select>

4
src/main/resources/templates/admin/contacto/create.html
Unescape View File

@ -74,9 +74,9 @@
</div> </div>
<div class ="form-group row"> <div class ="form-group row">
<label class="col-sm-3 col-form-label" for="cif">Apellido</label> <label class="col-sm-3 col-form-label" for="apellido">Apellido</label>
<div class = "col-sm-9"> <div class = "col-sm-9">
<input type="text" th:field="*{apellido}" required minlength="2" maxlength="100" title="Entra un nombre" class="form-control" id="cif"> <input type="text" th:field="*{apellido}" required minlength="2" maxlength="100" title="Entra un nombre" class="form-control" id="apellido">
</div> </div>
</div> </div>

7
src/main/resources/templates/admin/contacto/update.html
Unescape View File

@ -74,9 +74,9 @@
</div> </div>
<div class ="form-group row"> <div class ="form-group row">
<label class="col-sm-3 col-form-label" for="cif">Apellido</label> <label class="col-sm-3 col-form-label" for="apellido">Apellido</label>
<div class = "col-sm-9"> <div class = "col-sm-9">
<input type="text" th:field="*{apellido}" required minlength="2" maxlength=100" title="Entra un nombre" class="form-control" id="cif"> <input type="text" th:field="*{apellido}" required minlength="2" maxlength="100" title="Entra un nombre" class="form-control" id="apellido">
</div> </div>
</div> </div>
@ -109,6 +109,7 @@
</div> </div>
</div> </div>
<div class="text-center"> <div class="text-center">
<input type="submit" value="Guardar" class="btn"/> <input type="submit" value="Guardar" class="btn"/>
<input type="button" value="Cancelar" id="btnCancelar" class="btn" onclick="goBack()"/> <input type="button" value="Cancelar" id="btnCancelar" class="btn" onclick="goBack()"/>
@ -127,7 +128,7 @@
var formData = $(this).serialize(); var formData = $(this).serialize();
var empresaId = $('#empresa').val(); var empresaId = $('#empresa').val();
formData += '&contacto=' + encodeURIComponent(empresaId); formData += '&empresa.id=' + encodeURIComponent(empresaId);
$.ajax({ $.ajax({
url: '/contacto/update', url: '/contacto/update',
type: 'post', type: 'post',

1
src/main/resources/templates/admin/empresa/create.html
Unescape View File

@ -136,7 +136,6 @@
}); });
function goBack() { function goBack() {
console.log("goBack function called");
window.history.back(); window.history.back();
} }

3
src/main/resources/templates/admin/empresa/update.html
Unescape View File

@ -127,6 +127,9 @@
</form> </form>
<script> <script>
function goBack() {
window.history.back();
}
var tagify; // Declare tagify outside of the $(document).ready() function var tagify; // Declare tagify outside of the $(document).ready() function
$(document).ready(function() { $(document).ready(function() {

2
src/main/resources/templates/admin/oferta/create.html
Unescape View File

@ -108,7 +108,7 @@
</div> </div>
<div class="skills-container"> <div class="skills-container">
<h2>Select Skills</h2> <h2>Elige Skills</h2>
<select id="skills" multiple> <select id="skills" multiple>
<option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}"></option> <option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}"></option>
</select> </select>

2
src/main/resources/templates/admin/oferta/update.html
Unescape View File

@ -109,7 +109,7 @@
</div> </div>
<div class="skills-container"> <div class="skills-container">
<h2>Select Skills</h2> <h2>Elige Skills</h2>
<select id="skills" multiple> <select id="skills" multiple>
<option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${oferta.skills.contains(skill)}"></option> <option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${oferta.skills.contains(skill)}"></option>
</select> </select>

68
src/main/resources/templates/buscador_admin.html
Unescape View File

@ -117,11 +117,6 @@
<select id="secondaryDropdown"></select> <select id="secondaryDropdown"></select>
<input type="hidden" name="secondaryOption" id="hiddenSecondaryOption"> <input type="hidden" name="secondaryOption" id="hiddenSecondaryOption">
</div> </div>
<div id="yearDropdownContainer" style="display: none;">
<select id="yearDropdown"></select>
</div>
</form> </form>
</div> </div>
@ -249,11 +244,14 @@
secondaryDropdown.addEventListener('change', function() { secondaryDropdown.addEventListener('change', function() {
if (secondaryDropdown.value === 'Todo') { if (secondaryDropdown.value === 'Todo') {
searchBar.value = 'Todo'; searchBar.value = 'Todo';
searchBar.disabled = true; searchBar.disabled = true;
} else { } else if (secondaryDropdown.value === 'Este Año' || secondaryDropdown.value === 'Ultimos 3 meses' || secondaryDropdown.value === 'Ultimos 6 meses') {
searchBar.value = ''; searchBar.value = secondaryDropdown.value;
searchBar.disabled = false; searchBar.disabled = true;
} else {
searchBar.value = '';
searchBar.disabled = false;
} }
}); });
@ -273,7 +271,7 @@
options = ['Todo', 'Nombre', 'Empresa']; options = ['Todo', 'Nombre', 'Empresa'];
break; break;
case'ofertas': case'ofertas':
options = ['Todo', 'Nombre', 'Empresa','Año']; options = ['Todo', 'Nombre', 'Empresa','Este Año',"Ultimos 3 meses","Ultimos 6 meses"];
break; break;
case'sucursales': case'sucursales':
options = ['Todo', 'Nombre', 'Empresa','Localidad']; options = ['Todo', 'Nombre', 'Empresa','Localidad'];
@ -324,54 +322,6 @@
return true; return true;
} }
////////////////////////////////////////DATE//////////////////////////////////////
// Fetch the distinct years from the server
// Fetch the distinct years from the server
fetch('/api/distinct-years')
.then(response => response.json()) // Convert the response to JSON
.then(years => {
// Get a reference to the yearDropdown select element
var yearDropdown = document.getElementById('yearDropdown');
// Remove any existing options in the dropdown
yearDropdown.innerHTML = '';
// Iterate over each year
years.forEach(year => {
// Create a new option element
var option = document.createElement('option');
option.value = year;
option.text = year;
// Append the option to the yearDropdown select element
yearDropdown.appendChild(option);
});
})
.catch(error => console.error('Error:', error));
// Get a reference to the yearDropdownContainer div
// Add an event listener to the secondaryDropdown select element
secondaryDropdown.addEventListener('change', function() {
// Check if the selected value is "Año"
if (secondaryDropdown.value === 'Año') {
// If it is, make the yearDropdownContainer visible
yearDropdownContainer.style.display = 'block';
searchBar.disabled = true;
} else {
// If it's not, hide the yearDropdownContainer
yearDropdownContainer.style.display = 'none';
searchBar.disabled = false;
}
});
var yearDropdown = document.getElementById('yearDropdown');
var searchOption = document.getElementById('searchOption');
yearDropdown.addEventListener('change', function() {
searchBar.value = yearDropdown.value;
});
</script> </script>
</body> </body>
</html> </html>

7
src/main/resources/templates/buscador_alumno.html
Unescape View File

@ -219,9 +219,12 @@
var secondaryDropdown = document.getElementById('secondaryDropdown'); var secondaryDropdown = document.getElementById('secondaryDropdown');
secondaryDropdown.addEventListener('change', function() { secondaryDropdown.addEventListener('change', function() {
if (secondaryDropdown.value === 'Todo') { if (secondaryDropdown.value === 'Todo') {
searchBar.value = 'Todo'; searchBar.value = 'Todo';
searchBar.disabled = true; searchBar.disabled = true;
} else if (secondaryDropdown.value === 'Este Año' || secondaryDropdown.value === 'Ultimos 3 meses' || secondaryDropdown.value === 'Ultimos 6 meses') {
searchBar.value = secondaryDropdown.value;
searchBar.disabled = true;
} else { } else {
searchBar.value = ''; searchBar.value = '';
searchBar.disabled = false; searchBar.disabled = false;
@ -244,7 +247,7 @@
options = ['Todo', 'Nombre', 'Empresa']; options = ['Todo', 'Nombre', 'Empresa'];
break; break;
case'ofertas': case'ofertas':
options = ['Todo', 'Nombre', 'Empresa','Año']; options = ['Todo', 'Nombre', 'Empresa','Este Año',"Ultimos 3 meses","Ultimos 6 meses"];
break; break;
case'sucursales': case'sucursales':
options = ['Todo', 'Nombre', 'Empresa','Localidad']; options = ['Todo', 'Nombre', 'Empresa','Localidad'];

63
src/main/resources/templates/list/alumnos.html
Unescape View File

@ -107,9 +107,9 @@
<td>[[${alumno.correo}]]</td> <td>[[${alumno.correo}]]</td>
<td>[[${alumno.correo2}]]</td> <td>[[${alumno.correo2}]]</td>
<td>[[${alumno.nacionalidad}]]</td> <td>[[${alumno.nacionalidad}]]</td>
<td>[[${alumno.keywords}]]</td> <td class="keywords-cell">[[${alumno.keywords}]]</td>
<td>[[${alumno.ciclo.nombre}]]</td> <td>[[${alumno.ciclo.nombre}]]</td>
<td> <td class="keywords-cell">
<span th:each="skill : ${alumno.skills}" th:text="${skill.nombre} + ' '"></span> <span th:each="skill : ${alumno.skills}" th:text="${skill.nombre} + ' '"></span>
</td> </td>
@ -146,8 +146,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>
@ -270,38 +270,36 @@
iconHtml = `<i class="delete-icon fas fa-ban"></i> `; iconHtml = `<i class="delete-icon fas fa-ban"></i> `;
} }
row.innerHTML = ` row.innerHTML = `
<td> <td>
<i class="edit-icon fas fa-pen-square"></i> <i class="edit-icon fas fa-pen-square"></i>
<i class="delete-icon fas fa-ban hide-icon" th:if="${isAdmin}"></i> <i class="delete-icon fas fa-ban hide-icon" th:if="${isAdmin}"></i>
${alumno.nombre} ${alumno.nombre}
</td> </td>
<td>${alumno.apellido}</td> <td>${alumno.apellido}</td>
<td>${alumno.apellido2}</td> <td>${alumno.apellido2}</td>
<td>${alumno.fechaNacimiento}</td> <td>${alumno.fechaNacimiento}</td>
<td>${alumno.genero}</td> <td>${alumno.genero}</td>
<td>${alumno.nia}</td> <td>${alumno.nia}</td>
<td>${alumno.dni}</td> <td>${alumno.dni}</td>
<td>${alumno.correo}</td> <td>${alumno.correo}</td>
<td>${alumno.correo2}</td> <td>${alumno.correo2}</td>
<td>${alumno.nacionalidad}</td> <td>${alumno.nacionalidad}</td>
<td>${alumno.keywords}</td> <td class="keywords-cell">${alumno.keywords}</td>
<td>${alumno.ciclo.nombre}</td> <td>${alumno.ciclo.nombre}</td>
<td> <td class="keywords-cell">
${alumno.skills.map(skill => skill.nombre).join(', ')} ${alumno.skills.map(skill => skill.nombre).join(', ')}
</td> </td>
`; `;
tableBody.appendChild(row); tableBody.appendChild(row);
}); });
document.querySelectorAll('.edit-icon').forEach(function(icon) { document.querySelectorAll('.edit-icon').forEach(function(icon) {
icon.removeEventListener('click', handleEdit); icon.removeEventListener('click', handleEdit);
icon.addEventListener('click', handleEdit); icon.addEventListener('click', handleEdit);
//console.log("Edit icon event listener attached");
}); });
document.querySelectorAll('.delete-icon').forEach(function(icon) { document.querySelectorAll('.delete-icon').forEach(function(icon) {
icon.removeEventListener('click', handleDelete); icon.removeEventListener('click', handleDelete);
icon.addEventListener('click', handleDelete); icon.addEventListener('click', handleDelete);
//console.log("Delete icon event listener attached");
}); });
table.style.pointerEvents = 'auto'; table.style.pointerEvents = 'auto';
@ -349,6 +347,19 @@
} }
}); });
}); });
/////////////////MOUSE SROLL FOR KEYWORD AND SKILLS//////////////////////
// Select all elements with the 'keywords-cell' class
const cells = document.querySelectorAll('.keywords-cell');
// Add a 'wheel' event listener to each cell
cells.forEach(cell => {
cell.addEventListener('wheel', function(e) {
// Prevent the default behavior (vertical scroll)
e.preventDefault();
// Scroll horizontally instead
this.scrollLeft += e.deltaY;
}, { passive: false }); // Use passive: false to make preventDefault() work
});
</script> </script>
</body> </body>
</html> </html>

4
src/main/resources/templates/list/ciclos.html
Unescape View File

@ -83,8 +83,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

4
src/main/resources/templates/list/contactos.html
Unescape View File

@ -103,8 +103,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

21
src/main/resources/templates/list/empresas.html
Unescape View File

@ -68,7 +68,7 @@
<td>[[${empresa.cif}]]</td> <td>[[${empresa.cif}]]</td>
<td>[[${empresa.correo}]]</td> <td>[[${empresa.correo}]]</td>
<td>[[${empresa.telefono}]]</td> <td>[[${empresa.telefono}]]</td>
<td>[[${empresa.keywords}]]</td> <td class="keywords-cell">[[${empresa.keywords}]]</td>
<td>[[${empresa.sector.nombre}]]</td> <td>[[${empresa.sector.nombre}]]</td>
</tr> </tr>
</tbody> </tbody>
@ -103,8 +103,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>
@ -145,10 +145,10 @@
}); });
function handleEdit(event) { function handleEdit(event) {
console.log("handleEdit function called"); // console.log("handleEdit function called");
const row = event.target.closest('tr'); const row = event.target.closest('tr');
const rowId = row.dataset.id; const rowId = row.dataset.id;
//console.log("Row ID: " + rowId); // console.log("Row ID: " + rowId);
window.location = "/admin/empresa/update/" + rowId; window.location = "/admin/empresa/update/" + rowId;
} }
@ -242,7 +242,7 @@
<td>${empresa.cif}</td> <td>${empresa.cif}</td>
<td>${empresa.correo}</td> <td>${empresa.correo}</td>
<td>${empresa.telefono}</td> <td>${empresa.telefono}</td>
<td>${empresa.keywords}</td> <td class="keywords-cell">${empresa.keywords}</td>
<td>${empresa.sector.nombre}</td> <td>${empresa.sector.nombre}</td>
`; `;
tableBody.appendChild(row); tableBody.appendChild(row);
@ -299,6 +299,15 @@
} }
}); });
}); });
/////////////////MOUSE SROLL FOR KEYWORD AND SKILLS//////////////////////
const cells = document.querySelectorAll('.keywords-cell');
cells.forEach(cell => {
cell.addEventListener('wheel', function(e) {
e.preventDefault();
this.scrollLeft += e.deltaY;
}, { passive: false });
});
</script> </script>
</body> </body>
</html> </html>

4
src/main/resources/templates/list/familias.html
Unescape View File

@ -72,8 +72,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

16
src/main/resources/templates/list/ofertas.html
Unescape View File

@ -66,7 +66,7 @@
<td>[[${oferta.descripcion}]]</td> <td>[[${oferta.descripcion}]]</td>
<td>[[${oferta.sucursal.nombre}]]</td> <td>[[${oferta.sucursal.nombre}]]</td>
<td>[[${oferta.ciclo.nombre}]]</td> <td>[[${oferta.ciclo.nombre}]]</td>
<td> <td class="keywords-cell">
<span th:each="skill : ${oferta.skills}" th:text="${skill.nombre} + ' '"></span> <span th:each="skill : ${oferta.skills}" th:text="${skill.nombre} + ' '"></span>
</td> </td>
</tr> </tr>
@ -102,8 +102,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>
@ -242,7 +242,7 @@
<td>${oferta.descripcion}</td> <td>${oferta.descripcion}</td>
<td>${oferta.sucursal.nombre}</td> <td>${oferta.sucursal.nombre}</td>
<td>${oferta.ciclo.nombre}</td> <td>${oferta.ciclo.nombre}</td>
<td> <td class="keywords-cell">
${oferta.skills.map(skill => skill.nombre).join(', ')} ${oferta.skills.map(skill => skill.nombre).join(', ')}
</td> </td>
`; `;
@ -305,6 +305,14 @@
} }
}); });
}); });
/////////////////MOUSE SROLL FOR KEYWORD AND SKILLS//////////////////////
const cells = document.querySelectorAll('.keywords-cell');
cells.forEach(cell => {
cell.addEventListener('wheel', function(e) {
e.preventDefault();
this.scrollLeft += e.deltaY;
}, { passive: false });
});
</script> </script>
</body> </body>
</html> </html>

4
src/main/resources/templates/list/sectores.html
Unescape View File

@ -71,8 +71,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

4
src/main/resources/templates/list/skills.html
Unescape View File

@ -71,8 +71,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

4
src/main/resources/templates/list/sucursales.html
Unescape View File

@ -96,8 +96,8 @@
<div id="modalDelete" class ="modal"> <div id="modalDelete" class ="modal">
<div class="modal-content"> <div class="modal-content">
<p>¿Estas seguro que quires borar este elemnto?</p> <p>¿Estas seguro que quires borrar este elemnto?</p>
<span class="delete">Borar</span> <span class="delete">Borrar</span>
<span class="close">Cancelar</span> <span class="close">Cancelar</span>
</div> </div>

2
src/main/resources/templates/user/update_alu.html
Unescape View File

@ -150,7 +150,7 @@
</div> </div>
<div class="skills-container"> <div class="skills-container">
<h2>Select Skills</h2> <h2>Elige Skills</h2>
<select id="skills" multiple> <select id="skills" multiple>
<option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${alumno.skills.contains(skill)}"></option> <option th:each="skill : ${skills}" th:value="${skill.id}" th:text="${skill.nombre}" th:selected="${alumno.skills.contains(skill)}"></option>
</select> </select>

Write Preview
Loading…
Cancel
Save

Powered by INFORMATICA.FP.EDU.ES.