Fixed procedures

src/main/java/es/uv/saic/feign/AdminClient.java

@@ -13,13 +13,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import es.uv.saic.domain.Acreditacio;
 import es.uv.saic.domain.AcreditacioTransfer;
 import es.uv.saic.dto.ProcedureRequestDTO;
-import es.uv.saic.dto.ProcesDTO;
-import es.uv.saic.dto.TascaDTO;
 
 @FeignClient(name = "saic-core-service", contextId = "admin-controller")
 public interface AdminClient {
@@ -57,28 +54,12 @@ public interface AdminClient {
 			@RequestParam String subject, @RequestParam String body);
 
     @PutMapping("/admin/procedure")
-    void newProcedure(@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);
+    void newProcedure(@RequestBody ProcedureRequestDTO resquest);
     
 	@PostMapping("/admin/procedure")
 	public void editProcedure(@RequestBody ProcedureRequestDTO resquest);
 
-    @DeleteMapping("/admin/procedures")
+    @DeleteMapping("/admin/procedure")
     void removeProcedure(@RequestParam("idProces") Integer idProces);    
     
     @DeleteMapping("/admin/userrole")

src/main/java/es/uv/saic/web/AdminController.java

@@ -234,25 +234,9 @@ public class AdminController {
 	// POST para la creación de un procedimiento nuevo
 	@PostMapping("/admin/procedures/new")
 	@Secured({"ROLE_ADMIN"})
-	public String newProcedure(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 {
+	public String newProcedure(Model model, @RequestBody ProcedureRequestDTO request) throws NumberFormatException, ParseException {
 	
-		ac.newProcedure(params, idTascap, dataLimit, tipus, codiEvidencia, idTascaSeg, idTascaSeg2, opcions, idRol, titolCas, titolVal, descripcioCas, descripcioVal, nomEvidenciaCas, nomEvidenciaVal, idPlantilla, informe);
+		ac.newProcedure(request);
 		
 		this.loadProceduresData(model);
 		

src/main/resources/templates/adminProcedures.html

@@ -121,12 +121,21 @@
 
 		mermaid.initialize({ startOnLoad: false, theme: "default", flowchart: { diagramPadding: 5, useMaxWidth:false, htmlLabels:true, wrap: true, wrappingWidth: 750 } });
 		
-		// Intercept form submit, serialize to JSON and send via fetch.
 		$('#procedureForm').on('submit', function(e) {
+			var url = $(this).attr('action') || '/admin/procedures';
+
+			if (url.includes('remove')) {
+				e.preventDefault();
+				const idProces = $("input[name='idProces']").val();
+				
+				$.post(url, { idProces: idProces }, function() {
+					window.location.reload();
+				});
+				return; 
+			}
 			e.preventDefault();
 			$('.hiddenFields').show();
 
-			// Normalize empty text inputs and textareas (same behavior as before)
 			$("input[type=text]").each(function() {
 				var element = $(this);
 				if (element.val() == "" || element.val() == " ") {
@@ -176,7 +185,7 @@
 				var task = {
 					idTascap: $d.find("input[name='idTascap[]']").val(),
 					dataLimit: $d.find("input[name='dataLimit[]']").val(),
-					tipus: $d.find("select[name='tipus[]']").val(),
+					idTipus: $d.find("select[name='tipus[]']").val(),
 					idRol: $d.find("select[name='idRol[]']").val(),
 					idTascaSeg: $d.find("input[name='idTascaSeg[]']").val(),
 					idTascaSeg2: $d.find("input[name='idTascaSeg2[]']").val(),

src/main/resources/templates/components/form_procedure.html

@@ -29,7 +29,7 @@
 				<div class="form-group row">
 					<div class="col-2">
 						<label th:text="#{admin.procedures.form.id}">ID</label>
-						<input type="text" name="idProces" id="idProces" class="form-control" onchange="checkProcedureId(this.value);" required th:attr="readonly=(${action} == 'edit' ? 'true' : 'false')">
+						<input type="text" name="idProces" id="idProces" class="form-control" onchange="checkProcedureId(this.value);" th:value="${procedure.idProces}" required th:attr="readonly=(${action} == 'edit' ? 'true' : 'false')">
 					</div>
 					<div class="col-4">
 						<label th:text="#{admin.procedures.form.nameProcedure}">Código</label>