Index: lams_tool_mindmap/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/build.properties,v
diff -u -r1.2 -r1.2.6.1
--- lams_tool_mindmap/build.properties	1 May 2009 05:47:06 -0000	1.2
+++ lams_tool_mindmap/build.properties	14 Apr 2011 20:53:50 -0000	1.2.6.1
@@ -3,7 +3,7 @@
 signature=lamind10
 
 #project version
-tool.version=20090202
+tool.version=20110414
 
 package=org/lamsfoundation/lams/tool/mindmap
 package.name=org.lamsfoundation.lams.tool.mindmap
Index: lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Attic/Mindmap.hbm.xml,v
diff -u -r1.1 -r1.1.6.1
--- lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	3 Apr 2009 00:00:34 -0000	1.1
+++ lams_tool_mindmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.hbm.xml	14 Apr 2011 20:53:50 -0000	1.1.6.1
@@ -42,6 +42,14 @@
         />
 
         <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
+        <property
             name="createBy"
             type="java.lang.Long"
             update="true"
@@ -141,12 +149,11 @@
         />
 
         <property
-            name="lastActionId"
-            type="java.lang.Long"
+            name="mindmapExportContent"
+            type="java.lang.String"
             update="true"
             insert="true"
-            column="last_action_id"
-            length="20"
+            column="export_content"
         />
 
         <property
Index: lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql,v
diff -u -r1.1.2.2 -r1.1.2.2.4.1
--- lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql	12 May 2009 01:27:52 -0000	1.1.2.2
+++ lams_tool_mindmap/db/sql/create_lams_tool_mindmap.sql	14 Apr 2011 20:53:50 -0000	1.1.2.2.4.1
@@ -9,7 +9,7 @@
 drop table if exists tl_lamind10_request;
 
 create table tl_lamind10_attachment (uid bigint not null auto_increment, file_version_id bigint, file_type varchar(255), file_name varchar(255), file_uuid bigint, create_date datetime, mindmap_uid bigint, primary key (uid))type=innodb;
-create table tl_lamind10_mindmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, multiuser_mode bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, export_content text, reflect_on_activity bit, reflect_instructions text, primary key (uid))type=innodb;
+create table tl_lamind10_mindmap (uid bigint not null auto_increment, create_date datetime, update_date datetime, submission_deadline datetime, create_by bigint, title varchar(255), instructions text, run_offline bit, lock_on_finished bit, multiuser_mode bit, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, tool_content_id bigint, export_content text, reflect_on_activity bit, reflect_instructions text, primary key (uid))type=innodb;
 create table tl_lamind10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, session_id bigint, session_name varchar(250), mindmap_uid bigint, primary key (uid))type=innodb;
 create table tl_lamind10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), login_name varchar(255), first_name varchar(255), finishedActivity bit, mindmap_session_uid bigint, entry_uid bigint, primary key (uid))type=innodb;
 create table tl_lamind10_node (node_id bigint not null auto_increment, unique_id bigint, parent_id bigint, node_text varchar(100), node_color varchar(6), session_id bigint, user_id bigint, mindmap_id bigint, primary key (node_id))TYPE=InnoDB;
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20110414_updateTo236.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java,v
diff -u -r1.1.2.1 -r1.1.2.1.4.1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	6 May 2009 05:35:57 -0000	1.1.2.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/model/Mindmap.java	14 Apr 2011 20:53:50 -0000	1.1.2.1.4.1
@@ -45,6 +45,7 @@
     private Long uid;
     private Date createDate;
     private Date updateDate;
+    private Date submissionDeadline;
     private Long createBy;
     private String title;
     private String instructions;
@@ -129,8 +130,27 @@
     public void setUpdateDate(Date updateDate) {
 	this.updateDate = updateDate;
     }
+    
+    /**
+     * 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;
+    }
+
+    /**
      * @hibernate.property column="create_by" length="20"
      * 
      */
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java,v
diff -u -r1.1 -r1.1.6.1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java	3 Apr 2009 00:00:38 -0000	1.1
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/util/MindmapConstants.java	14 Apr 2011 20:53:50 -0000	1.1.6.1
@@ -60,4 +60,7 @@
     //public static final String ERROR_MSG_CONDITION = "error.condition";
     //public static final String ERROR_MSG_NAME_BLANK = "error.condition.name.blank";
     //public static final String ERROR_MSG_NAME_DUPLICATED = "error.condition.duplicated.name";
+    
+    public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+    public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 }
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java,v
diff -u -r1.5.2.5.2.2 -r1.5.2.5.2.3
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	28 Oct 2009 03:02:21 -0000	1.5.2.5.2.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java	14 Apr 2011 20:53:50 -0000	1.5.2.5.2.3
@@ -27,9 +27,11 @@
 import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
+import java.util.TimeZone;
 
 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;
@@ -60,6 +62,7 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
@@ -154,6 +157,24 @@
 		if (mindmap.isRunOffline()) {
 			return mapping.findForward("runOffline");
 		}
+		
+		//check if there is submission deadline
+		Date submissionDeadline = mindmap.getSubmissionDeadline();
+		if (submissionDeadline != null) {
+		    //store submission deadline to sessionMap
+		    request.setAttribute(MindmapConstants.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");
+		    }
+		}
 
 		MindmapUser mindmapUser;
 		if (mode.equals(ToolAccessMode.TEACHER)) {
Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java,v
diff -u -r1.5.2.2 -r1.5.2.2.2.1
--- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	18 May 2009 01:16:34 -0000	1.5.2.2
+++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/MonitoringAction.java	14 Apr 2011 20:53:50 -0000	1.5.2.2.2.1
@@ -25,9 +25,13 @@
 package org.lamsfoundation.lams.tool.mindmap.web.actions;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.List;
+import java.util.TimeZone;
+
 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;
@@ -42,12 +46,16 @@
 import org.lamsfoundation.lams.tool.mindmap.model.MindmapUser;
 import org.lamsfoundation.lams.tool.mindmap.service.IMindmapService;
 import org.lamsfoundation.lams.tool.mindmap.service.MindmapServiceProxy;
+import org.lamsfoundation.lams.tool.mindmap.util.MindmapConstants;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeConceptModel;
 import org.lamsfoundation.lams.tool.mindmap.util.xmlmodel.NodeModel;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.DateUtil;
 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 com.thoughtworks.xstream.XStream;
 
@@ -96,6 +104,16 @@
 	request.setAttribute("mindmapDTO", mindmapDTO);
 	request.setAttribute("contentFolderID", contentFolderID);
 	request.setAttribute("isGroupedActivity", isGroupedActivity);
+	
+	//set SubmissionDeadline, if any
+	if (mindmap.getSubmissionDeadline() != null) {
+	    Date submissionDeadline = mindmap.getSubmissionDeadline();
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+	    request.setAttribute(MindmapConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	}
 
 	return mapping.findForward("success");
     }
@@ -308,7 +326,38 @@
 
 	return null;
     }
+    
+    /**
+     * Set Submission Deadline
+     * 
+     * @param mapping
+     * @param form
+     * @param request
+     * @param response
+     * @return
+     */
+    public ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse response) {
+	setupService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	Mindmap mindmap = mindmapService.getMindmapByContentId(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, MindmapConstants.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);
+	}
+	mindmap.setSubmissionDeadline(tzSubmissionDeadline);
+	mindmapService.saveOrUpdateMindmap(mindmap);
 
+	return null;
+    }
+
     /**
      * Sets mindmapService
      */
Index: lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.2 -r1.2.6.1
--- lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml	14 Apr 2009 00:46:52 -0000	1.2
+++ lams_tool_mindmap/web/WEB-INF/struts/struts-config.xml	14 Apr 2011 20:53:50 -0000	1.2.6.1
@@ -14,14 +14,14 @@
   <form-beans>
 
     <form-bean
-      name="pedagogicalPlannerForm"
-      type="org.lamsfoundation.lams.tool.mindmap.web.forms.MindmapPedagogicalPlannerForm"
-    />
-    <form-bean
       name="monitoringForm"
       type="org.lamsfoundation.lams.tool.mindmap.web.forms.MonitoringForm"
     />
     <form-bean
+      name="pedagogicalPlannerForm"
+      type="org.lamsfoundation.lams.tool.mindmap.web.forms.MindmapPedagogicalPlannerForm"
+    />
+    <form-bean
       name="learningForm"
       type="org.lamsfoundation.lams.tool.mindmap.web.forms.LearningForm"
     />
Index: lams_tool_mindmap/web/pages/learning/mindmap.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/mindmap.jsp,v
diff -u -r1.9.2.1.4.1 -r1.9.2.1.4.2
--- lams_tool_mindmap/web/pages/learning/mindmap.jsp	14 Sep 2009 06:27:51 -0000	1.9.2.1.4.1
+++ lams_tool_mindmap/web/pages/learning/mindmap.jsp	14 Apr 2011 20:53:50 -0000	1.9.2.1.4.2
@@ -77,6 +77,14 @@
 			</c:choose>
 		</div>
 	</c:if>
+	
+	 <c:if test="${not empty submissionDeadline && (mode == 'author' || mode == 'learner')}">
+		 <div class="info">
+		  	<fmt:message key="authoring.info.teacher.set.restriction" >
+		  		<fmt:param><lams:Date value="${submissionDeadline}" /></fmt:param>
+		  	</fmt:message>
+		 </div>
+	 </c:if>
 
 	&nbsp;
 
Index: lams_tool_mindmap/web/pages/learning/runOffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/learning/Attic/runOffline.jsp,v
diff -u -r1.2.6.1 -r1.2.6.2
--- lams_tool_mindmap/web/pages/learning/runOffline.jsp	16 Sep 2009 07:46:02 -0000	1.2.6.1
+++ lams_tool_mindmap/web/pages/learning/runOffline.jsp	14 Apr 2011 20:53:50 -0000	1.2.6.2
@@ -16,9 +16,20 @@
 		${mindmapDTO.title}
 	</h1>
 
-	<p>
-		<fmt:message key="message.runOfflineSet" />
-	</p>
+	<c:choose>
+		<c:when test="${empty submissionDeadline}">
+			<p>
+				<fmt:message key="message.runOfflineSet" />
+			</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>
 
 	<c:if test="${mode == 'learner' || mode == 'author'}">
 		<html:form action="/learning" method="post" onsubmit="disableFinishButton();" styleId="Form">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/pages/monitoring/dateRestriction.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.3.2.2 -r1.3.2.2.2.1
--- lams_tool_mindmap/web/pages/monitoring/summary.jsp	14 May 2009 01:32:23 -0000	1.3.2.2
+++ lams_tool_mindmap/web/pages/monitoring/summary.jsp	14 Apr 2011 20:53:50 -0000	1.3.2.2.2.1
@@ -1,5 +1,13 @@
 <%@ include file="/common/taglibs.jsp"%>
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<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/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">
 <!--
 	var evalcomixWindow = null;
@@ -9,19 +17,30 @@
     	evalcomixWindow=window.open(url, 'evalcomixWindow', 'width=800,height=600,scrollbars=yes,resizable=yes');
 		if (window.focus) {evalcomixWindow.focus()}
 	}
+	
+	var settings = {
+		lams: '${lams}',
+		submissionDeadline: '${submissionDeadline}',
+		setSubmissionDeadlineUrl: '<c:url value="/monitoring.do?dispatch=setSubmissionDeadline"/>',
+		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}/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
 <c:set var="dto" value="${mindmapDTO}" />
 
-<h1>
+<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/>');" >
 		<fmt:message key="monitor.summary.th.advancedSettings" />
 	</a>
 </h1>
-<br />
 
 <div class="monitoring-advanced" id="advancedDiv" style="display:none">
 <table class="alternative-color">
@@ -90,6 +109,8 @@
 </table>
 </div>
 
+<%@include file="dateRestriction.jsp"%>
+
 <c:if test="${empty dto.sessionDTOs}">
 	<p class="warning">
 		<fmt:message key="label.nogroups" />