Просмотр исходного кода

Arreglados deprecated relacionados con las fechas.

Mario Martínez Hernández 2 месяцев назад
Родитель
Сommit
c31944e694
23 измененных файлов с 146 добавлено и 151 удалено
  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. 11 13
      src/main/java/es/uv/saic/domain/InstanciaTasca.java
  9. 1 0
      src/main/java/es/uv/saic/domain/InstanciaTascaVer.java
  10. 5 6
      src/main/java/es/uv/saic/domain/Tasca.java
  11. 4 4
      src/main/java/es/uv/saic/domain/TascaVersioTransfer.java
  12. 12 7
      src/main/java/es/uv/saic/domain/Usuari.java
  13. 16 11
      src/main/java/es/uv/saic/domain/UsuarisRol.java
  14. 3 6
      src/main/java/es/uv/saic/dto/DocumentDTO.java
  15. 2 0
      src/main/java/es/uv/saic/dto/InstanciaGanttDTOImp.java
  16. 5 6
      src/main/java/es/uv/saic/dto/TascaDTO.java
  17. 0 2
      src/main/java/es/uv/saic/feign/IndicadorClient.java
  18. 2 2
      src/main/java/es/uv/saic/service/AuthProvider.java
  19. 3 3
      src/main/java/es/uv/saic/service/IndicadorService.java
  20. 6 7
      src/main/java/es/uv/saic/service/InstanciaTascaService.java
  21. 5 2
      src/main/java/es/uv/saic/web/DashboardController.java
  22. 7 7
      src/main/resources/templates/dashboardTitulacio.html
  23. 4 4
      src/main/resources/templates/dashboardUniversitat.html

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

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

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

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 
-import java.util.Date;
+import java.time.LocalDateTime;
 
 public class AcreditacioTransfer {
 
@@ -17,13 +17,13 @@ public class AcreditacioTransfer {
 	private Integer grupNum;
 	private Integer grupCurs;
 	private Boolean inter;
-	private Date dataVerif;
+	private LocalDateTime dataVerif;
 	private String dataVerifStr;
-	private Date dataRenov;
+	private LocalDateTime dataRenov;
 	private String dataRenovStr;
-	private Date dataSegui;
+	private LocalDateTime dataSegui;
 	private String dataSeguiStr;
-	private Date dataAcred;
+	private LocalDateTime dataAcred;
 	private String dataAcredStr;
 	private Integer cursImpla;
 	
@@ -108,28 +108,28 @@ public class AcreditacioTransfer {
 	public void setInter(Boolean inter) {
 		this.inter = inter;
 	}
-	public Date getDataVerif() {
+	public LocalDateTime getDataVerif() {
 		return dataVerif;
 	}
-	public void setDataVerif(Date dataVerif) {
+	public void setDataVerif(LocalDateTime dataVerif) {
 		this.dataVerif = dataVerif;
 	}
-	public Date getDataRenov() {
+	public LocalDateTime getDataRenov() {
 		return dataRenov;
 	}
-	public void setDataRenov(Date dataRenov) {
+	public void setDataRenov(LocalDateTime dataRenov) {
 		this.dataRenov = dataRenov;
 	}
-	public Date getDataSegui() {
+	public LocalDateTime getDataSegui() {
 		return dataSegui;
 	}
-	public void setDataSegui(Date dataSegui) {
+	public void setDataSegui(LocalDateTime dataSegui) {
 		this.dataSegui = dataSegui;
 	}
-	public Date getDataAcred() {
+	public LocalDateTime getDataAcred() {
 		return dataAcred;
 	}
-	public void setDataAcred(Date dataAcred) {
+	public void setDataAcred(LocalDateTime dataAcred) {
 		this.dataAcred = dataAcred;
 	}
 	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.text.SimpleDateFormat;
-import java.util.Date;
+import java.time.LocalDate;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -11,8 +11,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 import jakarta.persistence.Transient;
 
 @Entity
@@ -36,8 +34,7 @@ public class Calendari implements Serializable {
 	
 	private String ambit;
 	
-	@Temporal(TemporalType.DATE)
-	private Date data;
+	private LocalDate data;
 	
 	@Transient
 	private String dataStr;
@@ -54,7 +51,7 @@ public class Calendari implements Serializable {
 	
 	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) {
 		
 		this.idCalendari = idCalendari;
@@ -70,7 +67,7 @@ public class Calendari implements Serializable {
 		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) {
 		
 		this.idCalendari = idCalendari;
@@ -127,13 +124,13 @@ public class Calendari implements Serializable {
 		this.ambit = ambit;
 	}
 
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 	}
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
-		this.dataStr = new SimpleDateFormat("yyyy-MM-dd").format(data);
+		this.dataStr = data.toString();
 	}
 	
 	public String getDataStr() {

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

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

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

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

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

@@ -1,6 +1,6 @@
 package es.uv.saic.domain;
 
-import java.sql.Timestamp;
+import java.time.LocalDateTime;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
@@ -9,8 +9,6 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.NamedQuery;
 import jakarta.persistence.Table;
-import jakarta.persistence.Temporal;
-import jakarta.persistence.TemporalType;
 
 @Entity
 @Table(name="indicador_enquesta_tmp")
@@ -38,9 +36,8 @@ public class IndicadorEnquestaTmp {
 	private String titulacioOrigen;
 	private Integer nenq;
 	private Integer ruct;
-	
-	@Temporal(TemporalType.TIMESTAMP)
-	private Timestamp data; 
+
+	private LocalDateTime data; 
 	
 	public IndicadorEnquestaTmp(){}
 	
@@ -148,11 +145,11 @@ public class IndicadorEnquestaTmp {
 		this.usuari = usuari;
 	}
 
-	public Timestamp getData() {
+	public LocalDateTime getData() {
 		return data;
 	}
 
-	public void setData(Timestamp data) {
+	public void setData(LocalDateTime 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.math.BigInteger;
-
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDate;
 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.
  * 
@@ -28,9 +35,8 @@ public class Instancia implements Serializable {
 
 	private Integer titulacio;
 	
-	@Temporal(TemporalType.DATE)
 	@Column(name="data")
-	private Date data;
+	private LocalDate data;
 
 	//bi-directional many-to-one association to Organ
 	@ManyToOne
@@ -84,11 +90,11 @@ public class Instancia implements Serializable {
 		this.titulacio = titulacio;
 	}
 	
-	public Date getData() {
+	public LocalDate getData() {
 		return data;
 	}
 
-	public void setData(Date data) {
+	public void setData(LocalDate data) {
 		this.data = data;
 	}
 

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

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

@@ -23,6 +23,7 @@ public class InstanciaTascaVer {
 	private BigInteger idInstanciaTasca;
 
     @Id
+    @SuppressWarnings("deprecation")
     @Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_mod")
 	private Timestamp dataMod;

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

@@ -1,9 +1,9 @@
 package es.uv.saic.domain;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 
 import jakarta.persistence.*;
-import java.util.Date;
 import java.util.List;
 
 
@@ -24,9 +24,8 @@ public class Tasca implements Serializable {
 	@Column(name="codi_evidencia")
 	private String codiEvidencia;
 
-	@Temporal(TemporalType.DATE)
 	@Column(name="data_lim")
-	private Date dataLim;
+	private LocalDate dataLim;
 
 	@Column(name="descripcio_cas")
 	private String descripcioCas;
@@ -99,11 +98,11 @@ public class Tasca implements Serializable {
 		this.codiEvidencia = codiEvidencia;
 	}
 
-	public Date getDataLim() {
+	public LocalDate getDataLim() {
 		return this.dataLim;
 	}
 
-	public void setDataLim(Date dataLim) {
+	public void setDataLim(LocalDate dataLim) {
 		this.dataLim = dataLim;
 	}
 
@@ -225,7 +224,7 @@ public class Tasca implements Serializable {
 	
 	public boolean isExpired() {
 		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;
 			}
 			else {

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

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

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

@@ -1,11 +1,17 @@
 package es.uv.saic.domain;
 
 import java.io.Serializable;
-import jakarta.persistence.*;
-
-import java.util.Date;
+import java.time.LocalDateTime;
 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.
@@ -30,9 +36,8 @@ public class Usuari implements Serializable {
 
 	private String nom;
 	
-	@Temporal(TemporalType.TIMESTAMP)
 	@Column(name="data_ultim")
-	private Date dataUltim;
+	private LocalDateTime dataUltim;
 	
 	private String locale;
 
@@ -104,11 +109,11 @@ public class Usuari implements Serializable {
 		this.nom = nom;
 	}
 	
-	public Date getDataUltim() {
+	public LocalDateTime getDataUltim() {
 		return this.dataUltim;
 	}
 
-	public void setDataUltim(Date dataUltim) {
+	public void setDataUltim(LocalDateTime dataUltim) {
 		this.dataUltim = dataUltim;
 	}
 	

+ 16 - 11
src/main/java/es/uv/saic/domain/UsuarisRol.java

@@ -1,9 +1,16 @@
 package es.uv.saic.domain;
 
-
 import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.Date;
+import java.time.LocalDate;
+
+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.
@@ -19,11 +26,9 @@ public class UsuarisRol implements Serializable {
 	@Column(name="id_usuari_rol")
 	private Integer idUsuariRol;
 
-	@Temporal(TemporalType.DATE)
-	private Date fin;
+	private LocalDate fin;
 
-	@Temporal(TemporalType.DATE)
-	private Date inici;
+	private LocalDate inici;
 
 	private Integer num;
 
@@ -60,19 +65,19 @@ public class UsuarisRol implements Serializable {
 		this.idUsuariRol = idUsuariRol;
 	}
 
-	public Date getFin() {
+	public LocalDate getFin() {
 		return this.fin;
 	}
 
-	public void setFin(Date fin) {
+	public void setFin(LocalDate fin) {
 		this.fin = fin;
 	}
 
-	public Date getInici() {
+	public LocalDate getInici() {
 		return this.inici;
 	}
 
-	public void setInici(Date inici) {
+	public void setInici(LocalDate inici) {
 		this.inici = inici;
 	}
 

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

@@ -7,18 +7,18 @@ public class DocumentDTO {
 	
 	public DocumentDTO() {}
 	
-	public DocumentDTO(String text, String ruta, String data, String size) {
+	public DocumentDTO(String text, String ruta, String data) {
 		String template = """
 			<a style="width:100;display:flex;" target="_blank" href="/download/document/[ruta]">
 				<span style="width:100%;display:flex;">
 					<span style="width:80%;text-align:left;">[text]</span>
 					<span>[data]</span>
 					&nbsp;&nbsp;&nbsp;
-					<span> ([size])</span>
 				</span>
 			</a>
 		""";
-		this.text = template.replace("[ruta]", ruta).replace("[text]", text).replace("[data]", data).replace("[size]", size);
+		this.text = template.replace("[ruta]", ruta).replace("[text]", text)
+					.replace("[data]", (data == null) ? "" : data);
 		this.ruta = ruta;
 	}
 	
@@ -34,7 +34,4 @@ public class DocumentDTO {
 	public void setRuta(String ruta) {
 		this.ruta = ruta;
 	}
-	
-	
-	
 }

+ 2 - 0
src/main/java/es/uv/saic/dto/InstanciaGanttDTOImp.java

@@ -12,6 +12,8 @@ public class InstanciaGanttDTOImp implements InstanciaGanttDTO{
 	private Integer progress;
 	private String custom_class;
 
+    public InstanciaGanttDTOImp(){}
+
     public InstanciaGanttDTOImp(BigInteger id, String name, String titCas, String titVal, String start, String end,
             Integer progress, String customClass) {
         this.id = id;

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

@@ -1,7 +1,7 @@
 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;
 
@@ -195,11 +195,11 @@ public class TascaDTO {
 
     
 
-    private String formatDate(Date date) {
+    private String formatDate(LocalDate date) {
         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);
     }
 
     public Integer getIdRol() {
@@ -225,6 +225,5 @@ public class TascaDTO {
     public void setInforme(Boolean informe) {
         this.informe = informe;
     }
-
     
 }

+ 0 - 2
src/main/java/es/uv/saic/feign/IndicadorClient.java

@@ -7,10 +7,8 @@ import org.springframework.web.bind.annotation.DeleteMapping;
 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 es.uv.saic.domain.IndicadorEnquesta;
-import es.uv.saic.dto.EnquestaDTO;
 
 @FeignClient(name = "saic-core-service", contextId = "indicador-controller")
 public interface IndicadorClient {

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

@@ -1,7 +1,7 @@
 package es.uv.saic.service;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.Hashtable;
 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.");
                     }
                     logger.info("Autenticación LDAP correcta: " + u.getUsuari());
-                    u.setDataUltim(new Date(System.currentTimeMillis()));
+                    u.setDataUltim(LocalDateTime.now());
                     this.us.save(u);
 	            	if(u.isAdmin()) {
 	            		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.StringReader;
 import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -57,7 +57,7 @@ public class IndicadorService {
 	    	String url = urls.get(xurls)+tits.get(xtits)+".xml";
 	    	String resText = "";
 	    	try {
-	    		URLConnection urlConnection = new URL(url).openConnection();
+	    		URLConnection urlConnection = new URI(url).toURL().openConnection();
 	    		urlConnection.addRequestProperty("Accept", "application/xml");
 	    		InputStream res = urlConnection.getInputStream();
 	    		resText = new String(res.readAllBytes(), StandardCharsets.UTF_8);
@@ -144,7 +144,7 @@ public class IndicadorService {
 	    String url = "http://bancuv.uv.es/wwwuv/stuff/web/siga/SGIC"+tit.toString()+".xml";
 	    String fileText;
 	    try {
-    		URLConnection urlConnection = new URL(url).openConnection();
+    		URLConnection urlConnection = new URI(url).toURL().openConnection();
     		urlConnection.addRequestProperty("Accept", "application/xml");
     		InputStream res = urlConnection.getInputStream();
     		fileText = new String(res.readAllBytes(), StandardCharsets.UTF_8);

+ 6 - 7
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.IOException;
 import java.math.BigInteger;
+import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
@@ -16,22 +16,21 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 
 import es.uv.saic.domain.Document;
-import es.uv.saic.domain.Email;
 import es.uv.saic.domain.EvidenciaTransfer;
 import es.uv.saic.domain.Instancia;
 import es.uv.saic.domain.InstanciaTasca;
 import es.uv.saic.domain.InstanciaTascaRepository;
+import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Plantilla;
 import es.uv.saic.domain.TascaVersioTransfer;
-import es.uv.saic.domain.Organ;
 import es.uv.saic.domain.Usuari;
 import es.uv.saic.dto.CategoriaDTO;
 import es.uv.saic.dto.EmailDTO;
 import es.uv.saic.dto.InstanciaTascaDTO;
 import es.uv.saic.dto.TascaInformeTransferDTO;
-import es.uv.saic.feign.PlantillaClient;
 import es.uv.saic.feign.DocumentClient;
 import es.uv.saic.feign.EmailClient;
+import es.uv.saic.feign.PlantillaClient;
 
 @Service
 public class InstanciaTascaService {
@@ -318,7 +317,7 @@ public class InstanciaTascaService {
 	public void saveChanges(Usuari user, InstanciaTasca it) {
 
 		it.setUsuari(user);
-		it.setDataFet(new Date(System.currentTimeMillis()));
+		it.setDataFet(LocalDate.now());
 		this.save(it);
 		
 		// Set next as active or close instance
@@ -339,7 +338,7 @@ public class InstanciaTascaService {
 			InstanciaTasca it_next = this.getNext(it.getInstancia().getIdInstancia(), it.getTasca().getProces().getIdProces(), next);
 			if(it_next.getUsuari() == null) {
 				it_next.setEstat("A");
-				it_next.setData(new Date(System.currentTimeMillis()));
+				it_next.setData(LocalDate.now());
 				if(it_next.getTasca().getTipus().getTipus() == 15) {
 					InstanciaTasca ta = this.findByInstanciaTascap(it.getInstancia().getIdInstancia(), Integer.parseInt(it_next.getTasca().getOpcions()));
 					it_next.setText(ta.getText());
@@ -350,7 +349,7 @@ public class InstanciaTascaService {
 				InstanciaTasca it_nextNew = new InstanciaTasca();
 				it_nextNew.setDataFet(null);
 				it_nextNew.setEstat("A");
-				it_nextNew.setData(new Date(System.currentTimeMillis()));
+				it_nextNew.setData(LocalDate.now());
 				it_nextNew.setEvidencia(null);
 				it_nextNew.setInstancia(it_next.getInstancia());
 				it_nextNew.setTasca(it_next.getTasca());

+ 5 - 2
src/main/java/es/uv/saic/web/DashboardController.java

@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.text.ParseException;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Optional;
 
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -122,7 +121,11 @@ public class DashboardController {
 	@GetMapping("/dashboard/documents/{idTitulacio}")
 	@ResponseBody
 	public List<CategoriaDocumentDTO> loadDocuments(Model model, @PathVariable Integer idTitulacio){
-		return dbc.loadDocuments(idTitulacio);
+		List<CategoriaDocumentDTO> a = dbc.loadDocuments(idTitulacio);
+		for (CategoriaDocumentDTO categoriaDocumentDTO : a) {
+			System.out.println("Categoria: " + categoriaDocumentDTO);
+		}
+		return a;
 	}
 
 	// GET para conseguir el diagrama de gantt a partir del ruct

+ 7 - 7
src/main/resources/templates/dashboardTitulacio.html

@@ -142,7 +142,7 @@
 													<span class="input-group-text date-group-icon" style="background-color: transparent !important;"><i class="fas fa-splotch"></i></span>
 												</div>
 												<div class="input-group-prepend">
-													<span class="input-group-text date-group-text-lg" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.renov}">Fecha Renovación: </strong>:&nbsp;<span id="dataRenov" th:text="${#dates.format(organ.acreditacio?.dataRenov, 'dd/MM/yyyy')}"></span></span>
+													<span class="input-group-text date-group-text-lg" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.renov}">Fecha Renovación: </strong>:&nbsp;<span id="dataRenov" th:text="${#temporals.format(organ.acreditacio?.dataRenov, 'dd/MM/yyyy')}"></span></span>
 												</div>
 											</div>
 											<div class="input-group date-group-sm">
@@ -150,7 +150,7 @@
 													<span class="input-group-text date-group-icon" style="background-color: transparent !important;"><i class="fas fa-check-double"></i></span>
 												</div>
 												<div class="input-group-prepend">
-													<span class="input-group-text date-group-text-sm" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.segui}">Fecha seguimiento: </strong>:&nbsp;<span id="dataSegui" th:text="${#dates.format(organ.acreditacio?.dataSegui, 'yyyy')}"></span></span>
+													<span class="input-group-text date-group-text-sm" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.segui}">Fecha seguimiento: </strong>:&nbsp;<span id="dataSegui" th:text="${#temporals.format(organ.acreditacio?.dataSegui, 'yyyy')}"></span></span>
 												</div>
 											</div>
 											<div class="input-group date-group-sm">
@@ -158,7 +158,7 @@
 													<span class="input-group-text date-group-icon" style="background-color: transparent !important;"><i class="fas fa-check"></i></span>
 												</div>
 												<div class="input-group-prepend">
-													<span class="input-group-text date-group-text-sm" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.verif}">Fecha verificación: </strong>:&nbsp;<span id="dataVerif" th:text="${#dates.format(organ.acreditacio?.dataVerif, 'dd/MM/yyyy')}"></span></span>
+													<span class="input-group-text date-group-text-sm" style="background-color: transparent !important;"><strong th:text="#{dashboard.acred.date.verif}">Fecha verificación: </strong>:&nbsp;<span id="dataVerif" th:text="${#temporals.format(organ.acreditacio?.dataVerif, 'dd/MM/yyyy')}"></span></span>
 												</div>
 											</div>
 											<div class="input-group date-group-sm">
@@ -373,7 +373,7 @@
 			    		<div class="col-3">
 							<label th:text="#{dashboard.acred.date.acred}">Fecha acreditación</label>
 							<div class="input-group date datepicker"> 
-								<input data-date-format="dd/mm/yyyy" type="text" id="edataAcred" th:value="${#dates.format(organ.acreditacio?.dataAcred, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
+								<input data-date-format="dd/mm/yyyy" type="text" id="edataAcred" th:value="${#temporals.format(organ.acreditacio?.dataAcred, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
 								<div class="input-group-prepend uv-date-icon">
 									<div class="input-group-addon input-group-text">
 										<span class="fa fa-calendar"></span>
@@ -399,7 +399,7 @@
 			    		<div class="col-3">
 							<label th:text="#{dashboard.acred.date.segui}">Fecha seguimiento</label>
 							<div class="input-group date datepicker"> 
-								<input data-date-format="dd/mm/yyyy" type="text" id="edataSegui" th:value="${#dates.format(organ.acreditacio?.dataSegui, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
+								<input data-date-format="dd/mm/yyyy" type="text" id="edataSegui" th:value="${#temporals.format(organ.acreditacio?.dataSegui, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
 								<div class="input-group-prepend uv-date-icon">
 									<div class="input-group-addon input-group-text">
 										<span class="fa fa-calendar"></span>
@@ -410,7 +410,7 @@
 						<div class="col-3">
 							<label th:text="#{dashboard.acred.date.renov}">Fecha renovación</label>
 							<div class="input-group date datepicker"> 
-								<input data-date-format="dd/mm/yyyy" type="text" id="edataRenov" th:value="${#dates.format(organ.acreditacio?.dataRenov, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
+								<input data-date-format="dd/mm/yyyy" type="text" id="edataRenov" th:value="${#temporals.format(organ.acreditacio?.dataRenov, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
 								<div class="input-group-prepend uv-date-icon">
 									<div class="input-group-addon input-group-text">
 										<span class="fa fa-calendar"></span>
@@ -421,7 +421,7 @@
 						<div class="col-3">
 							<label th:text="#{dashboard.acred.date.verif}">Fecha verificación</label>
 							<div class="input-group date datepicker"> 
-								<input data-date-format="dd/mm/yyyy" type="text" id="edataVerif" th:value="${#dates.format(organ.acreditacio?.dataVerif, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
+								<input data-date-format="dd/mm/yyyy" type="text" id="edataVerif" th:value="${#temporals.format(organ.acreditacio?.dataVerif, 'dd/MM/yyyy')}" class="form-control uv-datePicker" required pattern=".{1,}" autocomplete="off">
 								<div class="input-group-prepend uv-date-icon">
 									<div class="input-group-addon input-group-text">
 										<span class="fa fa-calendar"></span>

+ 4 - 4
src/main/resources/templates/dashboardUniversitat.html

@@ -174,16 +174,16 @@
 													<span th:text="${item.acreditacio?.grupCurs+' - '+item.acreditacio?.grup}"></span>
 												</td>
 												<td>
-													<span th:text="${#dates.format(item.acreditacio?.dataAcred, 'dd/MM/yyyy')}"></span>
+													<span th:text="${#temporals.format(item.acreditacio?.dataAcred, 'dd/MM/yyyy')}"></span>
 												</td>
 												<td>
-													<span th:text="${#dates.format(item.acreditacio?.dataRenov, 'dd/MM/yyyy')}"></span>
+													<span th:text="${#temporals.format(item.acreditacio?.dataRenov, 'dd/MM/yyyy')}"></span>
 												</td>
 												<td>
-													<span th:text="${#dates.format(item.acreditacio?.dataSegui, 'dd/MM/yyyy')}"></span>
+													<span th:text="${#temporals.format(item.acreditacio?.dataSegui, 'dd/MM/yyyy')}"></span>
 												</td>
 												<td>
-													<span th:text="${#dates.format(item.acreditacio?.dataVerif, 'dd/MM/yyyy')}"></span>
+													<span th:text="${#temporals.format(item.acreditacio?.dataVerif, 'dd/MM/yyyy')}"></span>
 												</td>
 												<td>
 													<span th:text="${item.acreditacio?.cursImpla}"></span>