v1.2-RELEASE

EsupPortail · Oct 23, 2020 · 57f8ddc · 57f8ddc
1 parent 00fb2ac
commit 57f8ddc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 48 deletions.
diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 	</parent>
 	<groupId>org.esupportail</groupId>
 	<artifactId>esup-signature</artifactId>
-	<version>1.2.BUILD-SNAPSHOT</version>
+	<version>1.2</version>
 	<name>esup-signature</name>
 	<properties>
 		<start-class>org.esupportail.esupsignature.EsupSignatureApplication</start-class>

diff --git a/src/main/java/org/esupportail/esupsignature/service/export/DataExportService.java b/src/main/java/org/esupportail/esupsignature/service/export/DataExportService.java
@@ -43,29 +43,22 @@ public List<LinkedHashMap<String, String>> getDatasToExport(Form form) {
         for(Data data : datas) {
             SignBook signBook = data.getSignBook();
             if(signBook != null && signBook.getSignRequests().size() > 0) {
+                List<Log> logs = logRepository.findBySignRequestId(signBook.getSignRequests().get(0).getId()).stream().sorted(Comparator.comparing(Log::getLogDate).reversed()).collect(Collectors.toList());
                 LinkedHashMap<String, String> toExportDatas = new LinkedHashMap<>();
                 toExportDatas.put("form_name", form.getName());
                 toExportDatas.put("form_create_date", data.getCreateDate().toString());
                 toExportDatas.put("form_create_by", data.getCreateBy());
                 toExportDatas.put("form_current_status", signBook.getStatus().name());
-                List<Log> lastLogs = logRepository.findBySignRequestIdAndFinalStatus(signBook.getSignRequests().get(0).getId(), SignRequestStatus.completed.name());
-                if(lastLogs.size() > 0) {
-                    toExportDatas.put("form_completed_date", lastLogs.get(0).getLogDate().toString());
-                    toExportDatas.put("form_completed_by", lastLogs.get(0).getEppnFor());
+                if(logs.size() > 0) {
+                    toExportDatas.put("form_completed_date", logs.get(0).getLogDate().toString());
+                    toExportDatas.put("form_completed_by", logs.get(0).getEppnFor());
                 } else {
-                    List<Log> refuseLogs = logRepository.findBySignRequestIdAndFinalStatus(signBook.getSignRequests().get(0).getId(), SignRequestStatus.refused.name());
-                    if(refuseLogs.size() > 0) {
-                        toExportDatas.put("form_completed_date", refuseLogs.get(0).getLogDate().toString());
-                        toExportDatas.put("form_completed_by", refuseLogs.get(0).getEppnFor());
-                    } else {
-                        toExportDatas.put("form_completed_date", "");
-                        toExportDatas.put("form_completed_by", "");
-                    }
+                    toExportDatas.put("form_completed_date", "");
+                    toExportDatas.put("form_completed_by", "");
                 }
                 for (Map.Entry<String, String> entry : data.getDatas().entrySet()) {
                     toExportDatas.put("form_data_" + entry.getKey(), entry.getValue());
                 }
-                List<Log> logs = logRepository.findBySignRequestId(signBook.getSignRequests().get(0).getId()).stream().sorted(Comparator.comparing(Log::getLogDate)).collect(Collectors.toList());
                 int step = 1;
                 //for(WorkflowStep workflowStep : signBook.getWorkflowSteps()) {
                 for (Log log : logs) {

diff --git a/src/main/java/org/esupportail/esupsignature/service/security/AuthorizeRequestsHelper.java b/src/main/java/org/esupportail/esupsignature/service/security/AuthorizeRequestsHelper.java
diff --git a/src/main/resources/static/js/modules/utils/PdfViewer.js b/src/main/resources/static/js/modules/utils/PdfViewer.js
@@ -581,4 +581,4 @@ export class PdfViewer extends EventFactory {
             source: self
         });
     }
-}
+}
diff --git a/src/main/resources/update_1.2-RELEASE.sql b/src/main/resources/update_1.2-RELEASE.sql
@@ -16,4 +16,4 @@
 --    "fk785uuku5axshwitce6byh7433" FOREIGN KEY (fields_id) REFERENCES field(id)
 
 
-alter table form_fields drop constraint uk_qyes453jb4ho6jt8bwjcdninr;
+alter table form_fields drop constraint uk_qyes453jb4ho6jt8bwjcdninr;
-Original file line number
+Diff line change
@@ Expand Up / @@ -581,4 +581,4 @@ export class PdfViewer extends EventFactory { @@
                 source: self
             });
         }
-    }
+    }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,4 @@
		-- "fk785uuku5axshwitce6byh7433" FOREIGN KEY (fields_id) REFERENCES field(id)


		alter table form_fields drop constraint uk_qyes453jb4ho6jt8bwjcdninr;
		alter table form_fields drop constraint uk_qyes453jb4ho6jt8bwjcdninr;