Skip to content
Snippets Groups Projects
Commit d433682b authored by srosse's avatar srosse
Browse files

OO-3276: add more properties to the signature email

parent c7734d2f
No related branches found
No related tags found
No related merge requests found
...@@ -42,7 +42,9 @@ import org.olat.core.gui.control.generic.iframe.IFrameDisplayController; ...@@ -42,7 +42,9 @@ import org.olat.core.gui.control.generic.iframe.IFrameDisplayController;
import org.olat.core.gui.media.MediaResource; import org.olat.core.gui.media.MediaResource;
import org.olat.core.gui.media.NotFoundMediaResource; import org.olat.core.gui.media.NotFoundMediaResource;
import org.olat.core.gui.translator.Translator; import org.olat.core.gui.translator.Translator;
import org.olat.core.id.Identity;
import org.olat.core.id.OLATResourceable; import org.olat.core.id.OLATResourceable;
import org.olat.core.id.UserConstants;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger; import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.Formatter; import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper; import org.olat.core.util.StringHelper;
...@@ -785,7 +787,8 @@ public class QTI21AssessmentRunController extends BasicController implements Gen ...@@ -785,7 +787,8 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
CourseEnvironment courseEnv, CourseNode courseNode, RepositoryEntry testEntry, Date timestamp, Locale locale) { CourseEnvironment courseEnv, CourseNode courseNode, RepositoryEntry testEntry, Date timestamp, Locale locale) {
MailBundle bundle = new MailBundle(); MailBundle bundle = new MailBundle();
bundle.setToId(candidateSession.getIdentity()); bundle.setToId(candidateSession.getIdentity());
String fullname = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(candidateSession.getIdentity()); Identity assessedIdentity = candidateSession.getIdentity();
String fullname = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(assessedIdentity);
Date assessedDate = candidateSession.getFinishTime() == null ? timestamp : candidateSession.getFinishTime(); Date assessedDate = candidateSession.getFinishTime() == null ? timestamp : candidateSession.getFinishTime();
String[] args = new String[] { String[] args = new String[] {
...@@ -796,7 +799,12 @@ public class QTI21AssessmentRunController extends BasicController implements Gen ...@@ -796,7 +799,12 @@ public class QTI21AssessmentRunController extends BasicController implements Gen
testEntry.getDisplayname(), // {4} testEntry.getDisplayname(), // {4}
fullname, // {5} fullname, // {5}
Formatter.getInstance(locale) Formatter.getInstance(locale)
.formatDateAndTime(assessedDate) // {6} .formatDateAndTime(assessedDate), // {6}
assessedIdentity.getName(), // {7}
assessedIdentity.getUser()
.getProperty(UserConstants.INSTITUTIONALUSERIDENTIFIER, locale), // {8}
assessedIdentity.getUser()
.getProperty(UserConstants.INSTITUTIONALNAME, locale), // {9}
}; };
Translator translator = Util.createPackageTranslator(QTI21AssessmentRunController.class, locale); Translator translator = Util.createPackageTranslator(QTI21AssessmentRunController.class, locale);
......
...@@ -26,6 +26,8 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -26,6 +26,8 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.translator.Translator; import org.olat.core.gui.translator.Translator;
import org.olat.core.id.Identity;
import org.olat.core.id.UserConstants;
import org.olat.core.logging.activity.ThreadLocalUserActivityLogger; import org.olat.core.logging.activity.ThreadLocalUserActivityLogger;
import org.olat.core.util.Formatter; import org.olat.core.util.Formatter;
import org.olat.core.util.Util; import org.olat.core.util.Util;
...@@ -80,7 +82,8 @@ public class AssessmentEntryOutcomesListener implements OutcomesListener { ...@@ -80,7 +82,8 @@ public class AssessmentEntryOutcomesListener implements OutcomesListener {
DigitalSignatureOptions options, Date timestamp, Locale locale) { DigitalSignatureOptions options, Date timestamp, Locale locale) {
MailBundle bundle = new MailBundle(); MailBundle bundle = new MailBundle();
bundle.setToId(candidateSession.getIdentity()); bundle.setToId(candidateSession.getIdentity());
String fullname = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(candidateSession.getIdentity()); Identity assessedIdentity = candidateSession.getIdentity();
String fullname = CoreSpringFactory.getImpl(UserManager.class).getUserDisplayName(assessedIdentity);
Date assessedDate = candidateSession.getFinishTime() == null ? timestamp : candidateSession.getFinishTime(); Date assessedDate = candidateSession.getFinishTime() == null ? timestamp : candidateSession.getFinishTime();
...@@ -93,7 +96,12 @@ public class AssessmentEntryOutcomesListener implements OutcomesListener { ...@@ -93,7 +96,12 @@ public class AssessmentEntryOutcomesListener implements OutcomesListener {
testEntry.getDisplayname(), // {4} testEntry.getDisplayname(), // {4}
fullname, // {5} fullname, // {5}
Formatter.getInstance(locale) Formatter.getInstance(locale)
.formatDateAndTime(assessedDate) // {6} .formatDateAndTime(assessedDate), // {6}
assessedIdentity.getName(), // {7}
assessedIdentity.getUser()
.getProperty(UserConstants.INSTITUTIONALUSERIDENTIFIER, locale), // {8}
assessedIdentity.getUser()
.getProperty(UserConstants.INSTITUTIONALNAME, locale), // {9}
}; };
String subject = translator.translate("digital.signature.mail.subject", args); String subject = translator.translate("digital.signature.mail.subject", args);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment