Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/lessonNotifications.jsp,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	14 Oct 2011 17:55:11 -0000	1.1.2.4
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	20 Oct 2011 16:55:16 -0000	1.1.2.5
@@ -18,15 +18,26 @@
 	<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;}
 		#activityDiv, #daysToDeadlineDiv {display: none;}
 		#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>
@@ -39,8 +50,9 @@
 	<!--
 		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,33 +72,62 @@
 			jQuery("#list3").jqGrid('navGrid','#pager3',{add:false,del:false,edit:false,position:'right'});
 			jQuery("#list3").jqGrid('filterToolbar',{stringResult: true, searchOnEnter: true, defaultSearch: 'cn'});
 			$("#list3").parents('div.ui-jqgrid-bdiv').css("max-height","1000px");
-			//$("#list3").setGridParam({page:1}).trigger('reloadGrid');	
-			//$("#pager_left table.ui-pg-table").insertAfter($("#pager #pager_right")[0]);
-			//$("#pager3_left").css('float', 'right');
-			//$("#pager3_center").css('te', left);
-			//$("#list3").jqGrid('setGridParam',{ page: 1 }).trigger("reloadGrid");
 			
+			//initialize jStepper for additional parameters
 			$("#daysToDeadline").jStepper({minValue:0, maxValue:999, defaultValue:3, allowDecimals:false});
 			
+    		//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"/>');
+    				}
+    			}
+    		});
+			
     		$('#emailButton').click(function() {
     			
+    			var isInstantEmailing = ($('#accordion').accordion('option', 'active') == 0);
     			var ids = jQuery("#list3").getGridParam('selarrrow');
-    			var params;
-    			if(ids.length) {
-    			    for (var i=0;i<ids.length;i++) {
+    			
+    			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);
-    			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 + "&scheduleDate=" + scheduleDate,
+    	            data: "method=emailUsers&emailBody=" + emailBody + params,
     	            dataType: 'json',
     	            type: 'post',
     	            success: function (json) {
@@ -100,22 +141,20 @@
     	            }
     	       	});
     		});
-    		
-    		$( "#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;
 			
@@ -134,14 +173,14 @@
 				$("#daysToDeadlineDiv").show();
 				daysToDeadline = document.getElementById("daysToDeadline").value;
 				if (daysToDeadline == "") {
-					return;
+					return "";
 				}
 			} else {
 				$("#daysToDeadlineDiv").hide();
 			}
 			
-			var url = "<c:url value='/emailNotifications.do'/>?method=getUsers&lessonId=${lesson.lessonId}&searchType=" + searchType + "&activityId=" + activityId + "&daysToDeadline=" + daysToDeadline;
-			return url;
+			//return search params
+			return "&lessonID=${lesson.lessonId}&searchType=" + searchType + "&activityID=" + activityId + "&daysToDeadline=" + daysToDeadline;
 		}
 	</script>
 	
@@ -156,18 +195,15 @@
 		<form action="<c:url value="/emailNotifications.do"/>?method=emailUsers" method="post" id="emailNotificationsForm" >	
 		
 		<div id="emailTextareaDiv">
-		
-			<%@ 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"/>" />
-		</div>
+		</div>		
 		
 		<!-- Dropdown menu for choosing a user search type -->
 		<div>
@@ -204,17 +240,9 @@
 			</div>
 		</div>
 		
-		<table id="list3"></table>
-		<div id="pager3"></div>
-
-		</form>
+		<%@ include file="additionalSettings.jsp"%>
 		
-		<br>
-		<a href="<c:url value='/emailNotifications.do'/>?method=showScheduledEmails&lessonID=${lesson.lessonId}">
-			<fmt:message key="email.notifications.scheduled.messages.list" />
-		</a>
-		
-
+		</form>
 	</div>
 </div>
 </body>