Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java =================================================================== diff -u -rf932b797330099220514e4c2acef885899567207 -rf3eca03fe33106d66158de0543c29c75f7333ba2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java (.../EmailNotificationsController.java) (revision f932b797330099220514e4c2acef885899567207) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java (.../EmailNotificationsController.java) (revision f3eca03fe33106d66158de0543c29c75f7333ba2) @@ -262,7 +262,7 @@ request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); request.setAttribute(AttributeNames.PARAM_ORGANISATION_ID, organisationId); - return "emailnotifications/scheduledEmailList"; + return "emailnotifications/scheduledEmailList5"; } /** @@ -298,7 +298,7 @@ request.setAttribute(AttributeNames.PARAM_LESSON_ID, lessonId); request.setAttribute(AttributeNames.PARAM_ORGANISATION_ID, organisationId); - return "emailnotifications/archivedEmailList"; + return "emailnotifications/archivedEmailList5"; } @RequestMapping("getArchivedRecipients") Index: lams_monitoring/web/emailnotifications/archivedEmailList5.jsp =================================================================== diff -u --- lams_monitoring/web/emailnotifications/archivedEmailList5.jsp (revision 0) +++ lams_monitoring/web/emailnotifications/archivedEmailList5.jsp (revision f3eca03fe33106d66158de0543c29c75f7333ba2) @@ -0,0 +1,130 @@ + +<%@ include file="/taglibs.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + + +

+ + +	+ + +	+ + +	+ + +
+ + + + +	+ + + + + + + + + + + + + +	+ + ${fn:length(email.recipients)} + +	+ ${email.body} +

+ + + + + + + + \ No newline at end of file Index: lams_monitoring/web/emailnotifications/lessonNotifications5.jsp =================================================================== diff -u -rf932b797330099220514e4c2acef885899567207 -rf3eca03fe33106d66158de0543c29c75f7333ba2 --- lams_monitoring/web/emailnotifications/lessonNotifications5.jsp (.../lessonNotifications5.jsp) (revision f932b797330099220514e4c2acef885899567207) +++ lams_monitoring/web/emailnotifications/lessonNotifications5.jsp (.../lessonNotifications5.jsp) (revision f3eca03fe33106d66158de0543c29c75f7333ba2) @@ -21,7 +21,6 @@ - @@ -111,7 +110,6 @@ } else { //get the timestamp in milliseconds since midnight Jan 1, 1970 var scheduleDate = datePicker.viewDate; - debugger; if (scheduleDate == null) { return; } @@ -128,12 +126,14 @@ dataType: 'json', type: 'post', success: function (json) { + let showToast = window.parent.showToast; + if (json.isSuccessfullySent) { - alert(""); + showToast(""); } else if (json.isSuccessfullyScheduled) { - alert(""); + showToast(""); } else { - alert(""); + showToast(""); } } }); @@ -185,7 +185,7 @@

Index: lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp =================================================================== diff -u --- lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp (revision 0) +++ lams_monitoring/web/emailnotifications/scheduledEmailList5.jsp (revision f3eca03fe33106d66158de0543c29c75f7333ba2) @@ -0,0 +1,111 @@ + + +<%@ include file="/taglibs.jsp"%> + + + + + + + + + + + + + getLessonView.do?lessonID=${lessonID} + lessonID=${lessonID} + + + getCourseView.do?organisationID=${organisationID} + organisationID=${organisationID} + + + + + + + + + + +

+ +

+ + + + + + + + + + + + + +

+ + +	+ + +	+ + +
+ + ${tDate} + + + + +	+ + + + + + + + + + + + + +	+ ${emailJob.emailBody} +

+ + + + + + \ No newline at end of file