diff --git a/src/main/java/com/example/proyectofinal/configuration/database/DatabaseTest.java b/src/main/java/com/example/proyectofinal/configuration/database/DatabaseTest.java index 894b194..7a024ff 100644 --- a/src/main/java/com/example/proyectofinal/configuration/database/DatabaseTest.java +++ b/src/main/java/com/example/proyectofinal/configuration/database/DatabaseTest.java @@ -53,7 +53,6 @@ public class DatabaseTest { skills, ciclo ); - System.out.println(alumno); alumnoRepository.save(alumno); Sector sector = new Sector("Tecnologia" + i); @@ -102,7 +101,11 @@ public class DatabaseTest { jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON alumnos(keywords,nombre,apellido,apellido2,dni,nia,correo,correo2,nacionalidad,genero)"); jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON ofertas(nombre,fecha)"); jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON sucursales(nombre,localidad,direccion)"); - + jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON sectores(nombre)"); + jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON ciclos(nombre)"); + jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON familias(nombre)"); + jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON skills(nombre)"); + jdbcTemplate.execute("CREATE FULLTEXT INDEX keywords_index ON contactos(nombre,apellido,apellido2,correo,telefono)"); }; } diff --git a/src/main/java/com/example/proyectofinal/controllers/BuscadorController.java b/src/main/java/com/example/proyectofinal/controllers/BuscadorController.java index ca993cb..a7fbd4d 100644 --- a/src/main/java/com/example/proyectofinal/controllers/BuscadorController.java +++ b/src/main/java/com/example/proyectofinal/controllers/BuscadorController.java @@ -32,6 +32,10 @@ public class BuscadorController { @Autowired private ContactoRepository contactoRepository; + @Autowired + private FamiliaRepository familiaRepository; + @Autowired + private CicloRepository cicloRepository; @GetMapping public String buscador(){ @@ -47,62 +51,62 @@ public class BuscadorController { if(word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")){ Set empresas = new HashSet<>(empressaRepository.findAll()); model.addAttribute("empresas", empresas); - return "list_empresas"; + return "/list/list_empresas"; } System.out.println("Buscando empresas"); if(word.length == 1){ Set empresas = new HashSet<>(empressaRepository.getEmpressaByKeywordsOrName(word[0])); model.addAttribute("empresas", empresas); - return "list_empresas"; + return "/list/list_empresas"; }else if(word.length == 2){ Set empresas = new HashSet<>(empressaRepository.getEmpressaByKeywordsOrName(word[0])); empresas.addAll(empressaRepository.getEmpressaByKeywordsOrName(word[1])); model.addAttribute("empresas", empresas); - return "list_empresas"; + return "/list/list_empresas"; } } else if (searchOption.equals("OptAlumno")) { if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todos")) { Set alumnos = new HashSet<>(alumnoRepository.findAll()); model.addAttribute("alumnos", alumnos); - return "list_alumnos"; + return "/list/list_alumnos"; } if (word.length == 1) { System.out.println("Buscando alumnos"); Set alumnos = new HashSet<>(alumnoRepository.getAlumnoByKeywordsOrName(word[0])); model.addAttribute("alumnos", alumnos); - return "list_alumnos"; + return "/list/list_alumnos"; } else if (word.length == 2) { System.out.println("Buscando alumnos"); Set alumnos = new HashSet<>(alumnoRepository.getAlumnoByKeywordsOrName(word[0])); alumnos.addAll(alumnoRepository.getAlumnoByKeywordsOrName(word[1])); model.addAttribute("alumnos", alumnos); - return "list_alumnos"; + return "/list/list_alumnos"; } }else if(searchOption.equals("OptOferta")) { if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { Set ofertas = new HashSet<>(ofertaRepository.findAll()); model.addAttribute("ofertas", ofertas); - return "list_ofertas"; + return "/list/list_ofertas"; } if (word.length == 1) { - Set ofertas = new HashSet<>(ofertaRepository.getOfertaByKeywordsOrName(word[0])); + Set ofertas = new HashSet<>(ofertaRepository.getOfertaFullTextSeach(word[0])); model.addAttribute("ofertas", ofertas); - return "list_ofertas"; + return "/list/list_ofertas"; } else if (word.length == 2) { - Set ofertas = new HashSet<>(ofertaRepository.getOfertaByKeywordsOrName(word[0])); - ofertas.addAll(ofertaRepository.getOfertaByKeywordsOrName(word[1])); + Set ofertas = new HashSet<>(ofertaRepository.getOfertaFullTextSeach(word[0])); + ofertas.addAll(ofertaRepository.getOfertaFullTextSeach(word[1])); model.addAttribute("ofertas", ofertas); - return "list_ofertas"; + return "/list/list_ofertas"; } } else if (searchOption.equals("OptSector")) { if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { Set sectores = new HashSet<>(sectorRepository.findAll()); model.addAttribute("sectores", sectores); - return "list_sectores"; + return "/list/list_sectores"; } else { Sector sector = sectorRepository.findByNombre(word[0]); model.addAttribute("sectores", sector); - return "list_sectores"; + return "/list/list_sectores"; } }else if(searchOption.equals("OptSucursal")) { if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { @@ -110,7 +114,7 @@ public class BuscadorController { model.addAttribute("sucursales", sucursalSet); return "/list/list_sucursales"; } else { - Set sucursalSet = new HashSet<>(sucursalRepository.getSucursalByKeywordsOrName(word[0])); + Set sucursalSet = new HashSet<>(sucursalRepository.getSucursalFullTextSeach(word[0])); model.addAttribute("sucursales", sucursalSet); return "/list/list_sucursales"; } @@ -119,12 +123,32 @@ public class BuscadorController { Set skills = new HashSet<>(skillRepository.findAll()); model.addAttribute("skills", skills); return "/list/list_skills"; + }else{ + Set skills = new HashSet<>(skillRepository.getSkillFullTextSeach(word[0])); + model.addAttribute("skills", skills); + return "/list/list_skills"; } - }else if(searchOption.equals("OptContactos")){ + }else if(searchOption.equals("OptContactos")) { if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { Set contactos = new HashSet<>(contactoRepository.findAll()); model.addAttribute("contactos", contactos); return "/list/list_contactos"; + } else { + Set contactos = new HashSet<>(contactoRepository.getContactoFullTextSeach(word[0])); + model.addAttribute("contactos", contactos); + return "/list/list_contactos"; + } + }else if(searchOption.equals("OptFamilias")) { + if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { + Set familias = new HashSet<>(familiaRepository.findAll()); + model.addAttribute("familias", familias); + return "/list/list_familias"; + } + }else if(searchOption.equals("OptCiclos")){ + if (word.length == 1 && word[0].equalsIgnoreCase("all") || word[0].equalsIgnoreCase("todas")) { + Set ciclos = new HashSet<>(cicloRepository.findAll()); + model.addAttribute("ciclos", ciclos); + return "/list/list_ciclos"; } }else{ System.out.println("ERROR EN BUSQUEDA DE UNA PALABRA"); @@ -132,15 +156,4 @@ public class BuscadorController { } return "error"; } - - @GetMapping("/paginaEditar") - public String openNewPage() { - System.out.println("Abriendo pagina de edicion"); - return "/admin/edit"; - } - - - - - } \ No newline at end of file diff --git a/src/main/java/com/example/proyectofinal/controllers/LogInController.java b/src/main/java/com/example/proyectofinal/controllers/LogInController.java deleted file mode 100644 index a0d507c..0000000 --- a/src/main/java/com/example/proyectofinal/controllers/LogInController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.proyectofinal.controllers; - -import org.springframework.web.bind.annotation.RestController; - -//@RestController -public class LogInController { -} diff --git a/src/main/java/com/example/proyectofinal/controllers/editController/EditController.java b/src/main/java/com/example/proyectofinal/controllers/editController/EditController.java new file mode 100644 index 0000000..a9b6410 --- /dev/null +++ b/src/main/java/com/example/proyectofinal/controllers/editController/EditController.java @@ -0,0 +1,43 @@ +package com.example.proyectofinal.controllers.editController; + +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +@RequestMapping("/editMain") +public class EditController { + + @GetMapping + public String editMain(){ + return "admin/editMain"; + } + + @GetMapping("/FamiliaEdit") + public String editFamilia(@RequestParam String text, Model model){ + model.addAttribute("text", text); + return "admin/editMenu/edit_menu"; + } + + @GetMapping("/{action}/{text}") + public String editFamilia(@PathVariable String action, @PathVariable String text, Model model){ + System.out.println(text); + model.addAttribute("text", text); + switch(action) { + case "crear": + System.out.println("crear "+text); + break; + case "editar": + System.out.println("editar "+text); + break; + case "borrar": + System.out.println("borrar "+ text); + break; + } + return "admin/editMenu/edit_menu"; + } + +} diff --git a/src/main/java/com/example/proyectofinal/controllers/EmpressaController.java b/src/main/java/com/example/proyectofinal/controllers/searchController/EmpressaController.java similarity index 90% rename from src/main/java/com/example/proyectofinal/controllers/EmpressaController.java rename to src/main/java/com/example/proyectofinal/controllers/searchController/EmpressaController.java index 9e663f3..24f4008 100644 --- a/src/main/java/com/example/proyectofinal/controllers/EmpressaController.java +++ b/src/main/java/com/example/proyectofinal/controllers/searchController/EmpressaController.java @@ -1,7 +1,6 @@ -package com.example.proyectofinal.controllers; +package com.example.proyectofinal.controllers.searchController; import com.example.proyectofinal.models.empresas.Contacto; -import com.example.proyectofinal.models.empresas.Empresa; import com.example.proyectofinal.repositories.empresas.ContactoRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; diff --git a/src/main/java/com/example/proyectofinal/controllers/searchController/FamiliaController.java b/src/main/java/com/example/proyectofinal/controllers/searchController/FamiliaController.java new file mode 100644 index 0000000..863009e --- /dev/null +++ b/src/main/java/com/example/proyectofinal/controllers/searchController/FamiliaController.java @@ -0,0 +1,27 @@ +package com.example.proyectofinal.controllers.searchController; + +import com.example.proyectofinal.models.empresas.Ciclo; +import com.example.proyectofinal.repositories.empresas.CicloRepository; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.HashSet; +import java.util.Set; + +@Controller +@RequestMapping("/familia") +public class FamiliaController { + @Autowired + private CicloRepository cicloRepository; + + @GetMapping("/{id}") + public String getFamiliaById(@PathVariable Long id, Model model) { + Set cicloSet = new HashSet<>(cicloRepository.findCicloByFamiliaId(id)); + model.addAttribute("ciclos", cicloSet); + return "/list/specific/list_familia_ciclo"; + } +} diff --git a/src/main/java/com/example/proyectofinal/controllers/searchController/LogInController.java b/src/main/java/com/example/proyectofinal/controllers/searchController/LogInController.java new file mode 100644 index 0000000..80693ce --- /dev/null +++ b/src/main/java/com/example/proyectofinal/controllers/searchController/LogInController.java @@ -0,0 +1,5 @@ +package com.example.proyectofinal.controllers.searchController; + +//@RestController +public class LogInController { +} diff --git a/src/main/java/com/example/proyectofinal/controllers/SectorController.java b/src/main/java/com/example/proyectofinal/controllers/searchController/SectorController.java similarity index 84% rename from src/main/java/com/example/proyectofinal/controllers/SectorController.java rename to src/main/java/com/example/proyectofinal/controllers/searchController/SectorController.java index 94a21d4..d2d5018 100644 --- a/src/main/java/com/example/proyectofinal/controllers/SectorController.java +++ b/src/main/java/com/example/proyectofinal/controllers/searchController/SectorController.java @@ -1,8 +1,7 @@ -package com.example.proyectofinal.controllers; +package com.example.proyectofinal.controllers.searchController; import com.example.proyectofinal.models.empresas.Empresa; import com.example.proyectofinal.repositories.empresas.EmpressaRepository; -import com.example.proyectofinal.repositories.empresas.SectorRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -16,8 +15,6 @@ import java.util.Set; @Controller @RequestMapping("/sector") public class SectorController { - @Autowired - private SectorRepository sectorRepository; @Autowired private EmpressaRepository empressaRepository; diff --git a/src/main/java/com/example/proyectofinal/models/empresas/Skill.java b/src/main/java/com/example/proyectofinal/models/empresas/Skill.java index e405993..1a5a109 100644 --- a/src/main/java/com/example/proyectofinal/models/empresas/Skill.java +++ b/src/main/java/com/example/proyectofinal/models/empresas/Skill.java @@ -12,7 +12,7 @@ import java.util.Set; @AllArgsConstructor @NoArgsConstructor @Data -@Table(name = "Skill") +@Table(name = "skills") public class Skill { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/CicloRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/CicloRepository.java index d5e2bc1..de153ea 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/CicloRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/CicloRepository.java @@ -2,6 +2,16 @@ package com.example.proyectofinal.repositories.empresas; import com.example.proyectofinal.models.empresas.Ciclo; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.lang.reflect.Array; +import java.util.ArrayList; public interface CicloRepository extends JpaRepository { + + @Query(value = "SELECT * FROM ciclos u WHERE MATCH(u.nombre, u.familias) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) + public Ciclo getCicloByKeywordsOrName(String keyword1); + + @Query(value = "Select * from ciclos c where c.familia_id = ?1", nativeQuery = true) + public ArrayList findCicloByFamiliaId(Long id); } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/ContactoRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/ContactoRepository.java index 1ec1faa..8fe7cc2 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/ContactoRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/ContactoRepository.java @@ -9,4 +9,7 @@ import java.util.ArrayList; public interface ContactoRepository extends JpaRepository { @Query("SELECT c FROM Contacto c WHERE c.empresa.sector.id = ?1") ArrayList findBySector(Long id); + + @Query(value = "SELECT * FROM contactos u WHERE MATCH(u.nombre, u.apellido,u.apellido2, u.correo, u.telefono) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) + public ArrayList getContactoFullTextSeach(String keyword1); } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/FamiliaRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/FamiliaRepository.java index 7c90a86..a2d6ac4 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/FamiliaRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/FamiliaRepository.java @@ -2,6 +2,9 @@ package com.example.proyectofinal.repositories.empresas; import com.example.proyectofinal.models.empresas.Familia; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface FamiliaRepository extends JpaRepository { + @Query(value = "SELECT * FROM familias u WHERE MATCH(u.nombre) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) + public Familia getFamiliaFullTextSeach(String keyword1); } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/OfertaRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/OfertaRepository.java index dcfbd6f..0fc80cb 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/OfertaRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/OfertaRepository.java @@ -1,6 +1,5 @@ package com.example.proyectofinal.repositories.empresas; -import com.example.proyectofinal.models.empresas.Empresa; import com.example.proyectofinal.models.empresas.Oferta; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -10,5 +9,5 @@ import java.util.ArrayList; public interface OfertaRepository extends JpaRepository { @Query(value = "SELECT * FROM ofertas u WHERE MATCH(u.nombre, u.fecha) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) - public ArrayList getOfertaByKeywordsOrName(String word); + public ArrayList getOfertaFullTextSeach(String word); } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/SectorRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/SectorRepository.java index 456c72d..e7ced66 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/SectorRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/SectorRepository.java @@ -8,4 +8,7 @@ public interface SectorRepository extends JpaRepository { @Query("SELECT s FROM Sector s WHERE s.nombre = ?1") Sector findByNombre(String nombre); + + @Query(value = "SELECT * FROM sectores u WHERE MATCH(u.nombre) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) + public Sector getSectorFullTextSeach(String word); } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/SkillRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/SkillRepository.java index 61ca7d0..1e4cca4 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/SkillRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/SkillRepository.java @@ -2,6 +2,13 @@ package com.example.proyectofinal.repositories.empresas; import com.example.proyectofinal.models.empresas.Skill; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.ArrayList; public interface SkillRepository extends JpaRepository { + + @Query(value = "SELECT * FROM skills u WHERE MATCH(u.nombre) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) + public ArrayList getSkillFullTextSeach(String word); + } diff --git a/src/main/java/com/example/proyectofinal/repositories/empresas/SucursalRepository.java b/src/main/java/com/example/proyectofinal/repositories/empresas/SucursalRepository.java index 8e8b5e4..e484f68 100644 --- a/src/main/java/com/example/proyectofinal/repositories/empresas/SucursalRepository.java +++ b/src/main/java/com/example/proyectofinal/repositories/empresas/SucursalRepository.java @@ -1,6 +1,5 @@ package com.example.proyectofinal.repositories.empresas; -import com.example.proyectofinal.models.empresas.Empresa; import com.example.proyectofinal.models.empresas.Sucursal; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -11,5 +10,5 @@ public interface SucursalRepository extends JpaRepository { //there is value = and nativeQuery = true so the query is written in SQL refering to the table in the database @Query(value = "SELECT * FROM sucursales u WHERE MATCH(u.nombre, u.localidad,u.direccion) AGAINST(?1 IN BOOLEAN MODE)", nativeQuery = true) - public ArrayList getSucursalByKeywordsOrName(String word); + public ArrayList getSucursalFullTextSeach(String word); } diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css new file mode 100644 index 0000000..cfe4217 --- /dev/null +++ b/src/main/resources/static/style.css @@ -0,0 +1,59 @@ +.logout-button { + position: fixed; + top: 0px; + right: 0px; + background-color: red; + color: white; + border: none; + text-decoration: none; + font-size: 20px; + padding: 0px; + margin: 0px; + border-radius: 0; + display: flex; + justify-content: center; + align-items: center; + width: 40px; + height: 40px; +} + +.back-button { + width: 200px !important; + height: 50px !important; + font-size: 25px !important; + margin-top: 100px; + background-color: #007BFF; + color: white; + font-weight: bolder; + border-radius: 5px; + justify-content: center; + align-items: center; + font-family: Verdana, Geneva, Tahoma, sans-serif; +} +h1 { + text-align: center; + text-decoration: underline; + background-color: #007BFF; + font-family: Verdana, Geneva, Tahoma, sans-serif; + font-size: 50px; + color: white; + margin-top: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + padding-left: 0; + padding-right: 0; + width: 100%; + position: fixed; + top: 0; +} +.cell{ + height: 10px; +} + +.table { + border: 1px solid black; + height: 75vh; + max-height: 100vh; + overflow-y: auto; +} diff --git a/src/main/resources/static/top_and_back.css b/src/main/resources/static/top_and_back.css new file mode 100644 index 0000000..8d4fcbe --- /dev/null +++ b/src/main/resources/static/top_and_back.css @@ -0,0 +1,64 @@ +.logout-button { + position: fixed; + top: 0px; + right: 0px; + background-color: red; + color: white; + border: none; + text-decoration: none; + font-size: 20px; + padding: 0px; + margin: 0px; + border-radius: 0; + display: flex; + justify-content: center; + align-items: center; + width: 40px; + height: 40px; +} +h1 { + text-align: center; + text-decoration: underline; + background-color: #007BFF; + font-family: Verdana, Geneva, Tahoma, sans-serif; + font-size: 50px; + color: white; + margin-top: 0; + margin-left: 0; + margin-right: 0; + padding-top: 0; + padding-left: 0; + padding-right: 0; + width: 100%; + position: fixed; + top: 0; +} +.back-button { + position: fixed; + bottom: 0; + left: 0; + width: 200px !important; + height: 50px !important; + font-size: 25px !important; + margin-top: 100px; + background-color: #007BFF; + color: white; + font-weight: bolder; + border-radius: 5px; + justify-content: center; + align-items: center; + font-family: Verdana, Geneva, Tahoma, sans-serif; +} +body { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + height: 100vh; +} + +.opt_butn { + display: flex; + justify-content: center; + align-items: center; +} diff --git a/src/main/resources/templates/admin/edit.html b/src/main/resources/templates/admin/editMain.html similarity index 54% rename from src/main/resources/templates/admin/edit.html rename to src/main/resources/templates/admin/editMain.html index 364407a..52e52c4 100644 --- a/src/main/resources/templates/admin/edit.html +++ b/src/main/resources/templates/admin/editMain.html @@ -1,24 +1,16 @@ + + EDITOR DE INFORMACIÓN +

ZONA ADMINISTRADOR

+
Empresa Alumno @@ -44,7 +44,7 @@ Skill Contactos Ciclo - Familia + Familia
Atras diff --git a/src/main/resources/templates/admin/editMenu/edit_menu.html b/src/main/resources/templates/admin/editMenu/edit_menu.html new file mode 100644 index 0000000..5f7d7e0 --- /dev/null +++ b/src/main/resources/templates/admin/editMenu/edit_menu.html @@ -0,0 +1,18 @@ + + + + + Title + + + + +

+
+ Crear + Editar + Borrar +
+ Atras + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/editMenu/familia/familia_borar.html b/src/main/resources/templates/admin/editMenu/familia/familia_borar.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/admin/editMenu/familia/familia_borar.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/editMenu/familia/familia_crear.html b/src/main/resources/templates/admin/editMenu/familia/familia_crear.html new file mode 100644 index 0000000..17ea98c --- /dev/null +++ b/src/main/resources/templates/admin/editMenu/familia/familia_crear.html @@ -0,0 +1,16 @@ + + + + + Title + + +

CREAR FAMILIA

+
+
+
+ +
+ Atras a Menu Administrador + + \ No newline at end of file diff --git a/src/main/resources/templates/admin/editMenu/familia/familia_edit.html b/src/main/resources/templates/admin/editMenu/familia/familia_edit.html new file mode 100644 index 0000000..566549b --- /dev/null +++ b/src/main/resources/templates/admin/editMenu/familia/familia_edit.html @@ -0,0 +1,10 @@ + + + + + Title + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/buscador_admin.html b/src/main/resources/templates/buscador_admin.html index 5b03520..9111f3b 100644 --- a/src/main/resources/templates/buscador_admin.html +++ b/src/main/resources/templates/buscador_admin.html @@ -1,6 +1,8 @@ + + Buscador +

PAGINA PRINCIPAL

- + EDITAR
diff --git a/src/main/resources/templates/list_alumnos.html b/src/main/resources/templates/list/list_alumnos.html similarity index 72% rename from src/main/resources/templates/list_alumnos.html rename to src/main/resources/templates/list/list_alumnos.html index 68709df..b96dd4c 100644 --- a/src/main/resources/templates/list_alumnos.html +++ b/src/main/resources/templates/list/list_alumnos.html @@ -1,42 +1,19 @@ + + Title -

Listado de Alumnos

+

Listado de Alumnos

@@ -75,7 +52,7 @@
-Back to Buscador +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list/list_ciclo.html b/src/main/resources/templates/list/list_ciclo.html new file mode 100644 index 0000000..4118323 --- /dev/null +++ b/src/main/resources/templates/list/list_ciclo.html @@ -0,0 +1,38 @@ + + + + + + + + Title + + + + + +

Listado de Ciclos

+
+ + + + + + + + + + + + + + + +
IdNombreFamilia
[[${ciclo.id}]][[${ciclo.nombre}]][[${ciclo.familia.nombre}]]
+
+Atras + + + \ No newline at end of file diff --git a/src/main/resources/templates/list/list_contactos.html b/src/main/resources/templates/list/list_contactos.html index 5f8703e..c0c6867 100644 --- a/src/main/resources/templates/list/list_contactos.html +++ b/src/main/resources/templates/list/list_contactos.html @@ -1,42 +1,19 @@ + + Title -

Listado de Alumnos

+

Listado de Alumnos

@@ -65,7 +42,7 @@
-Back to Buscador +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list_empresas.html b/src/main/resources/templates/list/list_empresas.html similarity index 68% rename from src/main/resources/templates/list_empresas.html rename to src/main/resources/templates/list/list_empresas.html index 20781fa..5c72160 100644 --- a/src/main/resources/templates/list_empresas.html +++ b/src/main/resources/templates/list/list_empresas.html @@ -1,42 +1,19 @@ + + Title -

Listado de Empresas

+

Listado de Empresas

@@ -65,7 +42,7 @@
-Back to Buscador +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list/list_familias.html b/src/main/resources/templates/list/list_familias.html new file mode 100644 index 0000000..e2207c0 --- /dev/null +++ b/src/main/resources/templates/list/list_familias.html @@ -0,0 +1,37 @@ + + + + + + + + Title + + + + + +

Familias

+
+ + + + + + + + + + + + + + +
IdNombre
[[${familia.id}]][[${familia.nombre}]]
+
+Atras + + + \ No newline at end of file diff --git a/src/main/resources/templates/list_ofertas.html b/src/main/resources/templates/list/list_ofertas.html similarity index 62% rename from src/main/resources/templates/list_ofertas.html rename to src/main/resources/templates/list/list_ofertas.html index 89df7e5..f60e903 100644 --- a/src/main/resources/templates/list_ofertas.html +++ b/src/main/resources/templates/list/list_ofertas.html @@ -1,42 +1,19 @@ + + Title -

Listado de Ofertas

+

Listado de Ofertas

@@ -57,7 +34,7 @@
-Back to Buscador +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list_sectores.html b/src/main/resources/templates/list/list_sectores.html similarity index 60% rename from src/main/resources/templates/list_sectores.html rename to src/main/resources/templates/list/list_sectores.html index cdd45ba..82937d8 100644 --- a/src/main/resources/templates/list_sectores.html +++ b/src/main/resources/templates/list/list_sectores.html @@ -1,42 +1,19 @@ + + Title -

Listado de Ofertas

+

Listado de Ofertas

@@ -53,7 +30,7 @@
-Back to Buscador +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list/list_skills.html b/src/main/resources/templates/list/list_skills.html index 5d43f75..5538f5f 100644 --- a/src/main/resources/templates/list/list_skills.html +++ b/src/main/resources/templates/list/list_skills.html @@ -1,42 +1,18 @@ + + Title -

Listado de Skills

+

Listado de Skills

diff --git a/src/main/resources/templates/list/list_sucursales.html b/src/main/resources/templates/list/list_sucursales.html index 5390f1d..61de502 100644 --- a/src/main/resources/templates/list/list_sucursales.html +++ b/src/main/resources/templates/list/list_sucursales.html @@ -1,42 +1,19 @@ + + Title -

Listado de Sucursales

+

Listado de Sucursales

diff --git a/src/main/resources/templates/list/specific/list_empresa_contactos.html b/src/main/resources/templates/list/specific/list_empresa_contactos.html index 9b3b028..7d4c6a5 100644 --- a/src/main/resources/templates/list/specific/list_empresa_contactos.html +++ b/src/main/resources/templates/list/specific/list_empresa_contactos.html @@ -1,42 +1,19 @@ + + Title -

Listado de Contactos

+

Listado de Contactos

@@ -65,7 +42,7 @@
-Atras a empressas +Atras \ No newline at end of file diff --git a/src/main/resources/templates/list/specific/list_familia_ciclo.html b/src/main/resources/templates/list/specific/list_familia_ciclo.html new file mode 100644 index 0000000..4b30cb8 --- /dev/null +++ b/src/main/resources/templates/list/specific/list_familia_ciclo.html @@ -0,0 +1,38 @@ + + + + + + + + Title + + + + + +

Listado de Ciclos

+
+ + + + + + + + + + + + + + + +
IdNombreFamilia
[[${ciclo.id}]][[${ciclo.nombre}]][[${ciclo.familia.nombre}]]
+
+Atras + + + \ No newline at end of file diff --git a/src/main/resources/templates/list/specific/list_sector_empresas.html b/src/main/resources/templates/list/specific/list_sector_empresas.html index e85f5cd..30a8cd2 100644 --- a/src/main/resources/templates/list/specific/list_sector_empresas.html +++ b/src/main/resources/templates/list/specific/list_sector_empresas.html @@ -1,42 +1,19 @@ + + Title -

Listado de Empresas

+

Listado de Empresas

@@ -65,7 +42,7 @@
-Atras a sectores +Atras \ No newline at end of file