Browse Source

Change format data and task advance

Drowsito 2 months ago
parent
commit
0912bd984b

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

@@ -198,7 +198,7 @@ public class TascaDTO {
     private String formatDate(Date date) {
         if (date == null)
             return "";
-        SimpleDateFormat formatter = new SimpleDateFormat("dd-MM-yyyy");
+        SimpleDateFormat formatter = new SimpleDateFormat("dd/MM/yyyy");
         return formatter.format(date);
     }
 

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

@@ -178,6 +178,9 @@ public class InstanciaTascaService {
 					builder.command("cp", editableFile, finalFile);
 					Process process = builder.start();
 					process.waitFor();
+					it.setEvidencia(it.getIdInstanciaTasca().toString()+".pdf");
+					it.setEstat("E");
+					this.saveChanges(user, it);
 				} 
 				catch (IOException e) {
 					e.printStackTrace();
@@ -189,10 +192,6 @@ public class InstanciaTascaService {
 					}
 				}
 			}
-			
-			it.setEvidencia(it.getIdInstanciaTasca().toString()+".pdf");
-			it.setEstat("E");
-			this.saveChanges(user, it);
 		}
 		else if(tipus == 20) { /* Check if procedure was instanced in the past */
 			String [] options = it.getTasca().getOpcions().split(";");
@@ -262,6 +261,9 @@ public class InstanciaTascaService {
 			try {
 				Process process = builder.start();
 				process.waitFor();
+				it.setEvidencia(it.getIdInstanciaTasca().toString()+".pdf");
+				it.setEstat("E");
+				this.saveChanges(user, it);
 			}
 			catch (IOException e) {
 				e.printStackTrace();
@@ -272,9 +274,6 @@ public class InstanciaTascaService {
 					Thread.currentThread().interrupt();
 				}
 			}
-			it.setEvidencia(it.getIdInstanciaTasca().toString()+".pdf");
-			it.setEstat("E");
-			this.saveChanges(user, it);
 		}
 		else if(tipus == 16){ /* Copy evidence from other procedure */
 			String [] options = it.getTasca().getOpcions().split(";");