Index: lams_monitoring/web/emailnotifications/courseNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/courseNotifications.jsp,v
diff -u -r1.14 -r1.15
--- lams_monitoring/web/emailnotifications/courseNotifications.jsp	14 Oct 2015 23:10:55 -0000	1.14
+++ lams_monitoring/web/emailnotifications/courseNotifications.jsp	6 Jul 2016 11:17:56 -0000	1.15
@@ -16,8 +16,9 @@
 	
 	<lams:css style="learner"/>
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>/css/jquery.jqGrid.css" />	
-	<style media="screen,projection" type="text/css">
+	<style type="text/css">
 		div#content {min-height: 250px; }
 		#emailTextareaDiv {float: right;}
 		#emailButton {text-align: right; float: right;}
@@ -44,10 +45,11 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.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.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
+	<script type="text/javascript">
 		jQuery(document).ready(function() {
 
 			//initialize user list 
@@ -73,11 +75,8 @@
 			$("#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 datetimepicker
+    		$("#datePicker").datetimepicker();
     		
     		//initialize accordion
     		$( "#accordion" ).accordion({
@@ -131,17 +130,17 @@
     			    }
     			} else if (isInstantEmailing && !ids.length) {
     				return;
-    				
-    			} else { //in case of scheduling
-    				var scheduleDate = $("#datePicker").datepicker( "getDate" );
+
+    			//in case of scheduling
+    			} else {
+       				//get the timestamp in milliseconds since midnight Jan 1, 1970
+    				var scheduleDate = $("#datePicker").datetimepicker('getDate');
     				if (scheduleDate == null) {
     					return;
-    				} else {
-    					scheduleDate = scheduleDate.getTime();
     				}
         			       			
     				var searchType = document.getElementById("searchType").value;
-    				params = "&searchType=" + searchType + "&scheduleDate=" + scheduleDate + getSearchParams(); 
+    				params = "&searchType=" + searchType + "&scheduleDate=" + scheduleDate.getTime() + getSearchParams(); 
     			}
     			
     			var emailBody = encodeURIComponent(document.getElementById("emailBody").value);
Index: lams_monitoring/web/emailnotifications/lessonNotifications.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/lessonNotifications.jsp,v
diff -u -r1.13 -r1.14
--- lams_monitoring/web/emailnotifications/lessonNotifications.jsp	9 Jun 2015 20:14:22 -0000	1.13
+++ lams_monitoring/web/emailnotifications/lessonNotifications.jsp	6 Jul 2016 11:17:56 -0000	1.14
@@ -17,8 +17,8 @@
 	<lams:css style="learner"/>
 	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui-redmond-theme.css" rel="stylesheet">
 	<link rel="stylesheet" type="text/css" href="<lams:LAMSURL/>/css/jquery.jqGrid.css" />
-	
-	<style media="screen,projection" type="text/css">
+	<link type="text/css" href="<lams:LAMSURL/>css/jquery-ui.timepicker.css" rel="stylesheet">
+	<style type="text/css">
 		div#content {min-height: 250px; }
 		#emailTextareaDiv {float: right;}
 		#emailButton {text-align: right; float: right;}
@@ -44,10 +44,11 @@
 	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.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.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.locale-en.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.js"></script>
-	<script language="JavaScript" type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
-	<script language="JavaScript" type="text/javascript">
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.timepicker.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.locale-en.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jqGrid.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/jquery.jstepper.min.js"></script>
+	<script type="text/javascript">
 		jQuery(document).ready(function() {
 			
 			//initialize user list 
@@ -76,11 +77,8 @@
 			//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 datetimepicker
+    		$("#datePicker").datetimepicker();
     		
     		//initialize accordion
     		$( "#accordion" ).accordion({
@@ -111,16 +109,16 @@
     			} else if (isInstantEmailing && !ids.length) {
     				return;
     				
-    			} else { //in case of scheduling
-    				var scheduleDate = $("#datePicker").datepicker( "getDate" );
+    			//in case of scheduling
+    			} else {
+    				//get the timestamp in milliseconds since midnight Jan 1, 1970
+    				var scheduleDate = $("#datePicker").datetimepicker('getDate');
     				if (scheduleDate == null) {
     					return;
-    				} else {
-    					scheduleDate = scheduleDate.getTime();
     				}
         			       			
     				var searchType = document.getElementById("searchType").value;
-    				params = "&searchType=" + searchType + "&scheduleDate=" + scheduleDate + getSearchParams(); 
+    				params = "&searchType=" + searchType + "&scheduleDate=" + scheduleDate.getTime() + getSearchParams();
     			}
     			
     			var emailBody = encodeURIComponent(document.getElementById("emailBody").value);
Index: lams_monitoring/web/emailnotifications/scheduledEmailList.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/emailnotifications/scheduledEmailList.jsp,v
diff -u -r1.5 -r1.6
--- lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	17 Oct 2012 08:39:49 -0000	1.5
+++ lams_monitoring/web/emailnotifications/scheduledEmailList.jsp	6 Jul 2016 11:17:56 -0000	1.6
@@ -47,7 +47,7 @@
 		<c:forEach var="emailJob" items="${scheduleList}">
 			<tr>
 				<td style="border-bottom: 1px solid #efefef;">
-					<fmt:formatDate value="${emailJob.triggerDate}" type="date" />
+					<lams:Date value="${emailJob.triggerDate}"/>
 				</td>
 				<td style="border-bottom: 1px solid #efefef;">
 					<c:choose>