Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/courseNotifications.jsp,v
diff -u -r1.1.2.5 -r1.1.2.6
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	14 Oct 2011 17:55:11 -0000	1.1.2.5
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	20 Oct 2011 16:55:16 -0000	1.1.2.6
@@ -17,15 +17,27 @@
 	<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: 290px; }
+		div#content {min-height: 250px; }
 		#emailTextareaDiv {float: right;}
 		#emailButton {text-align: right; float: right;}
 		#additionalParameters {min-height: 50px;}
 		#lessonsDiv {display: none;}
+		#lessonDiv { padding-bottom: 20px;}
 		#pager3_right table{float:right !important; }
+		#datePickerDiv {margin: 10px 0 50px;}
 		
-		#scheduleOptionsDiv {padding-top: 0; margin-top: 0; text-align: right;}
-		#restrictUsageDiv {text-align: right;}
+		/* Accordion */
+		.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited, .ui-state-active a:hover  {
+		    color: #47bc23 !important;
+		    background-image: none;
+		    background-color: transparent ;
+		}
+		#nowDiv{padding-left: 10px;}
+		.ui-jqgrid-hbox {padding-left: 0;}
+		#accordion {width: 314px;}
+		#accordion h3 a {border-bottom: 0;}
+		#accordion p {text-align: center; padding-bottom: 0px; margin-bottom: 0xp;}
+		#listEmailsHref {border-bottom: 1px dotted #47BC23;color: #47BC23;text-decoration: none;}
 	</style>	
 	
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-1.5.1.min.js"></script>
@@ -37,9 +49,10 @@
 	<script language="JavaScript" type="text/javascript">
 	<!--
 		jQuery(document).ready(function() {
-		
+
+			//initialize user list 
 			jQuery("#list3").jqGrid({
-			   	url: getUrl(),
+			   	url: "<c:url value='/emailNotifications.do'/>?method=getUsers" + getSearchParams(),
 				datatype: "json",
 			   	colNames:['<fmt:message key="email.notifications.user.name"/>'],
 			   	colModel:[
@@ -60,6 +73,27 @@
 			$("#list3").parents('div.ui-jqgrid-bdiv').css("max-height","1000px");
 			jQuery("#list3").jqGrid('filterToolbar',{stringResult: true, searchOnEnter: true, defaultSearch: 'cn'});
 			
+    		//initialize datePicker
+    		$( "#datePicker" ).datepicker({ 
+    			dateFormat: 'dd/mm/yy',
+    			minDate: 1
+    		});
+    		
+    		//initialize accordion
+    		$( "#accordion" ).accordion({
+    			autoHeight: false,
+    			create: function(event, ui) {
+    				
+    			},
+    			change: function(event, ui) {
+    				if ($('#accordion').accordion('option', 'active') == 0) {
+    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.send"/>');
+    				} else {
+    					$("#emailButton").attr('value', '<fmt:message key="email.notifications.button.schedule"/>');
+    				}
+    			}
+    		});
+			
 			jQuery("#lessonsTable").jqGrid({
 				datatype: "local",
 			   	colNames:['Id', '<fmt:message key="email.notifications.lesson.name"/>'],
@@ -81,18 +115,31 @@
 			
 			$("#lessonsTable").parents('div.ui-jqgrid-bdiv').css("max-height","10000px");
 			
+			//initialize jStepper for additional parameters
 			$("#daysToDeadline").jStepper({minValue:0, maxValue:999, defaultValue:3, allowDecimals:false});
 			
     		$('#emailButton').click(function() {
     			
+    			var isInstantEmailing = ($('#accordion').accordion('option', 'active') == 0);
     			var ids = jQuery("#list3").getGridParam('selarrrow');
-    			var params;
-    			if(ids.length) {
+    			var params = "";
+    			if(isInstantEmailing && ids.length) {
     			    for (var i=0;i<ids.length;i++) {
     			    	params += "&userId=" + ids[i];
     			    }
-    			} else {
+    			} else if (isInstantEmailing && !ids.length) {
     				return;
+    				
+    			} else { //in case of scheduling
+    				var scheduleDate = $("#datePicker").datepicker( "getDate" );
+    				if (scheduleDate == null) {
+    					return;
+    				} else {
+    					scheduleDate = scheduleDate.getTime();
+    				}
+        			       			
+    				var searchType = document.getElementById("searchType").value;
+    				params = "&searchType=" + searchType + "&scheduleDate=" + scheduleDate + getSearchParams(); 
     			}
     			
     			var emailBody = escape(document.getElementById("emailBody").value);
@@ -101,7 +148,7 @@
     	        $.ajax({
     	        	async: false,
     	            url: '<c:url value="/emailNotifications.do"/>',
-    	            data: 'method=emailUsers&' + params+ "&emailBody=" + emailBody + "&scheduleDate=" + scheduleDate,
+    	            data: "method=emailUsers&emailBody=" + emailBody + params,
     	            dataType: 'json',
     	            type: 'post',
     	            success: function (json) {
@@ -115,32 +162,28 @@
     	            }
     	       	});
     		});
-    		
-    		$( "#datePicker" ).datepicker({ 
-    			dateFormat: 'dd/mm/yy',
-    			minDate: 0
-    		});
 		});
 	
 	
 		function getUsers(){
-			var url = getUrl();
-			if (url.length) {
+			var searchParams = getSearchParams();
+			var url = "<c:url value='/emailNotifications.do'/>?method=getUsers" + searchParams;
+			if (searchParams.length) {
 				$("#list3").setGridParam({datatype:'json', page:1, url: url}).trigger('reloadGrid');	
 			} else {
 				$("#list3").setGridParam({page:1}).clearGridData();
 			}
 			return false;
 		}
 		
-		function getUrl() {
+		function getSearchParams() {
 			var searchType = document.getElementById("searchType").value;
 			
 			//process in case of "Have finished particular lesson" | "Haven't started particular lesson"
 			var lessonId = "";
 			if ((searchType == 7) || (searchType == 8)) {
 				$("#lessonDiv").show();
-				lessonId = "&lessonId=" + document.getElementById("lessonId").value;
+				lessonId = "&lessonID=" + document.getElementById("lessonId").value;
 				if (document.getElementById("lessonId").value == "") {
 					return "";
 				}
@@ -156,7 +199,7 @@
     			var ids = jQuery("#lessonsTable").getGridParam('selarrrow');
     			if(ids.length) {
     			    for (var i=0;i<ids.length;i++) {
-    			    	lessonIds += "&lessonId=" + ids[i];
+    			    	lessonIds += "&lessonID=" + ids[i];
     			    }
     			} else {
     				return "";
@@ -165,9 +208,8 @@
 				$("#lessonsDiv").hide();
 			}
 			
-			var url = "<c:url value='/emailNotifications.do'/>?method=getUsers&orgId=${org.organisationId}&searchType=" + searchType + lessonId + lessonIds;
-			return url;
-			
+			//return search params
+			return "&organisationID=${org.organisationId}&searchType=" + searchType + lessonId + lessonIds;
 		}
 	//-->
 	</script>
@@ -183,19 +225,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>
 				</fmt:message>
 			</c:set>
-			<textarea rows="8" name="emailBody" id="emailBody" cols="45" >${fn:replace(emailBody, '<br/>', newLineChar)}</textarea>
+			<textarea rows="8" name="emailBody" id="emailBody" cols="43" >${fn:replace(emailBody, '<br/>', newLineChar)}</textarea>
 			<br/><br/>
 			<input class="button" type="button" id="emailButton" value="<fmt:message key="email.notifications.send"/>" />
 			
@@ -229,17 +265,14 @@
 				</h3>
 				
 				<table id="lessonsTable"></table>
-				<input class="button space-left small-space-bottom" type="button" value="<fmt:message key="button.ok"/>" onclick="getUsers();" />			
+				<br/>
+				<input style="margin-left: 230px;" class="button small-space-bottom" type="button" value="<fmt:message key="button.ok"/>" onclick="getUsers();"  />			
 			</div>
 		</div>
 
-		<table id="list3"></table>
-		<div id="pager3"></div>	
+		<%@ include file="additionalSettings.jsp"%>
 
 		</form>
-		<br/>
-		<br/>
-
 	</div>
 </div>
 </body>