Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
diff -u -r917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b -ra4002ee13a835e74c08e3d657494f1c97b531013
--- lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision 917cdcbcb307b39b90b65f7b97a5b5f7863d7c5b)
+++ lams_central/web/includes/javascript/addLesson.js	(.../addLesson.js)	(revision a4002ee13a835e74c08e3d657494f1c97b531013)
@@ -230,9 +230,11 @@
 	
 	$('#schedulingEnableField').change(function(){
 		if ($(this).is(':checked')) {
-			$('#schedulingDatetimeField').show('slow');
+			$('#scheduleStartTime').show('slow');
+			$('#scheduleEndTime').show('slow');
 		} else {
-			$('#schedulingDatetimeField').hide('slow');
+			$('#scheduleStartTime').hide('slow');
+			$('#scheduleEndTime').hide('slow');
 		}
 	});
 	
@@ -242,17 +244,44 @@
 			$('#schedulingEnableField, #precedingLessonEnableField, ' +
 	          '#timeLimitEnableField, #timeLimitIndividualField').prop('checked', false).change();
 			$('#schedulingDatetimeField').val(null);
+			$('#schedulingEndDatetimeField').val(null);
 		}
 		
 		$('#schedulingEnableField, #precedingLessonEnableField, #timeLimitEnableField, #timeLimitIndividualField,' +
-		  '#precedingLessonIdField, #schedulingDatetimeField').prop('disabled', !checked);
+		  '#precedingLessonIdField, #schedulingDatetimeField, #schedulingEndDatetimeField').prop('disabled', !checked);
 	});
 	
 	$('#schedulingDatetimeField').datetimepicker({
 		'minDate' : 0
 	});
+	$('#schedulingEndDatetimeField').datetimepicker({
+		'minDate' : 0
+	});
+	
+	
+	$('#schedulingEndDatetimeField').change(function(){
+		if ( $('#schedulingEndDatetimeField').val() == "" ) {
+			$('#timeLimitIndividualField').prop('disabled', false);
+		} else {
+			checkScheduleDate();
+		}
+	});
+
+	$('#schedulingDatetimeField').change(function(){
+		checkScheduleDate();
+	});
 }
 
+function checkScheduleDate() {
+	var startDate = $('#schedulingDatetimeField').val() > "" ? Date.parse($('#schedulingDatetimeField').val()) : 0;
+	var endDate = $('#schedulingEndDatetimeField').val() > "" ? Date.parse($('#schedulingEndDatetimeField').val()) : 0;
+	if ( endDate - startDate ) {
+		$("#schedulingError").css("display","block");
+	} else {
+		$("#schedulingError").css("display","none");
+	}
+}
+
 function initConditionsTab(){
 	$('#precedingLessonEnableField').change(function(){
 		if ($(this).is(':checked')) {
@@ -271,6 +300,10 @@
 	$('#timeLimitEnableField').change(function(){
 		if ($(this).is(':checked')) {
 			$('#timeLimitDiv').show('slow');
+			if ( $('#schedulingEndDatetimeField').val() > "" ) {
+				$('#timeLimitIndividualField').prop('checked', true);
+				$('#timeLimitIndividualField').prop('disabled', true);
+			}
 		} else {
 			$('#timeLimitDiv').hide('slow');
 		}
@@ -332,6 +365,16 @@
 		return;
 	}
 	$('#monitorsField').val(monitors);
+
+	if ( $("#schedulingEnableField").is(':checked') && $("#timeLimitEnableField").is(':checked') ) {
+		if ( $('#schedulingEndDatetimeField').val() > "" && $("#schedulingEnableField").is(':checked') && ! $("#timeLimitIndividualField").is(':checked') ) {
+			$("#timelimitError").css("display","block");
+			doSelectTab(4);
+			return;
+		} else {
+			$("#timelimitError").css("display","none");
+		}
+	}
 	
 	if ($('#splitLearnersField').is(':checked')) {
 		var maxLearnerCount = $('#selected-learners div.draggableItem').length,