瀏覽代碼

Arreglados deprecated relacionados con las fechas.

Mario Martínez Hernández 2 月之前
父節點
當前提交
14629422ec
共有 33 個文件被更改,包括 195 次插入206 次删除
  1. 13 19
      src/main/java/es/uv/saic/domain/Acreditacio.java
  2. 13 13
      src/main/java/es/uv/saic/domain/AcreditacioTransfer.java
  3. 7 10
      src/main/java/es/uv/saic/domain/Calendari.java
  4. 4 4
      src/main/java/es/uv/saic/domain/EvidenciaTransfer.java
  5. 4 9
      src/main/java/es/uv/saic/domain/IndicadorEnquesta.java
  6. 5 8
      src/main/java/es/uv/saic/domain/IndicadorEnquestaTmp.java
  7. 14 8
      src/main/java/es/uv/saic/domain/Instancia.java
  8. 1 1
      src/main/java/es/uv/saic/domain/InstanciaRepository.java
  9. 11 13
      src/main/java/es/uv/saic/domain/InstanciaTasca.java
  10. 7 7
      src/main/java/es/uv/saic/domain/InstanciaTransfer.java
  11. 0 1
      src/main/java/es/uv/saic/domain/OrganRepository.java
  12. 5 6
      src/main/java/es/uv/saic/domain/Tasca.java
  13. 4 4
      src/main/java/es/uv/saic/domain/TascaVersioTransfer.java
  14. 12 7
      src/main/java/es/uv/saic/domain/Usuari.java
  15. 15 12
      src/main/java/es/uv/saic/domain/UsuarisRol.java
  16. 6 3
      src/main/java/es/uv/saic/dto/DocumentDTO.java
  17. 5 5
      src/main/java/es/uv/saic/dto/TascaDTO.java
  18. 5 5
      src/main/java/es/uv/saic/dto/UsuarisRolDTO.java
  19. 2 2
      src/main/java/es/uv/saic/service/AuthProvider.java
  20. 3 3
      src/main/java/es/uv/saic/service/IndicadorService.java
  21. 2 1
      src/main/java/es/uv/saic/service/InstanciaService.java
  22. 6 6
      src/main/java/es/uv/saic/service/InstanciaTascaService.java
  23. 0 1
      src/main/java/es/uv/saic/service/OrganService.java
  24. 16 11
      src/main/java/es/uv/saic/web/AdminController.java
  25. 10 9
      src/main/java/es/uv/saic/web/CalendarController.java
  26. 14 7
      src/main/java/es/uv/saic/web/DashboardController.java
  27. 0 6
      src/main/java/es/uv/saic/web/IndicadorController.java
  28. 0 4
      src/main/java/es/uv/saic/web/ManagersController.java
  29. 11 11
      src/main/java/es/uv/saic/web/ProceduresController.java
  30. 0 6
      src/main/java/es/uv/saic/web/StatsController.java
  31. 0 2
      src/main/java/es/uv/saic/web/SupervisionController.java
  32. 0 1
      src/main/java/es/uv/saic/web/TascaController.java
  33. 0 1
      src/main/java/es/uv/saic/web/UsuariController.java

+ 13 - 19
src/main/java/es/uv/saic/domain/Acreditacio.java

@@ -1,7 +1,7 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import java.util.Date;
+import java.time.LocalDateTime;
 
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.Id;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.IdClass;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 
 @Entity
 @Entity
 @Table(name="acreditacions")
 @Table(name="acreditacions")
@@ -30,20 +28,16 @@ public class Acreditacio  implements Serializable {
 	private Integer cursImpla;
 	private Integer cursImpla;
 	
 	
 	@Column(name="data_verif")
 	@Column(name="data_verif")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataVerif;
+	private LocalDateTime dataVerif;
 	
 	
 	@Column(name="data_renov")
 	@Column(name="data_renov")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataRenov;
+	private LocalDateTime dataRenov;
 	
 	
 	@Column(name="data_acred")
 	@Column(name="data_acred")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataAcred;
+	private LocalDateTime dataAcred;
 	
 	
 	@Column(name="data_segui")
 	@Column(name="data_segui")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date dataSegui;
+	private LocalDateTime dataSegui;
 	
 	
 	private String grup;
 	private String grup;
 	
 	
@@ -80,28 +74,28 @@ public class Acreditacio  implements Serializable {
 	public void setCursImpla(Integer cursImpla) {
 	public void setCursImpla(Integer cursImpla) {
 		this.cursImpla = cursImpla;
 		this.cursImpla = cursImpla;
 	}
 	}
-	public Date getDataVerif() {
+	public LocalDateTime getDataVerif() {
 		return dataVerif;
 		return dataVerif;
 	}
 	}
-	public void setDataVerif(Date dataVerif) {
+	public void setDataVerif(LocalDateTime dataVerif) {
 		this.dataVerif = dataVerif;
 		this.dataVerif = dataVerif;
 	}
 	}
-	public Date getDataRenov() {
+	public LocalDateTime getDataRenov() {
 		return dataRenov;
 		return dataRenov;
 	}
 	}
-	public void setDataRenov(Date dataRenov) {
+	public void setDataRenov(LocalDateTime dataRenov) {
 		this.dataRenov = dataRenov;
 		this.dataRenov = dataRenov;
 	}
 	}
-	public Date getDataAcred() {
+	public LocalDateTime getDataAcred() {
 		return dataAcred;
 		return dataAcred;
 	}
 	}
-	public void setDataAcred(Date dataAcred) {
+	public void setDataAcred(LocalDateTime dataAcred) {
 		this.dataAcred = dataAcred;
 		this.dataAcred = dataAcred;
 	}
 	}
-	public Date getDataSegui() {
+	public LocalDateTime getDataSegui() {
 		return dataSegui;
 		return dataSegui;
 	}
 	}
-	public void setDataSegui(Date dataSegui) {
+	public void setDataSegui(LocalDateTime dataSegui) {
 		this.dataSegui = dataSegui;
 		this.dataSegui = dataSegui;
 	}
 	}
 	public String getGrup() {
 	public String getGrup() {

+ 13 - 13
src/main/java/es/uv/saic/domain/AcreditacioTransfer.java

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 
 public class AcreditacioTransfer {
 public class AcreditacioTransfer {
 
 
@@ -17,13 +17,13 @@ public class AcreditacioTransfer {
 	private Integer grupNum;
 	private Integer grupNum;
 	private Integer grupCurs;
 	private Integer grupCurs;
 	private Boolean inter;
 	private Boolean inter;
-	private Date dataVerif;
+	private LocalDateTime dataVerif;
 	private String dataVerifStr;
 	private String dataVerifStr;
-	private Date dataRenov;
+	private LocalDateTime dataRenov;
 	private String dataRenovStr;
 	private String dataRenovStr;
-	private Date dataSegui;
+	private LocalDateTime dataSegui;
 	private String dataSeguiStr;
 	private String dataSeguiStr;
-	private Date dataAcred;
+	private LocalDateTime dataAcred;
 	private String dataAcredStr;
 	private String dataAcredStr;
 	private Integer cursImpla;
 	private Integer cursImpla;
 	
 	
@@ -108,28 +108,28 @@ public class AcreditacioTransfer {
 	public void setInter(Boolean inter) {
 	public void setInter(Boolean inter) {
 		this.inter = inter;
 		this.inter = inter;
 	}
 	}
-	public Date getDataVerif() {
+	public LocalDateTime getDataVerif() {
 		return dataVerif;
 		return dataVerif;
 	}
 	}
-	public void setDataVerif(Date dataVerif) {
+	public void setDataVerif(LocalDateTime dataVerif) {
 		this.dataVerif = dataVerif;
 		this.dataVerif = dataVerif;
 	}
 	}
-	public Date getDataRenov() {
+	public LocalDateTime getDataRenov() {
 		return dataRenov;
 		return dataRenov;
 	}
 	}
-	public void setDataRenov(Date dataRenov) {
+	public void setDataRenov(LocalDateTime dataRenov) {
 		this.dataRenov = dataRenov;
 		this.dataRenov = dataRenov;
 	}
 	}
-	public Date getDataSegui() {
+	public LocalDateTime getDataSegui() {
 		return dataSegui;
 		return dataSegui;
 	}
 	}
-	public void setDataSegui(Date dataSegui) {
+	public void setDataSegui(LocalDateTime dataSegui) {
 		this.dataSegui = dataSegui;
 		this.dataSegui = dataSegui;
 	}
 	}
-	public Date getDataAcred() {
+	public LocalDateTime getDataAcred() {
 		return dataAcred;
 		return dataAcred;
 	}
 	}
-	public void setDataAcred(Date dataAcred) {
+	public void setDataAcred(LocalDateTime dataAcred) {
 		this.dataAcred = dataAcred;
 		this.dataAcred = dataAcred;
 	}
 	}
 	public Integer getCursImpla() {
 	public Integer getCursImpla() {

+ 7 - 10
src/main/java/es/uv/saic/domain/Calendari.java

@@ -2,7 +2,7 @@ package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
 
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Entity;
@@ -11,8 +11,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import jakarta.persistence.Transient;
 import jakarta.persistence.Transient;
 
 
 @Entity
 @Entity
@@ -36,8 +34,7 @@ public class Calendari implements Serializable {
 	
 	
 	private String ambit;
 	private String ambit;
 	
 	
-	@Temporal(TemporalType.DATE)
-	private Date data;
+	private LocalDate data;
 	
 	
 	@Transient
 	@Transient
 	private String dataStr;
 	private String dataStr;
@@ -54,7 +51,7 @@ public class Calendari implements Serializable {
 	
 	
 	public Calendari() {}
 	public Calendari() {}
 
 
-	public Calendari(Integer idCalendari, Integer tipus, String titolCas, String titolVal, String ambit, Date data,
+	public Calendari(Integer idCalendari, Integer tipus, String titolCas, String titolVal, String ambit, LocalDate data,
 			Integer idProces, String titulacions, String centres, String color) {
 			Integer idProces, String titulacions, String centres, String color) {
 		
 		
 		this.idCalendari = idCalendari;
 		this.idCalendari = idCalendari;
@@ -70,7 +67,7 @@ public class Calendari implements Serializable {
 		this.color = color;
 		this.color = color;
 	}
 	}
 	
 	
-	public Calendari(Integer idCalendari, Integer tipus, String titolCas, String titolVal, String ambit, Date data,
+	public Calendari(Integer idCalendari, Integer tipus, String titolCas, String titolVal, String ambit, LocalDate data,
 			Integer idProces, String titulacions, String centres, String color, String status) {
 			Integer idProces, String titulacions, String centres, String color, String status) {
 		
 		
 		this.idCalendari = idCalendari;
 		this.idCalendari = idCalendari;
@@ -127,13 +124,13 @@ public class Calendari implements Serializable {
 		this.ambit = ambit;
 		this.ambit = ambit;
 	}
 	}
 
 
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 		return data;
 	}
 	}
 
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 		this.data = data;
-		this.dataStr = new SimpleDateFormat("yyyy-MM-dd").format(data);
+		this.dataStr = data.toString();
 	}
 	}
 	
 	
 	public String getDataStr() {
 	public String getDataStr() {

+ 4 - 4
src/main/java/es/uv/saic/domain/EvidenciaTransfer.java

@@ -1,7 +1,7 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.math.BigInteger;
 import java.math.BigInteger;
-import java.util.Date;
+import java.time.LocalDate;
 
 
 public class EvidenciaTransfer {
 public class EvidenciaTransfer {
 	private String evidencia;
 	private String evidencia;
@@ -9,7 +9,7 @@ public class EvidenciaTransfer {
 	private String nomEvidenciaCas;
 	private String nomEvidenciaCas;
 	private String nomEvidenciaVal;
 	private String nomEvidenciaVal;
 	private Integer curs;
 	private Integer curs;
-	private Date data;
+	private LocalDate data;
 	private String nomProces;
 	private String nomProces;
 	private BigInteger idTascai;
 	private BigInteger idTascai;
 	
 	
@@ -25,10 +25,10 @@ public class EvidenciaTransfer {
 	public void setCodiEvidencia(String codiEvidencia) {
 	public void setCodiEvidencia(String codiEvidencia) {
 		this.codiEvidencia = codiEvidencia;
 		this.codiEvidencia = codiEvidencia;
 	}
 	}
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 		return data;
 	}
 	}
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 		this.data = data;
 	}
 	}
 	public String getNomProces() {
 	public String getNomProces() {

+ 4 - 9
src/main/java/es/uv/saic/domain/IndicadorEnquesta.java

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 
 @Entity
 @Entity
 @Table(name="indicador_enquesta")
 @Table(name="indicador_enquesta")
@@ -37,8 +35,7 @@ public class IndicadorEnquesta {
 	private String titulacioOrigen;
 	private String titulacioOrigen;
 	private Integer nenq;
 	private Integer nenq;
 	private Integer ruct;
 	private Integer ruct;
-	@Temporal(TemporalType.TIMESTAMP)
-	private Timestamp data;
+	private LocalDateTime data;
 	
 	
 	public IndicadorEnquesta(){}
 	public IndicadorEnquesta(){}
 	
 	
@@ -178,11 +175,11 @@ public class IndicadorEnquesta {
 		this.ruct = ruct;
 		this.ruct = ruct;
 	}
 	}
 
 
-	public Timestamp getData() {
+	public LocalDateTime getData() {
 		return data;
 		return data;
 	}
 	}
 
 
-	public void setData(Timestamp data) {
+	public void setData(LocalDateTime data) {
 		this.data = data;
 		this.data = data;
 	}
 	}
 	
 	
@@ -235,6 +232,4 @@ public class IndicadorEnquesta {
 		
 		
 		return hash;
 		return hash;
 	}
 	}
-
-		
 }
 }

+ 5 - 8
src/main/java/es/uv/saic/domain/IndicadorEnquestaTmp.java

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 
 @Entity
 @Entity
 @Table(name="indicador_enquesta_tmp")
 @Table(name="indicador_enquesta_tmp")
@@ -38,9 +36,8 @@ public class IndicadorEnquestaTmp {
 	private String titulacioOrigen;
 	private String titulacioOrigen;
 	private Integer nenq;
 	private Integer nenq;
 	private Integer ruct;
 	private Integer ruct;
-	
-	@Temporal(TemporalType.TIMESTAMP)
-	private Timestamp data; 
+
+	private LocalDateTime data; 
 	
 	
 	public IndicadorEnquestaTmp(){}
 	public IndicadorEnquestaTmp(){}
 	
 	
@@ -148,11 +145,11 @@ public class IndicadorEnquestaTmp {
 		this.usuari = usuari;
 		this.usuari = usuari;
 	}
 	}
 
 
-	public Timestamp getData() {
+	public LocalDateTime getData() {
 		return data;
 		return data;
 	}
 	}
 
 
-	public void setData(Timestamp data) {
+	public void setData(LocalDateTime data) {
 		this.data = data;
 		this.data = data;
 	}
 	}
 	
 	

+ 14 - 8
src/main/java/es/uv/saic/domain/Instancia.java

@@ -2,12 +2,19 @@ package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.math.BigInteger;
-
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDate;
 import java.util.List;
 import java.util.List;
 
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+
 /**
 /**
  * The persistent class for the instancies database table.
  * The persistent class for the instancies database table.
  * 
  * 
@@ -28,9 +35,8 @@ public class Instancia implements Serializable {
 
 
 	private Integer titulacio;
 	private Integer titulacio;
 	
 	
-	@Temporal(TemporalType.DATE)
 	@Column(name="data")
 	@Column(name="data")
-	private Date data;
+	private LocalDate data;
 
 
 	//bi-directional many-to-one association to Organ
 	//bi-directional many-to-one association to Organ
 	@ManyToOne
 	@ManyToOne
@@ -84,11 +90,11 @@ public class Instancia implements Serializable {
 		this.titulacio = titulacio;
 		this.titulacio = titulacio;
 	}
 	}
 	
 	
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 		return data;
 	}
 	}
 
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 		this.data = data;
 	}
 	}
 
 

+ 1 - 1
src/main/java/es/uv/saic/domain/InstanciaRepository.java

@@ -49,7 +49,7 @@ public interface InstanciaRepository extends JpaRepository<Instancia, BigInteger
 	
 	
 	@Query(value=("""
 	@Query(value=("""
 		SELECT ins.id_instancia AS id, pr.titol_cas AS titCas, pr.titol_val AS titVal, 
 		SELECT ins.id_instancia AS id, pr.titol_cas AS titCas, pr.titol_val AS titVal, 
-			MIN(LEAST(ins.data, ta.data_lim - 31)) AS start, MAX(GREATEST(ta.data_lim, tai.data_fet)) AS end, 100 AS progress, 
+			to_char(MIN(LEAST(ins.data, ta.data_lim - 31)),'yyyy-MM-dd HH:mm') AS start, to_char(MAX(GREATEST(ta.data_lim, tai.data_fet)),'yyyy-MM-dd HH:mm') AS end, 100 AS progress, 
 			CASE WHEN pr.sub_titol IS NULL THEN pr.nom_proces 
 			CASE WHEN pr.sub_titol IS NULL THEN pr.nom_proces 
 			  WHEN pr.sub_titol IS NOT NULL THEN CONCAT(pr.nom_proces, ' (', pr.sub_titol, ')') 
 			  WHEN pr.sub_titol IS NOT NULL THEN CONCAT(pr.nom_proces, ' (', pr.sub_titol, ')') 
 			END AS name, 
 			END AS name, 

+ 11 - 13
src/main/java/es/uv/saic/domain/InstanciaTasca.java

@@ -2,9 +2,10 @@ package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.math.BigInteger;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 
 
 import jakarta.persistence.*;
 import jakarta.persistence.*;
-import java.util.Date;
 
 
 /**
 /**
  * The persistent class for the tasquesi database table.
  * The persistent class for the tasquesi database table.
@@ -20,17 +21,14 @@ public class InstanciaTasca implements Serializable {
 	@Column(name="id_tascai")
 	@Column(name="id_tascai")
 	private BigInteger idInstanciaTasca;
 	private BigInteger idInstanciaTasca;
 
 
-	@Temporal(TemporalType.DATE)
 	@Column(name="data_fet")
 	@Column(name="data_fet")
-	private Date dataFet;
+	private LocalDate dataFet;
 	
 	
-	@Temporal(TemporalType.DATE)
 	@Column(name="data")
 	@Column(name="data")
-	private Date data;
+	private LocalDate data;
 	
 	
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_mod")
 	@Column(name="data_mod")
-	private Date dataMod;
+	private LocalDateTime dataMod;
 	
 	
 	private Integer version;
 	private Integer version;
 
 
@@ -66,27 +64,27 @@ public class InstanciaTasca implements Serializable {
 		this.idInstanciaTasca = idInstanciaTasca;
 		this.idInstanciaTasca = idInstanciaTasca;
 	}
 	}
 
 
-	public Date getDataFet() {
+	public LocalDate getDataFet() {
 		return this.dataFet;
 		return this.dataFet;
 	}
 	}
 
 
-	public void setDataFet(Date dataFet) {
+	public void setDataFet(LocalDate dataFet) {
 		this.dataFet = dataFet;
 		this.dataFet = dataFet;
 	}
 	}
 	
 	
-	public Date getData() {
+	public LocalDate getData() {
 		return this.data;
 		return this.data;
 	}
 	}
 
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 		this.data = data;
 	}
 	}
 	
 	
-	public Date getDataMod() {
+	public LocalDateTime getDataMod() {
 		return dataMod;
 		return dataMod;
 	}
 	}
 
 
-	public void setDataMod(Date dataMod) {
+	public void setDataMod(LocalDateTime dataMod) {
 		this.dataMod = dataMod;
 		this.dataMod = dataMod;
 	}
 	}
 
 

+ 7 - 7
src/main/java/es/uv/saic/domain/InstanciaTransfer.java

@@ -1,7 +1,7 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.math.BigInteger;
 import java.math.BigInteger;
-import java.util.Date;
+import java.time.LocalDate;
 
 
 public class InstanciaTransfer {
 public class InstanciaTransfer {
 
 
@@ -24,8 +24,8 @@ public class InstanciaTransfer {
 	private String nomTascaActivaVal;
 	private String nomTascaActivaVal;
 	private String descTascaActivaCas;
 	private String descTascaActivaCas;
 	private String descTascaActivaVal;
 	private String descTascaActivaVal;
-	private Date dataLimTascaActiva;
-	private Date dataTascaActiva;
+	private LocalDate dataLimTascaActiva;
+	private LocalDate dataTascaActiva;
 	private Integer idTascapActiva;
 	private Integer idTascapActiva;
 	private boolean tascaActivaExpired;
 	private boolean tascaActivaExpired;
 	private boolean tascaActivaAssignedToUser;	
 	private boolean tascaActivaAssignedToUser;	
@@ -126,16 +126,16 @@ public class InstanciaTransfer {
 	public void setNomTascaActivaCas(String nomTascaActiva) {
 	public void setNomTascaActivaCas(String nomTascaActiva) {
 		this.nomTascaActivaCas = nomTascaActiva;
 		this.nomTascaActivaCas = nomTascaActiva;
 	}
 	}
-	public Date getDataTascaActiva() {
+	public LocalDate getDataTascaActiva() {
 		return dataTascaActiva;
 		return dataTascaActiva;
 	}
 	}
-	public void setDataTascaActiva(Date dataTascaActiva) {
+	public void setDataTascaActiva(LocalDate dataTascaActiva) {
 		this.dataTascaActiva = dataTascaActiva;
 		this.dataTascaActiva = dataTascaActiva;
 	}
 	}
-	public Date getDataLimTascaActiva() {
+	public LocalDate getDataLimTascaActiva() {
 		return dataLimTascaActiva;
 		return dataLimTascaActiva;
 	}
 	}
-	public void setDataLimTascaActiva(Date dataLimTascaActiva) {
+	public void setDataLimTascaActiva(LocalDate dataLimTascaActiva) {
 		this.dataLimTascaActiva = dataLimTascaActiva;
 		this.dataLimTascaActiva = dataLimTascaActiva;
 	}
 	}
 	public String getNomTascaActivaVal() {
 	public String getNomTascaActivaVal() {

+ 0 - 1
src/main/java/es/uv/saic/domain/OrganRepository.java

@@ -6,7 +6,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
-import es.uv.saic.dto.OrganDTO;
 import es.uv.saic.dto.OrganRepositoryDTO;
 import es.uv.saic.dto.OrganRepositoryDTO;
 
 
 @Repository
 @Repository

+ 5 - 6
src/main/java/es/uv/saic/domain/Tasca.java

@@ -1,9 +1,9 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
+import java.time.LocalDate;
 
 
 import jakarta.persistence.*;
 import jakarta.persistence.*;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
 
 
 
 
@@ -24,9 +24,8 @@ public class Tasca implements Serializable {
 	@Column(name="codi_evidencia")
 	@Column(name="codi_evidencia")
 	private String codiEvidencia;
 	private String codiEvidencia;
 
 
-	@Temporal(TemporalType.DATE)
 	@Column(name="data_lim")
 	@Column(name="data_lim")
-	private Date dataLim;
+	private LocalDate dataLim;
 
 
 	@Column(name="descripcio_cas")
 	@Column(name="descripcio_cas")
 	private String descripcioCas;
 	private String descripcioCas;
@@ -99,11 +98,11 @@ public class Tasca implements Serializable {
 		this.codiEvidencia = codiEvidencia;
 		this.codiEvidencia = codiEvidencia;
 	}
 	}
 
 
-	public Date getDataLim() {
+	public LocalDate getDataLim() {
 		return this.dataLim;
 		return this.dataLim;
 	}
 	}
 
 
-	public void setDataLim(Date dataLim) {
+	public void setDataLim(LocalDate dataLim) {
 		this.dataLim = dataLim;
 		this.dataLim = dataLim;
 	}
 	}
 
 
@@ -225,7 +224,7 @@ public class Tasca implements Serializable {
 	
 	
 	public boolean isExpired() {
 	public boolean isExpired() {
 		if(this.getDataLim() != null) {
 		if(this.getDataLim() != null) {
-			if((new Date(this.getDataLim().getTime()+(1000 * 60 * 60 * 24))).before(new Date())) {
+			if(this.getDataLim().isBefore(LocalDate.now())) {
 				return true;
 				return true;
 			}
 			}
 			else {
 			else {

+ 4 - 4
src/main/java/es/uv/saic/domain/TascaVersioTransfer.java

@@ -1,13 +1,13 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.math.BigInteger;
 import java.math.BigInteger;
-import java.util.Date;
+import java.time.LocalDate;
 
 
 public class TascaVersioTransfer {
 public class TascaVersioTransfer {
 
 
 	private BigInteger idInstanciaTasca;
 	private BigInteger idInstanciaTasca;
 	private String usuariFet;
 	private String usuariFet;
-	private Date dataFet;
+	private LocalDate dataFet;
 	private Integer version;
 	private Integer version;
 	private String nomEvidenciaVal;
 	private String nomEvidenciaVal;
 	private String nomEvidenciaCas;
 	private String nomEvidenciaCas;
@@ -29,10 +29,10 @@ public class TascaVersioTransfer {
 	public void setUsuariFet(String usuariFet) {
 	public void setUsuariFet(String usuariFet) {
 		this.usuariFet = usuariFet;
 		this.usuariFet = usuariFet;
 	}
 	}
-	public Date getDataFet() {
+	public LocalDate getDataFet() {
 		return dataFet;
 		return dataFet;
 	}
 	}
-	public void setDataFet(Date dataFet) {
+	public void setDataFet(LocalDate dataFet) {
 		this.dataFet = dataFet;
 		this.dataFet = dataFet;
 	}
 	}
 	public Integer getVersion() {
 	public Integer getVersion() {

+ 12 - 7
src/main/java/es/uv/saic/domain/Usuari.java

@@ -1,11 +1,17 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
 import java.io.Serializable;
 import java.io.Serializable;
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+
 
 
 /**
 /**
  * The persistent class for the usuaris database table.
  * The persistent class for the usuaris database table.
@@ -30,9 +36,8 @@ public class Usuari implements Serializable {
 
 
 	private String nom;
 	private String nom;
 	
 	
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_ultim")
 	@Column(name="data_ultim")
-	private Date dataUltim;
+	private LocalDateTime dataUltim;
 	
 	
 	private String locale;
 	private String locale;
 
 
@@ -104,11 +109,11 @@ public class Usuari implements Serializable {
 		this.nom = nom;
 		this.nom = nom;
 	}
 	}
 	
 	
-	public Date getDataUltim() {
+	public LocalDateTime getDataUltim() {
 		return this.dataUltim;
 		return this.dataUltim;
 	}
 	}
 
 
-	public void setDataUltim(Date dataUltim) {
+	public void setDataUltim(LocalDateTime dataUltim) {
 		this.dataUltim = dataUltim;
 		this.dataUltim = dataUltim;
 	}
 	}
 	
 	

+ 15 - 12
src/main/java/es/uv/saic/domain/UsuarisRol.java

@@ -1,11 +1,16 @@
 package es.uv.saic.domain;
 package es.uv.saic.domain;
 
 
-
 import java.io.Serializable;
 import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.Date;
+import java.time.LocalDate;
 
 
-import es.uv.saic.dto.OrganDTO;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinColumns;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.NamedQuery;
+import jakarta.persistence.Table;
 
 
 /**
 /**
  * The persistent class for the usuaris_rols database table.
  * The persistent class for the usuaris_rols database table.
@@ -21,11 +26,9 @@ public class UsuarisRol implements Serializable {
 	@Column(name="id_usuari_rol")
 	@Column(name="id_usuari_rol")
 	private Integer idUsuariRol;
 	private Integer idUsuariRol;
 
 
-	@Temporal(TemporalType.DATE)
-	private Date fin;
+	private LocalDate fin;
 
 
-	@Temporal(TemporalType.DATE)
-	private Date inici;
+	private LocalDate inici;
 
 
 	private Integer num;
 	private Integer num;
 
 
@@ -62,19 +65,19 @@ public class UsuarisRol implements Serializable {
 		this.idUsuariRol = idUsuariRol;
 		this.idUsuariRol = idUsuariRol;
 	}
 	}
 
 
-	public Date getFin() {
+	public LocalDate getFin() {
 		return this.fin;
 		return this.fin;
 	}
 	}
 
 
-	public void setFin(Date fin) {
+	public void setFin(LocalDate fin) {
 		this.fin = fin;
 		this.fin = fin;
 	}
 	}
 
 
-	public Date getInici() {
+	public LocalDate getInici() {
 		return this.inici;
 		return this.inici;
 	}
 	}
 
 
-	public void setInici(Date inici) {
+	public void setInici(LocalDate inici) {
 		this.inici = inici;
 		this.inici = inici;
 	}
 	}
 
 

+ 6 - 3
src/main/java/es/uv/saic/dto/DocumentDTO.java

@@ -34,7 +34,10 @@ public class DocumentDTO {
 	public void setRuta(String ruta) {
 	public void setRuta(String ruta) {
 		this.ruta = ruta;
 		this.ruta = ruta;
 	}
 	}
-	
-	
-	
+	public void setData(String data) {
+		this.text = this.text.replace("[data]", data);
+	}
+	public void setSize(String size) {
+		this.text = this.text.replace("[size]", size);
+	}
 }
 }

+ 5 - 5
src/main/java/es/uv/saic/dto/TascaDTO.java

@@ -1,7 +1,7 @@
 package es.uv.saic.dto;
 package es.uv.saic.dto;
 
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 
 import es.uv.saic.domain.Tasca;
 import es.uv.saic.domain.Tasca;
 
 
@@ -195,11 +195,11 @@ public class TascaDTO {
 
 
     
     
 
 
-    private String formatDate(Date date) {
+    private String formatDate(LocalDate date) {
         if (date == null)
         if (date == null)
             return "";
             return "";
-        SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
-        return formatter.format(date);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+        return date.format(formatter);
     }
     }
 
 
     public Integer getIdRol() {
     public Integer getIdRol() {

+ 5 - 5
src/main/java/es/uv/saic/dto/UsuarisRolDTO.java

@@ -1,7 +1,7 @@
 package es.uv.saic.dto;
 package es.uv.saic.dto;
 
 
-import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 
 import es.uv.saic.domain.Acreditacio;
 import es.uv.saic.domain.Acreditacio;
 import es.uv.saic.domain.UsuarisRol;
 import es.uv.saic.domain.UsuarisRol;
@@ -62,10 +62,10 @@ public class UsuarisRolDTO {
         this.inici = inici;
         this.inici = inici;
     }
     }
     
     
-    private String formatDate(Date date) {
+    private String formatDate(LocalDate date) {
         if (date == null)
         if (date == null)
             return "";
             return "";
-        SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
-        return formatter.format(date);
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+        return date.format(formatter);
     }
     }
 }
 }

+ 2 - 2
src/main/java/es/uv/saic/service/AuthProvider.java

@@ -1,7 +1,7 @@
 package es.uv.saic.service;
 package es.uv.saic.service;
 
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Hashtable;
 import java.util.Hashtable;
 import java.util.List;
 import java.util.List;
 
 
@@ -125,7 +125,7 @@ public class AuthProvider implements AuthenticationProvider {
                         throw new BadCredentialsException("Error de autenticación LDAP ["+username+"]: -> el servidor LDAP ha devuelto un estado incorrecto.");
                         throw new BadCredentialsException("Error de autenticación LDAP ["+username+"]: -> el servidor LDAP ha devuelto un estado incorrecto.");
                     }
                     }
                     logger.info("Autenticación LDAP correcta: " + u.getUsuari());
                     logger.info("Autenticación LDAP correcta: " + u.getUsuari());
-                    u.setDataUltim(new Date(System.currentTimeMillis()));
+                    u.setDataUltim(LocalDateTime.now());
                     this.us.save(u);
                     this.us.save(u);
 	            	if(u.isAdmin()) {
 	            	if(u.isAdmin()) {
 	            		authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));
 	            		authorities.add(new SimpleGrantedAuthority("ROLE_ADMIN"));

+ 3 - 3
src/main/java/es/uv/saic/service/IndicadorService.java

@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.io.StringReader;
 import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.net.URLConnection;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.ArrayList;
@@ -56,7 +56,7 @@ public class IndicadorService {
 	    	String url = urls.get(xurls)+tits.get(xtits)+".xml";
 	    	String url = urls.get(xurls)+tits.get(xtits)+".xml";
 	    	String resText = "";
 	    	String resText = "";
 	    	try {
 	    	try {
-	    		URLConnection urlConnection = new URL(url).openConnection();
+	    		URLConnection urlConnection = new URI(url).toURL().openConnection();
 	    		urlConnection.addRequestProperty("Accept", "application/xml");
 	    		urlConnection.addRequestProperty("Accept", "application/xml");
 	    		InputStream res = urlConnection.getInputStream();
 	    		InputStream res = urlConnection.getInputStream();
 	    		resText = new String(res.readAllBytes(), StandardCharsets.UTF_8);
 	    		resText = new String(res.readAllBytes(), StandardCharsets.UTF_8);
@@ -143,7 +143,7 @@ public class IndicadorService {
 	    String url = "http://bancuv.uv.es/wwwuv/stuff/web/siga/SGIC"+tit.toString()+".xml";
 	    String url = "http://bancuv.uv.es/wwwuv/stuff/web/siga/SGIC"+tit.toString()+".xml";
 	    String fileText;
 	    String fileText;
 	    try {
 	    try {
-    		URLConnection urlConnection = new URL(url).openConnection();
+    		URLConnection urlConnection = new URI(url).toURL().openConnection();
     		urlConnection.addRequestProperty("Accept", "application/xml");
     		urlConnection.addRequestProperty("Accept", "application/xml");
     		InputStream res = urlConnection.getInputStream();
     		InputStream res = urlConnection.getInputStream();
     		fileText = new String(res.readAllBytes(), StandardCharsets.UTF_8);
     		fileText = new String(res.readAllBytes(), StandardCharsets.UTF_8);

+ 2 - 1
src/main/java/es/uv/saic/service/InstanciaService.java

@@ -77,7 +77,8 @@ public class InstanciaService {
 	}
 	}
 	
 	
 	public List<InstanciaGanttDTO> findByOrganBetweenCurs(String tlugar, Integer lugar, Integer centre, List<Integer> titulacio, Integer cursIni, Integer cursFi){
 	public List<InstanciaGanttDTO> findByOrganBetweenCurs(String tlugar, Integer lugar, Integer centre, List<Integer> titulacio, Integer cursIni, Integer cursFi){
-		return this.instanciaRepository.findByOrganBetweenCurs(tlugar, lugar, centre, titulacio, cursIni, cursFi);
+		List<InstanciaGanttDTO> a = this.instanciaRepository.findByOrganBetweenCurs(tlugar, lugar, centre, titulacio, cursIni, cursFi);
+		return a;
 	}
 	}
 	
 	
 	public boolean exists(String proces, String tlugar, Integer lugar, Integer centre, Integer titulacio, Integer curs) {
 	public boolean exists(String proces, String tlugar, Integer lugar, Integer centre, Integer titulacio, Integer curs) {

+ 6 - 6
src/main/java/es/uv/saic/service/InstanciaTascaService.java

@@ -3,8 +3,8 @@ package es.uv.saic.service;
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.math.BigInteger;
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
@@ -21,15 +21,15 @@ import es.uv.saic.domain.EvidenciaTransfer;
 import es.uv.saic.domain.Instancia;
 import es.uv.saic.domain.Instancia;
 import es.uv.saic.domain.InstanciaTasca;
 import es.uv.saic.domain.InstanciaTasca;
 import es.uv.saic.domain.InstanciaTascaRepository;
 import es.uv.saic.domain.InstanciaTascaRepository;
+import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Plantilla;
 import es.uv.saic.domain.Plantilla;
 import es.uv.saic.domain.TascaVersioTransfer;
 import es.uv.saic.domain.TascaVersioTransfer;
-import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.CategoriaDTO;
 import es.uv.saic.dto.CategoriaDTO;
 import es.uv.saic.dto.InstanciaTascaDTO;
 import es.uv.saic.dto.InstanciaTascaDTO;
 import es.uv.saic.dto.TascaInformeTransferDTO;
 import es.uv.saic.dto.TascaInformeTransferDTO;
-import es.uv.saic.feign.PlantillaClient;
 import es.uv.saic.feign.DocumentClient;
 import es.uv.saic.feign.DocumentClient;
+import es.uv.saic.feign.PlantillaClient;
 
 
 @Service
 @Service
 public class InstanciaTascaService {
 public class InstanciaTascaService {
@@ -315,7 +315,7 @@ public class InstanciaTascaService {
 	public void saveChanges(Usuari user, InstanciaTasca it) {
 	public void saveChanges(Usuari user, InstanciaTasca it) {
 
 
 		it.setUsuari(user);
 		it.setUsuari(user);
-		it.setDataFet(new Date(System.currentTimeMillis()));
+		it.setDataFet(LocalDate.now());
 		this.save(it);
 		this.save(it);
 		
 		
 		// Set next as active or close instance
 		// Set next as active or close instance
@@ -336,7 +336,7 @@ public class InstanciaTascaService {
 			InstanciaTasca it_next = this.getNext(it.getInstancia().getIdInstancia(), it.getTasca().getProces().getIdProces(), next);
 			InstanciaTasca it_next = this.getNext(it.getInstancia().getIdInstancia(), it.getTasca().getProces().getIdProces(), next);
 			if(it_next.getUsuari() == null) {
 			if(it_next.getUsuari() == null) {
 				it_next.setEstat("A");
 				it_next.setEstat("A");
-				it_next.setData(new Date(System.currentTimeMillis()));
+				it_next.setDataFet(LocalDate.now());
 				if(it_next.getTasca().getTipus().getTipus() == 15) {
 				if(it_next.getTasca().getTipus().getTipus() == 15) {
 					InstanciaTasca ta = this.findByInstanciaTascap(it.getInstancia().getIdInstancia(), Integer.parseInt(it_next.getTasca().getOpcions()));
 					InstanciaTasca ta = this.findByInstanciaTascap(it.getInstancia().getIdInstancia(), Integer.parseInt(it_next.getTasca().getOpcions()));
 					it_next.setText(ta.getText());
 					it_next.setText(ta.getText());
@@ -347,7 +347,7 @@ public class InstanciaTascaService {
 				InstanciaTasca it_nextNew = new InstanciaTasca();
 				InstanciaTasca it_nextNew = new InstanciaTasca();
 				it_nextNew.setDataFet(null);
 				it_nextNew.setDataFet(null);
 				it_nextNew.setEstat("A");
 				it_nextNew.setEstat("A");
-				it_nextNew.setData(new Date(System.currentTimeMillis()));
+				it_nextNew.setData(LocalDate.now());
 				it_nextNew.setEvidencia(null);
 				it_nextNew.setEvidencia(null);
 				it_nextNew.setInstancia(it_next.getInstancia());
 				it_nextNew.setInstancia(it_next.getInstancia());
 				it_nextNew.setTasca(it_next.getTasca());
 				it_nextNew.setTasca(it_next.getTasca());

+ 0 - 1
src/main/java/es/uv/saic/service/OrganService.java

@@ -2,7 +2,6 @@ package es.uv.saic.service;
 
 
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
-import java.util.stream.Collector;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;

+ 16 - 11
src/main/java/es/uv/saic/web/AdminController.java

@@ -7,6 +7,9 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Calendar;
@@ -489,6 +492,7 @@ public class AdminController {
 			@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
 			@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
 			throws NumberFormatException, ParseException {
 			throws NumberFormatException, ParseException {
 
 
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DDMMYYYY);
 		Proces p = new Proces();
 		Proces p = new Proces();
 		p.setIdProces(Integer.parseInt(params.get("idProces")));
 		p.setIdProces(Integer.parseInt(params.get("idProces")));
 		p.setNomProces(params.get("nomProces"));
 		p.setNomProces(params.get("nomProces"));
@@ -524,7 +528,7 @@ public class AdminController {
 						nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
 						nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
 				t.setNomEvidenciaVal(
 				t.setNomEvidenciaVal(
 						nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
 						nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
-				t.setDataLim(new SimpleDateFormat(DDMMYYYY).parse(dataLimit.get(i)));
+				t.setDataLim(LocalDate.parse(dataLimit.get(i), formatter));
 				t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
 				t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
 				if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
 				if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
 					t.setCodiEvidencia(idPlantilla.get(i));
 					t.setCodiEvidencia(idPlantilla.get(i));
@@ -562,6 +566,7 @@ public class AdminController {
 			@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
 			@RequestParam(name = "informe[]", required = false) List<Boolean> informe)
 			throws NumberFormatException, ParseException {
 			throws NumberFormatException, ParseException {
 
 
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern(DDMMYYYY);
 		Proces p = ps.findByID(Integer.parseInt(params.get("idProces")));
 		Proces p = ps.findByID(Integer.parseInt(params.get("idProces")));
 		p.setNomProces(params.get("nomProces"));
 		p.setNomProces(params.get("nomProces"));
 		p.setVersio(params.get("versio"));
 		p.setVersio(params.get("versio"));
@@ -614,7 +619,7 @@ public class AdminController {
 						nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
 						nomEvidenciaCas.get(i).equals(".") ? "" : nomEvidenciaCas.get(i).replace("[comma]", ","));
 				t.setNomEvidenciaVal(
 				t.setNomEvidenciaVal(
 						nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
 						nomEvidenciaVal.get(i).equals(".") ? "" : nomEvidenciaVal.get(i).replace("[comma]", ","));
-				t.setDataLim(new SimpleDateFormat(DDMMYYYY).parse(dataLimit.get(i)));
+				t.setDataLim(LocalDate.parse(dataLimit.get(i), formatter));
 				t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
 				t.setTipus(tps.findOne(Integer.parseInt(tipus.get(i))));
 				if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
 				if (t.getTipus().getTipus() == 11 || t.getTipus().getTipus() == 15) {
 					t.setCodiEvidencia(idPlantilla.get(i));
 					t.setCodiEvidencia(idPlantilla.get(i));
@@ -649,7 +654,7 @@ public class AdminController {
 		UsuarisRol u = urs.findActive(idRol, usuari, lugar, tlugar);
 		UsuarisRol u = urs.findActive(idRol, usuari, lugar, tlugar);
 		if (u != null) {
 		if (u != null) {
 			u.setVigent(false);
 			u.setVigent(false);
-			u.setFin(Calendar.getInstance().getTime());
+			u.setFin(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
 			urs.save(u);
 			urs.save(u);
 		}
 		}
 
 
@@ -703,7 +708,7 @@ public class AdminController {
 				if (!u.getVigent()) {
 				if (!u.getVigent()) {
 					UsuarisRol r = new UsuarisRol();
 					UsuarisRol r = new UsuarisRol();
 					r.setFin(null);
 					r.setFin(null);
-					r.setInici(Calendar.getInstance().getTime());
+					r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
 					r.setUsuari(u.getUsuari());
 					r.setUsuari(u.getUsuari());
 					r.setOrgan(u.getOrgan());
 					r.setOrgan(u.getOrgan());
 					r.setRol(u.getRol());
 					r.setRol(u.getRol());
@@ -719,7 +724,7 @@ public class AdminController {
 			} else {
 			} else {
 				UsuarisRol r = new UsuarisRol();
 				UsuarisRol r = new UsuarisRol();
 				r.setFin(null);
 				r.setFin(null);
-				r.setInici(Calendar.getInstance().getTime());
+				r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
 				r.setUsuari(us.findByUsername(usuari));
 				r.setUsuari(us.findByUsername(usuari));
 				r.setOrgan(os.findByID(tlugar, lugar));
 				r.setOrgan(os.findByID(tlugar, lugar));
 				r.setRol(rs.findOne(idRol));
 				r.setRol(rs.findOne(idRol));
@@ -739,7 +744,7 @@ public class AdminController {
 				if (!u.getVigent()) {
 				if (!u.getVigent()) {
 					UsuarisRol r = new UsuarisRol();
 					UsuarisRol r = new UsuarisRol();
 					r.setFin(null);
 					r.setFin(null);
-					r.setInici(Calendar.getInstance().getTime());
+					r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
 					r.setUsuari(u.getUsuari());
 					r.setUsuari(u.getUsuari());
 					r.setOrgan(u.getOrgan());
 					r.setOrgan(u.getOrgan());
 					r.setRol(u.getRol());
 					r.setRol(u.getRol());
@@ -755,7 +760,7 @@ public class AdminController {
 			} else {
 			} else {
 				UsuarisRol r = new UsuarisRol();
 				UsuarisRol r = new UsuarisRol();
 				r.setFin(null);
 				r.setFin(null);
-				r.setInici(Calendar.getInstance().getTime());
+				r.setInici(Calendar.getInstance().getTime().toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
 				r.setUsuari(us.findByUsername(usuari));
 				r.setUsuari(us.findByUsername(usuari));
 				r.setOrgan(os.findByID(tlugar, idTitulacio));
 				r.setOrgan(os.findByID(tlugar, idTitulacio));
 				r.setRol(rs.findOne(idRol));
 				r.setRol(rs.findOne(idRol));
@@ -880,10 +885,10 @@ public class AdminController {
 		a.setGrupCurs(grupCurs);
 		a.setGrupCurs(grupCurs);
 		a.setGrupNum(grupNum);
 		a.setGrupNum(grupNum);
 		a.setGrup(acreditaGroups.get(grupNum));
 		a.setGrup(acreditaGroups.get(grupNum));
-		a.setDataAcred(new SimpleDateFormat(DDMMYYYY).parse(dataAcred));
-		a.setDataRenov(new SimpleDateFormat(DDMMYYYY).parse(dataRenov));
-		a.setDataSegui(new SimpleDateFormat(DDMMYYYY).parse(dataSegui));
-		a.setDataVerif(new SimpleDateFormat(DDMMYYYY).parse(dataVerif));
+		a.setDataAcred(new SimpleDateFormat(DDMMYYYY).parse(dataAcred).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		a.setDataRenov(new SimpleDateFormat(DDMMYYYY).parse(dataRenov).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		a.setDataSegui(new SimpleDateFormat(DDMMYYYY).parse(dataSegui).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
+		a.setDataVerif(new SimpleDateFormat(DDMMYYYY).parse(dataVerif).toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime());
 		a.setCursImpla(cursImpla);
 		a.setCursImpla(cursImpla);
 		a.setRecom(recom);
 		a.setRecom(recom);
 		a.setSegui(segui);
 		a.setSegui(segui);

+ 10 - 9
src/main/java/es/uv/saic/web/CalendarController.java

@@ -3,9 +3,9 @@ package es.uv.saic.web;
 import java.io.IOException;
 import java.io.IOException;
 import java.math.BigInteger;
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 
 
@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -57,8 +56,9 @@ public class CalendarController {
 			@RequestParam("titulacions") List<String> titulacions, @RequestParam("centres") List<String> centres, 
 			@RequestParam("titulacions") List<String> titulacions, @RequestParam("centres") List<String> centres, 
 			@RequestParam("data") String data, @RequestParam("instancia") Optional<Integer> instancia) throws IOException, ParseException {	
 			@RequestParam("data") String data, @RequestParam("instancia") Optional<Integer> instancia) throws IOException, ParseException {	
 		
 		
-		Date d = new SimpleDateFormat("dd/MM/yyyy").parse(data);
-		String dstr = new SimpleDateFormat("yyyy-MM-dd").format(d);
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+		LocalDate d = LocalDate.parse(data, formatter);
+		String dstr = d.toString();
 		Proces p = this.ps.findByID(idProces);
 		Proces p = this.ps.findByID(idProces);
 		Calendari c = new Calendari();
 		Calendari c = new Calendari();
 		c.setIdProces(p.getIdProces());
 		c.setIdProces(p.getIdProces());
@@ -93,8 +93,9 @@ public class CalendarController {
 			@RequestParam("centres") List<String> centres, @RequestParam("data") String data) throws IOException, ParseException {	
 			@RequestParam("centres") List<String> centres, @RequestParam("data") String data) throws IOException, ParseException {	
 		
 		
 		Calendari c = cs.findById(id);
 		Calendari c = cs.findById(id);
-		Date d = new SimpleDateFormat("dd/MM/yyyy").parse(data);
-		String dstr = new SimpleDateFormat("yyyy-MM-dd").format(d);
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd/MM/yyyy");
+		LocalDate d = LocalDate.parse(data, formatter);
+		String dstr = d.toString();
 		Proces p = this.ps.findByID(idProces);
 		Proces p = this.ps.findByID(idProces);
 		c.setIdProces(p.getIdProces());
 		c.setIdProces(p.getIdProces());
 		c.setData(d);
 		c.setData(d);
@@ -220,13 +221,13 @@ public class CalendarController {
 		if(hasErrors) {
 		if(hasErrors) {
 			cal.setStatus("E");
 			cal.setStatus("E");
 			cal.setColor("indianred");
 			cal.setColor("indianred");
-			cal.setData(new Date(System.currentTimeMillis()));
+			cal.setData(LocalDate.now());
 			cs.save(cal);
 			cs.save(cal);
 		}
 		}
 		else {
 		else {
 			cal.setStatus("F");
 			cal.setStatus("F");
 			cal.setColor("lightgreen");
 			cal.setColor("lightgreen");
-			cal.setData(new Date(System.currentTimeMillis()));
+			cal.setData(LocalDate.now());
 			cs.save(cal);
 			cs.save(cal);
 		}
 		}
 		
 		

+ 14 - 7
src/main/java/es/uv/saic/web/DashboardController.java

@@ -32,21 +32,20 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartFile;
 
 
-import es.uv.saic.domain.Informe;
-import es.uv.saic.domain.InformeProcessos;
-import es.uv.saic.domain.Instancia;
-import es.uv.saic.domain.Link;
 import es.uv.saic.domain.Categoria;
 import es.uv.saic.domain.Categoria;
 import es.uv.saic.domain.CursoValor;
 import es.uv.saic.domain.CursoValor;
 import es.uv.saic.domain.Document;
 import es.uv.saic.domain.Document;
 import es.uv.saic.domain.Grafica;
 import es.uv.saic.domain.Grafica;
 import es.uv.saic.domain.Indicador;
 import es.uv.saic.domain.Indicador;
+import es.uv.saic.domain.Informe;
+import es.uv.saic.domain.InformeProcessos;
+import es.uv.saic.domain.Instancia;
+import es.uv.saic.domain.Link;
 import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.UsuarisRol;
 import es.uv.saic.domain.UsuarisRol;
@@ -388,6 +387,8 @@ public class DashboardController {
 				DocumentDTO docdto = new DocumentDTO();
 				DocumentDTO docdto = new DocumentDTO();
 				docdto.setText(locale.equals("es") ? "No hay documentos subidos en esta categoría" : "No hi ha documents pujats en aquesta categoria");
 				docdto.setText(locale.equals("es") ? "No hay documentos subidos en esta categoría" : "No hi ha documents pujats en aquesta categoria");
 				docdto.setRuta("");
 				docdto.setRuta("");
+				docdto.setData("");
+				docdto.setSize("0kb");
 				cat.getChildren().add(docdto);
 				cat.getChildren().add(docdto);
 			}
 			}
 			data.add(cat);
 			data.add(cat);
@@ -427,13 +428,19 @@ public class DashboardController {
 			instancies = this.is.findByOrganBetweenCurs("C", o.getOrgan().getId().getLugar(), o.getOrgan().getId().getLugar(), ambits, currentYear-5, currentYear);
 			instancies = this.is.findByOrganBetweenCurs("C", o.getOrgan().getId().getLugar(), o.getOrgan().getId().getLugar(), ambits, currentYear-5, currentYear);
 		}
 		}
 		data.addAll(instancies);
 		data.addAll(instancies);
+
+		for(InstanciaGanttDTO i : data) {
+			System.out.println(i);
+		}
 		
 		
+		//TODO Esto peta
 		Collections.sort(data, new Comparator<InstanciaGanttDTO>() {  
 		Collections.sort(data, new Comparator<InstanciaGanttDTO>() {  
 			@Override  
 			@Override  
 			public int compare(InstanciaGanttDTO a, InstanciaGanttDTO b) {  
 			public int compare(InstanciaGanttDTO a, InstanciaGanttDTO b) {  
 				DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
 				DateTimeFormatter f = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-				LocalDateTime datea = LocalDateTime.parse(a.getStart()+" 00:01", f);
-				LocalDateTime dateb = LocalDateTime.parse(b.getStart()+" 00:01", f);
+
+				LocalDateTime datea = LocalDateTime.parse(a.getStart(), f);
+				LocalDateTime dateb = LocalDateTime.parse(b.getStart(), f);
 				boolean isBefore = datea.isBefore(dateb);
 				boolean isBefore = datea.isBefore(dateb);
 				return isBefore ? -1 : 1;
 				return isBefore ? -1 : 1;
 			}  
 			}  

+ 0 - 6
src/main/java/es/uv/saic/web/IndicadorController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXException;
@@ -21,10 +20,8 @@ import org.xml.sax.SAXException;
 import es.uv.saic.domain.Indicador;
 import es.uv.saic.domain.Indicador;
 import es.uv.saic.domain.IndicadorEnquesta;
 import es.uv.saic.domain.IndicadorEnquesta;
 import es.uv.saic.domain.IndicadorEnquestaTmp;
 import es.uv.saic.domain.IndicadorEnquestaTmp;
-import es.uv.saic.dto.EnquestaDTO;
 import es.uv.saic.dto.IndicadorEnquestaDTO;
 import es.uv.saic.dto.IndicadorEnquestaDTO;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
 import es.uv.saic.dto.IndicadorEnquestaTmpDup;
-import es.uv.saic.dto.IndicadorEnquestaValorDTO;
 import es.uv.saic.dto.IndicadorEnquestaValorDTOImp;
 import es.uv.saic.dto.IndicadorEnquestaValorDTOImp;
 import es.uv.saic.service.IndicadorEnquestaService;
 import es.uv.saic.service.IndicadorEnquestaService;
 import es.uv.saic.service.IndicadorEnquestaTmpService;
 import es.uv.saic.service.IndicadorEnquestaTmpService;
@@ -41,9 +38,6 @@ public class IndicadorController {
     @Autowired
     @Autowired
     private IndicadorEnquestaTmpService iets;
     private IndicadorEnquestaTmpService iets;
 
 
-    @Autowired
-    private es.uv.saic.service.OrganService os;
-
     /*
     /*
     * Endpoint para la funcion deleteByEnquestaCursAmbitEstudi de iets
     * Endpoint para la funcion deleteByEnquestaCursAmbitEstudi de iets
     */
     */

+ 0 - 4
src/main/java/es/uv/saic/web/ManagersController.java

@@ -6,13 +6,9 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 
 
-import jakarta.servlet.http.HttpSession;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 

+ 11 - 11
src/main/java/es/uv/saic/web/ProceduresController.java

@@ -9,11 +9,12 @@ import java.math.BigInteger;
 import java.nio.file.Files;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.StandardCopyOption;
 import java.sql.Timestamp;
 import java.sql.Timestamp;
-import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.Year;
 import java.time.Year;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Collections;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.HashSet;
 import java.util.List;
 import java.util.List;
@@ -29,7 +30,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -249,8 +249,8 @@ public class ProceduresController {
 			if(newTask){
 			if(newTask){
 				InstanciaTasca itNew = new InstanciaTasca();
 				InstanciaTasca itNew = new InstanciaTasca();
 				itNew.setUsuari(u);
 				itNew.setUsuari(u);
-				itNew.setDataFet(new Date(System.currentTimeMillis()));
-				itNew.setData(new Date(System.currentTimeMillis()));
+				itNew.setDataFet(LocalDate.now());
+				itNew.setData(LocalDate.now());
 				itNew.setEstat("E");
 				itNew.setEstat("E");
 				itNew.setEvidencia(fileName);
 				itNew.setEvidencia(fileName);
 				itNew.setInstancia(it.getInstancia());
 				itNew.setInstancia(it.getInstancia());
@@ -345,11 +345,11 @@ public class ProceduresController {
 		InstanciaTasca it = its.findById(id);
 		InstanciaTasca it = its.findById(id);
 		it.setText(text);
 		it.setText(text);
 		it.setUsuari(u);
 		it.setUsuari(u);
-		it.setDataMod(new Date(System.currentTimeMillis()));
+		it.setDataMod(LocalDateTime.now());
 		its.save(it);
 		its.save(it);
 		if(manual){
 		if(manual){
 			List<InstanciaTascaVer> itvs = this.itsver.findByIdInstanciaTasca(id);
 			List<InstanciaTascaVer> itvs = this.itsver.findByIdInstanciaTasca(id);
-			InstanciaTascaVer itv = new InstanciaTascaVer(id, it.getUsuari().getUsuari(), it.getText(), new Timestamp(it.getDataMod().getTime()));
+			InstanciaTascaVer itv = new InstanciaTascaVer(id, it.getUsuari().getUsuari(), it.getText(), Timestamp.valueOf(it.getDataMod()));
 			if(itvs != null){
 			if(itvs != null){
 				if(itvs.size() == 10){
 				if(itvs.size() == 10){
 					this.itsver.delete(itvs.get(itvs.size()-1));
 					this.itsver.delete(itvs.get(itvs.size()-1));
@@ -420,7 +420,7 @@ public class ProceduresController {
 			itt.setDataFet(formatDate(it.getDataFet()));
 			itt.setDataFet(formatDate(it.getDataFet()));
 			itt.setEstatInstancia(it.getInstancia().getEstat());
 			itt.setEstatInstancia(it.getInstancia().getEstat());
 			itt.setOpcions(it.getTasca().getOpcions());
 			itt.setOpcions(it.getTasca().getOpcions());
-			itt.setDataMod(formatDate(it.getDataMod()));
+			itt.setDataMod(formatDate(it.getDataMod().toLocalDate()));
 			
 			
 			if(itt.getEstat() != null) {
 			if(itt.getEstat() != null) {
 				if(itt.getEstat().equals("A")) {
 				if(itt.getEstat().equals("A")) {
@@ -477,10 +477,10 @@ public class ProceduresController {
 		model.put("flow", this.getFlowDiagram(i.getProces()));
 		model.put("flow", this.getFlowDiagram(i.getProces()));
 	}
 	}
 
 
-	private String formatDate(Date date) {
+	private String formatDate(LocalDate date) {
 		if (date == null) return "";
 		if (date == null) return "";
-		SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
-		return formatter.format(date);
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
+		return date.format(formatter);
 	}
 	}
 
 
 
 

+ 0 - 6
src/main/java/es/uv/saic/web/StatsController.java

@@ -1,19 +1,13 @@
 package es.uv.saic.web;
 package es.uv.saic.web;
 
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.session.SessionInformation;
-import org.springframework.security.core.session.SessionRegistry;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import es.uv.saic.domain.Email;
 import es.uv.saic.domain.Email;
-import es.uv.saic.domain.Usuari;
 import es.uv.saic.service.EmailService;
 import es.uv.saic.service.EmailService;
 
 
 // Controller to handle admin statistics page
 // Controller to handle admin statistics page

+ 0 - 2
src/main/java/es/uv/saic/web/SupervisionController.java

@@ -8,10 +8,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 

+ 0 - 1
src/main/java/es/uv/saic/web/TascaController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 

+ 0 - 1
src/main/java/es/uv/saic/web/UsuariController.java

@@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.domain.Usuari;