Fixed Date problem

src/main/java/es/uv/saic/domain/InstanciaTascaTransfer.java

@@ -1,7 +1,6 @@
 package es.uv.saic.domain;
 
 import java.math.BigInteger;
-import java.util.Date;
 import java.util.List;
 
 public class InstanciaTascaTransfer {
@@ -13,7 +12,7 @@ public class InstanciaTascaTransfer {
 	private Integer idTascap;
 	private String centre;
 	private String titulacio;
-	private Date dataLim;
+	private String dataLim;
 	private Integer tipus;
 	private String codiEvidencia;
 	private String nomEvidenciaCas;
@@ -22,8 +21,8 @@ public class InstanciaTascaTransfer {
 	private String titolVal;
 	private String descripcioCas;
 	private String descripcioVal;
-	private Date dataFet;
-	private Date dataMod;
+	private String dataFet;
+	private String dataMod;
 	private String usuariFet;
 	private String evidencia;
 	private String text;
@@ -66,10 +65,10 @@ public class InstanciaTascaTransfer {
 	public void setTitulacio(String titulacio) {
 		this.titulacio = titulacio;
 	}
-	public Date getDataLim() {
+	public String getDataLim() {
 		return dataLim;
 	}
-	public void setDataLim(Date dataLim) {
+	public void setDataLim(String dataLim) {
 		this.dataLim = dataLim;
 	}
 	public String getCodiEvidencia() {
@@ -114,10 +113,10 @@ public class InstanciaTascaTransfer {
 	public void setDescripcioVal(String descripcioVal) {
 		this.descripcioVal = descripcioVal;
 	}
-	public Date getDataFet() {
+	public String getDataFet() {
 		return dataFet;
 	}
-	public void setDataFet(Date dataFet) {
+	public void setDataFet(String dataFet) {
 		this.dataFet = dataFet;
 	}
 	public String getUsuariFet() {
@@ -204,10 +203,10 @@ public class InstanciaTascaTransfer {
 	public void setOpcions(String opcions) {
 		this.opcions = opcions;
 	}
-	public Date getDataMod() {
+	public String getDataMod() {
 		return dataMod;
 	}
-	public void setDataMod(Date dataMod) {
+	public void setDataMod(String dataMod) {
 		this.dataMod = dataMod;
 	}
 	

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

@@ -7,6 +7,7 @@ import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.sql.Timestamp;
+import java.text.SimpleDateFormat;
 import java.time.Year;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -180,13 +181,11 @@ public class ProceduresController {
 	 * @param id Instancia ID Instance to load
 	 * @return The name of the view to render
 	 */
-	@GetMapping("/procedure/{id}")
-	public HashMap<String, Object> getInstance(@RequestParam String location, @PathVariable BigInteger id, @RequestParam String usuari) {
+	@GetMapping("/procedure/{id}/{usuari}")
+	public HashMap<String, Object> getInstance(@PathVariable BigInteger id, @PathVariable String usuari) {
 		HashMap<String, Object> model = new HashMap<>();
 		Usuari u = us.findByUsername(usuari);
 
-		model.put("location", !location.equals(null) ? location : "procedures");
-
 		this.loadProcedure(model, u, id);
 		model.put("redirect", "procedure");
 		return model;
@@ -419,16 +418,16 @@ public class ProceduresController {
 			itt.setDescripcioCas(it.getTasca().getDescripcioCas());
 			itt.setDescripcioVal(it.getTasca().getDescripcioVal());
 			itt.setTipus(it.getTasca().getTipus().getTipus());
-			itt.setDataLim(it.getTasca().getDataLim());
+			itt.setDataLim(formatDate(it.getTasca().getDataLim()));
 			itt.setEstat(it.getEstat());
 			itt.setIsExpired(it.getTasca().isExpired());
 			itt.setIdTascap(it.getTasca().getIdTascap());
 			itt.setDescripcioRolCas(it.getTasca().getRol().getDescripcioCas());
 			itt.setDescripcioRolVal(it.getTasca().getRol().getDescripcioVal());
-			itt.setDataFet(it.getDataFet());
+			itt.setDataFet(formatDate(it.getDataFet()));
 			itt.setEstatInstancia(it.getInstancia().getEstat());
 			itt.setOpcions(it.getTasca().getOpcions());
-			itt.setDataMod(it.getDataMod());
+			itt.setDataMod(formatDate(it.getDataMod()));
 			
 			if(itt.getEstat() != null) {
 				if(itt.getEstat().equals("A")) {
@@ -485,6 +484,13 @@ public class ProceduresController {
 		model.put("flow", this.getFlowDiagram(i.getProces()));
 	}
 
+	private String formatDate(Date date) {
+		if (date == null) return "";
+		SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
+		return formatter.format(date);
+	}
+
+
 	/*
 	 * Get all drafts for a given task instance
 	 * @param model
@@ -684,7 +690,7 @@ public class ProceduresController {
 
 		if(action.equals("new")) {
 			Plantilla p = new Plantilla();
-			model.put("editable", true);
+				model.put("editable", true);
 			model.put("template", p);
 			model.put("redirect", "components/form_template");
 			return model;