Merge branch 'log-file-and-email' of UV-APPS/UV_SAIC_CORE into master

src/main/java/es/uv/saic/service/EmailService.java

@@ -71,7 +71,7 @@ public class EmailService {
         mailMessage.setTo(to);
         mailMessage.setSubject(subject);
         mailMessage.setText(msg);
-        mailMessage.setFrom("saic@uv.es");
+        mailMessage.setFrom("saiq@uib.cat");
 
         mailSender.send(mailMessage);
     }

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

@@ -358,7 +358,8 @@ public class ProceduresController {
 					String b64 = node.get("base64").asText();
 
 					byte[] bytes = Base64.getDecoder().decode(b64);
-					String ruta = "C:\\Users\\Pablo\\Desktop\\Trabajo\\SAIC\\docs"+ it.getIdInstanciaTasca() + "_" + nombre;
+					String nombreFichero = it.getIdInstanciaTasca() + "_" + nombre;
+					String ruta = Paths.get(filePath, nombreFichero).toString();
 					Files.write(Paths.get(ruta),bytes);
 
 					PamDocuments pamDocuments = new PamDocuments();
@@ -413,20 +414,20 @@ public class ProceduresController {
 			.append("<thead>")
 			.append("<tr>")
 			.append("<th colspan='3' class='header-group'>ORIGEN DE LA ACCIÓN</th>")
-			.append("<th colspan='4' class='header-group'>ACCIÓN PLANIFICADA</th>")
-			.append("<th colspan='4' class='header-group'>SEGUIMIENTO</th>")
+			.append("<th colspan='5' class='header-group'>ACCIÓN PLANIFICADA</th>")
+			.append("<th colspan='3' class='header-group'>SEGUIMIENTO</th>")
 			.append("</tr>")
 			.append("<tr class='subheader'>")
-			.append("<td style='width: 40px;'>ID</td>")
-			.append("<td style='width: 140px;'>Objetivo de mejora</td>")
-			.append("<td style='width: 100px;'>Origen</td>")
-			.append("<td style='width: 160px;'>Actividades a desarrollar</td>")
-			.append("<td style='width: 110px;'>Responsable</td>")
-			.append("<td style='width: 70px;'>Prioridad</td>")
-			.append("<td style='width: 80px;'>Curso Inicio/Fin</td>")
-			.append("<td style='width: 120px;'>Indicadores de seguimiento</td>")
-			.append("<td style='width: 90px;'>Grado ejecución</td>")
-			.append("<td style='width: 80px;'>Objetivo (SÍ/NO)</td>")
+			.append("<td style='width: 35px;'>ID</td>")
+			.append("<td style='width: 140px;'>OBJETIVO</td>")
+			.append("<td style='width: 90px;'>ORIGEN</td>")
+			.append("<td style='width: 160px;'>ACTIVIDADES</td>")
+			.append("<td style='width: 110px;'>RESPONSABLE</td>")
+			.append("<td style='width: 70px;'>PRIORIDAD</td>")
+			.append("<td style='width: 55px;'>CURSO INICIO</td>")
+        	.append("<td style='width: 55px;'>CURSO FIN</td>")
+			.append("<td style='width: 110px;'>INDICADORES</td>")
+			.append("<td style='width: 100px;'>GRADO DE EJECUCIÓN</td>")
 			.append("<td style='width: 130px;'>JUSTIFICACIÓN</td>")
 			.append("</tr></thead><tbody>");
 		
@@ -438,14 +439,10 @@ public class ProceduresController {
 			html.append("<td>").append(row.path("actividades").asText("")).append("</td>");
 			html.append("<td>").append(formatList(row.path("responsable"))).append("</td>");		
 			html.append("<td align='center'>").append(row.path("prioridad").asText("")).append("</td>");
-			html.append("<td align='center'>")
-				.append(row.path("cursoInicio").asText("")).append(" / ")
-				.append(row.path("cursoFin").asText(""))
-				.append("</td>");
+			html.append("<td align='center'>").append(row.path("cursoInicio").asText("")).append("</td>");
+			html.append("<td align='center'>").append(row.path("cursoFin").asText("")).append("</td>");
 			html.append("<td>").append(row.path("indicadores").asText("")).append("</td>");
 			html.append("<td>").append(row.path("gradoEjecucion").asText("")).append("</td>");
-			String consecucion = row.path("consecucion").asText(" - ");
-			html.append("<td align='center'>").append(consecucion).append("</td>");
 			html.append("<td>").append(row.path("justificacion").asText("")).append("</td>");
 			html.append("</tr>");
 		}

src/main/resources/application-local.properties

@@ -23,7 +23,7 @@ spring.datasource.password=docent1ia2.l6
 logging.file.path=/home/mariomh/Documentos/SAIC/docs/logs
 logging.file.name=/home/mariomh/Documentos/SAIC/docs/logs/saic.log
 
-saic.data.filePath=/home/mariomh/Documentos/SAIC/docs/files/
+saic.data.filePath=C:\\SAIC\\files\\
 saic.data.templates.filePath = /home/mariomh/Documentos/SAIC/docs/templates/
 saic.data.templates.logoPath = /home/mariomh/Documentos/SAIC/docs/templates/logos/
 saic.data.templates.fileNotFound = /home/mariomh/Documentos/SAIC/docs/filenotfound.pdf

src/main/resources/application-dev.properties → src/main/resources/application-pre.properties

@@ -17,7 +17,7 @@ spring.datasource.password=docent1ia2.l6
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
-logging.file.name=/DATA/saic-data/logs/saicd.log
+logging.file.name = /DATA/saic-data/logs/saic-core-pre.log
 
 saic.data.filePath=/DATA/saic-data/files/
 saic.data.templates.filePath=/DATA/saic-data/templates/

src/main/resources/application-prod.properties

@@ -17,7 +17,7 @@ spring.datasource.password=docent1ia2.l6
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
-logging.file.name=/DATA/saic-data/logs/saic.log
+logging.file.name = /DATA/saic-data/logs/saic-core-prod.log
 
 saic.data.filePath=/DATA/saic-data/files/
 saic.data.templates.filePath=/DATA/saic-data/templates/

src/main/resources/application-uib-local.properties

@@ -14,7 +14,7 @@ saic.mailer.calendar.enabled = false
 saic.mailer.maxMailsPerRound = 20
 
 # Database config
-spring.datasource.url=jdbc:postgresql://saiqpre.uib.cat:5432/saic_v3
+spring.datasource.url=jdbc:postgresql://127.0.0.1:5433/saic_v3
 spring.datasource.username=sys_saic
 spring.datasource.password=jw4s0F2026
 

src/main/resources/application-uib-dev.properties → src/main/resources/application-uib-pre.properties

@@ -17,7 +17,7 @@ spring.datasource.password=jw4s0F2026
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
-logging.file.name=/DATA/saic-data/logs/saicd.log
+logging.file.name = /DATA/saic-data/logs/saic-core-pre.log
 
 saic.data.filePath=/DATA/saic-data/files/
 saic.data.templates.filePath=/DATA/saic-data/templates/

src/main/resources/application-uib-prod.properties

@@ -16,7 +16,7 @@ spring.datasource.password=jw4s0F2026
 
 # Files and log config
 logging.file.path=/DATA/saic-data/logs
-logging.file.name=/DATA/saic-data/logs/saic.log
+logging.file.name = /DATA/saic-data/logs/saic-core-prod.log
 saic.data.filePath=/DATA/saic-data/files/
 saic.data.templates.filePath=/DATA/saic-data/templates/
 saic.data.templates.logoPath=/DATA/saic-data/templates/logos/

src/main/resources/application.properties

@@ -39,7 +39,7 @@ spring.sql.init.platform=postgres
 # Email config
 spring.main.banner-mode=off
 spring.mail.protocol=smtp
-spring.mail.host=post.uv.es
+spring.mail.host=stmp.uib.es
 spring.mail.port=25
 spring.mail.properties.mail.smtp.auth = false
 spring.mail.properties.mail.smtp.starttls.enable = false