Index: lams_tool_vote/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/build.properties,v
diff -u -r1.14.8.1 -r1.14.8.2
--- lams_tool_vote/build.properties	10 Mar 2010 15:01:22 -0000	1.14.8.1
+++ lams_tool_vote/build.properties	9 May 2011 12:09:59 -0000	1.14.8.2
@@ -4,7 +4,7 @@
 signature=lavote11
 
 #project version
-tool.version=20100309
+tool.version=20110509
 
 # hide tool option
 hideTool=false
Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/Attic/VoteContent.hbm.xml,v
diff -u -r1.9.10.1 -r1.9.10.2
--- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	10 Mar 2010 14:59:04 -0000	1.9.10.1
+++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml	9 May 2011 12:09:58 -0000	1.9.10.2
@@ -167,7 +167,13 @@
         length="1"        
    />
 
-
+   <property
+        name="submissionDeadline"
+        type="java.util.Date"
+        access="property"
+        column="submission_deadline"
+        length="20"        
+   />
     	 <set
             name="voteQueContents"
             order-by="display_order"
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.19.8.5 -r1.19.8.6
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	16 Apr 2010 07:04:49 -0000	1.19.8.5
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	9 May 2011 12:09:59 -0000	1.19.8.6
@@ -163,6 +163,15 @@
 label.learner.nomination  =Your nomination is:
 error.minNominationCount.not.reached  =You haven't selected enough nominations. You should select at least
 label.minNomCount  =Min Votes
+monitor.summary.date.restriction  =Date restriction
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to vote after the set date and time. 
+monitor.summary.after.date  =Date/time:
 
+monitor.summary.set.restriction  =Set restriction
+monitor.summary.unset.restriction  =Remove restriction
+authoring.info.teacher.set.restriction  =The instructor has set a restriction to this activity from {0} onwards.
+monitor.summary.notification  =Notification
+monitor.summary.date.restriction.set  =Date restriction has been set
+monitor.summary.date.restriction.removed  =Date restriction has been removed
 
 #======= End labels: Exported 157 labels for en AU =====
Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/create_lams_tool_vote.sql,v
diff -u -r1.25.10.3 -r1.25.10.4
--- lams_tool_vote/db/sql/create_lams_tool_vote.sql	16 Mar 2010 21:18:16 -0000	1.25.10.3
+++ lams_tool_vote/db/sql/create_lams_tool_vote.sql	9 May 2011 12:09:58 -0000	1.25.10.4
@@ -19,6 +19,7 @@
      , retries TINYINT(1) NOT NULL DEFAULT 0
      , reflectionSubject TEXT
      , show_results TINYINT(1) NOT NULL DEFAULT 1
+     , submission_deadline datetime DEFAULT NULL
      , PRIMARY KEY (uid)
 )TYPE=InnoDB;
 
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v
diff -u -r1.47.8.1 -r1.47.8.2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	10 Mar 2010 15:02:09 -0000	1.47.8.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java	9 May 2011 12:09:59 -0000	1.47.8.2
@@ -142,6 +142,10 @@
     public static final String OPT_INDEX = "optIndex";
 
     public static final String RUN_OFFLINE = "runOffline";
+    
+    // 	for submission deadline LDEV-2657
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 
     /*
      * refers to number of questions presented initially, we have a single record for default content
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java,v
diff -u -r1.7 -r1.7.8.1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	18 Feb 2009 23:06:58 -0000	1.7
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteContentDAO.java	9 May 2011 12:09:59 -0000	1.7.8.1
@@ -96,6 +96,7 @@
     public void updateVoteContent(VoteContent voteContent) {
 	this.getSession().setFlushMode(FlushMode.AUTO);
 	this.getHibernateTemplate().update(voteContent);
+	VoteContentDAO.logger.debug("after updateVoteContent:" +voteContent);
     }
 
     public void removeVoteById(Long voteContentId) {
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dbupdates/patch20110509_updateTo236.sql,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java,v
diff -u -r1.12.10.1 -r1.12.10.2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	10 Mar 2010 15:02:10 -0000	1.12.10.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteContent.java	9 May 2011 12:09:58 -0000	1.12.10.2
@@ -108,6 +108,8 @@
     
     /** persistent field */
     private Set voteAttachments;
+    
+    private Date submissionDeadline;
 
     /** full constructor */
     public VoteContent(Long voteContentId, String content, String title, String instructions, boolean defineLater, boolean runOffline, 
@@ -502,4 +504,16 @@
 	public void setShowResults(boolean showResults) {
 		this.showResults = showResults;
 	}
+
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+	
+	/**
+	 * @hibernate.property column="submission_deadline"
+	 * @return date submissionDeadline
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v
diff -u -r1.46.10.1 -r1.46.10.2
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	10 Mar 2010 15:02:10 -0000	1.46.10.1
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java	9 May 2011 12:09:58 -0000	1.46.10.2
@@ -159,7 +159,10 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.TimeZone;
+import java.util.Date;
 
+
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -189,6 +192,7 @@
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
@@ -396,7 +400,8 @@
     	logger.debug("fwding to :" + RUN_OFFLINE);
 		return (mapping.findForward(RUN_OFFLINE));
     }
-
+    
+    
     /* find out if the content is being modified at the moment. */
     boolean isDefineLater=VoteUtils.isDefineLater(voteContent);
     logger.debug("isDefineLater: " + isDefineLater);
@@ -406,6 +411,25 @@
 	    return (mapping.findForward(DEFINE_LATER));
     }
 
+    //	check if there is submission deadline
+    Date submissionDeadline = voteContent.getSubmissionDeadline();
+    if (submissionDeadline != null) {
+    	
+    	request.setAttribute(VoteAppConstants.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 deadline has passed, and if so forward to "runOffline"
+    	if (currentLearnerDate.after(tzSubmissionDeadline)) {
+    		return mapping.findForward(RUN_OFFLINE);
+    		
+    	}
+    	
+    }
+    
     /*
 	 * fetch question content from content
 	 */
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.44 -r1.44.10.1
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	23 May 2008 06:05:24 -0000	1.44
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	9 May 2011 12:09:58 -0000	1.44.10.1
@@ -30,10 +30,13 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
+import java.util.Date;
+import java.util.TimeZone;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.log4j.Logger;
 import org.apache.struts.action.ActionForm;
@@ -64,9 +67,12 @@
 import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt;
 import org.lamsfoundation.lams.tool.vote.service.IVoteService;
 import org.lamsfoundation.lams.tool.vote.service.VoteServiceProxy;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.MessageService;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
+import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
 
@@ -439,6 +445,7 @@
 			voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
 			logger.debug("retrieving voteService from session: " + voteService);
 		}
+		
 		logger.debug("voteService: " + voteService);
 		
 		logger.debug("isUserNamesVisible: " + isUserNamesVisible);
@@ -767,6 +774,15 @@
 	    
 	    VoteContent voteContent=voteService.retrieveVote(new Long(toolContentID));
 		logger.debug("existing voteContent:" + voteContent);
+				
+		if (voteContent.getSubmissionDeadline() != null) {
+			Date submissionDeadline = voteContent.getSubmissionDeadline();
+			HttpSession ss = SessionManager.getSession();
+			UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+			TimeZone teacherTimeZone = teacher.getTimeZone();
+			Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+			request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+		}
 		
     	/* this section is related to summary tab. Starts here. */
 		Map summaryToolSessions=MonitoringUtil.populateToolSessions(request, voteContent, voteService);
@@ -3834,6 +3850,38 @@
     }
     
     /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+    	
+    	IVoteService voteService = VoteServiceProxy.getVoteService(getServlet().getServletContext());
+		
+    	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+    	VoteContent voteContent = voteService.retrieveVote(contentID);
+	
+    	Long dateParameter = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SUBMISSION_DEADLINE, true);
+    	Date tzSubmissionDeadline = null;
+    	if (dateParameter != null) {
+    		Date submissionDeadline = new Date(dateParameter);
+		    HttpSession ss = SessionManager.getSession();
+		    org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss.getAttribute(AttributeNames.USER);
+		    TimeZone teacherTimeZone = teacher.getTimeZone();
+		    tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline);
+    	}
+    	voteContent.setSubmissionDeadline(tzSubmissionDeadline);
+    	voteService.updateVote(voteContent);
+    	return null;
+    }
+    
+    
+    /**
 	 * Return ResourceService bean.
 	 */
 	private MessageService getMessageService() {
Index: lams_tool_vote/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/common/tabbedheader.jsp,v
diff -u -r1.2 -r1.2.10.1
--- lams_tool_vote/web/common/tabbedheader.jsp	8 Jun 2007 01:43:35 -0000	1.2
+++ lams_tool_vote/web/common/tabbedheader.jsp	9 May 2011 12:09:59 -0000	1.2.10.1
@@ -19,7 +19,6 @@
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
 
 <%@ include file="/common/fckeditorheader.jsp"%>
Index: lams_tool_vote/web/learning/RunOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/RunOffline.jsp,v
diff -u -r1.11.8.1 -r1.11.8.2
--- lams_tool_vote/web/learning/RunOffline.jsp	16 Sep 2009 03:44:30 -0000	1.11.8.1
+++ lams_tool_vote/web/learning/RunOffline.jsp	9 May 2011 12:09:59 -0000	1.11.8.2
@@ -60,10 +60,21 @@
 			<h1>
 				<fmt:message key="activity.title" />
 			</h1>
-			<p>
-				<fmt:message key="label.learning.forceOfflineMessage" />
-			</p>
-
+			<c:choose>
+				<c:when test="${empty submissionDeadline}">
+					<p>
+						<fmt:message key="label.learning.forceOfflineMessage" />
+					</p>
+				</c:when>
+				<c:otherwise>
+					<div class="warning">
+						<fmt:message key="authoring.info.teacher.set.restriction" >
+							<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+						</fmt:message>
+					</div>
+				</c:otherwise>														
+			</c:choose>
+			
 			<div class="space-bottom-top align-right">
 
 				<c:if test="${voteGeneralLearnerFlowDTO.reflection != 'true'}">
Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.20 -r1.20.10.1
--- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	8 Jun 2007 01:43:32 -0000	1.20
+++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp	9 May 2011 12:09:59 -0000	1.20.10.1
@@ -43,8 +43,6 @@
 	<title> <fmt:message key="label.monitoring"/> </title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
-	<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
-
 	<script type="text/javascript">
 	
 	   	var imgRoot="${lams}images/";
Index: lams_tool_vote/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/SummaryContent.jsp,v
diff -u -r1.34.10.1 -r1.34.10.2
--- lams_tool_vote/web/monitoring/SummaryContent.jsp	10 Mar 2010 15:00:57 -0000	1.34.10.1
+++ lams_tool_vote/web/monitoring/SummaryContent.jsp	9 May 2011 12:09:58 -0000	1.34.10.2
@@ -24,9 +24,89 @@
 
 <c:set scope="request" var="lams"><lams:LAMSURL/></c:set>
 <c:set scope="request" var="tool"><lams:WebAppURL/></c:set>
-<script type="text/javascript" src="<lams:LAMSURL />/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
-<h1>
+<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">
+<script type="text/javascript" src="${lams}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery-1.5.1.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">
+<!--
+$(function(){
+	$("#datetime").datetimepicker();
+
+	var submissionDeadline = '${submissionDeadline}';
+	if (submissionDeadline != "") {
+		var date = new Date(eval(submissionDeadline));
+
+		$("#dateInfo").html( formatDate(date) );
+		
+		//open up date restriction area
+		toggleAdvancedOptionsVisibility(document.getElementById('restrictUsageDiv'), document.getElementById('restrictUsageTreeIcon'),'${lams}');
+	
+	}
+	
+});
+
+function formatDate(date) {
+	var currHour = "" + date.getHours();
+	if (currHour.length == 1) {
+		currHour = "0" + currHour;
+	}  
+	var currMin = "" + date.getMinutes();
+	if (currMin.length == 1) {
+		currMin = "0" + currMin;
+	}
+	return $.datepicker.formatDate( 'mm/dd/yy', date ) + " " + currHour + ":" + currMin;
+}
+
+function setSubmissionDeadline() {
+	//get the timestamp in milliseconds since midnight Jan 1, 1970
+	var date = $("#datetime").datetimepicker('getDate');
+	if (date == null) {
+		return;
+	}
+
+	var reqIDVar = new Date();
+	var url = "<c:url value="/monitoring.do"/>?dispatch=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
+				+ date.getTime() + "&reqID=" + reqIDVar.getTime();
+
+	$.ajax({
+		url : url,
+		success : function() {
+			$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.set" />');
+			$("#datetimeDiv").hide();
+			$("#dateInfo").html(formatDate(date) );
+			$("#dateInfoDiv").show();
+		}
+	});
+}
+function removeSubmissionDeadline() {
+	var reqIDVar = new Date();
+	var url = "<c:url value="/monitoring.do"/>?dispatch=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
+				+ "&reqID=" + reqIDVar.getTime();
+
+	$.ajax({
+		url : url,
+		success : function() {
+			$.growlUI('<fmt:message key="monitor.summary.notification" />', '<fmt:message key="monitor.summary.date.restriction.removed" />');
+			$("#dateInfoDiv").hide();
+			
+			$("#datetimeDiv").show();
+			$("#datetime").val("");
+		}
+	});
+}
+		
+
+-->
+</script>
+
+<h1 style="padding-bottom: 10px;">
 	<img src="<lams:LAMSURL/>/images/tree_closed.gif" id="treeIcon" onclick="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'), '<lams:LAMSURL/>');" />
 
 	<a href="javascript:toggleAdvancedOptionsVisibility(document.getElementById('advancedDiv'), document.getElementById('treeIcon'),'<lams:LAMSURL/>');" >
@@ -133,6 +213,11 @@
 	</c:choose>
 </table>
 </div>
+
+
+<%@include file="daterestriction.jsp"%>
+
+
 		<c:if test="${(voteGeneralMonitoringDTO.userExceptionNoToolSessions == 'true')}"> 	
 			<c:if test="${notebookEntriesExist != 'true' }"> 			
 				<table align="center">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_vote/web/monitoring/daterestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?