Index: lams_tool_preview/web/pages/monitoring/criteria.jsp =================================================================== diff -u -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900 -r6f2fea6274f356f936ab3d778adf20fdbf94652a --- lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900) +++ lams_tool_preview/web/pages/monitoring/criteria.jsp (.../criteria.jsp) (revision 6f2fea6274f356f936ab3d778adf20fdbf94652a) @@ -34,6 +34,66 @@ COMMENT_TEXTAREA_TIP_LABEL = '', WARN_COMMENTS_IS_BLANK_LABEL = '', WARN_MIN_NUMBER_WORDS_LABEL = ''; + + function clearMessage() { + $("#messageArea2").html(""); + return false; + } + + function closeResultsForLearner() { + $("#emailPreviewArea").html(""); + $("#emailPreviewArea").hide(); + return false; + } + + // Prview the email to be sent to the learner + function previewResultsForLearner(sessionId, userId) { + $(".btn-disable-on-submit").prop("disabled", true); + var url = ""; + clearMessage(); + $("#messageArea2_Busy").show(); + $("#emailPreviewArea").load( + url, + { + sessionMapID: "${sessionMapID}", + toolContentID: ${sessionMap.toolContentID}, + toolSessionId: sessionId, + userID: userId, + reqID: (new Date()).getTime() + }, + function() { + $("#messageArea2_Busy").hide(); + $("#emailPreviewArea").show(); + $(".btn-disable-on-submit").prop("disabled", false); + } + ); + return false; + } + + // Send the previewed email to the learner + function sendResultsForLearner(sessionId, userId, dateTimeStamp) { + $(".btn-disable-on-submit").prop("disabled", true); + var url = ""; + clearMessage(); + $("#messageArea2_Busy").show(); + $("#messageArea2").load( + url, + { + sessionMapID: "${sessionMapID}", + toolContentID: ${sessionMap.toolContentID}, + toolSessionId: sessionId, + dateTimeStamp: dateTimeStamp, + userID: userId, + reqID: (new Date()).getTime() + }, + function() { + $("#messageArea2_Busy").hide(); + closeResultsForLearner(); + $(".btn-disable-on-submit").prop("disabled", false); + } + ); + return false; + } @@ -44,6 +104,10 @@ + + +
+ <%@ include file="rubricspart.jsp" %> @@ -54,6 +118,8 @@ + + Index: lams_tool_preview/web/pages/monitoring/criteriapart.jsp =================================================================== diff -u -r2a63094444414bbd0b7df4ea2a1a4796db556a77 -r6f2fea6274f356f936ab3d778adf20fdbf94652a --- lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 2a63094444414bbd0b7df4ea2a1a4796db556a77) +++ lams_tool_preview/web/pages/monitoring/criteriapart.jsp (.../criteriapart.jsp) (revision 6f2fea6274f356f936ab3d778adf20fdbf94652a) @@ -127,75 +127,9 @@ }); }; setTimeout(function(){ window.dispatchEvent(new Event('resize')); }, 300); - }); - - function closeResultsForLearner() { - $("#emailPreviewArea").html(""); - $("#emailPreviewArea").hide(); - return false; - } - - function clearMessage() { - $("#messageArea2").html(""); - return false; - } - - // Prview the email to be sent to the learner - function previewResultsForLearner(sessionId, userId) { - $(".btn-disable-on-submit").prop("disabled", true); - var url = ""; - clearMessage(); - $("#messageArea2_Busy").show(); - $("#emailPreviewArea").load( - url, - { - sessionMapID: "${sessionMapID}", - toolContentID: ${sessionMap.toolContentID}, - toolSessionId: sessionId, - userID: userId, - reqID: (new Date()).getTime() - }, - function() { - $("#messageArea2_Busy").hide(); - $("#emailPreviewArea").show(); - $(".btn-disable-on-submit").prop("disabled", false); - } - ); - return false; - } - - // Send the previewed email to the learner - function sendResultsForLearner(sessionId, userId, dateTimeStamp) { - $(".btn-disable-on-submit").prop("disabled", true); - var url = ""; - clearMessage(); - $("#messageArea2_Busy").show(); - $("#messageArea2").load( - url, - { - sessionMapID: "${sessionMapID}", - toolContentID: ${sessionMap.toolContentID}, - toolSessionId: sessionId, - dateTimeStamp: dateTimeStamp, - userID: userId, - reqID: (new Date()).getTime() - }, - function() { - $("#messageArea2_Busy").hide(); - closeResultsForLearner(); - $(".btn-disable-on-submit").prop("disabled", false); - } - ); - return false; - } - - - -
-

@@ -220,6 +154,4 @@

-
- - \ No newline at end of file +
\ No newline at end of file Index: lams_tool_preview/web/pages/monitoring/rubricspart.jsp =================================================================== diff -u -r6437f6b8a894d41f5dd5a76a6fe7e95d50171900 -r6f2fea6274f356f936ab3d778adf20fdbf94652a --- lams_tool_preview/web/pages/monitoring/rubricspart.jsp (.../rubricspart.jsp) (revision 6437f6b8a894d41f5dd5a76a6fe7e95d50171900) +++ lams_tool_preview/web/pages/monitoring/rubricspart.jsp (.../rubricspart.jsp) (revision 6f2fea6274f356f936ab3d778adf20fdbf94652a) @@ -46,6 +46,10 @@   +