migration completed

pom.xml

@@ -163,6 +163,12 @@
 		    <version>0.8.12</version>
 		</dependency>
 	  	 -->
+
+		<dependency>
+			<groupId>es.uv.saic.shared</groupId>
+		    <artifactId>UV_SAIC_SHARED</artifactId>
+		    <version>0.0.1-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	
 

src/main/java/es/uv/saic/config/ApplicationLocaleResolver.java

@@ -9,7 +9,7 @@ import org.springframework.security.core.context.SecurityContext;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.web.servlet.i18n.SessionLocaleResolver;
 
-import es.uv.saic.domain.Usuari;
+import es.uv.saic.shared.domain.Usuari;
 import es.uv.saic.service.UsuariService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;

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

@@ -1,141 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="acreditacions")
-@NamedQuery(name="Acreditacio.findAll", query="SELECT t FROM Acreditacio t")
-@IdClass(AcreditacioPK.class)
-public class Acreditacio  implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-	
-	@Id
-	private String tlugar;
-	
-	@Id
-	private Integer lugar;
-	
-	@Column(name="curs_impla")
-	private Integer cursImpla;
-	
-	@Column(name="data_verif")
-	private LocalDateTime dataVerif;
-	
-	@Column(name="data_renov")
-	private LocalDateTime dataRenov;
-	
-	@Column(name="data_acred")
-	private LocalDateTime dataAcred;
-	
-	@Column(name="data_segui")
-	private LocalDateTime dataSegui;
-	
-	private String grup;
-	
-	@Column(name="grup_num")
-	private Integer grupNum;
-	
-	@Column(name="grup_curs")
-	private Integer grupCurs;
-	
-	private Boolean inter;
-
-	private Boolean recom;
-
-	private Boolean segui;
-		
-	public Acreditacio() {}
-	
-
-	public String getTlugar() {
-		return tlugar;
-	}
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-	public Integer getLugar() {
-		return lugar;
-	}
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-	public Integer getCursImpla() {
-		return cursImpla;
-	}
-	public void setCursImpla(Integer cursImpla) {
-		this.cursImpla = cursImpla;
-	}
-	public LocalDateTime getDataVerif() {
-		return dataVerif;
-	}
-	public void setDataVerif(LocalDateTime dataVerif) {
-		this.dataVerif = dataVerif;
-	}
-	public LocalDateTime getDataRenov() {
-		return dataRenov;
-	}
-	public void setDataRenov(LocalDateTime dataRenov) {
-		this.dataRenov = dataRenov;
-	}
-	public LocalDateTime getDataAcred() {
-		return dataAcred;
-	}
-	public void setDataAcred(LocalDateTime dataAcred) {
-		this.dataAcred = dataAcred;
-	}
-	public LocalDateTime getDataSegui() {
-		return dataSegui;
-	}
-	public void setDataSegui(LocalDateTime dataSegui) {
-		this.dataSegui = dataSegui;
-	}
-	public String getGrup() {
-		return grup;
-	}
-	public void setGrup(String grup) {
-		this.grup = grup;
-	}
-	public Integer getGrupCurs() {
-		return grupCurs;
-	}
-	public void setGrupCurs(Integer grupCurs) {
-		this.grupCurs = grupCurs;
-	}
-	public Boolean getInter() {
-		return inter;
-	}
-	public void setInter(Boolean inter) {
-		this.inter = inter;
-	}
-	public Integer getGrupNum() {
-		return grupNum;
-	}
-	public void setGrupNum(Integer grupNum) {
-		this.grupNum = grupNum;
-	}
-	public Boolean getRecom() {
-		return recom;
-	}
-	public void setRecom(Boolean recom) {
-		this.recom = recom;
-	}
-	public Boolean getSegui() {
-		return segui;
-	}
-	public void setSegui(Boolean segui) {
-		this.segui = segui;
-	}
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-}

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

@@ -1,52 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class AcreditacioPK implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String tlugar;
-	private Integer lugar;
-	
-	public AcreditacioPK() {}
-	
-	public AcreditacioPK(String tlugar, Integer lugar) {
-		this.tlugar = tlugar;
-		this.lugar = lugar;
-	}
-
-	public String getTlugar() {
-		return tlugar;
-	}
-
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-
-	public Integer getLugar() {
-		return lugar;
-	}
-
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(lugar, tlugar);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		AcreditacioPK other = (AcreditacioPK) obj;
-		return Objects.equals(lugar, other.lugar) && Objects.equals(tlugar, other.tlugar);
-	}
-
-}

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

@@ -1,44 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface AcreditacioRepository extends JpaRepository<Acreditacio, AcreditacioPK> {
-
-	@Query(value="SELECT ac.* FROM acreditacions ac "
-			+ "	LEFT JOIN organs og ON ac.tlugar = og.tlugar AND ac.lugar = og.lugar "
-			+ " WHERE og.actiu "
-			+ "	ORDER BY grup_curs DESC, grup_num ASC; ", nativeQuery=true)
-	List<Acreditacio> getAll(); 
-	
-	@Query(value="SELECT * FROM acreditacions "
-			+ "	  WHERE grup_curs = date_part('year', CURRENT_DATE) AND grup_num >= date_part('month', CURRENT_DATE) "
-			+ "   ORDER BY grup_num", nativeQuery=true)
-	List<Acreditacio> getNextsCurrentYear(); 
-	
-	@Query(value="SELECT * FROM acreditacions  WHERE grup_curs = ?1 AND grup_num = ?2  ORDER BY grup_num", nativeQuery=true)
-	List<Acreditacio> getByCursGrup(Integer curs, Integer grup); 
-	
-	@Query(value="SELECT ac.* FROM acreditacions ac "
-			+ "   LEFT JOIN organs og ON ac.lugar = og.lugar AND ac.tlugar = og.tlugar"
-			+ "	  WHERE ac.grup_curs = ?1 AND ac.grup_num = ?2 AND og.tambit = ?3 ORDER BY grup_num", nativeQuery=true)
-	List<Acreditacio> getByCursGrupTambit(Integer curs, Integer grup, String tambit); 
-	
-	@Query(value="SELECT * FROM acreditacions  WHERE grup_curs = ?1  ORDER BY grup_num", nativeQuery=true)
-	List<Acreditacio> getByCurs(Integer curs); 
-	
-	@Query(value="SELECT * FROM acreditacions "
-			+ "   WHERE tlugar = ?1 AND lugar = ?2 "
-			+ "	  ORDER BY data_acred DESC LIMIT 1;", nativeQuery=true)
-	Acreditacio getByOrgan(String tlugar, Integer lugar);
-	
-	@Query(value="SELECT * FROM acreditacions "
-			+ "   WHERE (tlugar, lugar) IN(SELECT tlugar, lugar FROM organs WHERE tlugar2 = ?1 AND lugar2 = ?2)"
-			+ "	  ORDER BY grup_curs, grup_num", nativeQuery=true)
-	List<Acreditacio> getByCentre(String tlugar, Integer lugar);
-	
-}

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

@@ -1,190 +0,0 @@
-package es.uv.saic.domain;
-
-import java.time.LocalDateTime;
-
-public class AcreditacioTransfer {
-
-	private Integer idAcreditacio;
-	private Integer ruct;
-	private Integer lugar;
-	private String tambit;
-	private String nomCas;
-	private String nomVal;
-	private Integer lugarCentre;
-	private String nomCentreCas;
-	private String nomCentreVal;
-	private String grup;
-	private Integer grupNum;
-	private Integer grupCurs;
-	private Boolean inter;
-	private LocalDateTime dataVerif;
-	private String dataVerifStr;
-	private LocalDateTime dataRenov;
-	private String dataRenovStr;
-	private LocalDateTime dataSegui;
-	private String dataSeguiStr;
-	private LocalDateTime dataAcred;
-	private String dataAcredStr;
-	private Integer cursImpla;
-	
-	public AcreditacioTransfer() {}
-	
-	public AcreditacioTransfer(Acreditacio a, Organ o) {
-		this.idAcreditacio = 0;
-		this.ruct = o.getRuct();
-		this.lugar = o.getId().getLugar();
-		this.tambit = o.getTambit();
-		this.nomCas = o.getNomCas();
-		this.nomVal = o.getNomVal();
-		this.lugarCentre = o.getOrgan().getId().getLugar();
-		this.nomCentreCas = o.getOrgan().getNomCas();
-		this.nomCentreVal = o.getOrgan().getNomVal();
-		this.grup = a.getGrup();
-		this.grupNum = a.getGrupNum();
-		this.grupCurs = a.getGrupCurs();
-		this.inter = a.getInter();
-		this.dataVerif = a.getDataVerif();
-		this.dataVerifStr = String.format("%1$td/%1$tm/%1$tY", dataVerif);
-		this.dataRenov = a.getDataRenov();
-		this.dataRenovStr = String.format("%1$td/%1$tm/%1$tY", dataRenov);
-		this.dataSegui = a.getDataSegui();
-		this.dataSeguiStr = String.format("%1$td/%1$tm/%1$tY", dataSegui);
-		this.dataAcred = a.getDataAcred();
-		this.dataAcredStr = String.format("%1$td/%1$tm/%1$tY", dataAcred);
-		this.cursImpla = a.getCursImpla();
-	}
-	
-	public Integer getIdAcreditacio() {
-		return idAcreditacio;
-	}
-	public void setIdAcreditacio(Integer idAcreditacio) {
-		this.idAcreditacio = idAcreditacio;
-	}
-	public Integer getRuct() {
-		return ruct;
-	}
-	public void setRuct(Integer ruct) {
-		this.ruct = ruct;
-	}
-	public String getTambit() {
-		return tambit;
-	}
-	public void setTambit(String tambit) {
-		this.tambit = tambit;
-	}
-	public String getNomCas() {
-		return nomCas;
-	}
-	public void setNomCas(String nomCas) {
-		this.nomCas = nomCas;
-	}
-	public String getNomVal() {
-		return nomVal;
-	}
-	public void setNomVal(String nomVal) {
-		this.nomVal = nomVal;
-	}
-	public String getGrup() {
-		return grup;
-	}
-	public void setGrup(String grup) {
-		this.grup = grup;
-	}
-	public Integer getGrupNum() {
-		return grupNum;
-	}
-	public void setGrupNum(Integer grupNum) {
-		this.grupNum = grupNum;
-	}
-	public Integer getGrupCurs() {
-		return grupCurs;
-	}
-	public void setGrupCurs(Integer grupCurs) {
-		this.grupCurs = grupCurs;
-	}
-	public Boolean getInter() {
-		return inter;
-	}
-	public void setInter(Boolean inter) {
-		this.inter = inter;
-	}
-	public LocalDateTime getDataVerif() {
-		return dataVerif;
-	}
-	public void setDataVerif(LocalDateTime dataVerif) {
-		this.dataVerif = dataVerif;
-	}
-	public LocalDateTime getDataRenov() {
-		return dataRenov;
-	}
-	public void setDataRenov(LocalDateTime dataRenov) {
-		this.dataRenov = dataRenov;
-	}
-	public LocalDateTime getDataSegui() {
-		return dataSegui;
-	}
-	public void setDataSegui(LocalDateTime dataSegui) {
-		this.dataSegui = dataSegui;
-	}
-	public LocalDateTime getDataAcred() {
-		return dataAcred;
-	}
-	public void setDataAcred(LocalDateTime dataAcred) {
-		this.dataAcred = dataAcred;
-	}
-	public Integer getCursImpla() {
-		return cursImpla;
-	}
-	public void setCursImpla(Integer cursImpla) {
-		this.cursImpla = cursImpla;
-	}
-	public String getDataVerifStr() {
-		return dataVerifStr;
-	}
-	public void setDataVerifStr(String dataVerfiStr) {
-		this.dataVerifStr = dataVerfiStr;
-	}
-	public String getDataRenovStr() {
-		return dataRenovStr;
-	}
-	public void setDataRenovStr(String dataRenovStr) {
-		this.dataRenovStr = dataRenovStr;
-	}
-	public String getDataSeguiStr() {
-		return dataSeguiStr;
-	}
-	public void setDataSeguiStr(String dataSeguiStr) {
-		this.dataSeguiStr = dataSeguiStr;
-	}
-	public String getDataAcredStr() {
-		return dataAcredStr;
-	}
-	public void setDataAcredStr(String dataAcredStr) {
-		this.dataAcredStr = dataAcredStr;
-	}
-	public Integer getLugar() {
-		return lugar;
-	}
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-	public Integer getLugarCentre() {
-		return lugarCentre;
-	}
-	public void setLugarCentre(Integer lugarCentre) {
-		this.lugarCentre = lugarCentre;
-	}
-	public String getNomCentreCas() {
-		return nomCentreCas;
-	}
-	public void setNomCentreCas(String nomCentreCas) {
-		this.nomCentreCas = nomCentreCas;
-	}
-	public String getNomCentreVal() {
-		return nomCentreVal;
-	}
-	public void setNomCentreVal(String nomCentreVal) {
-		this.nomCentreVal = nomCentreVal;
-	}
-
-}

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

@@ -1,188 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-import jakarta.persistence.Transient;
-
-@Entity
-@Table(name="calendari")
-@NamedQuery(name="Calendari.findAll", query="SELECT t FROM Calendari t")
-public class Calendari implements Serializable {
-	private static final long serialVersionUID = 1L;
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_calendari")
-	private Integer idCalendari;
-	
-	private Integer tipus;
-	
-	@Column(name="titol_cas")
-	private String titolCas;
-	
-	@Column(name="titol_val")
-	private String titolVal;
-	
-	private String ambit;
-	
-	private LocalDate data;
-	
-	@Transient
-	private String dataStr;
-	
-	private Integer idProces;
-	
-	private String titulacions;
-	
-	private String centres;
-	
-	private String color;
-	
-	private String status;
-	
-	public Calendari() {}
-
-	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;
-		this.tipus = tipus;
-		this.titolCas = titolCas;
-		this.titolVal = titolVal;
-		this.ambit = ambit;
-		this.data = data;
-		this.dataStr = new SimpleDateFormat("yyyy-MM-dd").format(data);
-		this.idProces = idProces;
-		this.titulacions = titulacions;
-		this.centres = centres;
-		this.color = color;
-	}
-	
-	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;
-		this.tipus = tipus;
-		this.titolCas = titolCas;
-		this.titolVal = titolVal;
-		this.ambit = ambit;
-		this.data = data;
-		this.dataStr = new SimpleDateFormat("yyyy-MM-dd").format(data);
-		this.idProces = idProces;
-		this.titulacions = titulacions;
-		this.centres = centres;
-		this.color = color;
-		this.status = status;
-	}
-
-	public Integer getIdCalendari() {
-		return idCalendari;
-	}
-
-	public void setIdCalendari(Integer idCalendari) {
-		this.idCalendari = idCalendari;
-	}
-
-	public Integer getTipus() {
-		return tipus;
-	}
-
-	public void setTipus(Integer tipus) {
-		this.tipus = tipus;
-	}
-
-	public String getTitolCas() {
-		return titolCas;
-	}
-
-	public void setTitolCas(String titolCas) {
-		this.titolCas = titolCas;
-	}
-
-	public String getTitolVal() {
-		return titolVal;
-	}
-
-	public void setTitolVal(String titolVal) {
-		this.titolVal = titolVal;
-	}
-
-	public String getAmbit() {
-		return ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	public LocalDate getData() {
-		return data;
-	}
-
-	public void setData(LocalDate data) {
-		this.data = data;
-		this.dataStr = data.toString();
-	}
-	
-	public String getDataStr() {
-		return dataStr;
-	}
-
-	public void setDataStr(String dataStr) {
-		this.dataStr = dataStr;
-	}
-
-	public Integer getIdProces() {
-		return idProces;
-	}
-
-	public void setIdProces(Integer idProces) {
-		this.idProces = idProces;
-	}
-
-	public String getTitulacions() {
-		return titulacions;
-	}
-
-	public void setTitulacions(String titulacions) {
-		this.titulacions = titulacions;
-	}
-
-	public String getCentres() {
-		return centres;
-	}
-
-	public void setCentres(String centres) {
-		this.centres = centres;
-	}
-
-	public String getColor() {
-		return color;
-	}
-
-	public void setColor(String color) {
-		this.color = color;
-	}
-	
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-}

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

@@ -1,15 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface CalendariRepository extends JpaRepository<Calendari, Integer> {
-
-	@Query(value="SELECT * FROM calendari WHERE data = current_date AND status = 'P';", nativeQuery=true)
-	List<Calendari> getNextEvents(); 
-	
-}

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

@@ -1,78 +0,0 @@
-package es.uv.saic.domain;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="categories")
-@NamedQuery(name="Categoria.findAll", query="SELECT i FROM Categoria i")
-public class Categoria {
-
-	@Id
-	@Column(name="id_categoria")
-	private Integer idCategoria;
-	private Integer pare;
-	private Integer ordre;
-	private String tipus;
-	private String nomVal;
-	private String nomCas;
-	private String tambit;
-	
-	public Categoria() {}
-	
-	public Categoria(Integer idCategoria, Integer pare, Integer ordre, String tipus, String nomVal, String nomCas, String tambit) {
-		this.idCategoria = idCategoria;
-		this.tipus = tipus;
-		this.nomVal = nomVal;
-		this.nomCas = nomCas;
-		this.pare = pare;
-		this.ordre = ordre;
-		this.tambit = tambit;
-	}
-	
-	public Integer getIdCategoria() {
-		return idCategoria;
-	}
-	public void setIdCategoria(Integer idCategoria) {
-		this.idCategoria = idCategoria;
-	}
-	public String getTipus() {
-		return tipus;
-	}
-	public void setTipus(String tipus) {
-		this.tipus = tipus;
-	}
-	public String getNomVal() {
-		return nomVal;
-	}
-	public void setNomVal(String nomVal) {
-		this.nomVal = nomVal;
-	}
-	public String getNomCas() {
-		return nomCas;
-	}
-	public void setNomCas(String nomCas) {
-		this.nomCas = nomCas;
-	}
-	public Integer getPare() {
-		return pare;
-	}
-	public void setPare(Integer pare) {
-		this.pare = pare;
-	}
-	public Integer getOrdre() {
-		return ordre;
-	}
-	public void setOrdre(Integer ordre) {
-		this.ordre = ordre;
-	}
-	public String getTambit() {
-		return tambit;
-	}
-	public void setTambit(String tambit) {
-		this.tambit = tambit;
-	}
-}

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

@@ -1,30 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface CategoriaRepository  extends JpaRepository<Categoria, Integer> {
-	
-	@Query(value="SELECT * FROM categories WHERE pare = ?1 AND tambit IN('U', 'C', ?2) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findByPareTambitAndU(Integer pare, String tambit); 
-
-	@Query(value="SELECT * FROM categories WHERE pare = ?1 AND (tambit = ?2) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findByPareTambit(Integer pare, String tambit); 
-
-	@Query(value="SELECT * FROM categories WHERE tipus = ?1 AND tambit IN('U', 'C', ?2) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findByTipusTambitAndU(String tipus, String tambit); 
-
-	@Query(value="SELECT * FROM categories WHERE tipus = ?1 AND (tambit = ?2) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findByTipusTambit(String tipus, String tambit); 
-	
-	@Query(value="SELECT * FROM categories WHERE pare IS NULL AND (tambit = ?1) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findFirstLevel(String ambit);
-
-	@Query(value="SELECT * FROM categories WHERE pare IS NULL AND tambit IN('U', 'C', ?1) ORDER BY ordre ASC;", nativeQuery=true)
-	List<Categoria> findFirstLevelAndU(String ambit);
-
-}

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

@@ -1,35 +0,0 @@
-package es.uv.saic.domain;
-
-public class CursoValor{
-    private String periodo;
-    private String valor;
-    private Integer curso;
-    
-    public CursoValor(){ }
-    
-    public CursoValor(String periodo, String valor) {
-        this.periodo = periodo;
-        this.valor = valor;
-        this.curso = Integer.parseInt(periodo.split("-")[1]);
-    }
-    
-    public String getPeriodo() {
-        return periodo;
-    }
-    public void setPeriodo(String periodo) {
-        this.periodo = periodo;
-    }
-    public Integer getCurso() {
-        return curso;
-    }
-    public void setValor(Integer curso) {
-        this.curso = curso;
-    }
-    public String getValor() {
-        return valor;
-    }
-    public void setValor(String valor) {
-        this.valor = valor;
-    }
-}
-

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

@@ -1,65 +0,0 @@
-package es.uv.saic.domain;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="datasources")
-@NamedQuery(name="Datasource.findAll", query="SELECT i FROM Datasource i")
-public class Datasource {
-
-    @Id
-	@Column(name="id_datasource")
-    Integer id;
-
-    String nom;
-
-    String driver;
-
-    String conn;
-
-    public Datasource(){}
-
-    public Datasource(Integer id, String nom, String driver, String conn) {
-        this.id = id;
-        this.nom = nom;
-        this.driver = driver;
-        this.conn = conn;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getNom() {
-        return nom;
-    }
-
-    public void setNom(String nom) {
-        this.nom = nom;
-    }
-
-    public String getDriver() {
-        return driver;
-    }
-
-    public void setDriver(String driver) {
-        this.driver = driver;
-    }
-
-    public String getConn() {
-        return conn;
-    }
-
-    public void setConn(String conn) {
-        this.conn = conn;
-    }
-
-}

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

@@ -1,10 +0,0 @@
-package es.uv.saic.domain;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface DatasourceRepository  extends JpaRepository<Datasource, Integer> {
-
-    
-}

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

@@ -1,93 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.Date;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.JoinColumns;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-@Entity
-@Table(name="documents")
-@NamedQuery(name="Document.findAll", query="SELECT i FROM Document i")
-public class Document {
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_document")
-	private Integer idDocument;
-	
-	@ManyToOne 
-	@JoinColumn(name="id_categoria")
-	private Categoria categoria;
-	
-	@ManyToOne
-	@JoinColumns({
-		@JoinColumn(name="lugar", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar", referencedColumnName="tlugar")
-		})
-	@JsonIgnore
-	private Organ organ;
-	
-	private String nom;
-	
-	private String ruta;
-	
-	private Date data;
-	
-	private boolean visible;
-	
-
-	public Integer getIdDocument() {
-		return idDocument;
-	}
-	public void setIdDocument(Integer idDocument) {
-		this.idDocument = idDocument;
-	}
-	public Categoria getCategoria() {
-		return categoria;
-	}
-	public void setCategoria(Categoria categoria) {
-		this.categoria = categoria;
-	}
-	public Organ getOrgan() {
-		return organ;
-	}
-	public void setOrgan(Organ organ) {
-		this.organ = organ;
-	}
-	public String getNom() {
-		return nom;
-	}
-	public void setNom(String nom) {
-		this.nom = nom;
-	}
-	public String getRuta() {
-		return ruta;
-	}
-	public void setRuta(String ruta) {
-		this.ruta = ruta;
-	}
-	public Date getData() {
-		return data;
-	}
-	public void setData(Date data) {
-		this.data = data;
-	}
-	public boolean isVisible() {
-		return visible;
-	}
-	public void setVisible(boolean visible) {
-		this.visible = visible;
-	}
-	
-	
-}

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

@@ -1,31 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-@Repository
-public interface DocumentRepository  extends JpaRepository<Document, Integer> {
-	
-	@Query(value="SELECT * FROM documents WHERE id_categoria = ?1 AND ((lugar = ?2 AND tlugar = ?3) OR lugar = 0) AND visible LIMIT 1;", nativeQuery=true)
-	Document findByCategoriaOrgan(Integer categoria, Integer lugar, String tlugar); 
-	
-	@Query(value="SELECT * FROM documents WHERE id_categoria = ?1 AND ((lugar = ?2 AND tlugar = ?3) OR lugar = 0) AND visible", nativeQuery=true)
-	List<Document> findAllByCategoriaOrgan(Integer categoria, Integer lugar, String tlugar);
-	
-	@Query(value="SELECT * FROM documents d LEFT JOIN categories c ON d.id_categoria = c.id_categoria WHERE c.nom_val = ?1 AND visible", nativeQuery=true)
-	List<Document> findByCategoriaNom(String nom); 
-	
-	@Query(value="SELECT * FROM documents d LEFT JOIN categories c ON d.id_categoria = c.id_categoria WHERE c.tipus = ?1 AND visible", nativeQuery=true)
-	List<Document> findByCategoriaTipus(String tipus); 
-	
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value="UPDATE documents SET visible = false WHERE lugar = ?1 AND tlugar = ?2", nativeQuery=true)
-	void archiveByOrgan(Integer lugar, String tlugar);
-
-}

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

@@ -1,71 +0,0 @@
-package es.uv.saic.domain;
-
-public class DummyDataTransfer {
-
-	public String text;
-	public String text2;
-	public String text3;
-	public int value;
-	public int value2;
-	public int value3;
-	
-	
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-	public int getValue() {
-		return value;
-	}
-	public void setValue(int value) {
-		this.value = value;
-	}
-	public String getText2() {
-		return text2;
-	}
-	public void setText2(String text2) {
-		this.text2 = text2;
-	}
-	public int getValue2() {
-		return value2;
-	}
-	public void setValue2(int value2) {
-		this.value2 = value2;
-	}
-	public String getText3() {
-		return text3;
-	}
-	public void setText3(String text3) {
-		this.text3 = text3;
-	}
-	public int getValue3() {
-		return value3;
-	}
-	public void setValue3(int value3) {
-		this.value3 = value3;
-	}
-	public boolean equals (Object o) {
-		if(o == null) { return false; }
-		if (this.getClass() != o.getClass()) { return false; }
-		DummyDataTransfer x = (DummyDataTransfer) o;
-		if (x.text.equals(this.text)) return true;
-        return false;
-	}
-	
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.text.hashCode();
-		hash = hash * prime + this.text2.hashCode();
-		hash = hash * prime + this.text3.hashCode();
-		hash = hash * prime + Integer.toString(this.value).hashCode();
-		hash = hash * prime + Integer.toString(this.value2).hashCode();
-		hash = hash * prime + Integer.toString(this.value3).hashCode();
-		
-		return hash;
-	}
-	
-	
-}

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

@@ -1,36 +0,0 @@
-package es.uv.saic.domain;
-
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="evidencia_indicador_enquesta")
-@NamedQuery(name="EvidenciaIndicadorEnquesta.findAll", query="SELECT n FROM EvidenciaIndicadorEnquesta n")
-public class EvidenciaIndicadorEnquesta {
-	
-	@EmbeddedId
-	private EvidenciaIndicadorEnquestaPK id;
-	
-	private String media;
-	
-	public EvidenciaIndicadorEnquesta(){}
-
-	public EvidenciaIndicadorEnquestaPK getId() {
-		return id;
-	}
-
-	public void setId(EvidenciaIndicadorEnquestaPK id) {
-		this.id = id;
-	}
-
-	public String getMedia() {
-		return media;
-	}
-
-	public void setMedia(String media) {
-		this.media = media;
-	}	
-
-}

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

@@ -1,78 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-
-public class EvidenciaIndicadorEnquestaPK  implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	private String proces;
-	private String evidencia;
-	private String enquesta;
-	private String indicador;
-	
-	public EvidenciaIndicadorEnquestaPK() {}
-
-	public String getProces() {
-		return proces;
-	}
-
-	public void setProces(String proces) {
-		this.proces = proces;
-	}
-
-	public String getEvidencia() {
-		return evidencia;
-	}
-
-	public void setEvidencia(String evidencia) {
-		this.evidencia = evidencia;
-	}
-
-	public String getEnquesta() {
-		return enquesta;
-	}
-
-	public void setEnquesta(String enquesta) {
-		this.enquesta = enquesta;
-	}
-
-	public String getIndicador() {
-		return indicador;
-	}
-
-	public void setIndicador(String indicador) {
-		this.indicador = indicador;
-	}
-	
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof EvidenciaIndicadorEnquestaPK)) {
-			return false;
-		}
-		EvidenciaIndicadorEnquestaPK castOther = (EvidenciaIndicadorEnquestaPK)other;
-		return 
-			this.proces.equals(castOther.proces)
-			&& this.evidencia.equals(castOther.evidencia)
-			&& this.enquesta.equals(castOther.enquesta)
-			&& this.indicador.equals(castOther.indicador);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.proces.hashCode();
-		hash = hash * prime + this.evidencia.hashCode();
-		hash = hash * prime + this.enquesta.hashCode();
-		hash = hash * prime + this.indicador.hashCode();
-		
-		return hash;
-	}
-	
-}

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

@@ -1,29 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import jakarta.transaction.Transactional;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface EvidenciaIndicadorEnquestaRepository extends JpaRepository<EvidenciaIndicadorEnquesta, EvidenciaIndicadorEnquestaPK>  {
-
-	@Query("SELECT a FROM EvidenciaIndicadorEnquesta a")
-	List<EvidenciaIndicadorEnquesta> findAll();
-	
-	@Query(value="SELECT * FROM evidencia_indicador_enquesta WHERE proces = ?1 AND evidencia = ?2 AND enquesta = ?3", nativeQuery=true)
-	List<EvidenciaIndicadorEnquesta> getIndicadors(String proces, String evidencia, String enquesta);
-	
-	@Query(value="SELECT * FROM evidencia_indicador_enquesta WHERE proces = ?1 AND evidencia = ?2", nativeQuery=true)
-	List<EvidenciaIndicadorEnquesta> getByProcesEvidencia(String proces, String evidencia);
-	
-	@Modifying
-	@Transactional
-	@Query(value="DELETE FROM evidencia_indicador_enquesta WHERE proces = ?1 AND evidencia = ?2", nativeQuery=true)
-	void removeByProcesEvidencia(String proces, String evidencia);
-
-}

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

@@ -1,64 +0,0 @@
-package es.uv.saic.domain;
-
-import java.math.BigInteger;
-import java.time.LocalDate;
-
-public class EvidenciaTransfer {
-	private String evidencia;
-	private String codiEvidencia;
-	private String nomEvidenciaCas;
-	private String nomEvidenciaVal;
-	private Integer curs;
-	private LocalDate data;
-	private String nomProces;
-	private BigInteger idTascai;
-	
-	public String getEvidencia() {
-		return evidencia;
-	}
-	public void setEvidencia(String evidencia) {
-		this.evidencia = evidencia;
-	}
-	public String getCodiEvidencia() {
-		return codiEvidencia;
-	}
-	public void setCodiEvidencia(String codiEvidencia) {
-		this.codiEvidencia = codiEvidencia;
-	}
-	public LocalDate getData() {
-		return data;
-	}
-	public void setData(LocalDate data) {
-		this.data = data;
-	}
-	public String getNomProces() {
-		return nomProces;
-	}
-	public void setNomProces(String nomProces) {
-		this.nomProces = nomProces;
-	}
-	public BigInteger getIdTascai() {
-		return idTascai;
-	}
-	public void setIdTascai(BigInteger idTascai) {
-		this.idTascai = idTascai;
-	}
-	public String getNomEvidenciaCas() {
-		return nomEvidenciaCas;
-	}
-	public void setNomEvidenciaCas(String nomEvidenciaCas) {
-		this.nomEvidenciaCas = nomEvidenciaCas;
-	}
-	public String getNomEvidenciaVal() {
-		return nomEvidenciaVal;
-	}
-	public void setNomEvidenciaVal(String nomEvidenciaVal) {
-		this.nomEvidenciaVal = nomEvidenciaVal;
-	}
-	public Integer getCurs() {
-		return curs;
-	}
-	public void setCurs(Integer curs) {
-		this.curs = curs;
-	}
-}

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

@@ -1,129 +0,0 @@
-package es.uv.saic.domain;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.EmbeddedId;
-import jakarta.persistence.Entity;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="grafiques")
-@NamedQuery(name="Grafica.findAll", query="SELECT g FROM Grafica g")
-public class Grafica {
-
-	@EmbeddedId
-	private GraficaPK idGrafica;
-	
-	private String dimensio;
-	
-	private String enquesta;
-	
-	private String indicador;
-	
-	private Integer g;
-	
-	@Column(name="nom_cas")
-	private String nomCas;
-	
-	@Column(name="nom_val")
-	private String nomVal;
-	
-	private String unitats;
-	
-	private boolean negar;
-	
-	private boolean likert;
-	
-	private Integer ordre;
-	
-	public Grafica() {}
-
-	public GraficaPK getIdGrafica() {
-		return idGrafica;
-	}
-
-	public void setIdGrafica(GraficaPK idGrafica) {
-		this.idGrafica = idGrafica;
-	}
-
-	public String getDimensio() {
-		return dimensio;
-	}
-
-	public void setDimensio(String dimensio) {
-		this.dimensio = dimensio;
-	}
-
-	public String getEnquesta() {
-		return enquesta;
-	}
-
-	public void setEnquesta(String enquesta) {
-		this.enquesta = enquesta;
-	}
-
-	public String getIndicador() {
-		return indicador;
-	}
-
-	public void setIndicador(String indicador) {
-		this.indicador = indicador;
-	}
-
-	public Integer getG() {
-		return g;
-	}
-
-	public void setG(Integer g) {
-		this.g = g;
-	}
-
-	public String getNomCas() {
-		return nomCas;
-	}
-
-	public void setNomCas(String nomCas) {
-		this.nomCas = nomCas;
-	}
-
-	public String getNomVal() {
-		return nomVal;
-	}
-
-	public void setNomVal(String nomVal) {
-		this.nomVal = nomVal;
-	}
-
-	public String getUnitats() {
-		return unitats;
-	}
-
-	public void setUnitats(String unitats) {
-		this.unitats = unitats;
-	}
-
-	public boolean isNegar() {
-		return negar;
-	}
-
-	public void setNegar(boolean negar) {
-		this.negar = negar;
-	}
-
-	public boolean isLikert() {
-		return likert;
-	}
-
-	public void setLikert(boolean likert) {
-		this.likert = likert;
-	}
-
-	public Integer getOrdre() {
-		return ordre;
-	}
-
-	public void setOrdre(Integer ordre) {
-		this.ordre = ordre;
-	}
-	
-}

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

@@ -1,60 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Embeddable;
-
-@Embeddable
-public class GraficaPK implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	@Column(name="id_grafica")
-	private String idGrafica;
-	private String estudi;
-	private String ambit;
-	
-	public GraficaPK() { }
-	
-	public String getIdGrafica() {
-		return idGrafica;
-	}
-	public void setIdGrafica(String idGrafica) {
-		this.idGrafica = idGrafica;
-	}
-	public String getEstudi() {
-		return estudi;
-	}
-	public void setEstudi(String estudi) {
-		this.estudi = estudi;
-	}
-	public String getAmbit() {
-		return ambit;
-	}
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(ambit, estudi, idGrafica);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		GraficaPK other = (GraficaPK) obj;
-		return Objects.equals(ambit, other.ambit) && Objects.equals(estudi, other.estudi)
-				&& Objects.equals(idGrafica, other.idGrafica);
-	}
-	
-	
-	
-}

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

@@ -1,18 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface GraficaRepository  extends JpaRepository<Grafica, GraficaPK> {
-
-	@Query(value="SELECT * FROM grafiques WHERE ambit LIKE ?1", nativeQuery=true)
-	List<Grafica> findLikeAmbit(String ambit);
-	
-	@Query(value="SELECT * FROM grafiques WHERE ambit LIKE ?1 AND UPPER(estudi) = UPPER(?2)", nativeQuery=true)
-	List<Grafica> findLikeAmbitAndEstudi(String ambit, String estudi);
-	
-}

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

@@ -1,92 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Optional;
-
-public class Indicador {
-	
-	private String dimension;
-	private String indicador;
-	private String valor;
-	private String ambit;
-	private List<CursoValor> valores;
-	
-	public Indicador() {
-		this.valores = new ArrayList<CursoValor>();
-	}
-	
-	public Indicador(String dimension, String indicador, String valor) {
-		this.dimension = dimension;
-		this.indicador = indicador;
-		this.valor = valor;
-		this.valores = new ArrayList<CursoValor>();
-	}
-
-	public Indicador(String dimension, String indicador, String valor, String ambit, List<CursoValor> cursoValors) {
-		this.dimension = dimension;
-		this.indicador = indicador;
-		this.valor = valor;
-		this.ambit = ambit;
-		this.valores = cursoValors;
-	}
-
-	public String getDimension() {
-		return dimension;
-	}
-	
-	public void setDimension(String dimension) {
-		this.dimension = dimension;
-	}
-	
-	public String getIndicador() {
-		return indicador;
-	}
-
-	public void setIndicador(String indicador) {
-		this.indicador = indicador;
-	}
-
-	public String getValor() {
-		return valor;
-	}
-
-	public void setValor(String valor) {
-		this.valor = valor;
-	}
-	
-	public String getAmbit() {
-		return ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	public List<CursoValor> getValores() {
-		return valores;
-	}
-
-	public void setValores(List<CursoValor> valores) {
-		this.valores = valores;
-	}
-	
-	public void addCursoValor(String curso, String valor) {
-		this.valores.add(new CursoValor(curso, valor));
-	}
-	
-	public void obtenerValor() {
-		this.valor = this.maxCursoValor().getValor().toString();
-	}
-	
-	public CursoValor maxCursoValor() {
-		Optional<CursoValor> v = this.valores.stream().max(Comparator.comparing(CursoValor::getCurso));
-		if(v.isPresent()) {
-			return v.get();
-		}
-		else {
-			return null;
-		}
-	}
-}

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

@@ -1,235 +0,0 @@
-package es.uv.saic.domain;
-
-import java.time.LocalDateTime;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="indicador_enquesta")
-@NamedQuery(name="IndicadorEnquesta.findAll", query="SELECT n FROM IndicadorEnquesta n")
-public class IndicadorEnquesta {
- 
-	@Id 
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id", updatable = false, nullable = false)
-	private Integer id;
-	private String valor;
-	private String num;
-	private Integer titulacio;
-	private Integer centre;
-	private Integer curs;
-	private String enquesta;
-	private String indicador;
-	private String ambit;
-	private String tipus;
-	private String estudi;
-	private String cursd;
-	private String cursEnquesta;
-	private String centreOrigen;
-	private String titulacioOrigen;
-	private Integer nenq;
-	private Integer ruct;
-	private LocalDateTime data;
-	
-	public IndicadorEnquesta(){}
-	
-	public Integer getId() {
-		return id;
-	}
-	
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	public Integer getTitulacio() {
-		return titulacio;
-	}
-
-	public void setTitulacio(Integer titulacio) {
-		this.titulacio = titulacio;
-	}
-	
-	public Integer getCentre() {
-		return centre;
-	}
-
-	public void setCentre(Integer centre) {
-		this.centre = centre;
-	}
-
-	public Integer getCurs() {
-		return curs;
-	}
-
-	public void setCurs(Integer curs) {
-		this.curs = curs;
-	}
-
-	public String getEnquesta() {
-		return enquesta;
-	}
-
-	public void setEnquesta(String enquesta) {
-		this.enquesta = enquesta;
-	}
-
-	public String getIndicador() {
-		return indicador;
-	}
-
-	public void setIndicador(String indicador) {
-		this.indicador = indicador;
-	}
-	
-	public String getValor() {
-		return valor;
-	}
-	
-	public void setValor(String valor) {
-		this.valor = valor;
-	}
-	
-	public String getNum() {
-		return num;
-	}
-	
-	public void setNum(String num) {
-		this.num = num;
-	}
-	
-	public String getAmbit() {
-		return ambit;
-	}
-	
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-	
-	public String getTipus() {
-		return tipus;
-	}
-	
-	public void setTipus(String tipus) {
-		this.tipus = tipus;
-	}
-	
-	public String getEstudi() {
-		return estudi;
-	}
-	
-	public void setEstudi(String estudi) {
-		this.estudi = estudi;
-	}
-	
-	public String getCursd() {
-		return cursd;
-	}
-	
-	public void setCursd(String cursd) {
-		this.cursd = cursd;
-	}
-	
-	public String getCursEnquesta() {
-		return cursEnquesta;
-	}
-
-	public void setCursEnquesta(String cursEnquesta) {
-		this.cursEnquesta = cursEnquesta;
-	}
-
-	public String getCentreOrigen() {
-		return centreOrigen;
-	}
-
-	public void setCentreOrigen(String centreOrigen) {
-		this.centreOrigen = centreOrigen;
-	}
-
-	public String getTitulacioOrigen() {
-		return titulacioOrigen;
-	}
-
-	public void setTitulacioOrigen(String titulacioOrigen) {
-		this.titulacioOrigen = titulacioOrigen;
-	}
-
-	public Integer getNenq() {
-		return nenq;
-	}
-
-	public void setNenq(Integer nenq) {
-		this.nenq = nenq;
-	}
-
-	public Integer getRuct() {
-		return ruct;
-	}
-
-	public void setRuct(Integer ruct) {
-		this.ruct = ruct;
-	}
-
-	public LocalDateTime getData() {
-		return data;
-	}
-
-	public void setData(LocalDateTime data) {
-		this.data = data;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof IndicadorEnquesta)) {
-			return false;
-		}
-		IndicadorEnquesta castOther = (IndicadorEnquesta)other;
-		return 
-			this.id.equals(castOther.id) &&
-			this.valor.equals(castOther.valor) &&
-			this.num.equals(castOther.num) &&
-			this.centre.equals(castOther.centre) &&
-			this.titulacio.equals(castOther.titulacio) &&
-			this.curs.equals(castOther.curs) &&
-			this.ambit.equals(castOther.ambit) &&
-			this.enquesta.equals(castOther.enquesta) &&
-			this.indicador.equals(castOther.indicador) &&
-			this.cursd.equals(castOther.cursd) &&
-			this.cursEnquesta.equals(castOther.cursEnquesta) &&
-			this.titulacioOrigen.equals(castOther.titulacioOrigen) &&
-			this.centreOrigen.equals(castOther.centreOrigen) &&
-			this.nenq.equals(castOther.nenq) &&
-			this.ruct.equals(castOther.ruct)&&
-			this.data.equals(castOther.data);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.id.hashCode();
-		hash = hash * prime + this.valor.hashCode();
-		hash = hash * prime + this.num.hashCode();
-		hash = hash * prime + this.centre.hashCode();
-		hash = hash * prime + this.titulacio.hashCode();
-		hash = hash * prime + this.curs.hashCode();
-		hash = hash * prime + this.ambit.hashCode();
-		hash = hash * prime + this.enquesta.hashCode();
-		hash = hash * prime + this.indicador.hashCode();
-		hash = hash * prime + this.cursd.hashCode();
-		hash = hash * prime + this.cursEnquesta.hashCode();
-		hash = hash * prime + this.titulacioOrigen.hashCode();
-		hash = hash * prime + this.centreOrigen.hashCode();
-		hash = hash * prime + this.nenq.hashCode();
-		hash = hash * prime + this.ruct.hashCode();
-		hash = hash * prime + this.data.hashCode();
-		
-		return hash;
-	}
-}

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

@@ -1,158 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import es.uv.saic.dto.IndicadorDTO;
-import es.uv.saic.dto.IndicadorEnquestaValorDTO;
-
-@Repository
-public interface IndicadorEnquestaRepository extends JpaRepository<IndicadorEnquesta, Long> {
-	
-	@Query("SELECT i FROM IndicadorEnquesta i")
-	List<IndicadorEnquesta> findAll();
-	
-	@Query(value="SELECT DISTINCT(CONCAT(enquesta, '_', indicador)) FROM indicador_enquesta ORDER BY 1 ASC", nativeQuery=true)
-	List<String> findTypes();
-	
-	@Query(value="SELECT * FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2 AND ambit = ?3 AND estudi = ?4", nativeQuery=true)
-	List<IndicadorEnquesta> findByEnquestaCursAmbitEstudi(String enquesta, Integer curs, String ambit, String estudi);
-	
-	@Query(value="SELECT * FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2 AND ambit = ?3 AND estudi = ?4 "
-			+ "AND centre = ?5 AND (titulacio = ?6 OR titulacio IN(SELECT lugar_eq FROM organs_equivalents WHERE tlugar = 'T' AND lugar = ?6))", nativeQuery=true)
-	List<IndicadorEnquesta> findByEnquestaCursAmbitEstudiCentreTitulacio(String enquesta, Integer curs, String ambit, String estudi,
-																		 Integer centre, Integer titulacio);
-	
-	@Query(value="SELECT * FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2 AND ambit = ?3 AND estudi = ?4 AND centre = ?5", nativeQuery=true)
-	List<IndicadorEnquesta> findByEnquestaCursAmbitEstudiCentre(String enquesta, Integer curs, String ambit, String estudi,
-																		 Integer centre);
-	
-	@Query(value="SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd "
-			+ "FROM indicador_enquesta ei "
-			+ "JOIN evidencia_indicador_enquesta eie ON LOWER(ei.enquesta) = LOWER(eie.enquesta) AND LOWER(ei.indicador) = LOWER(eie.indicador) "
-			+ "WHERE eie.evidencia = ?1 AND eie.proces = ?2 AND ei.curs = ?5 AND ei.ambit = 'T' "
-			+ "AND ei.centre = ?4 AND (ei.titulacio = ?3 OR ei.titulacio IN(SELECT lugar_eq FROM organs_equivalents WHERE tlugar_eq = 'T' AND tlugar = 'T' AND lugar = ?3)) "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd  "
-			+ "FROM indicador_enquesta ei "
-			+ "JOIN evidencia_indicador_enquesta eie ON LOWER(ei.enquesta) = LOWER(eie.enquesta) AND LOWER(ei.indicador) = LOWER(eie.indicador) "
-			+ "WHERE eie.evidencia = ?1 AND eie.proces = ?2 AND ei.curs = ?5 AND ei.ambit = 'C' "
-			+ "AND ei.centre = ?4 "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd  "
-			+ "FROM indicador_enquesta ei "
-			+ "JOIN evidencia_indicador_enquesta eie ON LOWER(ei.enquesta) = LOWER(eie.enquesta) AND LOWER(ei.indicador) = LOWER(eie.indicador) "
-			+ "WHERE eie.evidencia = ?1 AND eie.proces = ?2 AND ei.curs = ?5 AND ei.ambit = 'U'", nativeQuery=true)
-	List<IndicadorEnquestaValorDTO> getAssociatedInds(String evidencia, String proces, Integer titulacio, Integer centre, Integer curs);
-	
-	@Query(value="SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, ei.titulacio "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND ei.ambit = 'T' AND ei.centre = ?2 "
-			+ "AND (ei.titulacio = ?1 OR ei.titulacio IN(SELECT lugar_eq FROM organs_equivalents WHERE tlugar_eq = 'T' AND tlugar = 'T' AND lugar = ?1)) "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, 0 AS titulacio  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND ei.ambit = 'C' AND ei.centre = ?2 "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, 0 AS titulacio  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND ei.ambit = 'U' "
-			+ "ORDER BY 7 DESC ", nativeQuery=true)
-	List<IndicadorEnquestaValorDTO> getAllInds(Integer titulacio, Integer centre, Integer curs);
-	
-	@Query(value="SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, ei.num, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, ei.titulacio "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'T' AND ei.centre = ?2 "
-			+ "AND (ei.titulacio = ?1 OR ei.titulacio IN(SELECT lugar_eq FROM organs_equivalents WHERE tlugar_eq = 'T' AND tlugar = 'T' AND lugar = ?1)) "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, ei.num, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, 0 AS titulacio  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'C' AND ei.centre = ?2 AND upper(ei.estudi) IN(?4, 'U') "
-			+ "UNION "
-			+ "SELECT LOWER(ei.enquesta) AS enquesta, LOWER(ei.indicador) AS indicador, ei.valor, ei.num, LOWER(ei.ambit) AS ambit, ei.tipus, ei.cursd, 0 AS titulacio  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'U' AND upper(ei.estudi) IN(?4, 'U') "
-			+ "ORDER BY 7 DESC ", nativeQuery=true)
-	List<IndicadorEnquestaValorDTO> getAllIndValsByEstudi(Integer titulacio, Integer centre, Integer curs, String estudi);
-	
-	@Query(value="SELECT ei.* "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'T' AND ei.centre = ?2 "
-			+ "AND (ei.titulacio = ?1 OR ei.titulacio IN(SELECT lugar_eq FROM organs_equivalents WHERE tlugar_eq = 'T' AND tlugar = 'T' AND lugar = ?1)) "
-			+ "UNION "
-			+ "SELECT ei.*  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'C' AND ei.centre = ?2 AND upper(ei.estudi) IN(?4, 'U') "
-			+ "UNION "
-			+ "SELECT ei.*  "
-			+ "FROM indicador_enquesta ei "
-			+ "WHERE ei.curs = ?3 AND upper(ei.ambit) = 'U' AND upper(ei.estudi) IN(?4, 'U') "
-			+ "ORDER BY 7 DESC ", nativeQuery=true)
-	List<IndicadorEnquesta> getAllIndsByEstudi(Integer titulacio, Integer centre, Integer curs, String estudi);
-		
-	@Query(value="SELECT DISTINCT gr.dimensio, gr.estudi, ie.ambit, gr.ordre, ie.indicador, curs, valor FROM indicador_enquesta ie "
-			+ "		INNER JOIN grafiques gr ON ie.indicador = gr.indicador AND ie.enquesta = gr.enquesta AND LOWER(ie.estudi) = LOWER(gr.estudi) "
-			+ "		WHERE UPPER(ie.ambit) = 'T' AND LOWER(ie.estudi) = LOWER(?3) AND titulacio IN (?1) AND centre = ?2 AND curs > ?4 AND tipus = 'avg' "
-			+ "UNION "
-			+ "SELECT DISTINCT gr.dimensio, gr.estudi, ie.ambit, gr.ordre, ie.indicador, curs, valor FROM indicador_enquesta ie "
-			+ "		INNER JOIN grafiques gr ON ie.indicador = gr.indicador AND ie.enquesta = gr.enquesta AND (LOWER(ie.estudi) = LOWER(gr.estudi) OR LOWER(ie.estudi) = 'u') "
-			+ "		WHERE UPPER(ie.ambit) = 'C' AND (LOWER(ie.estudi) = LOWER(?3) OR LOWER(ie.estudi) = 'u') AND centre = ?2 AND curs > ?4 AND tipus = 'avg' "
-			+ "UNION "
-			+ "SELECT DISTINCT gr.dimensio, gr.estudi, ie.ambit, gr.ordre, ie.indicador, curs, valor FROM indicador_enquesta ie "
-			+ "		INNER JOIN grafiques gr ON ie.indicador = gr.indicador AND ie.enquesta = gr.enquesta AND (LOWER(ie.estudi) = LOWER(gr.estudi) OR LOWER(ie.estudi) = 'u') "
-			+ "		WHERE UPPER(ie.ambit) = 'U' AND (LOWER(ie.estudi) = LOWER(?3) OR LOWER(ie.estudi) = 'u') AND curs > ?4 AND tipus = 'avg' "
-			+ "ORDER BY 1, 2, 3, 4, 5, 6 ", nativeQuery=true)
-	List<IndicadorDTO> getGraphData(List<Integer> titulacions, Integer centre, String estudi, Integer cursMax);
-	
-	@Query(value="SELECT DISTINCT gr.dimensio, gr.estudi, ie.ambit, gr.ordre, ie.indicador, curs, valor FROM indicador_enquesta ie "
-			+ "		INNER JOIN grafiques gr ON ie.indicador = gr.indicador AND ie.enquesta = gr.enquesta AND (LOWER(ie.estudi) = LOWER(gr.estudi) OR LOWER(ie.estudi) = 'u') "
-			+ "		WHERE UPPER(ie.ambit) = 'C' AND (LOWER(ie.estudi) = LOWER(?2) OR LOWER(ie.estudi) = 'u') AND centre = ?1 AND curs > ?3 AND tipus = 'avg' "
-			+ "UNION "
-			+ "SELECT DISTINCT gr.dimensio, gr.estudi, ie.ambit, gr.ordre, ie.indicador, curs, valor FROM indicador_enquesta ie "
-			+ "		INNER JOIN grafiques gr ON ie.indicador = gr.indicador AND ie.enquesta = gr.enquesta AND (LOWER(ie.estudi) = LOWER(gr.estudi) OR LOWER(ie.estudi) = 'u') "
-			+ "		WHERE UPPER(ie.ambit) = 'U' AND (LOWER(ie.estudi) = LOWER(?2) OR LOWER(ie.estudi) = 'u') AND curs > ?3 AND tipus = 'avg' "
-			+ "ORDER BY 1, 2, 3, 4, 5, 6 ", nativeQuery=true)
-	List<IndicadorDTO> getGraphData(Integer centre, String estudi, Integer cursMax);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta WHERE centre IN(111, 121, 641, 642) AND ambit = 'C';", nativeQuery=true)
-	int deleteCentroNoAdscrito();
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta WHERE enquesta = ?1", nativeQuery=true)
-	int deleteByEnquesta(String enquesta);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2", nativeQuery=true)
-	int deleteByEnquestaCurs(String enquesta, Integer curs);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2 AND ambit IN('C', 'U'); "
-			+ "INSERT INTO indicador_enquesta (curs, enquesta, indicador, num, titulacio, valor, centre, ambit, tipus, estudi, cursd) "
-			+ "(SELECT ?2 AS curs, enquesta, indicador, num, titulacio, valor, centre, ambit, tipus, estudi, cursd "
-			+ "FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2-1 AND ambit IN('C', 'U')); "
-			+ "INSERT INTO indicador_enquesta (curs, enquesta, indicador, num, titulacio, valor, centre, ambit, tipus, estudi, cursd) "
-			+ "(SELECT ?2 AS curs, enquesta, indicador, num, titulacio, valor, centre, ambit, tipus, estudi, cursd "
-			+ "FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2-1 AND ambit IN('T') "
-			+ "AND titulacio NOT IN(SELECT DISTINCT(titulacio) FROM indicador_enquesta WHERE enquesta = ?1 AND curs = ?2 AND ambit IN('T')));", nativeQuery=true)
-	int fixBiennials(String enquesta, Integer curs);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="INSERT INTO indicador_enquesta (curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd, valor, centre_origen, titulacio_origen, curs_enquesta, nenq, ruct, data) "
-			+ "SELECT curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd, valor, centre_origen, titulacio_origen, curs_enquesta, nenq, ruct, data "
-			+ "FROM indicador_enquesta_tmp "
-			+ "WHERE enquesta = ?1", nativeQuery=true)
-	int consolidateByEnquesta(String enquesta);
-	
-}
-

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

@@ -1,245 +0,0 @@
-package es.uv.saic.domain;
-
-import java.time.LocalDateTime;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="indicador_enquesta_tmp")
-@NamedQuery(name="IndicadorEnquestaTmp.findAll", query="SELECT n FROM IndicadorEnquestaTmp n")
-public class IndicadorEnquestaTmp {
- 
-	@Id 
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id", updatable = false, nullable = false)
-	private Integer id;
-	private String valor;
-	private String num;
-	private Integer titulacio;
-	private Integer centre;
-	private Integer curs;
-	private String enquesta;
-	private String indicador;
-	private String ambit;
-	private String tipus;
-	private String estudi;
-	private String cursd;
-	private String usuari;
-	private String cursEnquesta;
-	private String centreOrigen;
-	private String titulacioOrigen;
-	private Integer nenq;
-	private Integer ruct;
-
-	private LocalDateTime data; 
-	
-	public IndicadorEnquestaTmp(){}
-	
-	public Integer getId() {
-		return id;
-	}
-	
-	public void setId(Integer id) {
-		this.id = id;
-	}
-	
-	public Integer getTitulacio() {
-		return titulacio;
-	}
-
-	public void setTitulacio(Integer titulacio) {
-		this.titulacio = titulacio;
-	}
-	
-	public Integer getCentre() {
-		return centre;
-	}
-
-	public void setCentre(Integer centre) {
-		this.centre = centre;
-	}
-
-	public Integer getCurs() {
-		return curs;
-	}
-
-	public void setCurs(Integer curs) {
-		this.curs = curs;
-	}
-
-	public String getEnquesta() {
-		return enquesta;
-	}
-
-	public void setEnquesta(String enquesta) {
-		this.enquesta = enquesta;
-	}
-
-	public String getIndicador() {
-		return indicador;
-	}
-
-	public void setIndicador(String indicador) {
-		this.indicador = indicador;
-	}
-	
-	public String getValor() {
-		return valor;
-	}
-	
-	public void setValor(String valor) {
-		this.valor = valor;
-	}
-	
-	public String getNum() {
-		return num;
-	}
-	
-	public void setNum(String num) {
-		this.num = num;
-	}
-	
-	public String getAmbit() {
-		return ambit;
-	}
-	
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-	
-	public String getTipus() {
-		return tipus;
-	}
-	
-	public void setTipus(String tipus) {
-		this.tipus = tipus;
-	}
-	
-	public String getEstudi() {
-		return estudi;
-	}
-	
-	public void setEstudi(String estudi) {
-		this.estudi = estudi;
-	}
-	
-	public String getCursd() {
-		return cursd;
-	}
-	
-	public void setCursd(String cursd) {
-		this.cursd = cursd;
-	}
-	
-	public String getUsuari() {
-		return usuari;
-	}
-
-	public void setUsuari(String usuari) {
-		this.usuari = usuari;
-	}
-
-	public LocalDateTime getData() {
-		return data;
-	}
-
-	public void setData(LocalDateTime data) {
-		this.data = data;
-	}
-	
-	public String getCursEnquesta() {
-		return cursEnquesta;
-	}
-
-	public void setCursEnquesta(String cursEnquesta) {
-		this.cursEnquesta = cursEnquesta;
-	}
-
-	public String getCentreOrigen() {
-		return centreOrigen;
-	}
-
-	public void setCentreOrigen(String centreOrigen) {
-		this.centreOrigen = centreOrigen;
-	}
-
-	public String getTitulacioOrigen() {
-		return titulacioOrigen;
-	}
-
-	public void setTitulacioOrigen(String titulacioOrigen) {
-		this.titulacioOrigen = titulacioOrigen;
-	}
-
-	public Integer getNenq() {
-		return nenq;
-	}
-
-	public void setNenq(Integer nenq) {
-		this.nenq = nenq;
-	}
-
-	public Integer getRuct() {
-		return ruct;
-	}
-
-	public void setRuct(Integer ruct) {
-		this.ruct = ruct;
-	}
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof IndicadorEnquestaTmp)) {
-			return false;
-		}
-		IndicadorEnquestaTmp castOther = (IndicadorEnquestaTmp)other;
-		return 
-			this.id.equals(castOther.id) &&
-			this.valor.equals(castOther.valor) &&
-			this.num.equals(castOther.num) &&
-			this.centre.equals(castOther.centre) &&
-			this.titulacio.equals(castOther.titulacio) &&
-			this.curs.equals(castOther.curs) &&
-			this.ambit.equals(castOther.ambit) &&
-			this.enquesta.equals(castOther.enquesta) &&
-			this.indicador.equals(castOther.indicador) &&
-			this.cursd.equals(castOther.cursd) &&
-			this.usuari.equals(castOther.usuari) &&
-			this.data.toString().equals(castOther.data.toString()) &&
-			this.cursEnquesta.equals(castOther.cursEnquesta) &&
-			this.titulacioOrigen.equals(castOther.titulacioOrigen) &&
-			this.centreOrigen.equals(castOther.centreOrigen) &&
-			this.nenq.equals(castOther.nenq) &&
-			this.ruct.equals(castOther.ruct);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.id.hashCode();
-		hash = hash * prime + this.valor.hashCode();
-		hash = hash * prime + this.centre.hashCode();
-		hash = hash * prime + this.titulacio.hashCode();
-		hash = hash * prime + this.curs.hashCode();
-		hash = hash * prime + this.ambit.hashCode();
-		hash = hash * prime + this.enquesta.hashCode();
-		hash = hash * prime + this.indicador.hashCode();
-		hash = hash * prime + this.usuari.hashCode();
-		hash = hash * prime + this.data.toString().hashCode();
-		hash = hash * prime + this.cursEnquesta.hashCode();
-		hash = hash * prime + this.titulacioOrigen.hashCode();
-		hash = hash * prime + this.centreOrigen.hashCode();
-		hash = hash * prime + this.nenq.hashCode();
-		hash = hash * prime + this.ruct.hashCode();
-		
-		return hash;
-	}	
-}

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

@@ -1,95 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import es.uv.saic.dto.IndicadorEnquestaTmpDup;
-
-@Repository
-public interface IndicadorEnquestaTmpRepository extends JpaRepository<IndicadorEnquestaTmp, Long> {
-	
-	@Query("SELECT i FROM IndicadorEnquestaTmp i")
-	List<IndicadorEnquestaTmp> findAll();
-	
-	@Query(value="SELECT * FROM indicador_enquesta_tmp WHERE enquesta = ?1 AND curs = ?2 AND ambit = ?3 AND estudi = ?4", nativeQuery=true)
-	List<IndicadorEnquestaTmp> findByEnquestaCursAmbitEstudi(String enquesta, Integer curs, String ambit, String estudi);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta_tmp WHERE enquesta = ?1", nativeQuery=true)
-	int deleteByEnquesta(String enquesta);
-	
-	@Transactional
-	@Modifying(clearAutomatically=true, flushAutomatically=true)
-	@Query(value="DELETE FROM indicador_enquesta_tmp WHERE enquesta = ?1 AND curs = ?2 AND ambit = ?3 AND estudi = ?4", nativeQuery=true)
-	int deleteByEnquestaCursAmbitEstudi(String enquesta, Integer curs, String ambit, String estudi);
-	
-	@Query(value="SELECT curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd FROM indicador_enquesta_tmp "
-			+ "WHERE enquesta = ?1 "
-			+ "GROUP BY curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd "
-			+ "HAVING COUNT(*) > 1", nativeQuery=true)
-	List<IndicadorEnquestaTmpDup> checkDupicates(String enquesta);
-	
-	@Query(value="SELECT COUNT(*) FROM indicador_enquesta_tmp WHERE enquesta = ?1", nativeQuery=true)
-	Integer countByEnquesta(String enquesta);
-	
-	@Query(value="SELECT curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd "
-				+ "FROM indicador_enquesta_tmp WHERE enquesta = ?1 "
-				+ "INTERSECT "
-				+ "SELECT curs, enquesta, indicador, titulacio, centre, ambit, tipus, estudi, cursd "
-				+ "FROM indicador_enquesta WHERE enquesta = ?1", nativeQuery=true)
-	List<IndicadorEnquestaTmpDup> checkIntegrity(String enquesta);
-
-	@Query(nativeQuery=true, value="""
-		WITH deleted AS (
-			DELETE FROM indicador_enquesta
-			WHERE (curs, enquesta, indicador, COALESCE(titulacio, -1), COALESCE(centre, -1), ambit, tipus, estudi, COALESCE(cursd, '')) IN(
-				SELECT curs, enquesta, indicador, COALESCE(titulacio, -1) AS titulacio, COALESCE(centre, -1) AS centre, ambit, 
-					   tipus, estudi, COALESCE(cursd, '') AS cursd 
-				FROM indicador_enquesta_tmp WHERE enquesta = ?1
-				INTERSECT 
-				SELECT curs, enquesta, indicador, COALESCE(titulacio, -1) AS titulacio, COALESCE(centre, -1) AS centre, ambit, 
-					   tipus, estudi, COALESCE(cursd, '') AS cursd  
-				FROM indicador_enquesta WHERE enquesta = ?1) 
-			RETURNING *)
-		SELECT COUNT(*) FROM deleted; """)
-	Integer deleteFromCurrent(String enquesta);
-
-	@Query(nativeQuery=true, value="""
-		WITH deleted AS (
-			DELETE FROM indicador_enquesta_tmp
-			WHERE (curs, enquesta, indicador, COALESCE(titulacio, -1), COALESCE(centre, -1), ambit, tipus, estudi, COALESCE(cursd, '')) IN(
-				SELECT curs, enquesta, indicador, COALESCE(titulacio, -1) AS titulacio, COALESCE(centre, -1) AS centre, ambit, 
-					   tipus, estudi, COALESCE(cursd, '') AS cursd 
-				FROM indicador_enquesta_tmp WHERE enquesta = ?1
-				INTERSECT 
-				SELECT curs, enquesta, indicador, COALESCE(titulacio, -1) AS titulacio, COALESCE(centre, -1) AS centre, ambit, 
-					   tipus, estudi, COALESCE(cursd, '') AS cursd  
-				FROM indicador_enquesta WHERE enquesta = ?1) 
-			RETURNING *)
-		SELECT COUNT(*) FROM deleted; """)
-	Integer deleteFromPending(String enquesta);
-
-	@Query(nativeQuery=true, value="""
-		WITH deleted AS (
-			DELETE FROM
-			indicador_enquesta_tmp AS a
-			USING indicador_enquesta_tmp AS b
-			WHERE
-				a.enquesta = ?1 AND b.enquesta = ?1 AND a.id < b.id
-				AND COALESCE(a.curs, -1) = COALESCE(b.curs, -1) AND COALESCE(a.enquesta, '') = COALESCE(b.enquesta, '') 
-				AND COALESCE(a.indicador, '') = COALESCE(b.indicador, '') AND COALESCE(a.titulacio, -1) = COALESCE(b.titulacio, -1) 
-				AND COALESCE(a.centre, -1) = COALESCE(b.centre, -1) AND COALESCE(a.ambit, '') = COALESCE(b.ambit, '') 
-				AND COALESCE(a.tipus, '') = COALESCE(b.tipus, '') AND COALESCE(a.estudi, '') = COALESCE(b.estudi, '') 
-				AND COALESCE(a.cursd, '') = COALESCE(b.cursd, '')
-			RETURNING *)
-		SELECT COUNT(*) FROM deleted; """)
-	Integer deleteDuplicates(String enquesta);
-
-}
-

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

@@ -1,143 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.util.List;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.FetchType;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.OneToMany;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="informes")
-@NamedQuery(name="Informe.findAll", query="SELECT i FROM Informe i")
-public class Informe implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_informe")
-	private Integer idInforme;
-	
-	private String nom;
-	
-	@Column(name="titol_cas")
-	private String titolCas;
-	
-	@Column(name="titol_val")
-	private String titolVal;
-	
-	@Column(name="descripcio_cas")
-	private String descripcioCas;
-	
-	@Column(name="descripcio_val")
-	private String descripcioVal;
-	
-	private boolean combinat;
-	
-	@Column(name="grup_web")
-	private String grupWeb;
-	
-	private Integer ordre;
-	
-	private String tambit;
-	
-	@OneToMany(fetch=FetchType.EAGER)
-    @JoinColumn(name = "id_informe", referencedColumnName = "id_informe")
-	private List<InformeProcessos> processos;
-
-	public Informe() {}
-	
-	public Integer getIdInforme() {
-		return idInforme;
-	}
-
-	public void setIdInforme(Integer idInforme) {
-		this.idInforme = idInforme;
-	}
-
-	public String getNom() {
-		return nom;
-	}
-
-	public void setNom(String nom) {
-		this.nom = nom;
-	}
-
-	public String getTitolCas() {
-		return titolCas;
-	}
-
-	public void setTitolCas(String titolCas) {
-		this.titolCas = titolCas;
-	}
-
-	public String getTitolVal() {
-		return titolVal;
-	}
-
-	public void setTitolVal(String titolVal) {
-		this.titolVal = titolVal;
-	}
-
-	public String getDescripcioCas() {
-		return descripcioCas;
-	}
-
-	public void setDescripcioCas(String descripcioCas) {
-		this.descripcioCas = descripcioCas;
-	}
-
-	public String getDescripcioVal() {
-		return descripcioVal;
-	}
-
-	public void setDescripcioVal(String descripcioVal) {
-		this.descripcioVal = descripcioVal;
-	}
-
-	public boolean isCombinat() {
-		return combinat;
-	}
-
-	public void setCombinat(boolean combinat) {
-		this.combinat = combinat;
-	}
-
-	public String getGrupWeb() {
-		return grupWeb;
-	}
-
-	public void setGrupWeb(String grupWeb) {
-		this.grupWeb = grupWeb;
-	}
-
-	public List<InformeProcessos> getProcessos() {
-		return processos;
-	}
-
-	public void setProcessos(List<InformeProcessos> processos) {
-		this.processos = processos;
-	}
-
-	public Integer getOrdre() {
-		return ordre;
-	}
-
-	public void setOrdre(Integer ordre) {
-		this.ordre = ordre;
-	}
-
-	public String getTambit() {
-		return tambit;
-	}
-
-	public void setTambit(String tambit) {
-		this.tambit = tambit;
-	}
-	
-	
-}

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

@@ -1,60 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-
-import jakarta.persistence.Column;
-
-public class InformeProcesPK implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Column(name="id_informe")
-	private Integer idInforme;
-	
-	@Column(name="nom_proces")
-	private String nomProces;
-	
-	public InformeProcesPK() {}
-	
-	public InformeProcesPK(Integer idInforme, String nomProces) {
-		this.idInforme = idInforme;
-		this.nomProces = nomProces;
-	}
-
-	public Integer getIdInforme() {
-		return idInforme;
-	}
-
-	public void setIdInforme(Integer idInforme) {
-		this.idInforme = idInforme;
-	}
-
-	public String getNomProces() {
-		return nomProces;
-	}
-
-	public void setNomProces(String nomProces) {
-		this.nomProces = nomProces;
-	}
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof InformeProcesPK)) {
-			return false;
-		}
-		InformeProcesPK castOther = (InformeProcesPK)other;
-		return 
-			this.idInforme.equals(castOther.idInforme)
-			&& this.nomProces.equals(castOther.nomProces);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.idInforme.hashCode();
-		hash = hash * prime + this.nomProces.hashCode();
-		
-		return hash;
-	}
-}

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

@@ -1,47 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="informes_processos")
-@IdClass(InformeProcesPK.class)
-@NamedQuery(name="InformeProcessos.findAll", query="SELECT i FROM InformeProcessos i")
-public class InformeProcessos implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_informe")
-	private Integer idInforme;
-	
-	@Id
-	@Column(name="nom_proces")
-	private String nomProces;
-	
-	public InformeProcessos() {}
-
-	public Integer getIdInforme() {
-		return idInforme;
-	}
-
-	public void setIdInforme(Integer idInforme) {
-		this.idInforme = idInforme;
-	}
-
-	public String getNomProces() {
-		return nomProces;
-	}
-
-	public void setNomProces(String nomProces) {
-		this.nomProces = nomProces;
-	}
-	
-	
-	
-}

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

@@ -1,22 +0,0 @@
-package es.uv.saic.domain;
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface InformeRepository extends JpaRepository<Informe, Integer> {
-	
-	@Query(value=("SELECT * FROM informes WHERE grup_web = ?1 ORDER BY ordre ASC"), nativeQuery=true)
-	public List<Informe> findByGrupWeb(String grupWeb);
-	
-	@Query(value=("SELECT * FROM informes WHERE grup_web = ?1 AND tambit IN('A', ?2) ORDER BY ordre ASC"), nativeQuery=true)
-	public List<Informe> findByGrupWebTambit(String grupWeb, String tambit);
-	
-	@Query(value=("SELECT * FROM informes WHERE NOT combinat ORDER BY ordre ASC"), nativeQuery=true)
-	public List<Informe> getNonCombined();
-}
-

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

@@ -1,139 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-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.
- * 
- */
-@Entity
-@Table(name="instancies")
-@NamedQuery(name="Instancia.findAll", query="SELECT i FROM Instancia i")
-public class Instancia implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_instancia")
-	private BigInteger idInstancia;
-
-	private Integer centre;
-
-	private String estat;
-
-	private Integer titulacio;
-	
-	@Column(name="data")
-	private LocalDate data;
-
-	//bi-directional many-to-one association to Organ
-	@ManyToOne
-	@JoinColumns({
-		@JoinColumn(name="lugar", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar", referencedColumnName="tlugar")
-		})
-	private Organ organ;
-
-	//bi-directional many-to-one association to Proces
-	@ManyToOne
-	@JoinColumn(name="id_proces")
-	private Proces proces;
-
-	//bi-directional many-to-one association to InstanciaTasca
-	@OneToMany(mappedBy="instancia")
-	private List<InstanciaTasca> instanciesTasques;
-
-	public Instancia() {
-	}
-
-	public BigInteger getIdInstancia() {
-		return this.idInstancia;
-	}
-
-	public void setIdInstancia(BigInteger idInstancia) {
-		this.idInstancia = idInstancia;
-	}
-
-	public Integer getCentre() {
-		return this.centre;
-	}
-
-	public void setCentre(Integer centre) {
-		this.centre = centre;
-	}
-
-	public String getEstat() {
-		return this.estat;
-	}
-
-	public void setEstat(String estat) {
-		this.estat = estat;
-	}
-
-	public Integer getTitulacio() {
-		return this.titulacio;
-	}
-
-	public void setTitulacio(Integer titulacio) {
-		this.titulacio = titulacio;
-	}
-	
-	public LocalDate getData() {
-		return data;
-	}
-
-	public void setData(LocalDate data) {
-		this.data = data;
-	}
-
-	public Organ getOrgan() {
-		return this.organ;
-	}
-
-	public void setOrgan(Organ organ) {
-		this.organ = organ;
-	}
-
-	public Proces getProces() {
-		return this.proces;
-	}
-
-	public void setProces(Proces proces) {
-		this.proces = proces;
-	}
-
-	public List<InstanciaTasca> getInstanciaTasca() {
-		return this.instanciesTasques;
-	}
-
-	public void setInstanciaTasca(List<InstanciaTasca> instanciaTasca) {
-		this.instanciesTasques = instanciaTasca;
-	}
-
-	public InstanciaTasca addInstanciaTasca(InstanciaTasca instanciaTasca) {
-		getInstanciaTasca().add(instanciaTasca);
-		instanciaTasca.setInstancia(this);
-
-		return instanciaTasca;
-	}
-
-	public InstanciaTasca removeInstanciaTasca(InstanciaTasca instanciaTasca) {
-		getInstanciaTasca().remove(instanciaTasca);
-		instanciaTasca.setInstancia(null);
-
-		return instanciaTasca;
-	}
-
-}

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

@@ -1,161 +0,0 @@
-package es.uv.saic.domain;
-
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import es.uv.saic.dto.InstanciaGanttDTO;
-
-@Repository
-public interface InstanciaRepository extends JpaRepository<Instancia, BigInteger> {
-	
-	@Query(value=("SELECT id_instancia FROM instancies"), nativeQuery=true)
-	List<BigInteger> findAllIds();
-	
-	@Query(value=("SELECT * FROM instancies WHERE tlugar = ?2 AND lugar = ?3 AND centre = ?4 AND titulacio = ?5 AND estat = 'F' "
-			+ "AND id_proces IN(SELECT id_proces FROM processos WHERE nom_proces = ?1 AND curs_avaluat = ?6)"), nativeQuery=true)
-	List<Instancia> findOlders(String proces, String tlugar, Integer lugar, Integer centre, Integer titulacio, Integer curs);
-	
-	@Query(value=("SELECT * FROM instancies WHERE id_instancia IN( "
-			+ "SELECT ti.id_instancia FROM tasquesi ti "
-			+ "LEFT JOIN tasques ta ON ti.id_tasca = ta.id_tasca "
-			+ "LEFT JOIN instancies ie ON ie.id_instancia = ti.id_instancia "
-			+ "LEFT JOIN processos pr ON pr.id_proces = ie.id_proces "
-			+ "WHERE ie.tlugar = ?2 AND ie.lugar = ?3 AND ie.centre = ?4 AND ie.titulacio = ?5 AND ie.estat = 'F' "
-			+ "      AND pr.nom_proces = ?1 AND pr.curs_avaluat = ?6 AND ta.id_tascap = ?7 AND ti.estat = ?8 "
-			+ ");"), nativeQuery=true)
-	List<Instancia> findOlders(String proces, String tlugar, Integer lugar, Integer centre, Integer titulacio, Integer curs, Integer idtascap, String estat);
-	
-	@Query(value=("SELECT * FROM instancies WHERE id_proces = ?1"), nativeQuery=true)
-	List<Instancia> findByIdProces(Integer idProces);
-	
-	@Query(value=("SELECT * FROM instancies WHERE tlugar = ?1 AND lugar = ?2 AND centre = ?3 AND titulacio = ?4 "
-			+ "AND id_proces IN(SELECT id_proces FROM processos WHERE nom_proces IN (?6) AND curs_avaluat = ?5)"), nativeQuery=true)
-	List<Instancia> findByOrganCursNom(String tlugar, Integer lugar, Integer centre, Integer titulacio, Integer curs, List<String> nom);
-
-	@Query(value=("""
-			SELECT ia.* FROM instancies ia
-			LEFT JOIN organs og ON ia.lugar = og.lugar AND ia.tlugar = og.tlugar
-			LEFT JOIN processos pr ON ia.id_proces = pr.id_proces 
-			WHERE og.lugar2 = ?1 AND og.tlugar2 = 'C' AND pr.curs_avaluat = ?2 AND pr.nom_proces IN(?3);
-		"""), nativeQuery=true)
-	List<Instancia> findByCentreCursNom(Integer lugar2, Integer curs, List<String> nom);
-	
-	@Query(value=("""
-		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, 
-			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, ')') 
-			END AS name, 
-			CASE WHEN ins.estat = 'F' THEN 'gantt-task-done' 
-			  WHEN ins.estat NOT IN('F', 'C') AND MAX(ta.data_lim) < current_date THEN 'gantt-task-pending' 
-			  WHEN ins.estat NOT IN('F', 'C') AND MAX(ta.data_lim) >= current_date THEN 'gantt-task-delayed' 
-			  WHEN ins.estat = 'C' THEN 'gantt-task-closed' 
-			END AS custom_class 
-		FROM instancies ins 
-		LEFT JOIN processos pr ON pr.id_proces = ins.id_proces 
-		LEFT JOIN tasques ta ON ins.id_proces = ta.id_proces 
-		LEFT JOIN tasquesi tai ON ins.id_instancia = tai.id_instancia 
-		WHERE ins.tlugar = ?1 AND ins.lugar = ?2 AND ins.centre = ?3 AND ins.titulacio IN(?4) 
-			AND EXTRACT(YEAR FROM ins.data) >= ?5 AND EXTRACT(YEAR FROM ins.data) <= ?6 
-		GROUP BY ins.id_instancia, pr.nom_proces, pr.sub_titol, pr.titol_cas, pr.titol_val, ins.data, ins.estat 
-		ORDER BY 5;"""), nativeQuery=true)
-	List<InstanciaGanttDTO> findByOrganBetweenCurs(String tlugar, Integer lugar, Integer centre, List<Integer> titulacio, Integer cursIni, Integer cursFi);
-	
-	@Query(value=("SELECT res.id_instancia FROM (SELECT DISTINCT ia.id_instancia, pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces FROM instancies ia, processos pr " + 
-			"WHERE ia.id_proces = pr.id_proces " + 
-			"AND pr.nom_proces IN (?4) AND pr.curs_avaluat IN (?3) AND ia.titulacio IN (?2) AND ia.centre IN (?1) " + 
-			"ORDER BY pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces) AS res"), nativeQuery=true)
-	List<BigInteger> filterSupervisables(List<Integer> centres, List<Integer> titulacions, List<Integer> cursos, List<String> procediments);
-	
-	@Query(value=("SELECT res.id_instancia FROM (SELECT DISTINCT ia.id_instancia, pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces FROM instancies ia, processos pr " + 
-			"WHERE ia.id_proces = pr.id_proces " + 
-			"AND pr.nom_proces = ?4 AND pr.curs_avaluat = ?3 AND ia.titulacio = ?2 AND ia.centre = ?1 " + 
-			"ORDER BY pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces) AS res"), nativeQuery=true)
-	BigInteger filterSupervisable(Integer centre, Integer titulacio, Integer curs, String procediment);
-	
-	@Query(value=("SELECT res.id_instancia FROM (SELECT DISTINCT ia.id_instancia, pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces  " + 
-			"FROM tasques ta, tasquesi ti, instancies ia, processos pr  " + 
-			"WHERE ta.id_tasca = ti.id_tasca AND ti.id_instancia = ia.id_instancia AND ta.id_proces = pr.id_proces  " + 
-			"AND ia.centre IN (?1) AND ia.titulacio IN (?2) AND pr.curs_avaluat IN (?3) AND ta.codi_evidencia IN (?4)  " +
-			"ORDER BY pr.curs_avaluat, ia.centre, ia.titulacio, pr.id_proces) AS res"), nativeQuery=true)
-	List<BigInteger> filterSupervisablesByEvidencies(List<Integer> centres, List<Integer> titulacions, List<Integer> cursos, List<String> evidencies);
-	
-    @Transactional
-	@Query(value="WITH y AS( " + 
-			"  INSERT INTO instancies " + 
-			"  SELECT CAST((id_proces*1000 + lugar2) as bigint)*10000 + lugar, id_proces, tlugar, lugar, lugar2 centre, lugar titulacio, 'A' estat, NOW() AS data " + 
-			"  FROM processos p, organs o  " + 
-			"  WHERE id_proces=?1 AND ambit='T' AND lugar IN (?2) RETURNING id_instancia, id_proces " + 
-			"), x AS( " + 
-			"INSERT INTO tasquesi(id_tascai, id_instancia, id_tasca, version)  " + 
-			"  SELECT (y.id_instancia*10000 + id_tascap) *100, y.id_instancia, id_tasca, 0 " + 
-			"  FROM tasques t, y  " + 
-			"  WHERE t.id_proces = y.id_proces " + 
-			"  ORDER BY id_tascap " + 
-			") " + 
-			"SELECT id_instancia FROM y;", nativeQuery=true)
-    BigInteger instantiateT(Integer idProces, Integer titulacio);
-	
-    @Transactional
-	@Query(value="WITH y AS( " + 
-			"  INSERT INTO instancies " + 
-			"  SELECT CAST((id_proces*1000 + lugar) AS bigint)*10000 + 1, id_proces, tlugar, lugar, lugar  centre, ?3 titulacio, 'A' estat, NOW() AS data " + 
-			"  FROM processos p, organs o " + 
-			"  WHERE id_proces=?1 AND ambit='C' AND o.tlugar='C' AND lugar IN (?2) RETURNING id_instancia, id_proces " + 
-			"), x AS( " + 
-			"  INSERT INTO tasquesi(id_tascai, id_instancia, id_tasca, version) " + 
-			"  (SELECT (y.id_instancia*10000 + id_tascap) *100, y.id_instancia, id_tasca, 0 " + 
-			"  FROM tasques t, y " + 
-			"  WHERE y.id_proces=t.id_proces " + 
-			"  ORDER BY id_tascap) RETURNING id_tascai " + 
-			") " + 
-			"SELECT id_instancia FROM y;", nativeQuery=true)
-	BigInteger instantiateC(Integer idProces, Integer centre, Integer titulacio);
-    
-    @Transactional
-	@Query(value="WITH y AS( " + 
-			"  INSERT INTO instancies " + 
-			"  SELECT CAST((id_proces*1000) AS bigint)*10000 + 1, id_proces, 'C' AS tlugar, 0 lugar, 0 centre, ?2 titulacio, 'A' estat, NOW() AS data " + 
-			"  FROM processos p " + 
-			"  WHERE id_proces=?1 AND ambit='U' RETURNING id_instancia, id_proces " + 
-			"), x AS( " + 
-			"  INSERT INTO tasquesi(id_tascai, id_instancia, id_tasca, version) " + 
-			"  (SELECT (y.id_instancia*10000 + id_tascap) *100, y.id_instancia, id_tasca, 0 " + 
-			"  FROM tasques t, y " + 
-			"  WHERE y.id_proces=t.id_proces " + 
-			"  ORDER BY id_tascap) RETURNING id_tascai " + 
-			") " + 
-			"SELECT id_instancia FROM y;", nativeQuery=true)
-	BigInteger instantiateU(Integer idProces, Integer titulacio);
-	
-    @Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value="WITH x AS(SELECT id_instancia FROM instancies WHERE id_instancia = ?1) " + 
-			"INSERT INTO tasquesi(id_tascai, id_instancia, id_tasca, version) " + 
-			"SELECT (x.id_instancia*10000 + id_tascap) *100, x.id_instancia, id_tasca, 0 " + 
-			"FROM tasques t, x WHERE t.id_proces = ?2 ORDER BY id_tascap;", nativeQuery=true)
-    void instantiateTasks(BigInteger idInstancia, Integer idProces);
-    
-    @Transactional
-	@Query(value="UPDATE tasquesi SET estat='A', data=NOW() WHERE id_tascai IN(SELECT MIN(id_tascai) FROM tasquesi WHERE id_instancia = ?1) RETURNING id_tascai;", nativeQuery=true)
-	BigInteger activateInstantiatedTask(BigInteger idInstancia);
-    
-    @Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value="DELETE FROM instancies WHERE id_instancia = ?1", nativeQuery=true)
-    Integer deleteInstance(BigInteger idInstancia);
-    
-    @Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value="DELETE FROM tasquesi WHERE id_instancia = ?1", nativeQuery=true)
-    Integer clearInstance(BigInteger idInstancia);
-	
-}
-

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

@@ -1,147 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-
-import jakarta.persistence.*;
-
-/**
- * The persistent class for the tasquesi database table.
- * 
- */
-@Entity
-@Table(name="tasquesi")
-@NamedQuery(name="InstanciaTasca.findAll", query="SELECT t FROM InstanciaTasca t")
-public class InstanciaTasca implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_tascai")
-	private BigInteger idInstanciaTasca;
-
-	@Column(name="data_fet")
-	private LocalDate dataFet;
-	
-	@Column(name="data")
-	private LocalDate data;
-	
-	@Column(name="data_mod")
-	private LocalDateTime dataMod;
-	
-	private Integer version;
-
-	private String estat;
-
-	private String evidencia;
-	
-	private String text;
-
-	//bi-directional many-to-one association to Instancia
-	@ManyToOne
-	@JoinColumn(name="id_instancia")
-	private Instancia instancia;
-
-	//bi-directional many-to-one association to Tasca
-	@ManyToOne
-	@JoinColumn(name="id_tasca")
-	private Tasca tasca;
-
-	//bi-directional many-to-one association to Usuari
-	@ManyToOne
-	@JoinColumn(name="usuari_fet")
-	private Usuari usuari;
-
-	public InstanciaTasca() {
-	}
-
-	public BigInteger getIdInstanciaTasca() {
-		return this.idInstanciaTasca;
-	}
-
-	public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-		this.idInstanciaTasca = idInstanciaTasca;
-	}
-
-	public LocalDate getDataFet() {
-		return this.dataFet;
-	}
-
-	public void setDataFet(LocalDate dataFet) {
-		this.dataFet = dataFet;
-	}
-	
-	public LocalDate getData() {
-		return this.data;
-	}
-
-	public void setData(LocalDate data) {
-		this.data = data;
-	}
-	
-	public LocalDateTime getDataMod() {
-		return dataMod;
-	}
-
-	public void setDataMod(LocalDateTime dataMod) {
-		this.dataMod = dataMod;
-	}
-
-	public Integer getVersion() {
-		return this.version;
-	}
-
-	public void setVersion(Integer version) {
-		this.version = version;
-	}
-	
-	public String getEstat() {
-		return this.estat;
-	}
-
-	public void setEstat(String estat) {
-		this.estat = estat;
-	}
-
-	public String getEvidencia() {
-		return this.evidencia;
-	}
-
-	public void setEvidencia(String evidencia) {
-		this.evidencia = evidencia;
-	}
-	
-	public String getText() {
-		return this.text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	public Instancia getInstancia() {
-		return this.instancia;
-	}
-
-	public void setInstancia(Instancia instancia) {
-		this.instancia = instancia;
-	}
-
-	public Tasca getTasca() {
-		return this.tasca;
-	}
-
-	public void setTasca(Tasca tasca) {
-		this.tasca = tasca;
-	}
-
-	public Usuari getUsuari() {
-		return this.usuari;
-	}
-
-	public void setUsuari(Usuari usuari) {
-		this.usuari = usuari;
-	}
-
-}

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

@@ -1,160 +0,0 @@
-package es.uv.saic.domain;
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import es.uv.saic.dto.TascaInformeTransferDTO;
-
-@Repository
-public interface InstanciaTascaRepository extends JpaRepository<InstanciaTasca, BigInteger> {
-	
-	@Query(nativeQuery=true, value=("""
-		WITH x AS(SELECT id_tasca, max(version) AS version FROM tasquesi WHERE id_instancia = ?1 GROUP BY id_tasca) 
-		SELECT ti.* FROM tasquesi ti, x WHERE ti.id_tasca = x.id_tasca AND ti.version = x.version AND id_instancia = ?1 ORDER BY id_tasca ASC; """))
-	public List<InstanciaTasca> findByInstancia(BigInteger idInstancia);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT ti.* FROM tasquesi ti 
-		LEFT JOIN tasques ta ON ti.id_tasca = ta.id_tasca 
-		WHERE id_instancia = ?1 AND id_tascap = ?2 
-		ORDER BY version DESC LIMIT 1; """))
-	public InstanciaTasca findByInstanciaTascap(BigInteger idInstancia, Integer tascap);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT * FROM tasquesi WHERE id_instancia = ?1 AND id_tasca = ?2 AND version < ?3 ORDER BY data_fet DESC; """))
-	public List<InstanciaTasca> findOlderVerions(BigInteger idInstancia, Integer idTasca, Integer version);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT * FROM tasquesi WHERE id_instancia = ?1 AND estat = 'A' 
-		AND version = (SELECT MAX(version) AS version FROM tasquesi WHERE id_instancia = ?1 AND estat = 'A'); """))
-	public InstanciaTasca findActiveByInstancia(BigInteger idInstancia);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT * FROM tasquesi WHERE estat  = 'A' AND id_tasca IN(SELECT id_tasca FROM tasques WHERE tipus = ?1)"""))
-	public List<InstanciaTasca> findActivesByType(Integer type);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT DISTINCT(ins.id_instancia) FROM instancies ins, usuaris_rols usr, tasques tas, tasquesi tasi 
-		WHERE ins.estat = 'A' 
-		AND ins.tlugar = usr.tlugar AND ins.lugar = usr.lugar 
-		AND usr.vigent = TRUE AND usr.usuari = ?1 AND ins.id_instancia = tasi.id_instancia 
-		AND tas.id_proces = ins.id_proces AND tas.id_rol = usr.id_rol 
-		AND tas.id_tasca = tasi.id_tasca AND tasi.id_tascai = ?2; """))
-	public BigInteger isUserAutorized(String usuari, BigInteger idTascai);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT DISTINCT(ins.id_instancia) FROM instancies ins, usuaris_rols usr, tasques tas, tasquesi tasi, rols rl 
-		WHERE ins.estat = 'A' AND ins.centre = usr.lugar 
-		AND usr.vigent = TRUE AND usr.usuari = ?1 AND ins.id_instancia = tasi.id_instancia 
-		AND tas.id_proces = ins.id_proces AND tas.id_rol = usr.id_rol 
-		AND rl.id_rol = usr.id_rol AND rl.ambit = 'C' 
-		AND tas.id_tasca = tasi.id_tasca AND tasi.id_tascai = ?2; """	))
-	public BigInteger isUserAutorizedByAmbitC(String usuari, BigInteger idTascai);
-	
-	@Query("SELECT i FROM InstanciaTasca i WHERE i.instancia.centre = ?1 AND i.instancia.titulacio = ?2 AND i.tasca.proces.nomProces = ?3 AND i.estat = 'E' AND i.tasca.proces.cursAvaluat < ?4")
-	public List<InstanciaTasca> findOlderByProces(Integer centre, Integer titulacio, String nomProces, Integer minCurs);
-
-	@Query(nativeQuery=true, value=("""
-		WITH x AS( 
-			SELECT id_tasca AS id_current FROM tasques WHERE id_proces = ?2 AND id_tascap = ?3 
-		) 
-		SELECT * FROM tasquesi t, x WHERE id_instancia = ?1 AND t.id_tasca = x.id_current 
-		AND version = (SELECT MAX(version) FROM tasquesi t, x WHERE t.id_tasca = x.id_current AND id_instancia = ?1); """))
-	public InstanciaTasca findNext(BigInteger idInstancia, Integer idProces, Integer idTascap);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT us.* FROM usuaris us, usuaris_rols usr, tasques tas, tasquesi tasi, instancies ins  
-		WHERE us.usuari = usr.usuari AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' 
-		AND ins.lugar = usr.lugar AND ins.tlugar = usr.tlugar AND ins.id_instancia = tasi.id_instancia AND ins.id_instancia = ?1 """))
-	public List<Usuari> getUsers(BigInteger idInstancia);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT ti.id_tascai, ti.id_instancia, ti.id_tasca, ti.version, ti.estat, ti.usuari_fet, ti.data_fet, ti.evidencia 
-		FROM tasquesi ti, tasques ta   
-		WHERE ti.id_tasca = ta.id_tasca AND ti.estat = 'A' AND ta.data_lim > NOW(); """))
-	public List<InstanciaTasca> getPastTasks();
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT ti.* FROM tasquesi ti 
-		JOIN tasques ta ON ta.id_tasca = ti.id_tasca 
-		WHERE ti.id_instancia = ?1 AND ta.informe AND estat = 'E' 
-		ORDER BY ta.id_tascap DESC, ti.version DESC  
-		LIMIT 1; """))
-	public InstanciaTasca getReportFromInstancia(BigInteger idInstancia);
-	
-	@Query(nativeQuery=true, value=("""
-		SELECT ti.* FROM tasquesi ti LEFT JOIN tasques ta 
-		ON ti.id_tasca = ta.id_tasca 
-		WHERE ti.id_instancia = ( 
-			SELECT id_instancia FROM instancies 
-			WHERE id_proces = ?1 AND tlugar = ?2 AND lugar = ?3 
-			AND centre = ?4 AND titulacio = ?5 AND estat = 'F' 
-		) 
-		AND ti.estat = 'E' AND ta.informe 
-		ORDER BY ti.id_tascai DESC, ti.version DESC LIMIT 1; """))
-	public InstanciaTasca getReportFromProcesOrgan(Integer idProces, String tlugar, Integer lugar,
-												   Integer centre, Integer titulacio);
-
-	@Query(nativeQuery=true, value=("""
-		SELECT ti.* FROM tasquesi ti LEFT JOIN tasques ta 
-		ON ti.id_tasca = ta.id_tasca 
-		WHERE ti.id_instancia = ( 
-				SELECT id_instancia FROM instancies ic 
-				LEFT JOIN processos pr ON ic.id_proces = pr.id_proces 
-				WHERE pr.nom_proces = ?1 AND ic.tlugar = ?2 AND ic.lugar = ?3 
-				AND ic.centre = ?4 AND ic.titulacio = ?5 AND ic.estat = 'F' 
-				ORDER BY pr.curs_avaluat DESC LIMIT 1 
-			) 
-		AND ti.estat = 'E' AND ta.informe 
-		ORDER BY ti.id_tascai DESC, ti.version DESC LIMIT 1; """))
-	public InstanciaTasca getReportFromNomProcesOrgan(String nomProces, String tlugar, Integer lugar,
-												      Integer centre, Integer titulacio);
-	
-	@Query(nativeQuery=true, value=("""
-			SELECT i.titulacio, pr.id_proces AS idProces, pr.nom_proces AS nomProces, pr.ambit, pr.curs_avaluat AS cursAvaluat, ti.id_tascai, 
-			           ti.id_instancia AS idInstancia, ti.id_tasca AS idTasca, ti.version, ti.estat, ti.usuari_fet AS usuariFet, ti.data_fet AS dataFet, 
-			           ti.evidencia FROM tasquesi ti 
-			LEFT JOIN tasques ta ON ta.id_tasca = ti.id_tasca 
-			LEFT JOIN instancies i ON i.id_instancia = ti.id_instancia 
-			LEFT JOIN processos pr ON pr.id_proces = i.id_proces 
-			WHERE (pr.nom_proces = ?1 OR pr.nom_proces IN(
-				SELECT nom_proces_eq FROM processos_equivalents WHERE nom_proces = ?1 AND (estudi = ?4 OR estudi = 'GM') AND ambit = 'T'
-				)) 
-			AND i.titulacio = ?2 AND pr.ambit = 'T' 
-			AND i.estat = 'F' AND ti.estat = 'E' AND ta.informe 
-			UNION 
-			SELECT i.titulacio, pr.id_proces AS idProces, pr.nom_proces AS nomProces, pr.ambit, pr.curs_avaluat AS cursAvaluat, ti.id_tascai, 
-			       ti.id_instancia AS idInstancia, ti.id_tasca AS idTasca, ti.version, ti.estat, ti.usuari_fet AS usuariFet, ti.data_fet AS dataFet, 
-			       ti.evidencia FROM tasquesi ti 
-			LEFT JOIN tasques ta ON ta.id_tasca = ti.id_tasca 
-			LEFT JOIN instancies i ON i.id_instancia = ti.id_instancia 
-			LEFT JOIN processos pr ON pr.id_proces = i.id_proces 
-			WHERE pr.nom_proces IN(SELECT nom_proces_eq FROM processos_equivalents WHERE nom_proces = ?1 AND (estudi = ?4 OR estudi = 'GM') AND ambit = 'C') 
-			AND i.centre = ?3 AND pr.ambit = 'C' 
-			AND i.estat = 'F' AND ti.estat = 'E' AND ta.informe 
-			ORDER BY cursAvaluat DESC FETCH FIRST 1 ROW ONLY; """))
-	public TascaInformeTransferDTO getLastByProcName(String proc, Integer tit, Integer centre, String estudi);	
-	
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value=("UPDATE tasquesi SET estat = null WHERE estat = 'A' AND id_instancia = ?1"), nativeQuery=true)
-	public void deactivateAll(BigInteger idInstancia);
-	
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value=("DELETE FROM tasquesi WHERE id_instancia = ?1 AND id_tasca = ?2"), nativeQuery=true)
-	public void removeAllVersions(BigInteger idInstancia, Integer idTasca);
-	
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value=("DELETE FROM tasquesi WHERE id_tascai = ?1"), nativeQuery=true)
-	public void remove(BigInteger idInstanciaTasca);
-	
-}
-

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

@@ -1,78 +0,0 @@
-package es.uv.saic.domain;
-
-import java.math.BigInteger;
-import java.sql.Timestamp;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-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="tasquesi_ver")
-@IdClass(InstanciaTascaVerPK.class)
-@NamedQuery(name="InstanciaTascaVer.findAll", query="SELECT n FROM InstanciaTascaVer n")
-public class InstanciaTascaVer {
-
-    @Id
-    @Column(name="id_tascai")
-	private BigInteger idInstanciaTasca;
-
-    @Id
-    @SuppressWarnings("deprecation")
-    @Temporal(TemporalType.TIMESTAMP)
-	@Column(name="data_mod")
-	private Timestamp dataMod;
-    
-    private String usuari;
-
-    private String text;
-
-    public InstanciaTascaVer(){}
-
-    public InstanciaTascaVer(BigInteger idInstanciaTasca, String usuari, String text, Timestamp dataMod) {
-        this.idInstanciaTasca = idInstanciaTasca;
-        this.usuari = usuari;
-        this.text = text;
-        this.dataMod = dataMod;
-    }
-
-    public BigInteger getIdInstanciaTasca() {
-        return idInstanciaTasca;
-    }
-
-    public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-        this.idInstanciaTasca = idInstanciaTasca;
-    }
-
-    public String getUsuari() {
-        return usuari;
-    }
-
-    public void setUsuari(String usuari) {
-        this.usuari = usuari;
-    }
-
-    public String getText() {
-        return text;
-    }
-
-    public void setText(String text) {
-        this.text = text;
-    }
-
-    public Timestamp getDataMod() {
-        return dataMod;
-    }
-
-    public void setDataMod(Timestamp dataMod) {
-        this.dataMod = dataMod;
-    }
-
-    
-
-}

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

@@ -1,36 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.sql.Timestamp;
-
-public class InstanciaTascaVerPK implements Serializable  {
-    private static final long serialVersionUID = 1L;
-
-	private BigInteger idInstanciaTasca;
-    private Timestamp dataMod;
-
-    public InstanciaTascaVerPK(){}
-
-    public InstanciaTascaVerPK(BigInteger idInstanciaTasca, Timestamp dataMod) {
-        this.idInstanciaTasca = idInstanciaTasca;
-        this.dataMod = dataMod;
-    }
-
-    public BigInteger getIdInstanciaTasca() {
-        return idInstanciaTasca;
-    }
-
-    public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-        this.idInstanciaTasca = idInstanciaTasca;
-    }
-
-    public Timestamp getdataMod() {
-        return dataMod;
-    }
-
-    public void setDataMod(Timestamp dataMod) {
-        this.dataMod = dataMod;
-    }
-
-}

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

@@ -1,28 +0,0 @@
-package es.uv.saic.domain;
-
-import java.math.BigInteger;
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-@Repository
-public interface InstanciaTascaVerRepository extends JpaRepository<InstanciaTascaVer, InstanciaTascaVerPK> {
-
-
-	@Query(value=("SELECT * FROM tasquesi_ver WHERE id_tascai = ?1 AND data_mod = ?2"), nativeQuery=true)
-	public InstanciaTascaVer findById(BigInteger idInstanciaTasca, Date dataMod);
-
-	@Query(value=("SELECT * FROM tasquesi_ver WHERE id_tascai = ?1 ORDER BY data_mod DESC"), nativeQuery=true)
-	public List<InstanciaTascaVer> findByIdInstanciaTasca(BigInteger idInstanciaTasca);
-
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value=("DELETE FROM tasquesi_ver WHERE id_tascai IN(SELECT id_tascai FROM tasquesi WHERE id_instancia = ?1)"), nativeQuery=true)
-	public void deleteByIdInstancia(BigInteger idInstancia);
-
-}

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

@@ -1,99 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.Date;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="links")
-@NamedQuery(name="Link.findAll", query="SELECT i FROM Link i")
-public class Link {
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id")
-	private Integer id;
-
-	@Column(name="ruct")
-	private Integer ruct;
-
-	@Column(name="token")
-	private String token;
-	
-    @Column(name="link")
-	private String link;
-
-    @Column(name="data")
-	private Date data;
-	
-    @Column(name="data_exp")
-	private Date dataExp;
-	
-    @Column(name="visites")
-	private Integer visites;
-
-    public Link(){}
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public Integer getRuct() {
-        return ruct;
-    }
-
-    public void setRuct(Integer ruct) {
-        this.ruct = ruct;
-    }
-
-    public String getToken() {
-        return token;
-    }
-
-    public void setToken(String token) {
-        this.token = token;
-    }
-
-    public String getLink() {
-        return link;
-    }
-
-    public void setLink(String link) {
-        this.link = link;
-    }
-
-    public Date getData() {
-        return data;
-    }
-
-    public void setData(Date data) {
-        this.data = data;
-    }
-
-    public Date getDataExp() {
-        return dataExp;
-    }
-
-    public void setDataExp(Date dataExp) {
-        this.dataExp = dataExp;
-    }
-
-    public Integer getVisites() {
-        return visites;
-    }
-
-    public void setVisites(Integer visites) {
-        this.visites = visites;
-    }
-	
-}

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

@@ -1,18 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface LinkRepository extends JpaRepository<Link, Integer>  {
-
-    @Query(value="SELECT * FROM links WHERE token = ?1 AND data_exp > CURRENT_DATE;", nativeQuery=true)
-	Link findByToken(String token); 
-
-    @Query(value="SELECT * FROM links WHERE ruct = ?1 AND data_exp > CURRENT_DATE;", nativeQuery=true)
-	List<Link> findByRuct(Integer ruct); 
-    
-}

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

@@ -1,85 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-
-
-/**
- * The persistent class for the noticia database table.
- * 
- */
-@Entity
-@NamedQuery(name="Noticia.findAll", query="SELECT n FROM Noticia n")
-public class Noticia implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_noticia")
-	private Integer idNoticia;
-
-	@Column(name="texto_c")
-	private String textoC;
-
-	@Column(name="texto_v")
-	private String textoV;
-
-	@Column(name="titulo_c")
-	private String tituloC;
-
-	@Column(name="titulo_v")
-	private String tituloV;
-
-	private Boolean visible;
-
-	public Noticia() {
-	}
-
-	public Integer getIdNoticia() {
-		return this.idNoticia;
-	}
-
-	public void setIdNoticia(Integer idNoticia) {
-		this.idNoticia = idNoticia;
-	}
-
-	public String getTextoC() {
-		return this.textoC;
-	}
-
-	public void setTextoC(String textoC) {
-		this.textoC = textoC;
-	}
-
-	public String getTextoV() {
-		return this.textoV;
-	}
-
-	public void setTextoV(String textoV) {
-		this.textoV = textoV;
-	}
-
-	public String getTituloC() {
-		return this.tituloC;
-	}
-
-	public void setTituloC(String tituloC) {
-		this.tituloC = tituloC;
-	}
-
-	public String getTituloV() {
-		return this.tituloV;
-	}
-
-	public void setTituloV(String tituloV) {
-		this.tituloV = tituloV;
-	}
-
-	public Boolean getVisible() {
-		return this.visible;
-	}
-
-	public void setVisible(Boolean visible) {
-		this.visible = visible;
-	}
-
-}

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

@@ -1,16 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface NoticiaRepository extends JpaRepository<Noticia, Long> {
-	
-	@Query("SELECT i FROM Noticia i WHERE i.visible = true")
-	List<Noticia> findVisibles();
-	
-}
-

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

@@ -1,212 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.List;
-import java.util.stream.Collectors;
-
-@Entity
-@Table(name="organs")
-@NamedQuery(name="Organ.findAll", query="SELECT o FROM Organ o")
-public class Organ implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@EmbeddedId
-	private OrganPK id;
-
-	private Boolean actiu;
-
-	@Column(name="nom_cas")
-	private String nomCas;
-
-	@Column(name="nom_val")
-	private String nomVal;
-
-	private Integer ruct;
-	
-	private String tambit;
-
-	//bi-directional many-to-one association to Instancia
-	@OneToMany(mappedBy="organ")
-	private List<Instancia> instancias;
-	
-	//bi-directional many-to-one association to Organ
-	@ManyToOne
-	@JoinColumns({
-		@JoinColumn(name="lugar2", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar2", referencedColumnName="tlugar")
-		})
-	private Organ organ;
-
-	//bi-directional many-to-one association to Organ
-	@OneToMany(mappedBy="organ")
-	private List<Organ> organsFill;
-	
-	@OneToMany()
-	@JoinColumns({
-		@JoinColumn(name="lugar", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar", referencedColumnName="tlugar")
-		})
-	private List<OrganEquivalent> organsEquivalents;
-
-	//bi-directional many-to-one association to UsuarisRol
-	@OneToMany(mappedBy="organ")
-	
-	private List<UsuarisRol> usuarisRols;
-	
-	@OneToOne()
-	@JoinColumns({
-		@JoinColumn(name="lugar", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar", referencedColumnName="tlugar")
-	})
-	private Acreditacio acreditacio;
-	
-	@Transient
-	private String codis;
-
-	public Organ() {}
-
-	public OrganPK getId() {
-		return this.id;
-	}
-
-	public void setId(OrganPK id) {
-		this.id = id;
-	}
-
-	public Boolean getActiu() {
-		return this.actiu;
-	}
-
-	public void setActiu(Boolean actiu) {
-		this.actiu = actiu;
-	}
-
-	public String getNomCas() {
-		return this.nomCas;
-	}
-
-	public void setNomCas(String nomCas) {
-		this.nomCas = nomCas;
-	}
-
-	public String getNomVal() {
-		return this.nomVal;
-	}
-
-	public void setNomVal(String nomVal) {
-		this.nomVal = nomVal;
-	}
-
-	public Integer getRuct() {
-		return this.ruct;
-	}
-
-	public void setRuct(Integer ruct) {
-		this.ruct = ruct;
-	}
-	
-	public String getTambit() {
-		return this.tambit;
-	}
-
-	public void setTambit(String tambit) {
-		this.tambit = tambit;
-	}
-
-	public Organ getOrgan() {
-		return this.organ;
-	}
-
-	public void setOrgan(Organ organ) {
-		this.organ = organ;
-	}
-
-	public List<Organ> getOrgansFill() {
-		return organsFill;
-	}
-	
-	public Organ addOrganFill(Organ o) {
-		this.getOrgansFill().add(o);
-		return o;
-	}
-	
-	public Organ removeOrganFill(Organ o) {
-		this.getOrgansFill().remove(o);
-		return o;
-	}
-
-	public void setOrgansFill(List<Organ> organsFill) {
-		this.organsFill = organsFill;
-	}
-
-	public List<Instancia> getInstancies() {
-		return this.instancias;
-	}
-
-	public void setInstancies(List<Instancia> instancias) {
-		this.instancias = instancias;
-	}
-
-	public Instancia addInstancia(Instancia instancia) {
-		this.getInstancies().add(instancia);
-		instancia.setOrgan(this);
-
-		return instancia;
-	}
-
-	public Instancia removeInstancia(Instancia instancia) {
-		this.getInstancies().remove(instancia);
-		instancia.setOrgan(null);
-
-		return instancia;
-	}
-
-	public List<UsuarisRol> getUsuarisRols() {
-		return this.usuarisRols;
-	}
-
-	public void setUsuarisRols(List<UsuarisRol> usuarisRols) {
-		this.usuarisRols = usuarisRols;
-	}
-
-	public UsuarisRol addUsuarisRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().add(usuarisRol);
-		usuarisRol.setOrgan(this);
-
-		return usuarisRol;
-	}
-
-	public UsuarisRol removeUsuarisRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().remove(usuarisRol);
-		usuarisRol.setOrgan(null);
-
-		return usuarisRol;
-	}
-	
-	public Acreditacio getAcreditacio() {
-		return acreditacio;
-	}
-
-	public void setAcreditacio(Acreditacio acreditacio) {
-		this.acreditacio = acreditacio;
-	}
-
-	@Transient
-	public String getCodis() {
-		return codis;
-	}
-	
-	@Transient
-	public void setCodis() {
-		this.codis = organsEquivalents.stream()
-									  .map(i->i.getLugarEq().toString())
-									  .collect(Collectors.joining(", "));
-		if(this.codis.isEmpty()) {
-			this.codis = this.getId().getLugar().toString();
-		}
-		else {
-			this.codis = this.getId().getLugar().toString() +", "+ this.codis;
-		}
-	}
-}

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

@@ -1,64 +0,0 @@
-package es.uv.saic.domain;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="organs_equivalents")
-@NamedQuery(name="OrganEquivalent.findAll", query="SELECT o FROM OrganEquivalent o")
-@IdClass(OrganEquivalentPK.class)
-public class OrganEquivalent {
-
-	@Id
-	private String tlugar;
-	
-	@Id
-	private Integer lugar;
-	
-	@Id
-	@Column(name="tlugar_eq")
-	private String tlugarEq;
-	
-	@Id
-	@Column(name="lugar_eq")
-	private Integer lugarEq;
-	
-	public OrganEquivalent() {}
-
-	public String getTlugar() {
-		return tlugar;
-	}
-
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-
-	public Integer getLugar() {
-		return lugar;
-	}
-
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-
-	public String getTlugarEq() {
-		return tlugarEq;
-	}
-
-	public void setTlugarEq(String tlugarEq) {
-		this.tlugarEq = tlugarEq;
-	}
-
-	public Integer getLugarEq() {
-		return lugarEq;
-	}
-
-	public void setLugarEq(Integer lugarEq) {
-		this.lugarEq = lugarEq;
-	}
-	
-}

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

@@ -1,61 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-public class OrganEquivalentPK implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private String tlugar;
-	private Integer lugar;
-	private String tlugarEq;
-	private Integer lugarEq;
-	
-	public OrganEquivalentPK() {}
-	
-	public String getTlugar() {
-		return tlugar;
-	}
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-	public Integer getLugar() {
-		return lugar;
-	}
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-	public String getTlugarEq() {
-		return tlugarEq;
-	}
-	public void setTlugarEq(String tlugarEq) {
-		this.tlugarEq = tlugarEq;
-	}
-	public Integer getLugarEq() {
-		return lugarEq;
-	}
-	public void setLugarEq(Integer lugarEq) {
-		this.lugarEq = lugarEq;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(lugar, lugarEq, tlugar, tlugarEq);
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		OrganEquivalentPK other = (OrganEquivalentPK) obj;
-		return Objects.equals(lugar, other.lugar) && Objects.equals(lugarEq, other.lugarEq)
-				&& Objects.equals(tlugar, other.tlugar) && Objects.equals(tlugarEq, other.tlugarEq);
-	}
-	
-	
-
-}

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

@@ -1,51 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-
-@Embeddable
-public class OrganPK implements Serializable {
-	//default serial version id, required for serializable classes.
-	private static final long serialVersionUID = 1L;
-
-	private String tlugar;
-
-	private Integer lugar;
-
-	public OrganPK() {
-	}
-	public String getTlugar() {
-		return this.tlugar;
-	}
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-	public Integer getLugar() {
-		return this.lugar;
-	}
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof OrganPK)) {
-			return false;
-		}
-		OrganPK castOther = (OrganPK)other;
-		return 
-			this.tlugar.equals(castOther.tlugar)
-			&& this.lugar.equals(castOther.lugar);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.tlugar.hashCode();
-		hash = hash * prime + this.lugar.hashCode();
-		
-		return hash;
-	}
-}

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

@@ -1,97 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import es.uv.saic.dto.OrganDTO;
-import es.uv.saic.dto.OrganRepositoryDTO;
-
-@Repository
-public interface OrganRepository extends JpaRepository<Organ, OrganPK> {
-
-	@Query("SELECT i FROM Organ i WHERE i.id.tlugar = ?1 AND i.id.lugar = ?2")
-	public Organ findByTlugarLugar(String tlugar, Integer lugar);
-	
-	@Query(value=("SELECT * FROM organs WHERE ruct = ?1 AND actiu"), nativeQuery=true)
-	public Organ findByRuct(Integer ruct);
-
-	@Query(value=("SELECT o1.lugar AS lugar, o1.tlugar AS tlugar," + 
-				"o1.lugar2 AS lugar2, o1.tlugar2 AS tlugar2, " + 
-				"o1.nom_cas AS nomCas, o1.nom_val AS nomVal," + 
-				"o1.ruct AS ruct, o1.tambit AS tambit," + 
-				"o2.nom_cas AS nomCas2, o2.nom_val AS nomVal2, " +
-				"o2.ruct AS ruct2 " + 
-				"FROM organs AS o1 JOIN organs AS o2 on o1.tlugar2 = o2.tlugar AND o1.lugar2 = o2.lugar WHERE o1.ruct = ?1 AND o1.actiu = true;"), nativeQuery=true)
-	public OrganDTO findByRuctDTO(Integer ruct);
-
-	@Query(value=("""
-		SELECT lugar FROM organs WHERE tlugar = ?1 AND lugar = ?2
-		UNION 
-		SELECT lugar FROM organs_equivalents WHERE tlugar_eq = ?1 AND lugar_eq = ?2; """), nativeQuery=true)
-	public List<Integer> exists(String tlugar, Integer lugar);
-	
-	@Query(value=("SELECT * FROM organs "
-			+ "WHERE tlugar = 'C' "
-			+ "AND lugar IN(SELECT DISTINCT centre FROM instancies)"), nativeQuery=true)
-	public List<Organ> findCurrentCentres();
-	
-	@Query(value=("SELECT DISTINCT titulacio FROM instancies WHERE centre IN(?1)"), nativeQuery=true)
-	public List<Integer> findTitulacionsByCentre(List<Integer> centre);
-
-	@Query(value=("SELECT * FROM organs WHERE actiu = true AND tlugar = 'T' AND tlugar2 = 'C' AND lugar = ?1 ORDER BY nom_val"), nativeQuery=true)
-	public Organ findByTitulacio(Integer titulacio);
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND tlugar2 = 'C' AND lugar = ?1 ORDER BY nom_val"), nativeQuery=true)
-	public Organ findSupervisableByTitulacio(Integer titulacio);
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findAllTitulacions();
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'C' ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findAllCentres();
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'C' AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findAllActiveCentres();
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findActiveTitulacions();
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'C' AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findActiveCentres();
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND tlugar2 = 'C' AND lugar2 = ?1 AND actiu ORDER BY tambit, nom_val"), nativeQuery=true)
-	public List<Organ> findActiveTitulacionsByCentre(Integer centre);	
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND tlugar2 = 'C' AND lugar2 = ?1 AND CAST(lugar/1000 AS integer) = ?2 AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findActiveTitulacionsByTypeCentre(Integer centre, Integer type);	
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND tlugar2 = 'C' AND lugar2 = ?1 AND tambit = ?2 AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findActiveTitulacionsByCentreTambit(Integer centre, String tambit);
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar NOT IN (0, 1, 2) AND tlugar2 = 'C' AND lugar2 IN(?1) AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findAllTitulacionsByCentres(List<Integer> centres);
-	
-	@Query(value=("SELECT * FROM organs WHERE tlugar = 'T' AND lugar IN(SELECT lugar FROM usuaris_rols WHERE usuari = ?1 AND tlugar = 'T') AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findTitulacionsByUsuari(String usuari);
-	
-	@Query(value=("SELECT DISTINCT * FROM organs WHERE lugar IN(SELECT lugar FROM usuaris_rols WHERE usuari = ?1 AND tlugar = 'C') " + 
-			"OR lugar IN(SELECT org.lugar2 FROM organs org, usuaris_rols usr WHERE usr.usuari = ?1 AND usr.tlugar = 'T' AND org.lugar = usr.lugar) " + 
-			"AND actiu ORDER BY nom_val"), nativeQuery=true)
-	public List<Organ> findCentresByUsuari(String usuari);
-	
-	@Query(value=("SELECT lugar_eq FROM organs_equivalents WHERE lugar = ?1 AND tlugar = ?2 AND tlugar_eq = ?2 ORDER BY lugar_eq DESC"), nativeQuery=true)
-	public List<Integer> getEquivalents(Integer lugar, String tlugar);
-
-	@Query(value=("SELECT o1.lugar AS lugar, o1.tlugar AS tlugar," + 
-				"o1.lugar2 AS lugar2, o1.tlugar2 AS tlugar2, " + 
-				"o1.nom_cas AS nomCas, o1.nom_val AS nomVal," + 
-				"o1.ruct AS ruct, o1.tambit AS tambit," + 
-				"o2.nom_cas AS nomCas2, o2.nom_val AS nomVal2, " +
-				"o2.ruct AS ruct2 " + 
-				"FROM organs AS o1 JOIN organs AS o2 on o1.tlugar2 = o2.tlugar AND o1.lugar2 = o2.lugar WHERE o1.actiu = true;"), nativeQuery=true)
-	public List<OrganRepositoryDTO> findAllTitulacionsWithCentre();
-	
-}

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

@@ -1,126 +0,0 @@
-package es.uv.saic.domain;
-
-import java.sql.Timestamp;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="plantilles")
-@NamedQuery(name="Plantilla.findAll", query="SELECT t FROM Plantilla t")
-public class Plantilla {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_plantilla")
-	private Integer idPlantilla;
-	
-	@Column(name="versio")
-	private Integer versio;
-	
-	@Column(name="codi")
-	private String codi;
-	
-	@Column(name="nom_cas")
-	private String nomCas;
-	
-	@Column(name="nom_val")
-	private String nomVal;
-	
-	@Column(name="data_creacio")
-	private Timestamp data_creacio;
-	
-	@Column(name="data_mod")
-	private Timestamp data_mod;
-	
-	@Column(name="text")
-	private String text;
-	
-	@Column(name="ambit")
-	private String ambit;
-
-	public Integer getIdPlantilla() {
-		return idPlantilla;
-	}
-
-	public void setIdPlantilla(Integer idPlantilla) {
-		this.idPlantilla = idPlantilla;
-	}
-
-	public Integer getVersio() {
-		return versio;
-	}
-
-	public void setVersio(Integer versio) {
-		this.versio = versio;
-	}
-
-	public String getCodi() {
-		return codi;
-	}
-
-	public void setCodi(String codi) {
-		this.codi = codi;
-	}
-
-	public String getNomCas() {
-		return nomCas;
-	}
-
-	public void setNomCas(String nomCas) {
-		this.nomCas = nomCas;
-	}
-
-	public String getNomVal() {
-		return nomVal;
-	}
-
-	public void setNomVal(String nomVal) {
-		this.nomVal = nomVal;
-	}
-
-	public Timestamp getData_creacio() {
-		return data_creacio;
-	}
-
-	public void setData_creacio(Timestamp data_creacio) {
-		this.data_creacio = data_creacio;
-	}
-
-	public Timestamp getData_mod() {
-		return data_mod;
-	}
-
-	public void setData_mod(Timestamp data_mod) {
-		this.data_mod = data_mod;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	public String getAmbit() {
-		return ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-	
-	
-}

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

@@ -1,24 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface PlantillaRepository extends JpaRepository<Plantilla, Integer> {
-
-	Plantilla findByIdPlantilla(Integer idPlantilla);
-	
-	@Query(value=("SELECT * FROM plantilles WHERE "
-			+ "id_plantilla IN(SELECT CAST(codi_evidencia AS INTEGER) FROM tasques WHERE tipus = 11 AND codi_evidencia IS NOT NULL) "
-			+ "AND id_plantilla = ?1"), nativeQuery=true)
-	List<Plantilla> findUsedByIdPlantilla(Integer idPlantilla);
-	
-	@Query(value=("SELECT * FROM plantilles WHERE "
-			+ "versio = ?1 AND codi = ?2 AND ambit = ?3"), nativeQuery=true)
-	Plantilla findByVersioCodiAmbit(Integer versio, String codi, String ambit);
-	
-}

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

@@ -1,198 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.List;
-
-
-@Entity
-@Table(name="processos")
-@NamedQuery(name="Proces.findAll", query="SELECT p FROM Proces p")
-public class Proces implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_proces")
-	private Integer idProces;
-
-	private String ambit;
-
-	@Column(name="curs_activacio")
-	private Integer cursActivacio;
-
-	@Column(name="curs_avaluat")
-	private Integer cursAvaluat;
-
-	@Column(name="descripcio_cas")
-	private String descripcioCas;
-
-	@Column(name="descripcio_val")
-	private String descripcioVal;
-
-	@Column(name="nom_proces")
-	private String nomProces;
-
-	@Column(name="titol_cas")
-	private String titolCas;
-
-	@Column(name="titol_val")
-	private String titolVal;
-	
-	private String comentaris;
-
-	private String versio;
-
-	@Column(name="sub_titol")
-	private String subTitol;
-
-	//bi-directional many-to-one association to Instancia
-	@OneToMany(mappedBy="proces")
-	private List<Instancia> instancies;
-
-	//bi-directional many-to-one association to Tasca
-	@OneToMany(mappedBy="proces")
-	private List<Tasca> tasques;	
-
-	public Proces() {}
-
-	public Integer getIdProces() {
-		return this.idProces;
-	}
-
-	public void setIdProces(Integer idProces) {
-		this.idProces = idProces;
-	}
-
-	public String getAmbit() {
-		return this.ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	public Integer getCursActivacio() {
-		return this.cursActivacio;
-	}
-
-	public void setCursActivacio(Integer cursActivacio) {
-		this.cursActivacio = cursActivacio;
-	}
-
-	public Integer getCursAvaluat() {
-		return this.cursAvaluat;
-	}
-
-	public void setCursAvaluat(Integer cursAvaluat) {
-		this.cursAvaluat = cursAvaluat;
-	}
-
-	public String getDescripcioCas() {
-		return this.descripcioCas;
-	}
-
-	public void setDescripcioCas(String descripcioCas) {
-		this.descripcioCas = descripcioCas;
-	}
-
-	public String getDescripcioVal() {
-		return this.descripcioVal;
-	}
-
-	public void setDescripcioVal(String descripcioVal) {
-		this.descripcioVal = descripcioVal;
-	}
-
-	public String getNomProces() {
-		return this.nomProces;
-	}
-
-	public void setNomProces(String nomProces) {
-		this.nomProces = nomProces;
-	}
-
-	public String getTitolCas() {
-		return this.titolCas;
-	}
-
-	public void setTitolCas(String titolCas) {
-		this.titolCas = titolCas;
-	}
-
-	public String getTitolVal() {
-		return this.titolVal;
-	}
-
-	public void setTitolVal(String titolVal) {
-		this.titolVal = titolVal;
-	}
-	
-	public String getComentaris() {
-		return this.comentaris;
-	}
-
-	public void setComentaris(String comentaris) {
-		this.comentaris = comentaris;
-	}
-
-	public String getVersio() {
-		return this.versio;
-	}
-
-	public void setVersio(String versio) {
-		this.versio = versio;
-	}
-
-	public String getSubTitol() {
-		return this.subTitol;
-	}
-
-	public void setSubTitol(String subTitol) {
-		this.subTitol = subTitol;
-	}
-
-	public List<Instancia> getInstancies() {
-		return this.instancies;
-	}
-
-	public void setInstancies(List<Instancia> instancies) {
-		this.instancies = instancies;
-	}
-
-	public Instancia addInstancia(Instancia instancia) {
-		getInstancies().add(instancia);
-		instancia.setProces(this);
-
-		return instancia;
-	}
-
-	public Instancia removeInstancia(Instancia instancia) {
-		getInstancies().remove(instancia);
-		instancia.setProces(null);
-
-		return instancia;
-	}
-
-	public List<Tasca> getTasques() {
-		return this.tasques;
-	}
-
-	public void setTasques(List<Tasca> tasques) {
-		this.tasques = tasques;
-	}
-
-	public Tasca addTasca(Tasca tasca) {
-		getTasques().add(tasca);
-		tasca.setProces(this);
-
-		return tasca;
-	}
-
-	public Tasca removeTasca(Tasca tasca) {
-		getTasques().remove(tasca);
-		tasca.setProces(null);
- 
-		return tasca;
-	}
-
-}

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

@@ -1,75 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface ProcesRepository extends JpaRepository<Proces, Integer> {
-
-	@Query("SELECT i FROM Proces i WHERE i.nomProces = ?1")
-	List<Proces> findByName(String nom);
-	
-	@Query("SELECT i FROM Proces i WHERE i.nomProces = ?1 AND i.cursAvaluat = ?2")
-	List<Proces> findByNameCurs(String nom, Integer curs);
-	
-	@Query(value="SELECT DISTINCT id_proces FROM processos WHERE curs_avaluat IN (?1) AND id_proces IN("
-			+ "SELECT id_proces FROM instancies WHERE centre IN(?2) AND titulacio IN(?3) AND nom_proces = ?4)", nativeQuery=true)
-	List<Integer> findProcsByCentreTitulacioCursNom(List<Integer> cursos, List<Integer> centres, List<Integer> titulacions, String nom);
-
-	@Query(value="SELECT DISTINCT id_proces FROM processos WHERE curs_avaluat IN (?1) AND id_proces IN("
-			+ "SELECT id_proces FROM instancies WHERE centre IN(?2) AND titulacio IN(?3)) ", nativeQuery=true)
-	List<Integer> findProcsByCentreTitulacioCurs(List<Integer> cursos, List<Integer> centres, List<Integer> titulacions);
-	
-	@Query(value="SELECT DISTINCT curs_avaluat FROM processos WHERE id_proces IN("
-			+ "SELECT id_proces FROM instancies WHERE centre IN(?1) AND titulacio IN(?2))", nativeQuery=true)
-	List<Integer> findCursosByCentreTitulacio(List<Integer> centres, List<Integer> titulacions);
-
-	@Query(nativeQuery=true, value=("""
-			SELECT T1.txt FROM(
-				SELECT CASE
-						WHEN 
-							ta.tipus IN(2, 20) 
-						THEN 
-							CONCAT(ta.id_tascap, '@{shape: hex, label: \"', 
-							CASE WHEN LENGTH(ta.titol_cas) > 497 THEN CONCAT(LEFT(ta.titol_cas, 497), '...') ELSE ta.titol_cas END,
-							' <br> <strong>Asignado a:</strong> ', ro.descripcio_cas, '<br> <strong>Fecha límite:</strong> ', ta.data_lim, '\"}')
-						WHEN
-							ta.tipus IN(21, 22) 
-						THEN 
-							CONCAT(ta.id_tascap, '@{shape: procs, label: \"', 
-							CASE WHEN LENGTH(ta.titol_cas) > 497 THEN CONCAT(LEFT(ta.titol_cas, 497), '...') ELSE ta.titol_cas END,
-							' <br> <strong>Asignado a:</strong> ', ro.descripcio_cas, '<br> <strong>Fecha límite:</strong> ', ta.data_lim, '\"}')
-						WHEN
-							ta.tipus IN(1, 11, 12, 14, 15) 
-						THEN 
-							CONCAT(ta.id_tascap, '@{shape: lean-r, label: \"', 
-							CASE WHEN LENGTH(ta.titol_cas) > 497 THEN CONCAT(LEFT(ta.titol_cas, 497), '...') ELSE ta.titol_cas END,
-							' <br> <strong>Asignado a:</strong> ', ro.descripcio_cas, '<br> <strong>Fecha límite:</strong> ', ta.data_lim, '\"}')
-						ELSE 
-							CONCAT(ta.id_tascap, '[\"', 
-							CASE WHEN LENGTH(ta.titol_cas) > 497 THEN CONCAT(LEFT(ta.titol_cas, 497), '...') ELSE ta.titol_cas END,
-							' <br> <strong>Asignado a:</strong> ', ro.descripcio_cas, '<br> <strong>Fecha límite:</strong> ', ta.data_lim, '\"]')
-					END AS txt, ta.id_tascap, 1 AS ordr 
-				FROM tasques ta LEFT JOIN rols ro ON ro.id_rol = ta.id_rol 
-				WHERE ta.id_proces IN(SELECT id_proces FROM processos WHERE nom_proces = ?1 ORDER BY id_proces DESC LIMIT 1)
-				UNION
-				SELECT CASE
-							WHEN tipus = 2 OR tipus = 20 THEN CONCAT(id_tascap, '-->|SÍ|', id_tasca_seg)
-					ELSE 
-							CONCAT(id_tascap, '-->', id_tasca_seg) 
-					END AS txt, id_tascap, 2 AS ordr 
-				FROM tasques 
-				WHERE id_proces IN(SELECT id_proces FROM processos WHERE nom_proces = ?1 ORDER BY id_proces DESC LIMIT 1) AND id_tasca_seg != 9999
-				UNION
-				SELECT CONCAT(id_tascap, '-->|NO|', id_tasca_seg2) AS txt, id_tascap, 2 AS ordr 
-				FROM tasques 
-				WHERE (tipus = 2 OR tipus = 20) AND id_proces IN(SELECT id_proces FROM processos WHERE nom_proces = ?1 ORDER BY id_proces DESC LIMIT 1) AND id_tasca_seg2 != 9999
-				ORDER BY ordr ASC, id_tascap ASC
-			) AS T1; """))
-	public List<String> getFlowDiagram(String proc);
-	
-}
-

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

@@ -1,124 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-import java.util.List;
-
-
-@Entity
-@Table(name="rols")
-@NamedQuery(name="Rol.findAll", query="SELECT r FROM Rol r")
-public class Rol implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_rol")
-	private Integer idRol;
-
-	private String ambit;
-
-	@Column(name="descripcio_cas")
-	private String descripcioCas;
-	
-	@Column(name="descripcio_val")
-	private String descripcioVal;
-
-	@Column(name="nom_rol")
-	private String nomRol;
-
-	//bi-directional many-to-one association to Tasca
-	@OneToMany(mappedBy="rol")
-	private List<Tasca> tasques;
-
-	//bi-directional many-to-one association to UsuarisRol
-	@OneToMany(mappedBy="rol")
-	private List<UsuarisRol> usuarisRols;
-
-	public Rol() {
-	}
-
-	public Integer getIdRol() {
-		return this.idRol;
-	}
-
-	public void setIdRol(Integer idRol) {
-		this.idRol = idRol;
-	}
-
-	public String getAmbit() {
-		return this.ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-	
-	public String getDescripcioCas() {
-		return descripcioCas;
-	}
-
-	public void setDescripcioCas(String descripcioCas) {
-		this.descripcioCas = descripcioCas;
-	}
-
-	public String getDescripcioVal() {
-		return descripcioVal;
-	}
-
-	public void setDescripcioVal(String descripcioVal) {
-		this.descripcioVal = descripcioVal;
-	}
-
-	public String getNomRol() {
-		return this.nomRol;
-	}
-
-	public void setNomRol(String nomRol) {
-		this.nomRol = nomRol;
-	}
-
-	public List<Tasca> getTasques() {
-		return this.tasques;
-	}
-
-	public void setTasques(List<Tasca> tasques) {
-		this.tasques = tasques;
-	}
-
-	public Tasca addTasque(Tasca tasca) {
-		getTasques().add(tasca);
-		tasca.setRol(this);
-
-		return tasca;
-	}
-
-	public Tasca removeTasque(Tasca tasca) {
-		getTasques().remove(tasca);
-		tasca.setRol(null);
-
-		return tasca;
-	}
-
-	public List<UsuarisRol> getUsuarisRols() {
-		return this.usuarisRols;
-	}
-
-	public void setUsuarisRols(List<UsuarisRol> usuarisRols) {
-		this.usuarisRols = usuarisRols;
-	}
-
-	public UsuarisRol addUsuarisRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().add(usuarisRol);
-		usuarisRol.setRol(this);
-
-		return usuarisRol;
-	}
-
-	public UsuarisRol removeUsuarisRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().remove(usuarisRol);
-		usuarisRol.setRol(null);
-
-		return usuarisRol;
-	}
-
-}

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

@@ -1,17 +0,0 @@
-package es.uv.saic.domain;
-
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface RolRepository extends JpaRepository<Rol, Integer> {
-
-	@Query(value=("SELECT * FROM rols WHERE id_rol NOT IN (1) ORDER BY descripcio_cas"), nativeQuery=true)
-	List<Rol> findAssignables();
-
-}

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

@@ -1,66 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.util.List;
-
-public class SupervisionSearchParams implements Serializable{
-	
-	private static final long serialVersionUID = 1L;
-	private List<Integer> centres;
-	private List<Integer> cursos;
-	private List<Integer> titulacions;
-	private List<String> procediments;
-	private List<String> evidencies;
-	private String searchType;
-	
-	public SupervisionSearchParams() {
-	}
-	
-	public SupervisionSearchParams(List<Integer> centres, List<Integer> titulacions, List<Integer> cursos, 
-								   List<String> procediments, List<String> evidencies, String searchType) {
-		super();
-		this.centres = centres;
-		this.cursos = cursos;
-		this.titulacions = titulacions;
-		this.procediments = procediments;
-		this.evidencies = evidencies;
-		this.searchType = searchType;
-	}
-	public List<Integer> getCentres() {
-		return centres;
-	}
-	public void setCentres(List<Integer> centres) {
-		this.centres = centres;
-	}
-	public List<Integer> getCursos() {
-		return cursos;
-	}
-	public void setCursos(List<Integer> cursos) {
-		this.cursos = cursos;
-	}
-	public List<Integer> getTitulacions() {
-		return titulacions;
-	}
-	public void setTitulacions(List<Integer> titulacions) {
-		this.titulacions = titulacions;
-	}
-	public List<String> getProcediments() {
-		return procediments;
-	}
-	public void setProcediments(List<String> procediments) {
-		this.procediments = procediments;
-	}
-	public List<String> getEvidencies() {
-		return evidencies;
-	}
-	public void setEvidencies(List<String> evidencies) {
-		this.evidencies = evidencies;
-	}
-	public String getSearchType() {
-		return searchType;
-	}
-	public void setSearchType(String searchType) {
-		this.searchType = searchType;
-	}
-	
-}

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

@@ -1,81 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Date;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="sys_status")
-@NamedQuery(name="SysStatus.findAll", query="SELECT t FROM SysStatus t")
-public class SysStatus implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_status")
-	private Integer idStatus;
-	
-	@Column(name="timestamp")
-	private Timestamp timestamp;
-	
-	@Column(name="type")
-	private String type;
-	
-	@Column(name="msg")
-	private String msg;
-	
-	@Column(name="err")
-	private String err;
-
-	public Integer getIdStatus() {
-		return idStatus;
-	}
-
-	public void setIdStatus(Integer idStatus) {
-		this.idStatus = idStatus;
-	}
-
-	public Date getTimestamp() {
-		return timestamp;
-	}
-
-	public void setTimestamp(Timestamp timestamp) {
-		this.timestamp = timestamp;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getMsg() {
-		return msg;
-	}
-
-	public void setMsg(String msg) {
-		this.msg = msg;
-	}
-	
-	public String getErr() {
-		return err;
-	}
-
-	public void setErr(String err) {
-		this.err = err;
-	}
-	
-	
-	
-	
-}

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

@@ -1,15 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface SysStatusRepository extends JpaRepository<SysStatus, Integer> {
-
-	@Query("SELECT i FROM SysStatus i WHERE i.type = ?1")
-	List<SysStatus> findByType(String type);
-	
-}

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

@@ -1,255 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-import jakarta.persistence.*;
-import java.util.List;
-
-
-/**
- * The persistent class for the tasques database table.
- * 
- */
-@Entity
-@Table(name="tasques")
-@NamedQuery(name="Tasca.findAll", query="SELECT t FROM Tasca t")
-public class Tasca implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name="id_tasca")
-	private Integer idTasca;
-
-	@Column(name="codi_evidencia")
-	private String codiEvidencia;
-
-	@Column(name="data_lim")
-	private LocalDate dataLim;
-
-	@Column(name="descripcio_cas")
-	private String descripcioCas;
-
-	@Column(name="descripcio_val")
-	private String descripcioVal;
-
-	@Column(name="id_tasca_seg")
-	private Integer idTascaSeg;
-
-	@Column(name="id_tasca_seg2")
-	private Integer idTascaSeg2;
-
-	@Column(name="id_tascap")
-	private Integer idTascap;
-
-	@Column(name="nom_evidencia_cas")
-	private String nomEvidenciaCas;
-	
-	@Column(name="nom_evidencia_val")
-	private String nomEvidenciaVal;
-
-	@Column(name="titol_cas")
-	private String titolCas;
-
-	@Column(name="titol_val")
-	private String titolVal;
-	
-	@Column(name="opcions")
-	private String opcions;
-	
-	@Column(name="informe")
-	private Boolean informe;
-
-	//bi-directional many-to-one association to Proces
-	@ManyToOne
-	@JoinColumn(name="id_proces")
-	private Proces proces;
-
-	//bi-directional many-to-one association to Rol
-	@ManyToOne
-	@JoinColumn(name="id_rol")
-	private Rol rol;
-
-	//bi-directional many-to-one association to Tipus
-	@ManyToOne
-	@JoinColumn(name="tipus")
-	private Tipus tipus;
-
-	//bi-directional many-to-one association to InstanciaTasca
-	@OneToMany(mappedBy="tasca")
-	private List<InstanciaTasca> instancies;
-
-	public Tasca() {
-	}
-
-	public Integer getIdTasca() {
-		return this.idTasca;
-	}
-
-	public void setIdTasca(Integer idTasca) {
-		this.idTasca = idTasca;
-	}
-
-	public String getCodiEvidencia() {
-		return this.codiEvidencia;
-	}
-
-	public void setCodiEvidencia(String codiEvidencia) {
-		this.codiEvidencia = codiEvidencia;
-	}
-
-	public LocalDate getDataLim() {
-		return this.dataLim;
-	}
-
-	public void setDataLim(LocalDate dataLim) {
-		this.dataLim = dataLim;
-	}
-
-	public String getDescripcioCas() {
-		return this.descripcioCas;
-	}
-
-	public void setDescripcioCas(String descripcioCas) {
-		this.descripcioCas = descripcioCas;
-	}
-
-	public String getDescripcioVal() {
-		return this.descripcioVal;
-	}
-
-	public void setDescripcioVal(String descripcioVal) {
-		this.descripcioVal = descripcioVal;
-	}
-
-	public Integer getIdTascaSeg() {
-		return this.idTascaSeg;
-	}
-
-	public void setIdTascaSeg(Integer idTascaSeg) {
-		this.idTascaSeg = idTascaSeg;
-	}
-
-	public Integer getIdTascaSeg2() {
-		return this.idTascaSeg2;
-	}
-
-	public void setIdTascaSeg2(Integer idTascaSeg2) {
-		this.idTascaSeg2 = idTascaSeg2;
-	}
-
-	public Integer getIdTascap() {
-		return this.idTascap;
-	}
-
-	public void setIdTascap(Integer idTascap) {
-		this.idTascap = idTascap;
-	}
-
-	public String getNomEvidenciaCas() {
-		return this.nomEvidenciaCas;
-	}
-
-	public void setNomEvidenciaCas(String nomEvidenciaCas) {
-		this.nomEvidenciaCas = nomEvidenciaCas;
-	}
-	public String getNomEvidenciaVal() {
-		return this.nomEvidenciaVal;
-	}
-
-	public void setNomEvidenciaVal(String nomEvidenciaVal) {
-		this.nomEvidenciaVal = nomEvidenciaVal;
-	}
-	public String getTitolCas() {
-		return this.titolCas;
-	}
-
-	public void setTitolCas(String titolCas) {
-		this.titolCas = titolCas;
-	}
-
-	public String getTitolVal() {
-		return this.titolVal;
-	}
-
-	public void setTitolVal(String titolVal) {
-		this.titolVal = titolVal;
-	}
-
-	public Proces getProces() {
-		return this.proces;
-	}
-
-	public void setProces(Proces proces) {
-		this.proces = proces;
-	}
-
-	public Rol getRol() {
-		return this.rol;
-	}
-
-	public void setRol(Rol rol) {
-		this.rol = rol;
-	}
-
-	public Tipus getTipus() {
-		return this.tipus;
-	}
-
-	public void setTipus(Tipus tipus) {
-		this.tipus = tipus;
-	}
-
-	public List<InstanciaTasca> getInstancies() {
-		return this.instancies;
-	}
-
-	public void setInstancies(List<InstanciaTasca> instanciaTascas) {
-		this.instancies = instanciaTascas;
-	}
-
-	public InstanciaTasca addInstancia(InstanciaTasca instanciaTasca) {
-		this.getInstancies().add(instanciaTasca);
-		instanciaTasca.setTasca(this);
-
-		return instanciaTasca;
-	}
-
-	public InstanciaTasca removeInstancia(InstanciaTasca instanciaTasca) {
-		this.getInstancies().remove(instanciaTasca);
-		instanciaTasca.setTasca(null);
-
-		return instanciaTasca;
-	}
-	
-	public boolean isExpired() {
-		if(this.getDataLim() != null) {
-			if(this.getDataLim().isBefore(LocalDate.now())) {
-				return true;
-			}
-			else {
-				return false;
-			}
-		}
-		else {
-			return false;
-		}
-	}
-	
-	public void setOpcions(String opcions) {
-		this.opcions = opcions;
-	}
-
-	public String getOpcions() {
-		return this.opcions;
-	}
-	
-	public void setInforme(Boolean informe) {
-		this.informe = informe;
-	}
-
-	public Boolean getInforme() {
-		return this.informe;
-	}
-
-}

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

@@ -1,48 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.Date;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-import org.springframework.transaction.annotation.Transactional;
-
-import es.uv.saic.dto.EvidenciaBuscadorDTO;
-
-@Repository
-public interface TascaRepository extends JpaRepository<Tasca, Integer> {
-
-	@Query(value=("SELECT * FROM tasques WHERE id_proces = ?1 ORDER BY id_tascap ASC"), nativeQuery=true)
-	List<Tasca> findByProces(Integer idProces);
-	
-	@Query(value=("SELECT * FROM tasques WHERE id_proces = ?1 AND id_tascap = ?2"), nativeQuery=true)
-	Tasca findByProcesTascap(Integer idProces, Integer idTascap);
-	
-	@Query(value=("SELECT DISTINCT codi_evidencia AS codiEvidencia, nom_evidencia_cas AS nomEvidenciaCas, nom_evidencia_val AS nomEvidenciaVal FROM tasques"), nativeQuery=true)
-	List<EvidenciaBuscadorDTO> findAllEvidencies();
-	
-	@Query(value=("SELECT DISTINCT ta.codi_evidencia AS codiEvidencia, ta.nom_evidencia_cas AS nomEvidenciaCas, ta.nom_evidencia_val AS nomEvidenciaVal " + 
-			"FROM tasques ta, tasquesi ti, instancies ia, processos pr " + 
-			"WHERE ta.id_tasca = ti.id_tasca AND ti.id_instancia = ia.id_instancia AND ta.id_proces = pr.id_proces " + 
-			"AND ia.centre IN (?1) AND ia.titulacio IN (?2) AND pr.curs_avaluat IN (?3)"), nativeQuery=true)
-	List<EvidenciaBuscadorDTO> findEvidenciesByCentreTitulacioCurs(List<Integer> centres, List<Integer> titulacions, List<Integer> cursos);
-	
-	@Query(value=("SELECT DISTINCT codi_evidencia AS codiEvidencia, nom_evidencia_cas AS nomEvidenciaCas, "
-			+ "id_tascap AS idTascap, nom_evidencia_val AS nomEvidenciaVal FROM tasques "
-			+ "WHERE id_proces = ?1 AND codi_evidencia IS NOT NULL AND codi_evidencia <> ''"), nativeQuery=true)
-	List<EvidenciaBuscadorDTO> getEvidencesByProcedure(Integer idProcedure);
-	
-	@Query(value=("SELECT DISTINCT codi_evidencia AS codiEvidencia "
-			+ "FROM tasques "
-			+ "WHERE codi_evidencia IS NOT NULL AND codi_evidencia <> ''"), nativeQuery=true)
-	List<String> getAllAvailableEvidences();
-	
-	@Transactional
-    @Modifying(flushAutomatically = true, clearAutomatically = true)
-	@Query(value="INSERT INTO tasques VALUES(?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?12, ?13)", nativeQuery=true)
-    Integer create(Integer idTasca, Integer idProces, Integer idTascap, String titolCas, String descripcioCas, String titolVal, 
-    		String descripcioVal, Date dataLim, Integer tipus, Integer idTascaSeg, Integer idTascaSeg2, Integer idRol, String codiEvidencia);
-	
-}

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

@@ -1,76 +0,0 @@
-package es.uv.saic.domain;
-
-import java.math.BigInteger;
-import java.time.LocalDate;
-
-public class TascaVersioTransfer {
-
-	private BigInteger idInstanciaTasca;
-	private String usuariFet;
-	private LocalDate dataFet;
-	private Integer version;
-	private String nomEvidenciaVal;
-	private String nomEvidenciaCas;
-	private String codiEvidencia; 
-	private String estat;
-	private Integer tipus;  
-	
-	public TascaVersioTransfer() {}
-
-	public BigInteger getIdInstanciaTasca() {
-		return idInstanciaTasca;
-	}
-	public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-		this.idInstanciaTasca = idInstanciaTasca;
-	}
-	public String getUsuariFet() {
-		return usuariFet;
-	}
-	public void setUsuariFet(String usuariFet) {
-		this.usuariFet = usuariFet;
-	}
-	public LocalDate getDataFet() {
-		return dataFet;
-	}
-	public void setDataFet(LocalDate dataFet) {
-		this.dataFet = dataFet;
-	}
-	public Integer getVersion() {
-		return version;
-	}
-	public void setVersion(Integer version) {
-		this.version = version;
-	}
-	public String getNomEvidenciaVal() {
-		return nomEvidenciaVal;
-	}
-	public void setNomEvidenciaVal(String nomEvidenciaVal) {
-		this.nomEvidenciaVal = nomEvidenciaVal;
-	}
-	public String getNomEvidenciaCas() {
-		return nomEvidenciaCas;
-	}
-	public void setNomEvidenciaCas(String nomEvidenciaCas) {
-		this.nomEvidenciaCas = nomEvidenciaCas;
-	}
-	public String getCodiEvidencia() {
-		return codiEvidencia;
-	}
-	public void setCodiEvidencia(String codiEvidencia) {
-		this.codiEvidencia = codiEvidencia;
-	}
-	public String getEstat() {
-		return estat;
-	}
-	public void setEstat(String estat) {
-		this.estat = estat;
-	}
-	public Integer getTipus() {
-		return tipus;
-	}
-	public void setTipus(Integer tipus) {
-		this.tipus = tipus;
-	}
-	
-	
-}

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

@@ -1,42 +0,0 @@
-package es.uv.saic.domain;
-
-
-import java.io.Serializable;
-import jakarta.persistence.*;
-
-
-/**
- * The persistent class for the tipus database table.
- * 
- */
-@Entity
-@NamedQuery(name="Tipus.findAll", query="SELECT t FROM Tipus t")
-public class Tipus implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private Integer tipus;
-
-	private String descripcio;
-
-
-	public Tipus() {
-	}
-
-	public Integer getTipus() {
-		return this.tipus;
-	}
-
-	public void setTipus(Integer tipus) {
-		this.tipus = tipus;
-	}
-
-	public String getDescripcio() {
-		return this.descripcio;
-	}
-
-	public void setDescripcio(String descripcio) {
-		this.descripcio = descripcio;
-	}
-
-}

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

@@ -1,11 +0,0 @@
-package es.uv.saic.domain;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-//import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface TipusRepository extends JpaRepository<Tipus, Integer> {
-
-}

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

@@ -1,215 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-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.
- * 
- */
-@Entity
-@Table(name="usuaris")
-@NamedQuery(name="Usuari.findAll", query="SELECT u FROM Usuari u")
-public class Usuari implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	private String usuari;
-
-	private String clau;
-
-	private String cognoms;
-
-	private String email;
-
-	private Boolean ldap;
-
-	private String nom;
-	
-	@Column(name="data_ultim")
-	private LocalDateTime dataUltim;
-	
-	private String locale;
-
-	//bi-directional many-to-one association to InstanciaTasca
-	@OneToMany(mappedBy="usuari")
-	private List<InstanciaTasca> instanciesTasques;
-
-	//bi-directional many-to-one association to UsuarisRol
-	@OneToMany(mappedBy="usuari")
-	private List<UsuarisRol> rols;
-	
-	@Transient
-	private boolean isGranted;
-	
-	@Transient
-	private boolean isAdmin;
-	
-	@Transient
-	private boolean isDataTest;
-
-	public Usuari() {
-	}
-
-	public String getUsuari() {
-		return this.usuari;
-	}
-
-	public void setUsuari(String usuari) {
-		this.usuari = usuari;
-	}
-
-	public String getClau() {
-		return this.clau;
-	}
-
-	public void setClau(String clau) {
-		this.clau = clau;
-	}
-
-	public String getCognoms() {
-		return this.cognoms;
-	}
-
-	public void setCognoms(String cognoms) {
-		this.cognoms = cognoms;
-	}
-
-	public String getEmail() {
-		return this.email;
-	}
-
-	public void setEmail(String email) {
-		this.email = email;
-	}
-
-	public Boolean getLdap() {
-		return this.ldap;
-	}
-
-	public void setLdap(Boolean ldap) {
-		this.ldap = ldap;
-	}
-
-	public String getNom() {
-		return this.nom;
-	}
-
-	public void setNom(String nom) {
-		this.nom = nom;
-	}
-	
-	public LocalDateTime getDataUltim() {
-		return this.dataUltim;
-	}
-
-	public void setDataUltim(LocalDateTime dataUltim) {
-		this.dataUltim = dataUltim;
-	}
-	
-	public String getLocale() {
-		return this.locale;
-	}
-	
-	public void setLocale(String locale) {
-		this.locale = locale;
-	}
-
-	public List<InstanciaTasca> getInstanciesTasques() {
-		return this.instanciesTasques;
-	}
-
-	public void setInstanciesTasques(List<InstanciaTasca> instanciaTascas) {
-		this.instanciesTasques = instanciaTascas;
-	}
-
-	public InstanciaTasca addInstanciaTasca(InstanciaTasca instanciaTasca) {
-		getInstanciesTasques().add(instanciaTasca);
-		instanciaTasca.setUsuari(this);
-
-		return instanciaTasca;
-	}
-
-	public InstanciaTasca removeInstanciaTasca(InstanciaTasca instanciaTasca) {
-		getInstanciesTasques().remove(instanciaTasca);
-		instanciaTasca.setUsuari(null);
-
-		return instanciaTasca;
-	}
-
-	public List<UsuarisRol> getUsuarisRols() {
-		return this.rols;
-	}
-
-	public void setUsuariRols(List<UsuarisRol> usuarisRols) {
-		this.rols = usuarisRols;
-	}
-
-	public UsuarisRol addRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().add(usuarisRol);
-		usuarisRol.setUsuari(this);
-
-		return usuarisRol;
-	}
-
-	public UsuarisRol removeRol(UsuarisRol usuarisRol) {
-		getUsuarisRols().remove(usuarisRol);
-		usuarisRol.setUsuari(null);
-
-		return usuarisRol;
-	}
-	
-	public boolean isGranted() {
-		return this.isGranted;
-	}
-
-	public void setGranted(boolean isGranted) {
-		this.isGranted = isGranted;
-	}
-	public boolean isAdmin() {
-		return this.isAdmin;
-	}
-
-	public void setAdmin(boolean isAdmin) {
-		this.isAdmin = isAdmin;
-	}
-
-	public boolean isDataTest() {
-		return isDataTest;
-	}
-
-	public void setDataTest(boolean isDataTest) {
-		this.isDataTest = isDataTest;
-	}
-	
-	public boolean equals(Object other) {
-		if (this == other) {
-			return true;
-		}
-		if (!(other instanceof Usuari)) {
-			return false;
-		}
-		Usuari castOther = (Usuari)other;
-		return 
-			this.usuari.equals(castOther.usuari);
-	}
-
-	public int hashCode() {
-		final int prime = 31;
-		int hash = 17;
-		hash = hash * prime + this.usuari.hashCode();
-		
-		return hash;
-	}
-	
-}

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

@@ -1,90 +0,0 @@
-package es.uv.saic.domain;
-
-
-
-import java.math.BigInteger;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-import es.uv.saic.dto.TascaAsignadaDTO;
-
-
-@Repository
-public interface UsuariRepository extends JpaRepository<Usuari, String> {
-	
-	@Query("SELECT i FROM Usuari i WHERE i.usuari = ?1")
-	Usuari findByUsername(String usuari);
-	
-	@Query(value=("(SELECT ur.tlugar AS tLugar, ur.lugar AS lugar, id_proces AS idProces , id_instancia AS instancia, id_tascai AS instanciaTasca, id_tascap AS tascaP, ur.id_rol AS rol \n"+ 
-			"FROM usuaris_rols ur \n"+
-			"INNER JOIN tasquesi ti ON ur.tlugar=ti.tlugar AND ur.lugar=ti.lugar \n"+
-			"WHERE ur.tlugar=ti.tlugar AND ur.id_rol=ti.id_rol AND vigent \n"+ 
-			"AND estat='A' AND usuari=?1) \n"+
-			"UNION \n"+
-			"(SELECT ur.tlugar AS tLugar, ur.lugar AS lugar, id_proces AS idProces , id_instancia AS instancia, id_tascai AS instanciaTasca, id_tascap AS tascaP, ur.id_rol AS rol \n"+
-			"FROM usuaris_rols ur, organs o, tasquesi ti \n"+
-			"WHERE ti.tlugar='T' AND ti.tlugar=o.tlugar AND ti.lugar=o.lugar AND o.tlugar2=ur.tlugar AND o.lugar2=ur.lugar \n"+
-			"AND ur.id_rol=ti.id_rol \n"+
-			"AND vigent \n"+
-			"AND estat='A' AND usuari=?1)"), nativeQuery=true)
-	List<TascaAsignadaDTO> findActiveInstanciaTasques(String usuari);
-	
-	@Query(value=("SELECT DISTINCT(ins.id_instancia) FROM instancies ins, usuaris_rols usr, tasques tas, tasquesi tasi WHERE ins.estat = 'A' " + 
-			"AND ((ins.tlugar = usr.tlugar AND ins.lugar = usr.lugar) OR (ins.centre = usr.lugar AND usr.tlugar = 'C')) " +
-			"AND tasi.id_instancia = ins.id_instancia " + 
-			"AND usr.vigent AND usr.usuari = ?1 AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' " + 
-			"AND tas.id_proces = ins.id_proces AND tas.id_rol = usr.id_rol ORDER BY ins.id_instancia ASC"), nativeQuery=true)
-	List<BigInteger> findActiveInstancies(String usuari);
-	
-	@Query(value=("SELECT DISTINCT(ins.id_instancia) FROM instancies ins, usuaris_rols usr, tasques tas, tasquesi tasi WHERE ins.estat = 'A'\n" + 
-			"AND usr.usuari = ?1 AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' AND tasi.id_instancia = ins.id_instancia\n" + 
-			"AND tas.id_proces = ins.id_proces AND tas.id_rol = usr.id_rol AND usr.vigent ORDER BY ins.id_instancia ASC"), nativeQuery=true)
-	List<BigInteger> findActiveInstanciesGranted(String usuari);
-	
-	@Query(value=("SELECT id_instancia FROM instancies WHERE lugar = ?1 AND tlugar = ?2"), nativeQuery=true)
-	List<BigInteger> findSupervisableProcessos(Integer lugar, String tlugar);
-	
-	@Query(value=("SELECT id_instancia FROM instancies WHERE centre = ?1"), nativeQuery=true)
-	List<BigInteger> findSupervisableProcessosResp(Integer centre);
-	
-	@Query(value=("SELECT id_instancia FROM instancies WHERE id_proces IN(SELECT id_proces FROM processos WHERE nom_proces IN(?1))"), nativeQuery=true)
-	List<BigInteger> findSupervisableProcessosSupervisor(List<String> procs);
-	
-	@Query(value=("SELECT DISTINCT(centre) FROM (SELECT o.lugar AS centre FROM usuaris_rols u " + 
-			 "LEFT JOIN organs o ON u.tlugar = o.tlugar AND u.lugar = o.lugar " + 
-			 "WHERE o.tlugar = 'C' AND u.usuari = ?1 AND u.vigent " + 
-			 "UNION " + 
-			 "SELECT lugar2 AS centre FROM usuaris_rols u " + 
-			 "LEFT JOIN organs o ON u.tlugar = o.tlugar AND u.lugar = o.lugar " + 
-			 "WHERE o.tlugar = 'T' AND u.usuari = ?1 AND u.vigent) a"), nativeQuery=true)
-	List<Integer> findSupervisableCentres(String usuari);
-	
-	@Query(value=("SELECT DISTINCT ins.centre FROM instancies ins "
-			+ "LEFT JOIN processos pr ON pr.id_proces = ins.id_proces "
-			+ "WHERE pr.nom_proces IN(?1)"), nativeQuery=true)
-	List<Integer> findSupervisableCentresSupervisor(List<String> procs);
-	
-	@Query(value="SELECT us.* FROM usuaris us, usuaris_rols usr, tasques tas, tasquesi tasi, instancies ins "
-			+ "WHERE us.usuari = usr.usuari AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' "
-			+ "AND ins.lugar = usr.lugar AND ins.tlugar = usr.tlugar AND ins.id_instancia = tasi.id_instancia AND ins.id_instancia = ?1 "
-			+ "AND usr.vigent AND tas.id_rol = usr.id_rol "
-			+ "UNION "
-			+ "SELECT us.* FROM usuaris us, usuaris_rols usr, tasques tas, tasquesi tasi, instancies ins "
-			+ "WHERE us.usuari = usr.usuari AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' "
-			+ "AND ins.centre = usr.lugar AND ins.id_instancia = tasi.id_instancia AND ins.id_instancia = ?1 "
-			+ "AND usr.vigent AND tas.id_rol = usr.id_rol "
-			+ "UNION "
-			+ "SELECT us.* FROM usuaris us, usuaris_rols usr, tasques tas, tasquesi tasi, instancies ins "
-			+ "WHERE us.usuari = usr.usuari AND tasi.id_tasca = tas.id_tasca AND tasi.estat = 'A' "
-			+ "AND usr.lugar = 0 AND usr.tlugar = 'U' AND ins.id_instancia = tasi.id_instancia AND ins.id_instancia = ?1 "
-			+ "AND usr.vigent AND tas.id_rol = usr.id_rol ", nativeQuery=true)
-	public List<Usuari> getInstanceAsignedUsers(BigInteger idInstancia);
-	
-	@Query(value=("SELECT * FROM usuaris WHERE usuari IN(SELECT DISTINCT usuari FROM usuaris_rols WHERE id_rol = ?1 "
-			+ "AND (lugar IN(?2) OR lugar IN (SELECT lugar FROM organs WHERE tlugar = 'T' AND lugar2 IN(?2))) AND vigent)"), nativeQuery=true)
-	List<Usuari> findByRolCentre(Integer idRol, List<Integer> centres);
-
-}

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

@@ -1,135 +0,0 @@
-package es.uv.saic.domain;
-
-import java.io.Serializable;
-import java.time.LocalDate;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-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.
- * 
- */
-@Entity
-@Table(name="usuaris_rols")
-@NamedQuery(name="UsuarisRol.findAll", query="SELECT u FROM UsuarisRol u")
-public class UsuarisRol implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_usuari_rol")
-	private Integer idUsuariRol;
-
-	private LocalDate fin;
-
-	private LocalDate inici;
-
-	private Integer num;
-
-	private Integer supervisor;
-
-	private Boolean vigent;
-
-	//bi-directional many-to-one association to Organ
-	@ManyToOne
-	@JoinColumns({
-		@JoinColumn(name="lugar", referencedColumnName="lugar"),
-		@JoinColumn(name="tlugar", referencedColumnName="tlugar")
-		})
-	private Organ organ;
-
-	//bi-directional many-to-one association to Rol
-	@ManyToOne
-	@JoinColumn(name="id_rol")
-	private Rol rol;
-
-	//bi-directional many-to-one association to Usuari
-	@ManyToOne
-	@JoinColumn(name="usuari")
-	private Usuari usuari;
-
-	public UsuarisRol() {
-	}
-
-	public Integer getIdUsuariRol() {
-		return this.idUsuariRol;
-	}
-
-	public void setIdUsuariRol(Integer idUsuariRol) {
-		this.idUsuariRol = idUsuariRol;
-	}
-
-	public LocalDate getFin() {
-		return this.fin;
-	}
-
-	public void setFin(LocalDate fin) {
-		this.fin = fin;
-	}
-
-	public LocalDate getInici() {
-		return this.inici;
-	}
-
-	public void setInici(LocalDate inici) {
-		this.inici = inici;
-	}
-
-	public Integer getNum() {
-		return this.num;
-	}
-
-	public void setNum(Integer num) {
-		this.num = num;
-	}
-
-	public Integer getSupervisor() {
-		return this.supervisor;
-	}
-
-	public void setSupervisor(Integer supervisor) {
-		this.supervisor = supervisor;
-	}
-
-	public Boolean getVigent() {
-		return this.vigent;
-	}
-
-	public void setVigent(Boolean vigent) {
-		this.vigent = vigent;
-	}
-
-	public Organ getOrgan() {
-		return this.organ;
-	}
-
-	public void setOrgan(Organ organ) {
-		this.organ = organ;
-	}
-
-	public Rol getRol() {
-		return this.rol;
-	}
-
-	public void setRol(Rol rol) {
-		this.rol = rol;
-	}
-
-	public Usuari getUsuari() {
-		return this.usuari;
-	}
-
-	public void setUsuari(Usuari usuariBean) {
-		this.usuari = usuariBean;
-	}
-
-}

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

@@ -1,64 +0,0 @@
-package es.uv.saic.domain;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface UsuarisRolRepository extends JpaRepository<UsuarisRol, Long> {
-
-	@Query("SELECT i FROM UsuarisRol i WHERE i.usuari = ?1")
-	List<UsuarisRol> findByUsername(String usuari);
-	
-	@Query("SELECT i FROM UsuarisRol i WHERE i.usuari = ?1 AND i.vigent = TRUE")
-	List<UsuarisRol> findByUsernameActive(Usuari usuari);
-	
-	@Query("SELECT i FROM UsuarisRol i WHERE i.usuari = ?1 AND i.vigent = TRUE AND i.rol.nomRol = ?2")
-	UsuarisRol findByUsernameActiveRol(Usuari usuari, String Rol);
-	
-	@Query("SELECT i FROM UsuarisRol i WHERE i.usuari = ?1 AND i.vigent = TRUE AND i.rol.nomRol IN(?2)")
-	UsuarisRol findByUsernameActiveRoles(Usuari usuari, ArrayList<String> Rol);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE usuari = ?1 AND tlugar = ?2 AND lugar = ?3 AND vigent LIMIT 1"), nativeQuery=true)
-	UsuarisRol findActiveByUsuariTlugarLugar(String usuari, String tlugar, Integer lugar);
-	
-	//@Query("SELECT i FROM UsuarisRol i WHERE i.usuari = ?1 AND i.vigent = TRUE AND i.rol.ambit = ?2 LIMIT 1")
-	@Query(value=("SELECT ur.* "
-			+ "FROM usuaris_rols ur LEFT JOIN rols r ON ur.id_rol = r.id_rol "
-			+ "WHERE ur.usuari = ?1 AND r.ambit = ?2 AND ur.vigent LIMIT 1"), nativeQuery=true)
-	UsuarisRol findByUsernameActiveAmbit(String usuari, String ambit);
-	
-	@Query(value=("SELECT nom_proces FROM processos_rols WHERE id_rol IN(SELECT id_rol FROM rols WHERE nom_rol = ?1)"), nativeQuery=true)
-	List<String> findAssociatedProcs(String rol);
-
-	@Query(value=("SELECT * FROM usuaris_rols WHERE tlugar = 'C' AND lugar = ?1 AND vigent ORDER BY id_rol ASC"), nativeQuery=true)
-	List<UsuarisRol> findManagerByCentre(Integer centre);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE tlugar = 'T' AND lugar = ?1 AND vigent ORDER BY lugar"), nativeQuery=true)
-	List<UsuarisRol> findManagerByTitulacio(Integer titulacio);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE tlugar = 'C' AND lugar IN(?1) AND vigent ORDER BY id_rol ASC"), nativeQuery=true)
-	List<UsuarisRol> findManagerByCentres(List<Integer> centre);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE tlugar = 'T' AND lugar IN(?1) AND vigent ORDER BY lugar"), nativeQuery=true)
-	List<UsuarisRol> findManagerByTitulacions(List<Integer> titulacio);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE id_rol = ?1 AND usuari = ?2 AND lugar = ?3 AND tlugar = ?4"), nativeQuery=true)
-	UsuarisRol find(Integer idRol, String usuari, Integer lugar, String tlugar);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE id_rol = ?1 AND usuari = ?2 AND lugar = ?3 AND tlugar = ?4 AND vigent"), nativeQuery=true)
-	UsuarisRol findActive(Integer idRol, String usuari, Integer lugar, String tlugar);
-	
-	@Query(value=("SELECT * FROM usuaris_rols WHERE id_rol = ?1 AND usuari = ?2 AND lugar = ?3 AND tlugar = ?4 ORDER BY num DESC LIMIT 1"), nativeQuery=true)
-	UsuarisRol findLast(Integer idRol, String usuari, Integer lugar, String tlugar);
-	
-	@Query(value=("SELECT num FROM usuaris_rols WHERE id_rol = ?1 AND lugar = ?2 AND tlugar = ?3 ORDER BY num DESC LIMIT 1"), nativeQuery=true)
-	Integer findLastNum(Integer idRol, Integer lugar, String tlugar);
-	
-	
-}

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

@@ -1,63 +0,0 @@
-package es.uv.saic.domain;
-
-import java.util.Date;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
-import jakarta.persistence.NamedQuery;
-import jakarta.persistence.Table;
-
-@Entity
-@Table(name="wiki")
-@NamedQuery(name="Wiki.findAll", query="SELECT i FROM Wiki i")
-public class Wiki {
-	
-	@Id
-	@GeneratedValue(strategy = GenerationType.IDENTITY)
-	@Column(name="id_wiki")
-	private Integer idWiki;
-	private Date data;
-	@Column(name="data_mod")
-	private Date dataMod;
-	private String text;
-	private String categoria;
-	
-	public Wiki() {}
-	
-	public Integer getIdWiki() {
-		return idWiki;
-	}
-	public void setIdWiki(Integer idWiki) {
-		this.idWiki = idWiki;
-	}
-	public Date getData() {
-		return data;
-	}
-	public void setData(Date data) {
-		this.data = data;
-	}
-	public Date getDataMod() {
-		return dataMod;
-	}
-	public void setDataMod(Date dataMod) {
-		this.dataMod = dataMod;
-	}
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-	public String getCategoria() {
-		return categoria;
-	}
-	public void setCategoria(String categoria) {
-		this.categoria = categoria;
-	}
-	
-	
-	
-}

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

@@ -1,11 +0,0 @@
-package es.uv.saic.domain;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public interface WikiRepository  extends JpaRepository<Wiki, Integer> {
-	@Query(value="SELECT * FROM wiki WHERE categoria = ?1 LIMIT 1;", nativeQuery=true)
-	Wiki findByCategoria(String categoria); 
-}

src/main/java/es/uv/saic/dto/ArchiveOrganDTO.java

@@ -1,25 +0,0 @@
-package es.uv.saic.dto;
-
-public class ArchiveOrganDTO {
-    private Integer lugar;
-    private String tlugar;
-
-    
-    public ArchiveOrganDTO(Integer lugar, String tlugar) {
-        this.lugar = lugar;
-        this.tlugar = tlugar;
-    }
-    
-    public Integer getLugar() {
-        return lugar;
-    }
-    public void setLugar(Integer lugar) {
-        this.lugar = lugar;
-    }
-    public String getTlugar() {
-        return tlugar;
-    }
-    public void setTlugar(String tlugar) {
-        this.tlugar = tlugar;
-    }
-}

src/main/java/es/uv/saic/dto/CategoriaDTO.java

@@ -1,27 +0,0 @@
-package es.uv.saic.dto;
-
-public class CategoriaDTO {
-    Integer categoria;
-    Integer lugar;
-    String tlugar;
- 
-    CategoriaDTO() {}
-
-    public CategoriaDTO(Integer categoria, Integer lugar, String tlugar) {
-        this.categoria = categoria;
-        this.lugar = lugar;
-        this.tlugar = tlugar;
-    }
-    
-    public Integer getCategoria() {
-        return this.categoria;
-    }
-
-    public Integer getLugar() {
-        return this.lugar;
-    }
-
-    public String getTlugar() {
-        return this.tlugar;
-    }
-}

src/main/java/es/uv/saic/dto/CategoriaDocumentDTO.java

@@ -1,34 +0,0 @@
-package es.uv.saic.dto;
-
-import java.util.List;
-
-public class CategoriaDocumentDTO {
-
-	private String text;
-	private List<DocumentDTO> children;
-	
-	public CategoriaDocumentDTO() {}
-
-	public CategoriaDocumentDTO(String text, List<DocumentDTO> children) {
-		this.text = text;
-		this.children = children;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-
-	public List<DocumentDTO> getChildren() {
-		return children;
-	}
-
-	public void setChildren(List<DocumentDTO> children) {
-		this.children = children;
-	}
-	
-	
-}

src/main/java/es/uv/saic/dto/DocumentDTO.java

@@ -1,37 +0,0 @@
-package es.uv.saic.dto;
-
-public class DocumentDTO {
-
-	private String text;
-	private String ruta;
-	
-	public DocumentDTO() {}
-	
-	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>
-			</a>
-		""";
-		this.text = template.replace("[ruta]", ruta).replace("[text]", text)
-					.replace("[data]", (data == null) ? "" : data);
-		this.ruta = ruta;
-	}
-	
-	public String getText() {
-		return text;
-	}
-	public void setText(String text) {
-		this.text = text;
-	}
-	public String getRuta() {
-		return ruta;
-	}
-	public void setRuta(String ruta) {
-		this.ruta = ruta;
-	}
-}

src/main/java/es/uv/saic/dto/DocumentTmpDTO.java

@@ -1,42 +0,0 @@
-package es.uv.saic.dto;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public class DocumentTmpDTO {
-    Integer idDocument;
-    Integer idCategoria;
-    Integer lugar;
-    String tlugar;
-    MultipartFile file;
-
-    DocumentTmpDTO() {}
-
-    public DocumentTmpDTO(Integer idDocument, Integer idCategoria, Integer lugar,
-        String tlugar, MultipartFile file) {
-        this.idDocument = idDocument;
-        this.idCategoria = idCategoria;
-        this.lugar = lugar;
-        this.tlugar = tlugar;
-        this.file = file;
-    }
-
-    public Integer getIdDocument() {
-        return this.idDocument;
-    }
-
-    public Integer getIdCategoria() {
-        return this.idCategoria;
-    }
-
-    public Integer getLugar() {
-        return this.lugar;
-    }
-
-    public String getTlugar() {
-        return this.tlugar;
-    }
-
-    public MultipartFile getFile () {
-        return this.file;
-    }
-}

src/main/java/es/uv/saic/dto/EmailDTO.java

@@ -1,62 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-
-public class EmailDTO {
-    private String usuari;
-    private BigInteger idInstanciaTasca;
-    private String to;
-    private String subject;
-    private String message;
-
-    public EmailDTO() {};
-
-    public EmailDTO(String usuari, BigInteger idInstanciaTasca,String to, String subject, String message) {
-        this.usuari = usuari;
-        this.idInstanciaTasca = idInstanciaTasca;
-        this.to = to;
-        this.subject = subject;
-        this.message = message;
-    }
-
-    public String getUsuari() {
-        return this.usuari;
-    }
-
-    public void setUsuari(String usuari) {
-        this.usuari = usuari;
-    }
-
-    public BigInteger getIdInstanciaTasca() {
-        return this.idInstanciaTasca;
-    }
-
-    public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-        this.idInstanciaTasca = idInstanciaTasca;
-    }
-
-    public String getTo() {
-        return to;
-    }
-
-    public void setTo(String to) {
-        this.to = to;
-    }
-
-    public String getSubject() {
-        return subject;
-    }
-
-    public void setSubject(String subject) {
-        this.subject = subject;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-}

src/main/java/es/uv/saic/dto/EnquestaDTO.java

@@ -1,53 +0,0 @@
-package es.uv.saic.dto;
-
-public class EnquestaDTO {
-    String enquesta;
-    Integer curs;
-    String ambit;
-    String estudi;
-    Integer centre;
-    Integer titulacio;
-
-    public EnquestaDTO() {};
-    
-    public EnquestaDTO(String enquesta, Integer curs, String ambit, String estudi,
-        Integer centre, Integer titulacio) {
-            this.enquesta = enquesta;
-            this.curs = curs;
-            this.ambit = ambit;
-            this.estudi = estudi;
-            this.centre = centre;
-            this.titulacio = titulacio;
-    }
-
-    public EnquestaDTO(String enquesta, Integer curs, String ambit, String estudi) {
-        this.enquesta = enquesta;
-        this.curs = curs;
-        this.ambit = ambit;
-        this.estudi = estudi;
-    }
-
-    public String getEnquesta() {
-        return this.enquesta;
-    }
-
-    public Integer getCurs() {
-        return this.curs;
-    }
-
-    public String getAmbit() {
-        return this.ambit;
-    }
-
-    public String getEstudi() {
-        return this.estudi;
-    }
-
-    public Integer getCentre() {
-        return this.centre;
-    }
-
-    public Integer getTitulacio() {
-        return this.titulacio;
-    }
-}

src/main/java/es/uv/saic/dto/EvidenciaBuscadorDTO.java

@@ -1,8 +0,0 @@
-package es.uv.saic.dto;
-
-public interface EvidenciaBuscadorDTO {
-    String getCodiEvidencia();
-    String getNomEvidenciaVal();
-    String getNomEvidenciaCas();	
-    Integer getIdTascap();
-}

src/main/java/es/uv/saic/dto/ImportDTO.java

@@ -1,177 +0,0 @@
-package es.uv.saic.dto;
-
-import java.io.IOException;
-import java.util.List;
-
-import org.springframework.web.multipart.MultipartFile;
-
-public class ImportDTO {
-    // Campos comunes
-    String tipus;
-    String principal;
-    String enquesta;
-    String ambit;
-    String estudi;
-    String locale;
-    String clau;
-    List<String> ignoredColumns;
-
-    // Campos específicos para importación desde archivo
-    byte[] fileContent;
-    String fileName;
-    String delim;
-
-    // Campos específicos para importación desde base de datos
-    Integer dbOrigen;
-    String vista;
-    Integer curs;
-    Integer dstCurs;
-
-    // Constructor completo para todos los campos
-    public ImportDTO(MultipartFile file, String tipus, String principal, String enquesta, String ambit, String estudi,
-            String locale, String delim, String clau, List<String> ignoredColumns, Integer dbOrigen, String vista,
-            Integer curs, Integer dstCurs) {
-        if (file != null) {
-            try {
-                this.fileContent = file.getBytes();
-                this.fileName = file.getOriginalFilename();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-        this.tipus = tipus;
-        this.principal = principal;
-        this.enquesta = enquesta;
-        this.ambit = ambit;
-        this.estudi = estudi;
-        this.locale = locale;
-        this.delim = delim;
-        this.clau = clau;
-        this.ignoredColumns = ignoredColumns;
-        this.dbOrigen = dbOrigen;
-        this.vista = vista;
-        this.curs = curs;
-        this.dstCurs = dstCurs;
-    }
-
-    public byte[] getFileContent() {
-        return fileContent;
-    }
-
-    public void setFileContent(byte[] fileContent) {
-        this.fileContent = fileContent;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-
-    public void setFileName(String fileName) {
-        this.fileName = fileName;
-    }
-
-    // Getters y Setters
-    public String getTipus() {
-        return tipus;
-    }
-
-    public void setTipus(String tipus) {
-        this.tipus = tipus;
-    }
-
-    public String getPrincipal() {
-        return principal;
-    }
-
-    public void setPrincipal(String principal) {
-        this.principal = principal;
-    }
-
-    public String getEnquesta() {
-        return enquesta;
-    }
-
-    public void setEnquesta(String enquesta) {
-        this.enquesta = enquesta;
-    }
-
-    public String getAmbit() {
-        return ambit;
-    }
-
-    public void setAmbit(String ambit) {
-        this.ambit = ambit;
-    }
-
-    public String getEstudi() {
-        return estudi;
-    }
-
-    public void setEstudi(String estudi) {
-        this.estudi = estudi;
-    }
-
-    public String getLocale() {
-        return locale;
-    }
-
-    public void setLocale(String locale) {
-        this.locale = locale;
-    }
-
-    public String getDelim() {
-        return delim;
-    }
-
-    public void setDelim(String delim) {
-        this.delim = delim;
-    }
-
-    public String getClau() {
-        return clau;
-    }
-
-    public void setClau(String clau) {
-        this.clau = clau;
-    }
-
-    public List<String> getIgnoredColumns() {
-        return ignoredColumns;
-    }
-
-    public void setIgnoredColumns(List<String> ignoredColumns) {
-        this.ignoredColumns = ignoredColumns;
-    }
-
-    public Integer getDbOrigen() {
-        return dbOrigen;
-    }
-
-    public void setDbOrigen(Integer dbOrigen) {
-        this.dbOrigen = dbOrigen;
-    }
-
-    public String getVista() {
-        return vista;
-    }
-
-    public void setVista(String vista) {
-        this.vista = vista;
-    }
-
-    public Integer getCurs() {
-        return curs;
-    }
-
-    public void setCurs(Integer curs) {
-        this.curs = curs;
-    }
-
-    public Integer getDstCurs() {
-        return dstCurs;
-    }
-
-    public void setDstCurs(Integer dstCurs) {
-        this.dstCurs = dstCurs;
-    }
-}

src/main/java/es/uv/saic/dto/IndicadorDTO.java

@@ -1,9 +0,0 @@
-package es.uv.saic.dto;
-
-public interface IndicadorDTO {
-	String getDimensio();
-	String getIndicador();
-	String getAmbit();
-	String getCurs();
-	String getValor();
-}

src/main/java/es/uv/saic/dto/IndicadorEnquestaTmpDup.java

@@ -1,13 +0,0 @@
-package es.uv.saic.dto;
-
-public interface IndicadorEnquestaTmpDup {
-	String getCurs();
-	String getCursd();
-	String getEnquesta();
-	String getTipus();
-	String getAmbit();
-	String getEstudi();
-	String getIndicador();
-	String getTitulacio();
-	String getCentre();
-}

src/main/java/es/uv/saic/dto/IndicadorEnquestaValorDTO.java

@@ -1,15 +0,0 @@
-package es.uv.saic.dto;
-
-public interface IndicadorEnquestaValorDTO {
-	String getEnquesta();
-	String getIndicador();
-	String getValor();
-	String getNum();
-	String getAmbit();
-	String getTipus();
-	String getMin();
-	String getMax();
-	Integer getCurs();
-	String getCursd();
-	String getMedia();
-}

src/main/java/es/uv/saic/dto/InstanciaDTO.java

@@ -1,197 +0,0 @@
-package es.uv.saic.dto;
-
-import java.io.Serializable;
-import java.math.BigInteger;
-
-import org.springframework.context.i18n.LocaleContextHolder;
-
-import es.uv.saic.domain.Instancia;
-
-public class InstanciaDTO implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	private BigInteger idInstancia;
-	private BigInteger idInstanciaTasca;
-	private Integer centre;
-	private String estat;
-	private Integer titulacio;
-	private String tlugar;
-	private Integer lugar;
-	private String nomProces;
-	private String descVal;
-	private String descCas;
-	private String ambit;
-	private String text;
-	private String tambit;
-	private String nomval;
-	private String nomcas;
-	private Integer cursAvaluat;
-	private String nomValTitulacio;
-
-	public InstanciaDTO() {}
-	
-	public InstanciaDTO(Instancia i) {
-		String locale = LocaleContextHolder.getLocale().getLanguage();
-		this.idInstancia = i.getIdInstancia();
-		this.centre = i.getCentre();
-		this.estat = i.getEstat();
-		this.titulacio = i.getTitulacio();
-		this.lugar = i.getOrgan().getId().getLugar();
-		this.tlugar = i.getOrgan().getId().getTlugar();
-		this.nomProces = i.getProces().getNomProces();
-		this.descVal = i.getProces().getTitolVal();
-		this.descCas = i.getProces().getTitolCas();
-		this.ambit = i.getProces().getAmbit(); 
-		this.tambit = i.getOrgan().getTambit();
-		this.nomval = i.getOrgan().getOrgan().getNomVal();
-		this.nomcas = i.getOrgan().getNomCas();
-		this.cursAvaluat = i.getProces().getCursAvaluat();
-		this.nomValTitulacio = i.getOrgan().getNomVal();
-		
-		String icon = "<span class=\"btn gantt-legend-done\" style=\"border-width:5px;border-radius:50%;width:20px;height:20px;margin-top:-2px\"></span>";
-		if(this.estat.equals("A")) {
-			icon = "<span class=\"btn gantt-legend-active\" style=\"border-width:5px;border-radius:50%;width:20px;height:20px;margin-top:-2px\"></span>";
-		}
-		else if(this.estat.equals("C")) {
-			icon = "<span class=\"btn gantt-legend-closed\" style=\"border-width:5px;border-radius:50%;width:20px;height:20px;margin-top:-2px\"></span>";
-		}
-		
-		this.text = icon+" <a target=\"_blank\" href=\"/procedure/"+i.getIdInstancia().toString()+"\">"+i.getProces().getNomProces() + " - " + (locale.equals("es") ? i.getProces().getTitolCas() : i.getProces().getTitolVal()) +"</a>";
-	}
-	
-	public BigInteger getIdInstancia() {
-		return this.idInstancia;
-	}
-
-	public void setIdInstancia(BigInteger idInstancia) {
-		this.idInstancia = idInstancia;
-	}
-
-	public Integer getCentre() {
-		return this.centre;
-	}
-
-	public void setCentre(Integer centre) {
-		this.centre = centre;
-	}
-
-	public String getEstat() {
-		return this.estat;
-	}
-
-	public void setEstat(String estat) {
-		this.estat = estat;
-	}
-
-	public Integer getTitulacio() {
-		return this.titulacio;
-	}
-
-	public void setTitulacio(Integer titulacio) {
-		this.titulacio = titulacio;
-	}
-
-	public String getTlugar() {
-		return tlugar;
-	}
-
-	public void setTlugar(String tlugar) {
-		this.tlugar = tlugar;
-	}
-
-	public Integer getLugar() {
-		return lugar;
-	}
-
-	public void setLugar(Integer lugar) {
-		this.lugar = lugar;
-	}
-
-	public String getNomProces() {
-		return nomProces;
-	}
-
-	public void setNomProces(String nomProces) {
-		this.nomProces = nomProces;
-	}
-
-	public String getDescVal() {
-		return descVal;
-	}
-
-	public void setDescVal(String descVal) {
-		this.descVal = descVal;
-	}
-
-	public String getDescCas() {
-		return descCas;
-	}
-
-	public void setDescCas(String descCas) {
-		this.descCas = descCas;
-	}
-
-	public String getAmbit() {
-		return ambit;
-	}
-
-	public void setAmbit(String ambit) {
-		this.ambit = ambit;
-	}
-
-	public String getText() {
-		return text;
-	}
-
-	public void setText(String text) {
-		this.text = text;
-	}
-	
-	public BigInteger getIdInstanciaTasca() {
-		return idInstanciaTasca;
-	}
-
-	public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-		this.idInstanciaTasca = idInstanciaTasca;
-	}
-
-	public String getTambit() {
-		return tambit;
-	}
-
-	public void setTambit(String tambit) {
-		this.tambit = tambit;
-	}
-	
-	public String getNomval() {
-		return nomval;
-	}
-
-	public void setNomval(String nomval) {
-		this.nomval = nomval;
-	}
-
-	public String getNomcas() {
-		return nomcas;
-	}
-
-	public void setNomcas(String nomcas) {
-		this.nomcas = nomcas;
-	}
-	
-	public Integer getCursAvaluat() {
-		return cursAvaluat;
-	}
-
-	public void setCursAvaluat(Integer cursAvaluat) {
-		this.cursAvaluat = cursAvaluat;
-	}
-
-	public String getNomValTitulacio() {
-		return nomValTitulacio;
-	}
-
-	public void setNomValTitulacio(String nomValTitulacio) {
-		this.nomValTitulacio = nomValTitulacio;
-	}
-}

src/main/java/es/uv/saic/dto/InstanciaGanttDTO.java

@@ -1,14 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-
-public interface InstanciaGanttDTO {
-	BigInteger getId();
-	String getName();
-	String getTitCas();
-	String getTitVal();
-	String getStart();
-	String getEnd();
-	Integer getProgress();
-	String getCustom_class();
-}

src/main/java/es/uv/saic/dto/InstanciaGanttDTOImp.java

@@ -1,97 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-
-public class InstanciaGanttDTOImp implements InstanciaGanttDTO{
-    private BigInteger id;
-	private String name;
-	private String titCas;
-	private String titVal;
-	private String start;
-	private String end;
-	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;
-        this.name = name;
-        this.titCas = titCas;
-        this.titVal = titVal;
-        this.start = start;
-        this.end = end;
-        this.progress = progress;
-        this.custom_class = customClass;
-    }
-
-    public InstanciaGanttDTOImp(InstanciaGanttDTO instanciaGanttDTO) {
-        this.id = instanciaGanttDTO.getId();
-        this.name = instanciaGanttDTO.getName();
-        this.titCas = instanciaGanttDTO.getTitCas();
-        this.titVal = instanciaGanttDTO.getTitVal();
-        this.start = instanciaGanttDTO.getStart();
-        this.end = instanciaGanttDTO.getEnd();
-        this.progress = instanciaGanttDTO.getProgress();
-        this.custom_class = instanciaGanttDTO.getCustom_class();
-    }
-
-    public void setId(BigInteger id) {
-        this.id = id;
-    }
-    public void setName(String name) {
-        this.name = name;
-    }
-    public void setTitCas(String titCas) {
-        this.titCas = titCas;
-    }
-    public void setTitVal(String titVal) {
-        this.titVal = titVal;
-    }
-    public void setStart(String start) {
-        this.start = start;
-    }
-    public void setEnd(String end) {
-        this.end = end;
-    }
-    public void setProgress(Integer progress) {
-        this.progress = progress;
-    }
-    public void setCustom_class(String customClass) {
-        this.custom_class = customClass;
-    }
-    @Override
-    public BigInteger getId() {
-        return id;
-    }
-    @Override
-    public String getName() {
-        return name;
-    }
-    @Override
-    public String getTitCas() {
-        return titCas;    
-    }
-    @Override
-    public String getTitVal() {
-        return titVal;
-    }
-    @Override
-    public String getStart() {
-        return start;
-    }
-    @Override
-    public String getEnd() {
-        return end;
-    }
-    @Override
-    public Integer getProgress() {
-        return progress;
-    }
-
-    @Override
-    public String getCustom_class() {
-        return custom_class;
-    }   
-}

src/main/java/es/uv/saic/dto/InstanciaTascaDTO.java

@@ -1,64 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-
-import es.uv.saic.domain.InstanciaTasca;
-
-public class InstanciaTascaDTO {
-    private BigInteger idInstanciaTasca;
-	private String evidencia;
-	private String text;
-    private InstanciaDTO instancia;
-    private TascaDTO tasca;
-
-    public InstanciaTascaDTO(){}
-    
-    public InstanciaTascaDTO(BigInteger idInstanciaTasca, String evidencia, String text, InstanciaDTO instancia,
-            TascaDTO tasca) {
-        this.idInstanciaTasca = idInstanciaTasca;
-        this.evidencia = evidencia;
-        this.text = text;
-        this.instancia = instancia;
-        this.tasca = tasca;
-    }
-
-    public InstanciaTascaDTO(InstanciaTasca its){
-        this.idInstanciaTasca = its.getIdInstanciaTasca();
-        this.evidencia = its.getEvidencia();
-        this.text = its.getText();
-        instancia = new InstanciaDTO(its.getInstancia());
-        tasca = new TascaDTO(its.getTasca());
-    }
-
-    public BigInteger getIdInstanciaTasca() {
-        return idInstanciaTasca;
-    }
-    public void setIdInstanciaTasca(BigInteger idInstanciaTasca) {
-        this.idInstanciaTasca = idInstanciaTasca;
-    }
-    public String getEvidencia() {
-        return evidencia;
-    }
-    public void setEvidencia(String evidencia) {
-        this.evidencia = evidencia;
-    }
-    public String getText() {
-        return text;
-    }
-    public void setText(String text) {
-        this.text = text;
-    }
-    public InstanciaDTO getInstancia() {
-        return instancia;
-    }
-    public void setInstancia(InstanciaDTO instancia) {
-        this.instancia = instancia;
-    }
-    public TascaDTO getTasca() {
-        return tasca;
-    }
-    public void setTasca(TascaDTO tasca) {
-        this.tasca = tasca;
-    }
-    
-}

src/main/java/es/uv/saic/dto/OrganDTO.java

@@ -1,197 +0,0 @@
-package es.uv.saic.dto;
-
-import es.uv.saic.domain.Acreditacio;
-import es.uv.saic.domain.Organ;
-
-public class OrganDTO{
-    private Integer lugar;
-    private String tlugar;
-    private Integer lugar2;
-    private String tlugar2;
-    private String nomCas;
-    private String nomVal;
-    private Integer ruct;
-    private String tambit;
-    private String tambit2;
-    private String nomCas2;
-    private String nomVal2;
-    private Integer ruct2;
-    private String codis;
-    private String codis2;
-    private Acreditacio acreditacio;
-
-    public OrganDTO() {}
-
-    public OrganDTO(Integer lugar, String tlugar, Integer lugar2, String tlugar2, 
-                   String nomCas, String nomVal, Integer ruct, String tambit, 
-                   String tambit2, String nomCas2, String nomVal2, Integer ruct2,
-                   String codis, String codis2, Acreditacio acreditacio) {
-        this.lugar = lugar;
-        this.tlugar = tlugar;
-        this.lugar2 = lugar2;
-        this.tlugar2 = tlugar2;  
-        this.nomCas = nomCas;
-        this.nomVal = nomVal;
-        this.ruct = ruct;
-        this.tambit = tambit;
-        this.tambit2 = tambit2;
-        this.nomCas2 = nomCas2;
-        this.nomVal2 = nomVal2;
-        this.ruct2 = ruct2;
-        this.codis = codis;
-        this.codis2 = codis2;
-        this.acreditacio = acreditacio;
-    }
-
-    public OrganDTO(Organ organ) {
-        this.lugar = organ.getId().getLugar();
-        this.tlugar = organ.getId().getTlugar();
-        this.lugar2 = organ.getOrgan().getId().getLugar();
-        this.tlugar2 =  organ.getOrgan().getId().getTlugar();  
-        this.nomCas = organ.getNomCas();
-        this.nomVal = organ.getNomVal();
-        this.ruct = organ.getRuct();
-        this.tambit = organ.getTambit();
-        this.tambit2 = organ.getOrgan().getTambit();
-        this.nomCas2 = organ.getOrgan().getNomCas();
-        this.nomVal2 = organ.getOrgan().getNomVal();
-        this.ruct2 = organ.getOrgan().getRuct();
-        this.codis = organ.getCodis();
-        this.codis2 = organ.getOrgan().getCodis();
-        this.acreditacio = organ.getAcreditacio();
-    }
-
-    public OrganDTO(OrganRepositoryDTO organ) {
-        this.lugar = Integer.parseInt(organ.getLugar());
-        this.tlugar = organ.getTlugar();
-        this.lugar2 = Integer.parseInt(organ.getLugar2());
-        this.tlugar2 =  organ.getTlugar2();  
-        this.nomCas = organ.getNomCas();
-        this.nomVal = organ.getNomVal();
-        this.ruct = organ.getRuct();
-        this.tambit = organ.getTambit();
-        this.nomCas2 = organ.getNomCas2();
-        this.nomVal2 = organ.getNomVal2();
-        this.ruct2 = organ.getRuct2();
-    }
-
-    public Integer getLugar() {
-        return lugar;
-    }
-
-    public String getTlugar() {
-        return tlugar;
-    }
-
-    public Integer getLugar2() {
-        return lugar2;
-    }
-
-    public String getTlugar2() {
-        return tlugar2;
-    }
-
-    public String getNomCas() {
-        return nomCas;
-    }
-
-    public String getNomVal() {
-        return nomVal;
-    }
-
-    public Integer getRuct() {
-        return ruct;
-    }
-
-    public String getTambit() {
-        return tambit;
-    }
-
-    public String getTambit2() {
-        return tambit2;
-    }
-
-    public Integer getRuct2() {
-        return ruct2;
-    }
-
-    public String getNomCas2() {
-        return nomCas2;
-    }
-
-    public String getNomVal2() {
-        return nomVal2;
-    }
-
-    public String getCodis() {
-        return codis;
-    }
-
-    public String getCodis2() {
-        return codis2;
-    }
-
-    public Acreditacio getAcreditacio() {
-        return acreditacio;
-    }
-
-    public void setLugar(Integer lugar) {
-        this.lugar = lugar;
-    }
-
-    public void setTlugar(String tlugar) {
-        this.tlugar = tlugar;
-    }
-
-    public void setLugar2(Integer lugar2) {
-        this.lugar2 = lugar2;
-    }
-
-    public void setTlugar2(String tlugar2) {
-        this.tlugar2 = tlugar2;
-    }
-
-    public void setNomCas(String nomCas) {
-        this.nomCas = nomCas;
-    }
-
-    public void setNomVal(String nomVal) {
-        this.nomVal = nomVal;
-    }
-
-    public void setRuct(Integer ruct) {
-        this.ruct = ruct;
-    }
-
-    public void setTambit(String tambit) {
-        this.tambit = tambit;
-    }
-
-    public void setTambit2(String tambit) {
-        this.tambit2 = tambit;
-    }
-
-    public void setNomCas2(String nomCas2) {
-        this.nomCas2 = nomCas2;
-    }
-
-    public void setNomVal2(String nomVal2) {
-        this.nomVal2 = nomVal2;
-    }
-
-    public void setRuct2(Integer ruct2) {
-        this.ruct2 = ruct2;
-    }
-
-    public void setCodis(String codis) {
-        this.codis = codis;
-    }
-
-    public void setCodis2(String codis) {
-        this.codis2 = codis;
-    }
-
-     public void setAcreditacio(Acreditacio acreditacio) {
-        this.acreditacio = acreditacio;
-    }
-}

src/main/java/es/uv/saic/dto/OrganRepositoryDTO.java

@@ -1,15 +0,0 @@
-package es.uv.saic.dto;
-
-public interface OrganRepositoryDTO {
-    String getLugar();
-    String getTlugar();
-    String getLugar2();
-    String getTlugar2();
-    String getNomCas();
-    String getNomVal();
-    Integer getRuct();
-    String getTambit();
-    String getNomCas2();
-    String getNomVal2();
-    Integer getRuct2();
-} 

src/main/java/es/uv/saic/dto/PdfDTO.java

@@ -1,46 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-import java.util.Optional;
-
-public class PdfDTO {
-    private String content;
-    private Optional<BigInteger> idtascai;
-    private BigInteger idtasca;
-    
-    public PdfDTO() {}
-
-    public PdfDTO(String content, Optional<BigInteger> idtascai) {
-        this.content = content;
-        this.idtascai = idtascai;
-    }
-
-    public PdfDTO(String content, BigInteger idtasca) {
-        this.content = content;
-        this.idtasca = idtasca;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public Optional<BigInteger> getIdtascai() {
-        return idtascai;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public void setIdtascai(Optional<BigInteger> idtascai) {
-        this.idtascai = idtascai;
-    }
-
-    public BigInteger getIdtasca() {
-        return idtasca;
-    }
-
-    public void setIdtasca(BigInteger idtasca) {
-        this.idtasca = idtasca;
-    }
-}

src/main/java/es/uv/saic/dto/ProcedureRequestDTO.java

@@ -1,32 +0,0 @@
-package es.uv.saic.dto;
-
-import java.util.List;
-
-public class ProcedureRequestDTO {
-    private ProcesDTO proces;
-    private List<TascaDTO> tasques;
-
-    public ProcedureRequestDTO() {}
-
-    public ProcedureRequestDTO(ProcesDTO proces, List<TascaDTO> tasques) {
-        this.proces = proces;
-        this.tasques = tasques;
-    }
-
-    public ProcesDTO getProces() {
-        return proces;
-    }
-
-    public void setProces(ProcesDTO proces) {
-        this.proces = proces;
-    }
-
-    public List<TascaDTO> getTasques() {
-        return tasques;
-    }
-
-    public void setTasques(List<TascaDTO> tasques) {
-        this.tasques = tasques;
-    }
-    
-}

src/main/java/es/uv/saic/dto/ProcesDTO.java

@@ -1,181 +0,0 @@
-package es.uv.saic.dto;
-
-import es.uv.saic.domain.Proces;
-
-public class ProcesDTO {
-    private Integer idProces;
-    private String nomProces;
-    private Integer lugar;
-    private Integer lugar2;
-    private String tambit;
-    private Integer cursAvaluat;
-    private String versio;
-    private String titolCas;
-    private String titolVal;
-    private String ambit;
-    private Integer cursActivacio;
-    private String descripcioCas;
-    private String descripcioVal;
-    private String comentaris;
-    private String subTitol;
-
-    public ProcesDTO() {
-    }
-    
-    public ProcesDTO(Integer idProces, String nomProces, Integer lugar, Integer lugar2, String tambit,
-            Integer cursAvaluat, String versio, String titolCas, String titolVal, String ambit, Integer cursActivacio,
-            String descripcioCas, String descripcioVal, String comentaris, String subtitol) {
-        this.idProces = idProces;
-        this.nomProces = nomProces;
-        this.lugar = lugar;
-        this.lugar2 = lugar2;
-        this.tambit = tambit;
-        this.cursAvaluat = cursAvaluat;
-        this.versio = versio;
-        this.titolCas = titolCas;
-        this.titolVal = titolVal;
-        this.ambit = ambit;
-        this.cursActivacio = cursActivacio;
-        this.descripcioCas = descripcioCas;
-        this.descripcioVal = descripcioVal;
-        this.comentaris = comentaris;
-        this.subTitol = subtitol;
-    }
-
-    public ProcesDTO(Proces proces) {
-        this.idProces = proces.getIdProces();
-        this.nomProces = proces.getNomProces();
-        this.tambit = proces.getAmbit();
-        this.cursAvaluat = proces.getCursAvaluat();
-        this.versio = proces.getVersio();
-        this.titolCas = proces.getTitolCas();
-        this.titolVal = proces.getTitolVal();
-        this.ambit = proces.getAmbit();
-        this.cursActivacio = proces.getCursActivacio();
-        this.descripcioCas = proces.getDescripcioCas();
-        this.descripcioVal = proces.getDescripcioVal();
-        this.comentaris = proces.getComentaris();
-        this.subTitol = proces.getSubTitol();
-    }
-    
-    public Integer getIdProces() {
-        return idProces;
-    }
-
-    public void setIdProces(Integer idProces) {
-        this.idProces = idProces;
-    }
-
-    public String getNomProces() {
-        return nomProces;
-    }
-
-    public Integer getLugar() {
-        return lugar;
-    }
-
-    public Integer getLugar2() {
-        return lugar2;
-    }
-
-    public String getTambit() {
-        return tambit;
-    }
-
-    public void setNomProces(String nomProces) {
-        this.nomProces = nomProces;
-    }
-
-    public void setLugar(Integer lugar) {
-        this.lugar = lugar;
-    }
-
-    public void setLugar2(Integer lugar2) {
-        this.lugar2 = lugar2;
-    }
-
-    public void setTambit(String tambit) {
-        this.tambit = tambit;
-    }
-
-    public Integer getCursAvaluat() {
-        return cursAvaluat;
-    }
-
-    public void setCursAvaluat(Integer cursAvaluat) {
-        this.cursAvaluat = cursAvaluat;
-    }
-
-    public String getVersio() {
-        return versio;
-    }
-
-    public void setVersio(String versio) {
-        this.versio = versio;
-    }
-
-    public String getTitolVal() {
-        return titolVal;
-    }
-
-    public void setTitolVal(String titolVal) {
-        this.titolVal = titolVal;
-    }
-
-    public String getTitolCas() {
-        return titolCas;
-    }
-
-    public void setTitolCas(String titolCas) {
-        this.titolCas = titolCas;
-    }
-
-    public String getAmbit() {
-        return ambit;
-    }
-
-    public void setAmbit(String ambit) {
-        this.ambit = ambit;
-    }
-
-    public Integer getCursActivacio() {
-        return cursActivacio;
-    }
-
-    public void setCursActivacio(Integer cursActivacio) {
-        this.cursActivacio = cursActivacio;
-    }
-
-    public String getDescripcioCas() {
-        return descripcioCas;
-    }
-
-    public void setDescripcioCas(String descripcioCas) {
-        this.descripcioCas = descripcioCas;
-    }
-
-    public String getDescripcioVal() {
-        return descripcioVal;
-    }
-
-    public void setDescripcioVal(String descripcioVal) {
-        this.descripcioVal = descripcioVal;
-    }
-
-    public String getComentaris() {
-        return comentaris;
-    }
-
-    public void setComentaris(String comentaris) {
-        this.comentaris = comentaris;
-    }
-
-    public String getSubTitol() {
-        return subTitol;
-    }
-
-    public void setSubTitol(String subtitol) {
-        this.subTitol = subtitol;
-    }
-    
-}

src/main/java/es/uv/saic/dto/RolDTO.java

@@ -1,71 +0,0 @@
-package es.uv.saic.dto;
-
-import es.uv.saic.domain.Rol;
-
-public class RolDTO {
-    private Integer idRol;
-    private String descripcioCas;
-    private String descripcioVal;
-    private String nomRol;
-    private String ambit;
-
-    public RolDTO() {
-    }
-
-    public RolDTO(Integer idRol, String descripcioCas, String descripcioVal, String nomRol, String ambit) {
-        this.idRol = idRol;
-        this.descripcioCas = descripcioCas;
-        this.descripcioVal = descripcioVal;
-        this.nomRol = nomRol;
-        this.ambit = ambit;
-    }
-
-    public RolDTO(Rol rol) {
-        this.idRol = rol.getIdRol();
-        this.descripcioCas = rol.getDescripcioCas();
-        this.descripcioVal = rol.getDescripcioVal();
-        this.nomRol = rol.getNomRol();
-        this.ambit = rol.getAmbit();
-    }
-
-    public Integer getIdRol() {
-        return idRol;
-    }
-
-    public void setIdRol(Integer idRol) {
-        this.idRol = idRol;
-    }
-
-    public String getDescripcioCas() {
-        return descripcioCas;
-    }
-
-    public void setDescripcioCas(String descripcioCas) {
-        this.descripcioCas = descripcioCas;
-    }
-
-    public String getDescripcioVal() {
-        return descripcioVal;
-    }
-
-    public void setDescripcioVal(String descripcioVal) {
-        this.descripcioVal = descripcioVal;
-    }
-
-    public String getNomRol() {
-        return nomRol;
-    }
-
-    public void setNomRol(String nomRol) {
-        this.nomRol = nomRol;
-    }
-
-    public String getAmbit() {
-        return ambit;
-    }
-
-    public void setAmbit(String ambit) {
-        this.ambit = ambit;
-    }
-
-}

src/main/java/es/uv/saic/dto/TablaDTO.java

@@ -1,33 +0,0 @@
-package es.uv.saic.dto;
-
-public class TablaDTO {
-    Integer dbOrigen;
-    String vista;
-    String locale;
-    
-    public TablaDTO(Integer dbOrigen, String vista, String locale) {
-        this.dbOrigen = dbOrigen;
-        this.vista = vista;
-        this.locale = locale;
-    }
-    public Integer getDbOrigen() {
-        return dbOrigen;
-    }
-    public void setDbOrigen(Integer dbOrigen) {
-        this.dbOrigen = dbOrigen;
-    }
-    public String getVista() {
-        return vista;
-    }
-    public void setVista(String vista) {
-        this.vista = vista;
-    }
-    public String getLocale() {
-        return locale;
-    }
-    public void setLocale(String locale) {
-        this.locale = locale;
-    }
-
-    
-}

src/main/java/es/uv/saic/dto/TascaAsignadaDTO.java

@@ -1,11 +0,0 @@
-package es.uv.saic.dto;
-
-public interface TascaAsignadaDTO {
-	String getTLugar();
-	String getLugar();
-	String getIdProces();
-	String getInstancia();
-	String getInstanciaTasca();
-	String getTascaP();
-	Object getRol();
-}

src/main/java/es/uv/saic/dto/TascaDTO.java

@@ -1,238 +0,0 @@
-package es.uv.saic.dto;
-
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-
-import es.uv.saic.domain.Tasca;
-
-public class TascaDTO {
-    private Integer idTasca;
-    private String codiEvidencia;
-    private String dataLim;
-    private String descripcioCas;
-    private String descripcioVal;
-    private Integer idTascaSeg;
-    private Integer idTascaSeg2;
-    private Integer idTascap;
-    private Integer idTipus;
-    private String nomTipus;
-    private String nomEvidenciaCas;
-    private String nomEvidenciaVal;
-    private String titolCas;
-    private String titolVal;
-    private String opcions;
-    private Integer idRol;
-    private String nomRol;
-    private Boolean informe;
-    private Integer idPlantilla;
-
-    public TascaDTO() {
-    }
-
-    public TascaDTO(Integer idTasca, String codiEvidencia, String dataLim, String descripcioCas, String descripcioVal,
-            Integer idTascaSeg, Integer idTascaSeg2, Integer idTascap, Integer idTipus, String nomTipus,
-            String nomEvidenciaCas, String nomEvidenciaVal, String titolCas, String titolVal, String opcions,
-            Integer idRol, String nomRol, Boolean informe, Integer idPlantilla) {
-        this.idTasca = idTasca;
-        this.codiEvidencia = codiEvidencia;
-        this.dataLim = dataLim;
-        this.descripcioCas = descripcioCas;
-        this.descripcioVal = descripcioVal;
-        this.idTascaSeg = idTascaSeg;
-        this.idTascaSeg2 = idTascaSeg2;
-        this.idTascap = idTascap;
-        this.idTipus = idTipus;
-        this.nomTipus = nomTipus;
-        this.nomEvidenciaCas = nomEvidenciaCas;
-        this.nomEvidenciaVal = nomEvidenciaVal;
-        this.titolCas = titolCas;
-        this.titolVal = titolVal;
-        this.opcions = opcions;
-        this.idRol = idRol;
-        this.nomRol = nomRol;
-        this.informe = informe;
-        this.idPlantilla = idPlantilla;
-    }
-
-    public TascaDTO(Tasca tasca) {
-        this.idTasca = tasca.getIdTasca();
-        this.codiEvidencia = tasca.getCodiEvidencia();
-        this.dataLim = formatDate(tasca.getDataLim());
-        this.descripcioCas = tasca.getDescripcioCas();
-        this.descripcioVal = tasca.getDescripcioVal();
-        this.idTascaSeg = tasca.getIdTascaSeg();
-        this.idTascaSeg2 = tasca.getIdTascaSeg2();
-        this.idTascap = tasca.getIdTascap();
-        this.idTipus = tasca.getTipus().getTipus();
-        this.nomTipus = tasca.getTipus().getDescripcio();
-        this.nomEvidenciaCas = tasca.getNomEvidenciaCas();
-        this.nomEvidenciaVal = tasca.getNomEvidenciaVal();
-        this.titolCas = tasca.getTitolCas();
-        this.titolVal = tasca.getTitolVal();
-        this.opcions = tasca.getOpcions();
-        this.idRol = tasca.getRol().getIdRol();
-        this.nomRol = tasca.getRol().getNomRol();
-        this.informe = tasca.getInforme();
-    }
-
-    public Integer getIdTasca() {
-        return idTasca;
-    }
-
-    public void setIdTasca(Integer idTasca) {
-        this.idTasca = idTasca;
-    }
-
-    public String getCodiEvidencia() {
-        return codiEvidencia;
-    }
-
-    public void setCodiEvidencia(String codiEvidencia) {
-        this.codiEvidencia = codiEvidencia;
-    }
-
-    public Integer getIdTipus() {
-        return idTipus;
-    }
-
-    public void setIdTipus(Integer tipus) {
-        this.idTipus = tipus;
-    }
-
-    public String getNomEvidenciaCas() {
-        return nomEvidenciaCas;
-    }
-
-    public void setNomEvidenciaCas(String nomEvidenciaCas) {
-        this.nomEvidenciaCas = nomEvidenciaCas;
-    }
-
-    public String getOpcions() {
-        return opcions;
-    }
-
-    public void setOpcions(String opcions) {
-        this.opcions = opcions;
-    }
-
-    public String getNomRol() {
-        return nomRol;
-    }
-
-    public void setNomRol(String nomRol) {
-        this.nomRol = nomRol;
-    }
-
-    public String getDataLim() {
-        return dataLim;
-    }
-
-    public void setDataLim(String dataLim) {
-        this.dataLim = dataLim;
-    }
-
-    public String getDescripcioCas() {
-        return descripcioCas;
-    }
-
-    public void setDescripcioCas(String descripcioCas) {
-        this.descripcioCas = descripcioCas;
-    }
-
-    public String getDescripcioVal() {
-        return descripcioVal;
-    }
-
-    public void setDescripcioVal(String descripcioVal) {
-        this.descripcioVal = descripcioVal;
-    }
-
-    public Integer getIdTascaSeg() {
-        return idTascaSeg;
-    }
-
-    public void setIdTascaSeg(Integer idTascaSeg) {
-        this.idTascaSeg = idTascaSeg;
-    }
-
-    public Integer getIdTascaSeg2() {
-        return idTascaSeg2;
-    }
-
-    public void setIdTascaSeg2(Integer idTascaSeg2) {
-        this.idTascaSeg2 = idTascaSeg2;
-    }
-
-    public Integer getIdTascap() {
-        return idTascap;
-    }
-
-    public void setIdTascap(Integer idTascap) {
-        this.idTascap = idTascap;
-    }
-
-    public String getNomEvidenciaVal() {
-        return nomEvidenciaVal;
-    }
-
-    public void setNomEvidenciaVal(String nomEvidenciaVal) {
-        this.nomEvidenciaVal = nomEvidenciaVal;
-    }
-
-    public String getTitolCas() {
-        return titolCas;
-    }
-
-    public void setTitolCas(String titolCas) {
-        this.titolCas = titolCas;
-    }
-
-    public String getTitolVal() {
-        return titolVal;
-    }
-
-    public void setTitolVal(String titolVal) {
-        this.titolVal = titolVal;
-    }
-
-    
-
-    private String formatDate(LocalDate date) {
-        if (date == null)
-            return "";
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
-        return date.format(formatter);
-    }
-
-    public Integer getIdRol() {
-        return idRol;
-    }
-
-    public void setIdRol(Integer idRol) {
-        this.idRol = idRol;
-    }
-
-    public String getNomTipus() {
-        return nomTipus;
-    }
-
-    public void setNomTipus(String nomTipus) {
-        this.nomTipus = nomTipus;
-    }
-
-    public Boolean getInforme() {
-        return informe;
-    }
-
-    public void setInforme(Boolean informe) {
-        this.informe = informe;
-    }
-    
-    public Integer getIdPlantilla() {
-        return idPlantilla;
-    }
-
-    public void setIdPlantilla(Integer idPlantilla) {
-        this.idPlantilla = idPlantilla; 
-    }
-}

src/main/java/es/uv/saic/dto/TascaInformeTransferDTO.java

@@ -1,19 +0,0 @@
-package es.uv.saic.dto;
-
-import java.sql.Date;
-
-public interface TascaInformeTransferDTO {
-    Integer getTitulacio();
-    Integer getIdProces();
-    String getNomProces();
-    String getAmbit();
-    Integer getCursAvaluat();
-    Integer getIdTascai();
-    Integer getIdInstancia();
-    Integer getIdTasca();
-    Integer getVersio();
-    String getEstat();
-    String getUsuariFet();
-    Date getDataFet();
-    String getEvidencia();
-}

src/main/java/es/uv/saic/dto/TascaVersioTransferDTO.java

@@ -1,16 +0,0 @@
-package es.uv.saic.dto;
-
-import java.math.BigInteger;
-import java.sql.Date;
-
-public interface TascaVersioTransferDTO {
-    BigInteger getIdInstanciaTasca();
-    String getUsuariFet();
-    Date getDataFet();
-    Integer getVersion();
-    String getNomEvidenciaVal();
-    String getNomEvidenciaCas();
-    String getCodiEvidencia();
-    String getEstat();
-    Integer getTipus();
-}

src/main/java/es/uv/saic/dto/TemplateDataDTO.java

@@ -1,65 +0,0 @@
-package es.uv.saic.dto;
-
-public class TemplateDataDTO {
-    private InstanciaTascaDTO instanciaTasca;
-    private Integer idTitulacio;
-    private Integer idCentre;
-    private Integer curs;
-    private String template;
-
-    public TemplateDataDTO() {
-}
-    
-    public TemplateDataDTO(InstanciaTascaDTO instanciaTasca, String template) {
-        this.instanciaTasca = instanciaTasca;
-        this.template = template;
-    }
-
-    public TemplateDataDTO(Integer idTitulacio, Integer idCentre, Integer curs, String template) {
-        this.idTitulacio = idTitulacio;
-        this.idCentre = idCentre;
-        this.curs = curs;
-        this.template = template;
-    }
-
-    public InstanciaTascaDTO getInstanciaTasca() {
-        return instanciaTasca;
-    }
-
-    public void setInstanciaTasca(InstanciaTascaDTO instanciaTasca) {
-        this.instanciaTasca = instanciaTasca;
-    }
-
-    public String getTemplate() {
-        return template;
-    }
-
-    public void setTemplate(String template) {
-        this.template = template;
-    }
-
-    public Integer getIdTitulacio() {
-        return idTitulacio;
-    }
-
-    public void setIdTitulacio(Integer idTitulacio) {
-        this.idTitulacio = idTitulacio;
-    }
-
-    public Integer getIdCentre() {
-        return idCentre;
-    }
-
-    public void setIdCentre(Integer idCentre) {
-        this.idCentre = idCentre;
-    }
-
-    public Integer getCurs() {
-        return curs;
-    }
-
-    public void setCurs(Integer curs) {
-        this.curs = curs;
-    }
-
-}

src/main/java/es/uv/saic/dto/UsuariDTO.java

@@ -1,57 +0,0 @@
-package es.uv.saic.dto;
-
-import es.uv.saic.domain.Usuari;
-
-public class UsuariDTO {
-    private String nom;
-    private String cognoms;
-    private String email;
-    private String usuari;
-    
-    public UsuariDTO(String nom, String cognoms, String email, String usuari) {
-        this.nom = nom;
-        this.cognoms = cognoms;
-        this.email = email;
-        this.usuari = usuari;
-    }
-
-    public UsuariDTO(Usuari usuari) {
-        this.nom = usuari.getNom();
-        this.cognoms = usuari.getCognoms();
-        this.email = usuari.getEmail();
-        this.usuari = usuari.getUsuari();
-    }
-
-    public String getNom() {
-        return nom;
-    }
-
-    public void setNom(String nom) {
-        this.nom = nom;
-    }
-
-    public String getCognoms() {
-        return cognoms;
-    }
-
-    public void setCognoms(String cognoms) {
-        this.cognoms = cognoms;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public String getUsuari() {
-        return usuari;
-    }
-
-    public void setUsuari(String usuari) {
-        this.usuari = usuari;
-    }
-    
-}

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

@@ -1,92 +0,0 @@
-package es.uv.saic.feign;
-
-import java.math.BigInteger;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.openfeign.FeignClient;
-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.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import es.uv.saic.domain.Acreditacio;
-import es.uv.saic.domain.AcreditacioTransfer;
-import es.uv.saic.dto.ProcedureRequestDTO;
-
-@FeignClient(name = "saic-core-service", contextId = "admin-controller")
-public interface AdminClient {
-    @PostMapping("/admin/instance")
-    HashMap<String, Object> instantiate(@RequestParam("procedure") Integer idProces,
-			@RequestParam("center") Integer idCentre,
-			@RequestParam("titulation") Integer idTitulacio);
-     
-    @DeleteMapping("/admin/instance")
-    void deleteInstance(@RequestParam BigInteger idInstancia);
-    
-    @PostMapping("/admin/instance/clear")
-    String clearInstance(@RequestParam BigInteger idInstancia);
-
-    @PostMapping("/admin/instance/close")
-    String closeInstance(@RequestParam BigInteger idInstancia);
-
-    @DeleteMapping("/admin/instance/task")
-    String removeTask(@RequestParam BigInteger idInstanciaTasca);
-
-    @PostMapping("/admin/instance/task/clear")
-    String clearTask(@RequestParam BigInteger idInstanciaTasca);
-
-    @PostMapping("/admin/instance/task/reload")
-    String reloadTask(@RequestParam BigInteger idInstanciaTasca);
-
-    @PostMapping("/admin/instance/task/reactivate")
-    String activateTask(@RequestParam BigInteger idInstanciaTasca);
-
-    @PostMapping("/admin/instance/task/edit")
-    String editTask(@RequestParam BigInteger idInstanciaTasca);
-
-    @PostMapping("/admin/mailing")
-    void sendMails( @RequestParam Integer idRol, @RequestParam("centres[]") List<Integer> centres,
-			@RequestParam String subject, @RequestParam String body);
-
-    @PutMapping("/admin/procedure")
-    void newProcedure(@RequestBody ProcedureRequestDTO resquest);
-    
-	@PostMapping("/admin/procedure")
-	public void editProcedure(@RequestBody ProcedureRequestDTO resquest);
-
-    @DeleteMapping("/admin/procedure")
-    void removeProcedure(@RequestParam("idProces") Integer idProces);    
-    
-    @DeleteMapping("/admin/userrole")
-    boolean removeUserrole(@RequestParam("idRol") Integer idRol, @RequestParam("usuari") String usuari, 
-		@RequestParam("lugar") Integer lugar, @RequestParam("tlugar") String tlugar);
-    
-    @PutMapping("/admin/userrole")
-	boolean newUserrole(@RequestParam("idRol") Integer idRol, @RequestParam(name="usuari", required=false) String usuari, @RequestParam("centre") Integer idCentre, 
-			@RequestParam(name="titulacio", required=false) Integer idTitulacio, @RequestParam Map<String,String> params);
-	
-	@GetMapping("/admin/templates")
-	List<String> getTemplates2();
-
-	@PostMapping("/admin/templates/inds/update")
-	void updateTemplateInds(@RequestParam(name="indicador[]", required=true) List<String> indicador,
-			@RequestParam(name="enquesta[]", required=true) List<String> enquesta,
-			@RequestParam(name="media[]", required=true) List<String> media,
-			@RequestParam(name="evidencia", required=true) String evidencia,
-			@RequestParam(name="proces", required=true) String proces
-			);
-	
-	@GetMapping("/admin/acredita/{curs}/{grup}/{tambit}")  
-	List<AcreditacioTransfer> acreditacionsByCurs(@PathVariable Integer curs, @PathVariable Integer grup, @PathVariable String tambit);
-
-	@PostMapping("/admin/acredita") 
-	Acreditacio UpdateAcreditacio(@RequestParam String tlugar, @RequestParam Integer lugar, 
-									@RequestParam Integer grupCurs, @RequestParam Integer grupNum, @RequestParam Integer cursImpla,
-									@RequestParam String dataAcred, @RequestParam String dataRenov, @RequestParam String dataSegui,
-									@RequestParam String dataVerif, @RequestParam Boolean recom, @RequestParam Boolean segui);			
-}

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

@@ -1,43 +0,0 @@
-package es.uv.saic.feign;
-
-import java.util.List;
-import java.util.Optional;
-
-import org.springframework.cloud.openfeign.FeignClient;
-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.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import es.uv.saic.domain.Calendari;
-
-@FeignClient(name = "saic-core-service", contextId = "calendar-controller")
-public interface CalendarClient {
-        @ResponseBody
-	@PostMapping("/calendar")
-	public Calendari calendarAddEvent(@RequestParam("idProces") Integer idProces, 
-        @RequestParam("titulacions") List<String> titulacions, @RequestParam("centres") List<String> centres, 
-        @RequestParam("data") String data, @RequestParam("instancia") Optional<Integer> instancia);
-
-    @ResponseBody
-	@PostMapping("/calendar/{id}")
-	public Calendari calendarAddEvent(@PathVariable("id") Integer id, 
-        @RequestParam("idProces") Integer idProces, @RequestParam("titulacions") List<String> titulacions, 
-        @RequestParam("centres") List<String> centres, @RequestParam("data") String data);
-
-    @ResponseBody
-	@GetMapping("/calendar")
-	public List<Calendari> calendarGetEvents();
-
-    @ResponseBody
-	@DeleteMapping("/calendar")
-	public Integer calendarDeleteEvent(@RequestParam("id") Integer id);
-
-    @ResponseBody
-	@PostMapping("/calendar/instantiate")
-    public List<String> instantiate(@RequestParam("id") Integer id,
-        @RequestParam("idProces") Integer idProces, @RequestParam("centres") List<Integer> centres,
-        @RequestParam("titulacions") List<Integer> titulacions, @RequestParam String usuari);   
-}

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

@@ -1,89 +0,0 @@
-package es.uv.saic.feign;
-
-import java.util.HashMap;
-import java.util.List;
-
-import org.springframework.cloud.openfeign.FeignClient;
-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 org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import es.uv.saic.domain.Categoria;
-import es.uv.saic.domain.Grafica;
-import es.uv.saic.domain.Indicador;
-import es.uv.saic.domain.Link;
-import es.uv.saic.dto.CategoriaDocumentDTO;
-import es.uv.saic.dto.InstanciaGanttDTOImp;
-
-@FeignClient(name = "saic-core-service", contextId = "dashboard-controller")
-public interface DashboardClient {
-    @PostMapping("/dashboard")
-	@ResponseBody
-	public HashMap<String, Object> getOrganList(@RequestBody String usuari);
-
-    @PostMapping("/dashboard/{ruct}")
-	@ResponseBody
-	public HashMap<String, Object> getDashboardOrgan(@PathVariable Integer ruct, @RequestBody String usuari);
-
-    @PostMapping("/dashboard/procedures/{idTitulacio}")
-	@ResponseBody
-	public List<?> loadReports(@PathVariable Integer idTitulacio);
-
-    @GetMapping("/dashboard/documents/{idTitulacio}")
-	@ResponseBody
-	public List<CategoriaDocumentDTO> loadDocuments(@PathVariable Integer idTitulacio);
-
-    @GetMapping("/dashboard/gantt/{ruct}")
-	@ResponseBody
-	public List<InstanciaGanttDTOImp> loadGantt(@PathVariable Integer ruct);
-
-    @GetMapping("/dashboard/documents/cats/{idCategoria}/{tambit}")
-	@ResponseBody
-	public List<Categoria> getDocumentChildCats(@PathVariable Integer idCategoria, @PathVariable String tambit);
-
-    @GetMapping("/dashboard/documents/catsu/{idCategoria}/{tambit}")
-	@ResponseBody
-	public List<Categoria> getDocumentChildCatsU(@PathVariable Integer idCategoria, @PathVariable String tambit);
-
-    @PostMapping("/dashboard/documents")
-	@ResponseBody
-	public void uploadDocument(@RequestParam MultipartFile file, @RequestParam Integer idCategoria, 
-							   @RequestParam Integer lugar, @RequestParam String tlugar);
-    
-    @PostMapping("/dashboard/documents/archive")
-	@ResponseBody
-	public void archiveDocuments(@RequestParam Integer lugar, @RequestParam String tlugar);
-
-    @GetMapping("/dashboard/graphs/list/{ruct}")
-	@ResponseBody
-	public List<Grafica> getGraphDataList(@PathVariable Integer ruct);
-
-    @GetMapping("/dashboard/graphs/rates/{lugar}")
-	@ResponseBody
-	public List<Indicador> getGraphDataTaxes(@PathVariable Integer lugar);
-
-	@GetMapping("/dashboard/graphs/inds/{ruct}/{tambit}")
-	@ResponseBody
-	public List<Indicador> getGraphDataByRuctTambit(@PathVariable Integer ruct, @PathVariable String tambit);
-
-    @GetMapping("/dashboard/graphs/inds/{ruct}")
-	@ResponseBody
-	public List<Indicador> getGraphDataByRuct(@PathVariable Integer ruct);
-
-    @GetMapping("/dashboard/links/{ruct}")
-	@ResponseBody
-	public List<Link> getLinks(@PathVariable Integer ruct);
-
-    @PostMapping("/dashboard/links/{ruct}")
-	@ResponseBody
-	public Link createLink(@PathVariable Integer ruct, @RequestParam String dataExp);
-
-    @DeleteMapping("/dashboard/links/{id}")
-	@ResponseBody
-	public Integer deleteLink(@PathVariable Integer id);
-}