Index: lams_tool_assessment/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/build.properties,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/build.properties	2 Mar 2010 13:10:00 -0000	1.5
+++ lams_tool_assessment/build.properties	18 May 2011 18:48:24 -0000	1.6
@@ -13,7 +13,7 @@
 weblib=lib
 
 #project version
-tool.version=20100225
+tool.version=20110413
 
 # hide tool option
 hideTool=false
Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/xdoclet/struts-actions.xml,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/conf/xdoclet/struts-actions.xml	16 Feb 2011 16:49:08 -0000	1.13
+++ lams_tool_assessment/conf/xdoclet/struts-actions.xml	18 May 2011 18:48:24 -0000	1.14
@@ -240,6 +240,10 @@
 			<forward name="question" path="/pages/monitoring/parts/questionsummary.jsp" />			
 			<forward name="user" path="/pages/monitoring/parts/usersummary.jsp" />
 		</action>	
+		<action path="/monitoring/setSubmissionDeadline"
+			type="org.lamsfoundation.lams.tool.assessment.web.action.MonitoringAction"
+			parameter="setSubmissionDeadline" >
+		</action>		
 		<action path="/monitoring/exportSummary"
 			type="org.lamsfoundation.lams.tool.assessment.web.action.MonitoringAction"
 			parameter="exportSummary" >
Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v
diff -u -r1.17 -r1.18
--- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	2 Mar 2010 13:10:00 -0000	1.17
+++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql	18 May 2011 18:48:24 -0000	1.18
@@ -24,6 +24,7 @@
    uid bigint not null auto_increment,
    create_date datetime,
    update_date datetime,
+   submission_deadline datetime,
    create_by bigint,
    title varchar(255),
    run_offline tinyint,
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v
diff -u -r1.17 -r1.18
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	7 Feb 2011 21:14:29 -0000	1.17
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java	18 May 2011 18:48:24 -0000	1.18
@@ -192,6 +192,10 @@
     
     public static final String ATTR_QUESTION_NUMBERING_OFFSET = "questionNumberingOffset";
     
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
+    
     public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
 
     // error message keys
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/Assessment.hbm.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	2 Mar 2010 13:10:00 -0000	1.5
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml	18 May 2011 18:48:24 -0000	1.6
@@ -41,6 +41,14 @@
             column="update_date"
         />
 
+        <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
         <many-to-one
             name="createdBy"
             class="org.lamsfoundation.lams.tool.assessment.model.AssessmentUser"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java,v
diff -u -r1.7 -r1.8
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	14 Dec 2010 23:14:59 -0000	1.7
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java	18 May 2011 18:48:24 -0000	1.8
@@ -100,6 +100,8 @@
     private Date created;
 
     private Date updated;
+    
+    private Date submissionDeadline;
 
     private AssessmentUser createdBy;
 
@@ -290,8 +292,27 @@
     public void setUpdated(Date updated) {
 	this.updated = updated;
     }
+    
+    /**
+     * Returns deadline for learner's submission
+     * 
+     * @return submissionDeadline
+     * @hibernate.property column="submission_deadline"
+     */
+    public Date getSubmissionDeadline() {
+	return submissionDeadline;
+    }
 
     /**
+     * Sets deadline for learner's submission
+     * 
+     * @param submissionDeadline
+     */
+    public void setSubmissionDeadline(Date submissionDeadline) {
+	this.submissionDeadline = submissionDeadline;
+    }
+
+    /**
      * @return Returns the userid of the user who created the Share assessment.
      * 
      * @hibernate.many-to-one cascade="save-update" column="create_by"
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	16 Feb 2011 16:49:08 -0000	1.18
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	18 May 2011 18:48:24 -0000	1.19
@@ -31,6 +31,7 @@
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.TimeZone;
 import java.util.TreeSet;
 
 import javax.servlet.ServletException;
@@ -62,6 +63,7 @@
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -159,6 +161,7 @@
 	sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, assessment.getInstructions());
 	sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, false);
 	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, finishedLock);
+	sessionMap.put(AssessmentConstants.PARAM_RUN_OFFLINE, assessment.getRunOffline());
 
 	sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId);
 	sessionMap.put(AssessmentConstants.ATTR_USER, assessmentUser);
@@ -174,14 +177,28 @@
 	assessment.setDefineLater(false);
 	service.saveOrUpdateAssessment(assessment);
 
-	// add run offline support
+	// run offline support
 	if (assessment.getRunOffline()) {
-	    sessionMap.put(AssessmentConstants.PARAM_RUN_OFFLINE, true);
 	    return mapping.findForward("runOffline");
-	} else {
-	    sessionMap.put(AssessmentConstants.PARAM_RUN_OFFLINE, false);
 	}
 
+	//check if there is submission deadline
+	Date submissionDeadline = assessment.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    //store submission deadline to sessionMap
+	    sessionMap.put(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline);
+	   
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone learnerTimeZone = learnerDto.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline);
+	    Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date());
+	    
+	    //calculate whether submission deadline has passed, and if so forward to "runOffline"
+	    if (currentLearnerDate.after(tzSubmissionDeadline)) {
+		return mapping.findForward("runOffline");
+	    }
+	}
 	
 	Set<AssessmentQuestion> questionList = new TreeSet<AssessmentQuestion>(new SequencableComparator());
 	if (questionsFromDB != null) {
@@ -320,7 +337,7 @@
 	sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, true);
 	request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID);
 	return mapping.findForward(AssessmentConstants.SUCCESS);
-    }   
+    } 
     
     /**
      * Display same entire authoring page content from HttpSession variable.
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v
diff -u -r1.15 -r1.16
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	7 Feb 2011 21:14:29 -0000	1.15
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java	18 May 2011 18:48:24 -0000	1.16
@@ -31,11 +31,13 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Set;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import jxl.JXLException;
 
@@ -61,7 +63,10 @@
 import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
 import org.lamsfoundation.lams.tool.assessment.util.AssessmentExportXLSUtil;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 import org.springframework.web.context.WebApplicationContext;
@@ -95,6 +100,9 @@
 	if (param.equals("saveUserGrade")) {
 	    return saveUserGrade(mapping, form, request, response);
 	}
+	if (param.equals("setSubmissionDeadline")) {
+	    return setSubmissionDeadline(mapping, form, request, response);
+	}	
 	if (param.equals("exportSummary")) {
 	    return exportSummary(mapping, form, request, response);
 	}
@@ -115,6 +123,16 @@
 
 	Assessment assessment = service.getAssessmentByContentId(contentId);
 	assessment.toDTO();
+	
+	//set SubmissionDeadline, if any
+	if (assessment.getSubmissionDeadline() != null) {
+	    Date submissionDeadline = assessment.getSubmissionDeadline();
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+	    request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	}
 
 	// cache into sessionMap
 	boolean isGroupedActivity = service.isGroupedActivity(contentId);
@@ -186,7 +204,38 @@
 
 	return null;
     }
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	service = getAssessmentService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Assessment assessment = service.getAssessmentByContentId(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, AssessmentConstants.ATTR_SUBMISSION_DEADLINE, true);
+	Date tzSubmissionDeadline = null;
+	if (dateParameter != null) {
+	    Date submissionDeadline = new Date(dateParameter);
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+	}
+	assessment.setSubmissionDeadline(tzSubmissionDeadline);
+	service.saveOrUpdateAssessment(assessment);
 
+	return null;
+    }
+
     /**
      * Export Excel format survey data.
      * 
Index: lams_tool_assessment/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v
diff -u -r1.15 -r1.16
--- lams_tool_assessment/web/pages/learning/learning.jsp	16 Feb 2011 16:49:08 -0000	1.15
+++ lams_tool_assessment/web/pages/learning/learning.jsp	18 May 2011 18:48:24 -0000	1.16
@@ -154,6 +154,14 @@
 			</p>
 		</c:if>
 		
+		<c:if test="${not empty sessionMap.submissionDeadline && (sessionMap.mode == 'author' || sessionMap.mode == 'learner')}">
+			<div class="info">
+				<fmt:message key="authoring.info.teacher.set.restriction" >
+					<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+				</fmt:message>
+			</div>
+		</c:if>
+		
 		<div id="question" style="display:none; cursor: default"> 
 	        <h1 style="padding: 30 10 50">
 	        	<fmt:message key='label.learning.blockui.are.you.ready' />
Index: lams_tool_assessment/web/pages/learning/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/Attic/runoffline.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_assessment/web/pages/learning/runoffline.jsp	14 Sep 2009 05:08:58 -0000	1.4
+++ lams_tool_assessment/web/pages/learning/runoffline.jsp	18 May 2011 18:48:24 -0000	1.5
@@ -24,9 +24,20 @@
 			${sessionMap.title}
 		</h1>
 
-		<p>
-			<fmt:message key="run.offline.message" />
-		</p>
+		<c:choose>
+			<c:when test="${empty sessionMap.submissionDeadline}">
+				<p>
+					<fmt:message key="run.offline.message" />
+				</p>			
+			</c:when>
+			<c:otherwise>
+				<div class="warning">
+					<fmt:message key="authoring.info.teacher.set.restriction" >
+						<fmt:param><lams:Date value="${sessionMap.submissionDeadline}" /></fmt:param>
+					</fmt:message>
+				</div>
+			</c:otherwise>
+		</c:choose>
 
 		<div class="space-bottom-top align-right">
 			<html:link href="#" property="FinishButton" styleId="finishButton"
Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/monitoring.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_assessment/web/pages/monitoring/monitoring.jsp	13 Dec 2010 23:43:36 -0000	1.5
+++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp	18 May 2011 18:48:24 -0000	1.6
@@ -4,14 +4,21 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%>
 
+<c:set var="lams"><lams:LAMSURL /></c:set>
+
 <lams:html>
 	<lams:head>
 		<%@ include file="/common/tabbedheader.jsp" %>
+		<link type="text/css" href="${lams}/css/jquery-ui-1.8.11.flick-theme.css" rel="stylesheet">
+		<link type="text/css" href="${lams}/css/jquery-ui-timepicker-addon.css" rel="stylesheet">
 		<link href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet" type="text/css" media="screen">
 		<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/jquery-ui-1.8.6.custom.css'/>" />
 		<link rel="stylesheet" type="text/css" href="<html:rewrite page='/includes/css/ui.jqgrid.css'/>" />
  
 		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery-1.4.2.min.js'/>"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-1.8.11.custom.min.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery-ui-timepicker-addon.js"></script>
+		<script type="text/javascript" src="${lams}includes/javascript/jquery.blockUI.js"></script> 
  		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/grid.locale-en.js'/>"></script>
  		<script type="text/javascript" src="<html:rewrite page='/includes/javascript/jquery.jqGrid.min.js'/>"></script>
  		<script type="text/javascript"> 
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	7 Feb 2011 21:14:29 -0000	1.12
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	18 May 2011 18:48:24 -0000	1.13
@@ -175,12 +175,26 @@
 		}
 	};
 	window.onresize = resizeIframe;
+	
+	var settings = {
+		lams: '<lams:LAMSURL />',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring/setSubmissionDeadline.do"/>',
+		toolContentID: '${param.toolContentID}',
+		messageNotification: '<fmt:message key="monitor.summary.notification" />',
+		messageRestrictionSet: '<fmt:message key="monitor.summary.date.restriction.set" />',
+		messageRestrictionRemoved: '<fmt:message key="monitor.summary.date.restriction.removed" />'
+	};
 	-->		
 </script>
 
+<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
+
 <%@ include file="parts/advanceoptions.jsp"%>
 
+<%@ include file="parts/dateRestriction.jsp"%>
+
 <c:choose>
 	<c:when test="${empty summaryList}">
 		<div align="center">
Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	2 Mar 2010 13:10:00 -0000	1.2
+++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp	18 May 2011 18:48:24 -0000	1.3
@@ -1,5 +1,3 @@
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-
 <h1>
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/monitoring/parts/dateRestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?