Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery-ui-1.8.11.custom.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/css/jquery-ui-timepicker-addon.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_diagonals-small_75_f5f5f5_40x40.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_diagonals-small_75_f5f5f5_40x40.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_flat_0_aaaaaa_40x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_flat_0_aaaaaa_40x100.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_flat_75_ffffff_40x100.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_flat_75_ffffff_40x100.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_glass_55_fbf9ee_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_glass_55_fbf9ee_1x400.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_glass_65_ffffff_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_glass_65_ffffff_1x400.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_glass_75_dadada_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_glass_75_dadada_1x400.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_glass_75_e6e6e6_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_glass_75_e6e6e6_1x400.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-bg_glass_95_fef1ec_1x400.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-bg_glass_95_fef1ec_1x400.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-icons_222222_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-icons_222222_256x240.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-icons_2e83ff_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-icons_2e83ff_256x240.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-icons_454545_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-icons_454545_256x240.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-icons_888888_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-icons_888888_256x240.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/images/css/jquery-ui.start-theme/ui-icons_cd0a0a_256x240.png
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/jquery-ui.start-theme/Attic/ui-icons_cd0a0a_256x240.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery-1.5.1.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery-ui-1.8.11.custom.min.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery-ui-timepicker-addon.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/build.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v
diff -u -r1.22.8.2 -r1.22.8.3
--- lams_tool_sbmt/build.properties	28 Oct 2009 02:31:19 -0000	1.22.8.2
+++ lams_tool_sbmt/build.properties	29 Mar 2011 23:12:35 -0000	1.22.8.3
@@ -8,7 +8,7 @@
 signature=lasbmt11
 
 #project version
-tool.version=20091028
+tool.version=20110325
 
 # Minimum compatible version
 min.server.version.number=2.0.3
Index: lams_tool_sbmt/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v
diff -u -r1.50.6.1 -r1.50.6.2
--- lams_tool_sbmt/build.xml	23 Jul 2009 05:09:50 -0000	1.50.6.1
+++ lams_tool_sbmt/build.xml	29 Mar 2011 23:12:35 -0000	1.50.6.2
@@ -494,7 +494,7 @@
 		</delete>
 	</target>
 	
-	<target name="explode-tool" depends="deploy-tool" description="explode tool jar and war package to a war folder">
+	<target name="explode-tool" depends="delete-exploded-tool-folder, deploy-tool" description="explode tool jar and war package to a war folder">
 		<!-- rename war file to avoid name conflict -->
 		<move tofile="${jboss.deploy}/temp-${product}.war" file="${jboss.deploy}/${product}.war"/>
 		<!-- explode the ear -->
Index: lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesContent.hbm.xml,v
diff -u -r1.12 -r1.12.10.1
--- lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	3 Sep 2008 02:11:21 -0000	1.12
+++ lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	29 Mar 2011 23:12:35 -0000	1.12.10.1
@@ -175,6 +175,14 @@
         />
 
         <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
+        <property
             name="notifyLearnersOnMarkRelease"
             type="boolean"
             update="true"
Index: lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql,v
diff -u -r1.28.10.2 -r1.28.10.3
--- lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	28 Oct 2009 02:31:19 -0000	1.28.10.2
+++ lams_tool_sbmt/db/sql/create_lams_tool_sbmt.sql	29 Mar 2011 23:12:35 -0000	1.28.10.3
@@ -24,6 +24,7 @@
    created datetime, 
    created_by bigint, 
    updated datetime,
+   submission_deadline datetime,
    mark_release_notify tinyint DEFAULT 0,
    file_submit_notify tinyint DEFAULT 0,
    primary key (content_id)
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SubmitFilesContent.hbm.xml,v
diff -u -r1.10 -r1.10.10.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	3 Sep 2008 02:11:21 -0000	1.10
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml	29 Mar 2011 23:12:35 -0000	1.10.10.1
@@ -175,6 +175,14 @@
         />
 
         <property
+            name="submissionDeadline"
+            type="java.util.Date"
+            update="true"
+            insert="true"
+            column="submission_deadline"
+        />
+
+        <property
             name="notifyLearnersOnMarkRelease"
             type="boolean"
             update="true"
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java,v
diff -u -r1.21 -r1.21.10.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	3 Sep 2008 02:11:21 -0000	1.21
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.java	29 Mar 2011 23:12:35 -0000	1.21.10.1
@@ -87,6 +87,8 @@
 	private Date created;
 
 	private Date updated;
+	
+	private Date submissionDeadline;
 
 	private SubmitUser createdBy;
 
@@ -397,7 +399,19 @@
 	public void setUpdated(Date updated) {
 		this.updated = updated;
 	}
+	
+	/**
+	 * @hibernate.property column="submission_deadline"
+	 * @return
+	 */
+	public Date getSubmissionDeadline() {
+		return submissionDeadline;
+	}
 
+	public void setSubmissionDeadline(Date submissionDeadline) {
+		this.submissionDeadline = submissionDeadline;
+	}
+
 	/**
 	 * @hibernate.property column="mark_release_notify"
 	 * @return
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dbupdates/patch20110325_updateTo236.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v
diff -u -r1.21.10.1 -r1.21.10.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	23 Jul 2009 05:09:50 -0000	1.21.10.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java	29 Mar 2011 23:12:35 -0000	1.21.10.2
@@ -72,6 +72,12 @@
 	public static final Object ATTR_ARRIVE_LIMIT = "arriveLimit";
 
 	public static final String ATTR_USER_FINISHED = "userFinished";
+	
+	public static final String ATTR_RUN_OFFLINE = "runOffline";
+	
+	public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline";
+	
+	public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed";
 
 	public static final String EVENT_NAME_NOTIFY_LEARNERS_ON_MARK_RELEASE = "notify_learners_on_mark_release";
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.49 -r1.49.10.1
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	10 Oct 2008 00:37:16 -0000	1.49
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	29 Mar 2011 23:12:35 -0000	1.49.10.1
@@ -26,9 +26,11 @@
 package org.lamsfoundation.lams.tool.sbmt.web;
 
 import java.io.IOException;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -63,6 +65,7 @@
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.DateUtil;
 import org.lamsfoundation.lams.util.FileUtil;
 import org.lamsfoundation.lams.util.FileValidatorUtil;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -171,6 +174,23 @@
 	if (content.isRunOffline()) {
 	    return mapping.findForward("runOffline");
 	}
+	
+	//check if there is submission deadline
+	Date submissionDeadline = content.getSubmissionDeadline();
+	if (submissionDeadline != null) {
+	    //store submission deadline to sessionMap
+	    sessionMap.put(SbmtConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline);
+	   
+	    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");
+	    }
+	}
 
 	if (content.isNotifyLearnersOnMarkRelease()) {
 	    submitFilesService.getEventNotificationService().createEvent(SbmtConstants.TOOL_SIGNATURE,
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.47.10.1 -r1.47.10.2
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	23 Jul 2009 05:09:49 -0000	1.47.10.1
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	29 Mar 2011 23:12:35 -0000	1.47.10.2
@@ -30,13 +30,16 @@
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.Comparator;
+import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.TimeZone;
 import java.util.TreeMap;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
@@ -60,9 +63,12 @@
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.tool.sbmt.util.SbmtConstants;
+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.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -122,6 +128,16 @@
 	AuthoringDTO authorDto = new AuthoringDTO(persistContent);
 	request.setAttribute(SbmtConstants.AUTHORING_DTO, authorDto);
 	request.setAttribute(SbmtConstants.PAGE_EDITABLE, persistContent.isContentInUse());
+	
+	//set SubmissionDeadline, if any
+	if (persistContent.getSubmissionDeadline() != null) {
+	    Date submissionDeadline = persistContent.getSubmissionDeadline();
+	    HttpSession ss = SessionManager.getSession();
+	    UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	    TimeZone teacherTimeZone = teacher.getTimeZone();
+	    Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline);
+	    request.setAttribute(SbmtConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime());
+	}
 
 	DynaActionForm smbtMonitoringForm = (DynaActionForm) form;
 	// smbtMonitoringForm.set("currentTab", WebUtil.readStrParam(request, AttributeNames.PARAM_CURRENT_TAB,true));
@@ -297,7 +313,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) {
+	submitFilesService = getSubmitFilesService();
+	
+	Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+	SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
+	
+	Long dateParameter = WebUtil.readLongParam(request, SbmtConstants.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);
+	}
+	content.setSubmissionDeadline(tzSubmissionDeadline);
+	submitFilesService.saveOrUpdateContent(content);
 
+	return null;
+    }
+
     // **********************************************************
     // Mark udpate/view methods
     // **********************************************************
Index: lams_tool_sbmt/web/learner/runoffline.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/runoffline.jsp,v
diff -u -r1.16.8.1 -r1.16.8.2
--- lams_tool_sbmt/web/learner/runoffline.jsp	16 Sep 2009 02:14:03 -0000	1.16.8.1
+++ lams_tool_sbmt/web/learner/runoffline.jsp	29 Mar 2011 23:12:35 -0000	1.16.8.2
@@ -29,10 +29,22 @@
 			<fmt:message key="activity.title"></fmt:message>
 		</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>
 
+
 		<c:if test="${sessionMap.userFinished and sessionMap.reflectOn}">
 			<div class="small-space-top">
 				<h2>
Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v
diff -u -r1.26.8.2 -r1.26.8.3
--- lams_tool_sbmt/web/learner/sbmtlearner.jsp	16 Sep 2009 02:14:03 -0000	1.26.8.2
+++ lams_tool_sbmt/web/learner/sbmtlearner.jsp	29 Mar 2011 23:12:35 -0000	1.26.8.3
@@ -59,20 +59,28 @@
 		<p>
 			<c:out value="${sessionMap.instruction}" escapeXml="false" />
 		</p>
-    <c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
-		<c:if test="${sessionMap.lockOnFinish}">
-			<div class="info">
-				<c:choose>
-					<c:when test="${sessionMap.userFinished}">
-						<fmt:message key="message.activityLocked" />
-					</c:when>
-					<c:otherwise>
-						<fmt:message key="message.warnLockOnFinish" />
-					</c:otherwise>
-				</c:choose>
-			</div>
+	    <c:if test="${sessionMap.mode == 'author' || sessionMap.mode == 'learner'}">
+			<c:if test="${sessionMap.lockOnFinish}">
+				<div class="info">
+					<c:choose>
+						<c:when test="${sessionMap.userFinished}">
+							<fmt:message key="message.activityLocked" />
+						</c:when>
+						<c:otherwise>
+							<fmt:message key="message.warnLockOnFinish" />
+						</c:otherwise>
+					</c:choose>
+				</div>
+			</c:if>
+			
+			<c:if test="${not empty sessionMap.submissionDeadline}">
+				<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>			
 		</c:if>
-	</c:if>
 
 		<%@include file="/common/messages.jsp"%>
 		<c:if test="${sessionMap.limitUpload}">
Index: lams_tool_sbmt/web/monitoring/monitoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/monitoring.jsp,v
diff -u -r1.19 -r1.19.10.1
--- lams_tool_sbmt/web/monitoring/monitoring.jsp	8 Jun 2007 01:40:14 -0000	1.19
+++ lams_tool_sbmt/web/monitoring/monitoring.jsp	29 Mar 2011 23:12:35 -0000	1.19.10.1
@@ -37,41 +37,20 @@
         }
         
         
-	var statisticTargetDiv = "statisticArea";
+	var statisticTargetDiv = "#statisticArea";
 	function doStatistic(){
 		var url = "<c:url value="/monitoring.do"/>";
 	    var reqIDVar = new Date();
-		var param = "method=doStatistic&toolContentID=" + ${param.toolContentID} +"&reqID="+reqIDVar.getTime();
-		messageLoading();
-	    var myAjax = new Ajax.Updater(
-		    	statisticTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:messageComplete,
-		    		evalScripts:true
-		    	}
-	    );
+		$(statisticTargetDiv).load(
+				url,
+				{
+					method: "doStatistic",
+					toolContentID: "${param.toolContentID}", 
+					reqID: reqIDVar.getTime()
+				}
+			);
 		
-	}
-	
-	function showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
-		}
-	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
-	}
-	function messageLoading(){
-		showBusy(statisticTargetDiv);
-	}
-	function messageComplete(){
-		hideBusy(statisticTargetDiv);
-	}        
+	}       
 	</script>
 </lams:head>
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_sbmt/web/monitoring/parts/restrictusage.jsp'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_sbmt/web/monitoring/parts/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/parts/summary.jsp,v
diff -u -r1.10 -r1.10.10.1
--- lams_tool_sbmt/web/monitoring/parts/summary.jsp	3 Sep 2008 02:11:21 -0000	1.10
+++ lams_tool_sbmt/web/monitoring/parts/summary.jsp	29 Mar 2011 23:12:35 -0000	1.10.10.1
@@ -7,81 +7,126 @@
 	<lams:LAMSURL />
 </c:set>
 
-<script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
-<script type="text/javascript" src="${lams}includes/javascript/prototype.js"></script>
+<link type="text/css" href="${lams}/css/jquery-ui-1.8.11.custom.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">
-	function launchPopup(url,title) {
-		var wd = null;
-		if(wd && wd.open && !wd.closed){
-			wd.close();
+	$(function(){
+		$("#datetime").datetimepicker();
+		
+		var submissionDeadline = "${submissionDeadline}";
+		if (submissionDeadline != "") {
+			var date = new Date(eval(submissionDeadline));
+			$("#dateInfo").html( formatDate(date) );
 		}
-		wd = window.open(url,title,'resizable,width=796,height=570,scrollbars');
-		wd.window.focus();
+	});
+	
+	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 showBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.show(targetDiv+"_Busy");
+	
+	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"/>?method=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
+					+ date.getTime() + "&reqID=" + reqIDVar.getTime();
+
+		$.ajax({
+			url : url,
+			success : function() {
+				$("#datetimeDiv").hide();
+				$("#dateInfo").html(formatDate(date) );
+				$("#dateInfoDiv").show();
+			}
+		});
 	}
-	function hideBusy(targetDiv){
-		if($(targetDiv+"_Busy") != null){
-			Element.hide(targetDiv+"_Busy");
-		}				
+	function removeSubmissionDeadline() {
+		var reqIDVar = new Date();
+		var url = "<c:url value="/monitoring.do"/>?method=setSubmissionDeadline&toolContentID=${param.toolContentID}&submissionDeadline="
+					+ "&reqID=" + reqIDVar.getTime();
+
+		$.ajax({
+			url : url,
+			success : function() {
+				$("#dateInfoDiv").hide();
+				
+				$("#datetimeDiv").show();
+				$("#datetime").val("");
+			}
+		});
 	}
 	
-	function viewMark(userId,sessionId){
+	function launchPopup(url, title) {
+		var wd = null;
+		if (wd && wd.open && !wd.closed) {
+			wd.close();
+		}
+		wd = window.open(url, title,
+				'resizable,width=796,height=570,scrollbars');
+		wd.window.focus();
+	}
+
+	function viewMark(userId, sessionId) {
 		var act = "<c:url value="/monitoring.do"/>";
-		launchPopup(act + "?method=listMark&userID="+userId+"&toolSessionID="+sessionId,"mark");
+		launchPopup(act + "?method=listMark&userID=" + userId
+				+ "&toolSessionID=" + sessionId, "mark");
 	}
-	function viewAllMarks(sessionId){
+	function viewAllMarks(sessionId) {
 		var act = "<c:url value="/monitoring.do"/>";
-		launchPopup(act + "?method=listAllMarks&toolSessionID="+sessionId,"mark");
+		launchPopup(act + "?method=listAllMarks&toolSessionID=" + sessionId,
+				"mark");
 	}
-	
-	var messageTargetDiv = "messageArea";
-	function releaseMarks(sessionId){
+
+	var messageTargetDiv = "#messageArea";
+	function releaseMarks(sessionId) {
 		var url = "<c:url value="/monitoring.do"/>";
-	    var reqIDVar = new Date();
-		var param = "method=releaseMarks&toolSessionID=" + sessionId +"&reqID="+reqIDVar.getTime();
-		messageLoading();
-	    var myAjax = new Ajax.Updater(
-		    	messageTargetDiv,
-		    	url,
-		    	{
-		    		method:'get',
-		    		parameters:param,
-		    		onComplete:messageComplete,
-		    		evalScripts:true
-		    	}
-	    );
-		
+		var reqIDVar = new Date();
+		$(messageTargetDiv).load(
+			url,
+			{
+				method: "releaseMarks",
+				toolSessionID: sessionId, 
+				reqID: reqIDVar.getTime()
+			}
+		);
 	}
-	
-	function downloadMarks(sessionId){
+
+	function downloadMarks(sessionId) {
 		var url = "<c:url value="/monitoring.do"/>";
-	    var reqIDVar = new Date();
-		var param = "?method=downloadMarks&toolSessionID=" + sessionId +"&reqID="+reqIDVar.getTime();
+		var reqIDVar = new Date();
+		var param = "?method=downloadMarks&toolSessionID=" + sessionId
+				+ "&reqID=" + reqIDVar.getTime();
 		url = url + param;
-		location.href=url;
+		location.href = url;
 	}
-	
-	function messageLoading(){
-		showBusy(messageTargetDiv);
-	}
-	function messageComplete(){
-		hideBusy(messageTargetDiv);
-	}
 </script>
 
 
-<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">
@@ -184,9 +229,8 @@
 </table>
 </div>
 
+<%@include file="restrictusage.jsp"%>
 
-
-
 <table cellpadding="0">
 <tr><td>
 	<img src="${tool}/images/indicator.gif" style="display:none" id="messageArea_Busy" />