Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/courseNotifications.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	6 Sep 2011 12:25:48 -0000	1.1.2.4
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	14 Oct 2011 17:55:11 -0000	1.1.2.5
@@ -17,15 +17,20 @@
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-1.8.11.redmont-theme.css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>/css/ui.jqgrid-4.1.2.css" />	
 	<style media="screen,projection" type="text/css">
-		div#content {min-height: 250px; }
+		div#content {min-height: 290px; }
 		#emailTextareaDiv {float: right;}
 		#emailButton {text-align: right; float: right;}
 		#additionalParameters {min-height: 50px;}
 		#lessonsDiv {display: none;}
 		#pager3_right table{float:right !important; }
+		
+		#scheduleOptionsDiv {padding-top: 0; margin-top: 0; text-align: right;}
+		#restrictUsageDiv {text-align: right;}
 	</style>	
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-1.5.1.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/monitorToolSummaryAdvanced.js "></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/grid.locale-en.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.min.js"></script>
 	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
@@ -91,22 +96,30 @@
     			}
     			
     			var emailBody = escape(document.getElementById("emailBody").value);
+    			var scheduleDate = $("#datePicker").datepicker( "getDate" );
+    			scheduleDate = (scheduleDate == null) ? "" : scheduleDate.getTime();
     	        $.ajax({
     	        	async: false,
     	            url: '<c:url value="/emailNotifications.do"/>',
-    	            data: 'method=emailUsers&' + params+ "&emailBody=" + emailBody,
+    	            data: 'method=emailUsers&' + params+ "&emailBody=" + emailBody + "&scheduleDate=" + scheduleDate,
     	            dataType: 'json',
     	            type: 'post',
     	            success: function (json) {
     		            if (json.isSuccessfullySent) {
     		            	alert('<fmt:message key="email.notifications.emails.successfully.sent" />');
+    					} else if (json.isSuccessfullyScheduled) {
+    		            	alert('<fmt:message key="email.notifications.emails.successfully.scheduled" />');
     					} else {
     						alert('<fmt:message key="email.notifications.problems.sending.emails" />');
     					}
     	            }
     	       	});
     		});
-
+    		
+    		$( "#datePicker" ).datepicker({ 
+    			dateFormat: 'dd/mm/yy',
+    			minDate: 0
+    		});
 		});
 	
 	
@@ -170,6 +183,13 @@
 		<form action="<c:url value="/emailNotifications.do"/>?method=emailUsers" method="post" id="emailNotificationsForm" >	
 		
 		<div id="emailTextareaDiv">
+			<a href="<c:url value='/emailNotifications.do'/>?method=showScheduledEmails&organisationID=${org.organisationId}" style="float: right;" >
+				<fmt:message key="email.notifications.scheduled.messages.list" />
+			</a>
+			<br/><br/>
+		
+			<%@ include file="scheduleOptions.jsp"%>
+			
 			<c:set var="emailBody"><fmt:message key="email.notifications.lesson.email.body" >
 					<fmt:param>${lesson.lessonName}</fmt:param>
 					<fmt:param><lams:LAMSURL/>home.do?method=learner&lessonID=${lesson.lessonId}</fmt:param>
@@ -178,6 +198,7 @@
 			<textarea rows="8" name="emailBody" id="emailBody" cols="45" >${fn:replace(emailBody, '<br/>', newLineChar)}</textarea>
 			<br/><br/>
 			<input class="button" type="button" id="emailButton" value="<fmt:message key="email.notifications.send"/>" />
+			
 		</div>
 		
 		<!-- Dropdown menu for choosing a user search type -->
@@ -217,6 +238,7 @@
 
 		</form>
 		<br/>
+		<br/>
 
 	</div>
 </div>