#12464 Attach documents to external emails - added caption and fixed …

…duplicate email history
SORMAS-Foundation · Dec 19, 2023 · 105729d · 105729d
1 parent b893fb4
commit 105729d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 0 deletions.
diff --git a/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java b/sormas-api/src/main/java/de/symeda/sormas/api/i18n/Captions.java
@@ -1408,6 +1408,7 @@ public interface Captions {
 	String exposureSourceCaseName = "exposureSourceCaseName";
 	String exposureTimePeriod = "exposureTimePeriod";
 	String externalEmailAttachedDocuments = "externalEmailAttachedDocuments";
+	String ExternalEmailOptions_attachedDocuments = "ExternalEmailOptions.attachedDocuments";
 	String ExternalEmailOptions_recipientEmail = "ExternalEmailOptions.recipientEmail";
 	String ExternalEmailOptions_templateName = "ExternalEmailOptions.templateName";
 	String externalEmailSentBy = "externalEmailSentBy";

diff --git a/sormas-api/src/main/resources/captions.properties b/sormas-api/src/main/resources/captions.properties
@@ -2917,6 +2917,7 @@ environmentSampleViewType=Environment
 environmentSampleNewSample=New sample
 ExternalEmailOptions.templateName=Choose template
 ExternalEmailOptions.recipientEmail=Email address
+ExternalEmailOptions.attachedDocuments=Attach document(s)
 externalEmailUsedTemplate=Template
 externalEmailSentBy=Sent by
 externalEmailSentTo=Sent to

diff --git a/...nd/src/main/java/de/symeda/sormas/backend/manualmessagelog/ManualMessageLogFacadeEjb.java b/...nd/src/main/java/de/symeda/sormas/backend/manualmessagelog/ManualMessageLogFacadeEjb.java
@@ -81,6 +81,9 @@ public List<ManualMessageLogIndexDto> getIndexList(ManualMessageLogCriteria crit
 		}
 
 		cq.orderBy(cb.desc(root.get(ManualMessageLog.SENT_DATE)));
+		// distinct needed because of the jurisdiction selection,
+		// it can bring multiple results for one manual message log because the person has multiple assigned entities that can have email
+		cq.distinct(true);
 
 		List<ManualMessageLogIndexDto> resultList = em.createQuery(cq).getResultList();