Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.354 -r1.355
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.110 -r1.111
--- lams_central/conf/language/lams/ApplicationResources.properties	7 Jan 2013 13:03:52 -0000	1.110
+++ lams_central/conf/language/lams/ApplicationResources.properties	8 Jan 2013 11:19:31 -0000	1.111
@@ -358,6 +358,7 @@
 label.tab.lesson =Lesson
 label.tab.class =Class
 label.tab.advanced =Advanced
+label.tab.conditions =Conditions
 label.tab.lesson.title =Select the sequence to add a lesson, and click on Add now
 label.tab.class.title =Please use drag n' drop to select or unselect monitors and learners
 label.tab.lesson.name =Lesson name:
@@ -385,5 +386,12 @@
 label.tab.advanced.field.split.number =No. learners per lesson
 label.tab.advanced.field.scheduling =Enable scheduling
 label.tab.advanced.split.desc =[0] instances of this lesson will be created <br />and approximately [1] will be allocated to each lesson
-
+label.tab.conditions.dependencies =Dependencies
+label.tab.conditions.dependencies.desc =Select a lesson that students will need to complete before they can see the lesson you are about to create.
+label.tab.conditions.timelimit =Time limitations
+label.tab.conditions.timelimit.desc =Set the number of days the lesson will be available to students. After this period the lesson will no longer be shown.<br />If the time should count from the moment the learner starts the lesson, select the option for individual time limit.
+label.tab.conditions.timelimit.days =Number days:
+label.tab.conditions.timelimit.individual =Is this time limit for each individual?
+label.tab.conditions.enable =Enable
+label.tab.conditions.dependencies.desc =Select a lesson that students will need to complete before they can see the lesson you are about to create.
 #======= End labels: Exported 345 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java,v
diff -u -r1.41 -r1.42
--- lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	7 Jan 2013 13:03:52 -0000	1.41
+++ lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java	8 Jan 2013 11:19:32 -0000	1.42
@@ -30,6 +30,9 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.TreeSet;
 import java.util.Vector;
 
 import javax.servlet.ServletException;
@@ -52,7 +55,9 @@
 import org.lamsfoundation.lams.learningdesign.dao.IGroupUserDAO;
 import org.lamsfoundation.lams.learningdesign.service.ILearningDesignService;
 import org.lamsfoundation.lams.lesson.Lesson;
+import org.lamsfoundation.lams.lesson.dto.LessonDTO;
 import org.lamsfoundation.lams.lesson.service.ILessonService;
+import org.lamsfoundation.lams.lesson.util.LessonDTOComparator;
 import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
@@ -366,6 +371,7 @@
 	}
     }
 
+    @SuppressWarnings("unchecked")
     public ActionForward newLesson(ActionMapping mapping, ActionForm form, HttpServletRequest req,
 	    HttpServletResponse res) throws IOException, UserAccessDeniedException, JSONException,
 	    RepositoryCheckedException {
@@ -387,7 +393,7 @@
 	    userJSON.put("firstName", user.getFirstName());
 	    userJSON.put("lastName", user.getLastName());
 	    userJSON.put("login", user.getLogin());
-	    
+
 	    users.append("selectedLearners", userJSON);
 	}
 
@@ -399,17 +405,29 @@
 	    userJSON.put("firstName", user.getFirstName());
 	    userJSON.put("lastName", user.getLastName());
 	    userJSON.put("login", user.getLogin());
-	    
+
 	    if (userDTO.getUserID().equals(user.getUserID())) {
 		// creator is always selected
 		users.append("selectedMonitors", userJSON);
 	    } else {
 		users.append("unselectedMonitors", userJSON);
 	    }
 	}
-	
+
 	req.setAttribute("users", users.toString());
 
+	// find lessons which can be set as preceding ones for newly created lesson
+	Organisation organisation = (Organisation) getService().findById(Organisation.class, organisationID);
+	Set<LessonDTO> availableLessons = new TreeSet<LessonDTO>(new LessonDTOComparator());
+	for (Lesson availableLesson : (Set<Lesson>) organisation.getLessons()) {
+	    Integer availableLessonState = availableLesson.getLessonStateId();
+	    if (!Lesson.REMOVED_STATE.equals(availableLessonState)
+		    && !Lesson.FINISHED_STATE.equals(availableLessonState)) {
+		availableLessons.add(new LessonDTO(availableLesson));
+	    }
+	}
+	req.setAttribute("availablePrecedingLessons", availableLessons);
+
 	return mapping.findForward("newLesson");
     }
 
@@ -455,7 +473,7 @@
 	    if (publicFolder != null) {
 		folderContents.add(publicFolder);
 	    }
-	 // special behaviour for organisation folders
+	    // special behaviour for organisation folders
 	} else if (folderID.equals(WorkspaceAction.ORG_FOLDER_ID)) {
 	    folderContents = getWorkspaceManagementService().getAccessibleOrganisationWorkspaceFolders(userID);
 
Index: lams_central/web/newLesson.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/newLesson.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/newLesson.jsp	7 Jan 2013 21:11:30 -0000	1.2
+++ lams_central/web/newLesson.jsp	8 Jan 2013 11:19:31 -0000	1.3
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
 
 <!DOCTYPE HTML>
 <lams:html>
@@ -45,6 +46,7 @@
 			initLessonTab();
 			initClassTab();
 			initAdvancedTab();
+			initConditionsTab();
 		});
 	</script>
 </lams:head>
@@ -63,6 +65,7 @@
 		<li><a href="#tabLesson"><fmt:message key="label.tab.lesson" /></a></li>
 		<li><a href="#tabClass"><fmt:message key="label.tab.class" /></a></li>
 		<li><a href="#tabAdvanced"><fmt:message key="label.tab.advanced" /></a></li>
+		<li><a href="#tabConditions"><fmt:message key="label.tab.conditions" /></a></li>
 	</ul>
 	
 	<!-- Tab contents -->
@@ -122,9 +125,8 @@
 		</table>
 	</div>
 	
-	
+	<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring.do" method="POST">
 	<div id="tabAdvanced">
-		<form id="lessonForm" action="<lams:LAMSURL/>monitoring/monitoring.do" method="POST">
 			<input name="method" value="newLesson" type="hidden" />
 			<input name="organisationID" value="${param.organisationID}" type="hidden" />
 			<input id="ldIdField" name="learningDesignID" type="hidden" />
@@ -136,12 +138,12 @@
 
 			<div class="fieldSectionTitle"><fmt:message key="label.tab.advanced.details" /></div>
 			<input id="introEnableField" name="introEnable" value="true" type="checkbox"><fmt:message key="label.tab.advanced.intro.enable" /></input>
-			<div id="introSection" class="fieldInnerSection">
+			<div class="fieldInnerSection">
 				<span><fmt:message key="label.tab.advanced.intro.description" /></span>
 				<textarea id="introDescriptionField" name="introDescription" disabled="disabled"></textarea>
 				<br />
 				<input id="introImageField" name="introImage" value="true" type="checkbox"
-				       disabled="disabled" class="fieldInnerSection"><fmt:message key="label.tab.advanced.intro.image" /></input>
+				       disabled="disabled"><fmt:message key="label.tab.advanced.intro.image" /></input>
 			</div>
 
 			
@@ -152,7 +154,7 @@
 			<input name="portfolioEnable" value="true" type="checkbox" checked="checked"><fmt:message key="label.tab.advanced.field.export" /></input><br />
 			<input id="presenceEnableField" name="presenceEnable" value="true" type="checkbox"><fmt:message key="label.tab.advanced.field.presence" /></input><br />
 			<input id="imEnableField" name="imEnable" value="true" type="checkbox" disabled="disabled"><fmt:message key="label.tab.advanced.field.im" /></input><br />
-			<input id="splitLearnersField" type="checkbox" ><fmt:message key="label.tab.advanced.field.split" /></input><br />
+			<input id="splitLearnersField" type="checkbox"><fmt:message key="label.tab.advanced.field.split" /></input><br />
 			<table id="splitLearnersTable">
 				<tr>
 					<td id="splitLearnersCell">
@@ -165,8 +167,29 @@
 			</table>
 			<input id="schedulingEnableField" name="schedulingEnable" value="true" type="checkbox"><fmt:message key="label.tab.advanced.field.scheduling" /></input>
 			<input id="schedulingDatetimeField" name="schedulingDatetime" disabled="disabled" />
-		</form>
 	</div>
+	
+	<div id="tabConditions">
+		<div class="fieldSectionTitle"><fmt:message key="label.tab.conditions.dependencies" /></div>
+		<div class="fieldSectionDescription"><fmt:message key="label.tab.conditions.dependencies.desc" /></div>
+		<input id="precedingLessonEnableField" name="precedingLessonEnable"
+		       type="checkbox"><fmt:message key="label.tab.conditions.enable" /></input>
+		<select id="precedingLessonIdField" name="precedingLessonId" disabled="disabled">
+			<c:forEach var="availableLesson" items="${availablePrecedingLessons}">
+				<option value="${availableLesson.lessonID}"><c:out value="${availableLesson.lessonName}" /></option>
+			</c:forEach>
+		</select>
+		
+		<div class="fieldSectionTitle"><fmt:message key="label.tab.conditions.timelimit" /></div>
+		<div class="fieldSectionDescription"><fmt:message key="label.tab.conditions.timelimit.desc" /></div>
+		<input id="timeLimitEnableField" name="timeLimitEnable" value="true" type="checkbox"><fmt:message key="label.tab.conditions.enable" /></input>
+		<div class="fieldInnerSection">
+			<fmt:message key="label.tab.conditions.timelimit.days" /> <input id="timeLimitDaysField" name="timeLimitDays" /><br />
+			<input id="timeLimitIndividualField" name="timeLimitIndividual" disabled="disabled" value="true"
+			       type="checkbox"><fmt:message key="label.tab.conditions.timelimit.individual" /></input>
+		</div>
+	</div>
+	</form>
 </div>
 </body>
 </lams:html>
\ No newline at end of file
Index: lams_central/web/css/newLesson.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/newLesson.css,v
diff -u -r1.2 -r1.3
--- lams_central/web/css/newLesson.css	7 Jan 2013 21:11:30 -0000	1.2
+++ lams_central/web/css/newLesson.css	8 Jan 2013 11:19:31 -0000	1.3
@@ -11,6 +11,10 @@
 	padding: 0px;
 }
 
+.ui-spinner {
+	margin-left: 10px;
+}
+
 div#tabs ul li a, a.ygtvspacer, a#closeButton, a#addButton {
 	border-bottom: none;
 }
@@ -153,11 +157,11 @@
 }
 
 	
-div#tabAdvanced {
+div#tabAdvanced, div#tabConditions {
 	padding-left: 30px;
 }
 
-div#tabAdvanced input[type="checkbox"] {
+input[type="checkbox"] {
 	margin: 5px 5px 0px 0px;
 	border: none;
 }
@@ -168,15 +172,15 @@
 	font-weight: bold;
 }
 
-.fieldInnerSection {
-	padding-left: 30px;
+.fieldSectionDescription {
+	padding: 10px 0px 10px 0px;
 }
 
-div#introSection {
-	padding-top: 5px;
+.fieldInnerSection {
+	padding: 10px 0px 0px 30px;
 }
 
-div#introSection span {
+div.fieldInnerSection span {
 	vertical-align: top;
 }
 
@@ -207,5 +211,19 @@
 }
 
 #schedulingDatetimeField {
-	margin-left: 40px;
+	margin-left: 50px;
+}
+
+
+#precedingLessonIdField {
+	margin: 0px 0px 0px 70px;
+}
+
+#timeLimitDaysField {
+	width: 50px;
+	margin: 0px 0px 0px 5px !important;
+}
+
+#timeLimitIndividualField {
+	margin-top: 15px;
 }
\ No newline at end of file
Index: lams_central/web/includes/javascript/newLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/Attic/newLesson.js,v
diff -u -r1.2 -r1.3
--- lams_central/web/includes/javascript/newLesson.js	7 Jan 2013 21:11:30 -0000	1.2
+++ lams_central/web/includes/javascript/newLesson.js	8 Jan 2013 11:19:31 -0000	1.3
@@ -189,20 +189,40 @@
 	
 	$('#startMonitorField').change(function(){
 		var checked = !$(this).is(':checked');
-		var schedulingEnableField = $('#schedulingEnableField');
 		if (!checked) {
-			schedulingEnableField.attr('checked', false);
-			$('#schedulingDatetimeField').val(null).prop('disabled', true);
+			$('#schedulingEnableField, #precedingLessonEnableField, ' +
+	          '#timeLimitEnableField, #timeLimitIndividualField').attr('checked', false);
+			$('#timeLimitIndividualField, #precedingLessonIdField, #schedulingDatetimeField').prop('disabled', true);
+			$('#timeLimitDaysField').spinner('disable');
+			$('#schedulingDatetimeField').val(null);
 		}
-		schedulingEnableField.prop('disabled', !checked);
+		
+		$('#schedulingEnableField, #precedingLessonEnableField, #timeLimitEnableField').prop('disabled', !checked);
 	});
 	
 	$('#schedulingDatetimeField').datetimepicker({
 		'minDate' : 0
 	});
 }
 
+function initConditionsTab(){
+	$('#precedingLessonEnableField').change(function(){
+		$('#precedingLessonIdField').prop('disabled', !$(this).is(':checked'));
+	});
+	
+	$('#timeLimitDaysField').spinner({
+		'disabled'    : true,
+		'min'         : 0,
+		'max'         : 180
+	}).spinner('value', 30);
+	
+	$('#timeLimitEnableField').change(function(){
+		$('#timeLimitDaysField').spinner($(this).is(':checked') ? 'enable' : 'disable');
+		$('#timeLimitIndividualField').prop('disabled', !$(this).is(':checked'));
+	});
+}
 
+
 function addLesson(){
 	if (submitInProgress) {
 		return;
Index: lams_common/src/java/org/lamsfoundation/lams/lesson/util/LessonDTOComparator.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/util/LessonDTOComparator.java,v
diff -u
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/lesson/util/LessonDTOComparator.java	8 Jan 2013 11:19:29 -0000	1.1
@@ -0,0 +1,45 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */
+
+/* $Id: LessonDTOComparator.java,v 1.1 2013/01/08 11:19:29 marcin Exp $ */
+package org.lamsfoundation.lams.lesson.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.lesson.dto.LessonDTO;
+
+/**
+ * The same as LessonComparator, but works for DTOs.
+ */
+public class LessonDTOComparator implements Comparator<LessonDTO> {
+
+    @Override
+    public int compare(LessonDTO o1, LessonDTO o2) {
+	if ((o1 != null) && (o2 != null)) {
+	    return (int) (o1.getLessonID() - o2.getLessonID());
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+}
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v
diff -u -r1.78 -r1.79
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	7 Jan 2013 13:03:48 -0000	1.78
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	8 Jan 2013 11:19:43 -0000	1.79
@@ -262,6 +262,7 @@
 	String lessonName = request.getParameter("lessonName");
 	int organisationId = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID);
 	long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
+
 	boolean introEnable = WebUtil.readBooleanParam(request, "introEnable", false);
 	String introDescription = request.getParameter("introDescription");
 	boolean introImage = WebUtil.readBooleanParam(request, "introImage", false);
@@ -276,6 +277,14 @@
 	Date schedulingDatetime = schedulingEnable ? MonitoringAction.LESSON_SCHEDULING_DATETIME_FORMAT.parse(request
 		.getParameter("schedulingDatetime")) : null;
 
+	boolean precedingLessonEnable = WebUtil.readBooleanParam(request, "precedingLessonEnable", false);
+	Long precedingLessonId = WebUtil.readLongParam(request, "precedingLessonId", true);
+	boolean timeLimitEnableField = WebUtil.readBooleanParam(request, "timeLimitEnableField", false);
+	Integer timeLimitDaysField = WebUtil.readIntParam(request, "timeLimitDaysField", true);
+	boolean timeLimitIndividualField = WebUtil.readBooleanParam(request, "timeLimitIndividualField", false);
+	Integer timeLimitIndividual = timeLimitEnableField && timeLimitIndividualField ? timeLimitDaysField : null;
+	Integer timeLimitLesson = timeLimitEnableField && !timeLimitIndividualField ? timeLimitDaysField : null;
+
 	IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet()
 		.getServletContext());
 
@@ -338,7 +347,7 @@
 	    }
 	    Lesson lesson = monitoringService.initializeLesson(lessonInstanceName, introDescription, ldId,
 		    organisationId, userId, null, introEnable, introImage, portfolioEnable, presenceEnable, imEnable,
-		    enableLiveEdit, notificationsEnable, null, null);
+		    enableLiveEdit, notificationsEnable, timeLimitIndividual, precedingLessonId);
 
 	    monitoringService.createLessonClassForLesson(lesson.getLessonId(), organisation, learnerGroupInstanceName,
 		    lessonInstanceLearners, staffGroupInstanceName, staff, userId);
@@ -347,8 +356,14 @@
 		if (schedulingDatetime == null) {
 		    monitoringService.startLesson(lesson.getLessonId(), userId);
 		} else {
+		    // if lesson should start in few days, set it here
 		    monitoringService.startLessonOnSchedule(lesson.getLessonId(), schedulingDatetime, userId);
 		}
+
+		// if lesson should finish in few days, set it here
+		if (timeLimitLesson != null) {
+		    monitoringService.finishLessonOnSchedule(lesson.getLessonId(), timeLimitLesson, userId);
+		}
 	    }
 	}
 
@@ -670,7 +685,7 @@
 	response.getWriter().print(jsonObject);
 	return null;
     }
-    
+
     /**
      * <P>
      * </P>