|
|
@@ -8,8 +8,6 @@ import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import jakarta.servlet.http.HttpServletResponse;
|
|
|
-import jakarta.servlet.http.HttpSession;
|
|
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.annotation.Secured;
|
|
|
@@ -19,6 +17,7 @@ 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.PostMapping;
|
|
|
+import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestParam;
|
|
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
|
|
|
|
@@ -28,6 +27,7 @@ import es.uv.saic.domain.DummyDataTransfer;
|
|
|
import es.uv.saic.domain.Plantilla;
|
|
|
import es.uv.saic.domain.Usuari;
|
|
|
import es.uv.saic.dto.OrganDTO;
|
|
|
+import es.uv.saic.dto.ProcedureRequestDTO;
|
|
|
import es.uv.saic.dto.ProcesDTO;
|
|
|
import es.uv.saic.dto.RolDTO;
|
|
|
import es.uv.saic.dto.TemplateDataDTO;
|
|
|
@@ -37,6 +37,8 @@ import es.uv.saic.feign.OrganClient;
|
|
|
import es.uv.saic.feign.PlantillaClient;
|
|
|
import es.uv.saic.feign.ProceduresClient;
|
|
|
import es.uv.saic.feign.UsuariClient;
|
|
|
+import jakarta.servlet.http.HttpServletResponse;
|
|
|
+import jakarta.servlet.http.HttpSession;
|
|
|
|
|
|
@Controller
|
|
|
public class AdminController {
|
|
|
@@ -256,33 +258,15 @@ public class AdminController {
|
|
|
|
|
|
return "adminProcedures";
|
|
|
}
|
|
|
-
|
|
|
- // POST para editar un procedimiento ya existente
|
|
|
+
|
|
|
@PostMapping("/admin/procedures/edit")
|
|
|
@Secured({"ROLE_ADMIN"})
|
|
|
- public String editProcedure(Model model, Authentication auth, HttpServletResponse response, @RequestParam Map<String,String> params,
|
|
|
- @RequestParam(name="idTascap[]", required=false) List<String> idTascap,
|
|
|
- @RequestParam(name="dataLimit[]", required=false) List<String> dataLimit,
|
|
|
- @RequestParam(name="tipus[]", required=false) List<String> tipus,
|
|
|
- @RequestParam(name="codiEvidencia[]", required=false) List<String> codiEvidencia,
|
|
|
- @RequestParam(name="idTascaSeg[]", required=false) List<String> idTascaSeg,
|
|
|
- @RequestParam(name="idTascaSeg2[]", required=false) List<String> idTascaSeg2,
|
|
|
- @RequestParam(name="opcions[]", required=false) List<String> opcions,
|
|
|
- @RequestParam(name="idRol[]", required=false) List<String> idRol,
|
|
|
- @RequestParam(name="titolCas[]", required=false) List<String> titolCas,
|
|
|
- @RequestParam(name="titolVal[]", required=false) List<String> titolVal,
|
|
|
- @RequestParam(name="descripcioCas[]", required=false) List<String> descripcioCas,
|
|
|
- @RequestParam(name="descripcioVal[]", required=false) List<String> descripcioVal,
|
|
|
- @RequestParam(name="nomEvidenciaCas[]", required=false) List<String> nomEvidenciaCas,
|
|
|
- @RequestParam(name="nomEvidenciaVal[]", required=false) List<String> nomEvidenciaVal,
|
|
|
- @RequestParam(name="idPlantilla[]", required=false) List<String> idPlantilla,
|
|
|
- @RequestParam(name="informe[]", required=false) List<Boolean> informe)
|
|
|
- throws NumberFormatException, ParseException {
|
|
|
-
|
|
|
- ac.editProcedure(params, idTascap, dataLimit, tipus, codiEvidencia, idTascaSeg, idTascaSeg2, opcions, idRol, titolCas, titolVal, descripcioCas, descripcioVal, nomEvidenciaCas, nomEvidenciaVal, idPlantilla, informe);
|
|
|
-
|
|
|
- this.loadProceduresData(model);
|
|
|
+ public String editProcedure(Model model, @RequestBody ProcedureRequestDTO request) {
|
|
|
+ // Extraemos los datos del wrapper
|
|
|
+ ac.editProcedure(request);
|
|
|
|
|
|
+ this.loadProceduresData(model);
|
|
|
+
|
|
|
return "adminProcedures";
|
|
|
}
|
|
|
|
|
|
@@ -300,28 +284,22 @@ public class AdminController {
|
|
|
// POST que le eliminar un usuario concreto del sitema
|
|
|
@PostMapping("/admin/userrole/remove")
|
|
|
@Secured({"ROLE_ADMIN", "ROLE_MANAGER"})
|
|
|
- public void removeUserrole(Model model, Authentication auth, HttpServletResponse response, HttpSession session, @RequestParam("idRol") Integer idRol,
|
|
|
+ @ResponseBody
|
|
|
+ public boolean removeUserrole(Model model, Authentication auth, HttpServletResponse response, HttpSession session, @RequestParam("idRol") Integer idRol,
|
|
|
@RequestParam("usuari") String usuari, @RequestParam("lugar") Integer lugar, @RequestParam("tlugar") String tlugar) throws IOException{
|
|
|
|
|
|
- HashMap<String, Object> map = ac.removeUserrole(idRol, usuari, lugar, tlugar);
|
|
|
-
|
|
|
- response.sendRedirect("/dashboard");
|
|
|
+ return ac.removeUserrole(idRol, usuari, lugar, tlugar);
|
|
|
}
|
|
|
|
|
|
// POST para añadir un nuevo usuario al sistema
|
|
|
@PostMapping("/admin/userrole/new")
|
|
|
@Secured({"ROLE_ADMIN", "ROLE_MANAGER"})
|
|
|
- public void newUserrole(Model model, Authentication auth, HttpServletResponse response, HttpSession session, @RequestParam("idRol") Integer idRol,
|
|
|
+ @ResponseBody
|
|
|
+ public boolean newUserrole(Model model, Authentication auth, HttpServletResponse response, HttpSession session, @RequestParam("idRol") Integer idRol,
|
|
|
@RequestParam(name="usuari", required=false) String usuari, @RequestParam("centre") Integer idCentre,
|
|
|
@RequestParam(name="titulacio", required=false) Integer idTitulacio, @RequestParam Map<String,String> params) throws IOException{
|
|
|
|
|
|
- HashMap<String, Object> map = ac.newUserrole(idRol, usuari, idCentre, idTitulacio, params);
|
|
|
-
|
|
|
- session.setAttribute("respCentres", (List<Integer>) map.get("respCentres"));
|
|
|
- session.setAttribute("respTitulacions", (List<Integer>) map.get("respTitulacions"));
|
|
|
- session.setAttribute("roleExists", map.get("roleExists"));
|
|
|
-
|
|
|
- response.sendRedirect("/dashboard");
|
|
|
+ return ac.newUserrole(idRol, usuari, idCentre, idTitulacio, params);
|
|
|
}
|
|
|
|
|
|
//¿POSIBLE ELIMINACIÓN?
|
|
|
@@ -420,4 +398,9 @@ public class AdminController {
|
|
|
return ac.UpdateAcreditacio(tlugar, lugar, grupCurs, grupNum, cursImpla, dataAcred, dataRenov, dataSegui, dataVerif, recom, segui);
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/admin/checkProcedureID")
|
|
|
+ @ResponseBody
|
|
|
+ public boolean checkProcedureID(@RequestParam String id) {
|
|
|
+ return pc.findProcesByID(Integer.parseInt(id)) != null;
|
|
|
+ }
|
|
|
}
|