Index: lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -ra9f5e7f17f2c4ca78ee68eb398817a79735c148f
--- lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/includes/javascript/monitorToolSummaryAdvanced.js	(.../monitorToolSummaryAdvanced.js)	(revision a9f5e7f17f2c4ca78ee68eb398817a79735c148f)
@@ -27,19 +27,13 @@
 			var date = new Date(eval(submissionDeadlineSettings.submissionDeadline));
 
 			if ( typeof submissionDeadlineSettings.submissionDateString != 'undefined' ) {
-				$("#dateInfo").html( submissionDeadlineSettings.submissionDateString );
+				$("#dateInfo").html(submissionDeadlineSettings.submissionDateString );
 			} else {
 				$("#dateInfo").html( formatDate(date) );
 			}
-			
-			if ( $("#restrictUsageDiv").hasClass("collapse") )  {
-				// new version - using the according
-				//open up date restriction area
-				$("#restrictUsageDiv").addClass("in");
-			} else {
-				// old code - remove once bootstrapping is completed.
-				toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),submissionDeadlineSettings.lams);
-			}
+
+			// show the date area straight away as it has a date set!
+			$("#restrictUsageDiv").addClass("show");
 		}
 	});	
 	
@@ -57,17 +51,18 @@
 	}
 
 	function setSubmissionDeadline() {
-		//get the timestamp in milliseconds since midnight Jan 1, 1970
-		var date = $("#datetime").datetimepicker('getDate');
-		if (date == null) {
+		// Need to get the timestamp in milliseconds since midnight Jan 1, 1970. 
+		var moment = $("#datetime").data("DateTimePicker").date(); 
+		if (moment == null) {
 			return;
 		}
 
 		var reqIDVar = new Date();
 		var parameterDelimiter = (submissionDeadlineSettings.setSubmissionDeadlineUrl.indexOf("?") == -1) ? "?" : "&"; 
 		
 		var url = submissionDeadlineSettings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + submissionDeadlineSettings.toolContentID + "&submissionDeadline=" +
-					+ date.getTime() + "&reqID=" + reqIDVar.getTime();
+					+ moment.valueOf() + "&reqID=" + reqIDVar.getTime();
+
 		$.ajax({
 			url : url,
 			success : function(data) {
@@ -88,7 +83,7 @@
 		
 		var url = submissionDeadlineSettings.setSubmissionDeadlineUrl + parameterDelimiter + "toolContentID=" + submissionDeadlineSettings.toolContentID + "&submissionDeadline=" +
 				"&reqID=" + reqIDVar.getTime();
-
+		
 		$.ajax({
 			url : url,
 			success : function() {