Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
diff -u -r7095cfba4c04b9581b3615df808869f9b36d8117 -ra354dd7ec8e034119821cb463b15762c630d424e
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 7095cfba4c04b9581b3615df808869f9b36d8117)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision a354dd7ec8e034119821cb463b15762c630d424e)
@@ -894,25 +894,29 @@
final String NEW_LINE_CHARACTER = "
";
HttpSession ss = SessionManager.getSession();
- UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER);
- Long userId = new Long(toolUser.getUserID().longValue());
+ UserDTO userDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+ Long userId = new Long(userDto.getUserID().longValue());
QaQueUsr user = getUserByIdAndSession(userId, new Long(sessionId));
-
String fullName = user.getFullname();
- String message = NEW_LINE_CHARACTER + NEW_LINE_CHARACTER
- + messageService.getMessage("label.user.has.answered.questions", new Object[] { fullName });
-
+ //add question-answer pairs to email message
List responses = qaUsrRespDAO.getResponsesByUserUid(user.getUid());
+ Date attemptTime = new Date();
+ String message = new String();
for (QaUsrResp response : responses) {
String question = response.getQaQuestion().getQuestion();
String answer = response.getAnswer();
- message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER + question + answer;
+ message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER + question + " " + answer;
+ attemptTime = response.getAttemptTime();
}
+
+ message = NEW_LINE_CHARACTER
+ + NEW_LINE_CHARACTER
+ + messageService
+ .getMessage("label.user.has.answered.questions", new Object[] { fullName, attemptTime })
+ + message + NEW_LINE_CHARACTER + NEW_LINE_CHARACTER;
- message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER;
-
eventNotificationService.notifyLessonMonitors(sessionId, message, true);
}