Submit Files

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.16 -r1.17 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 8 Aug 2005 00:42:33 -0000 1.16 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 8 Aug 2005 05:30:09 -0000 1.17 @@ -187,7 +187,11 @@ dto.setToolSessionID(sessionID); dto.setUserID(userID); if(learner != null){ - dto.setLocked(learner.isFinished()); + //only content is lock-on-finished, then check whehter learner choose "finish" + if(content.isLockOnFinished()) + dto.setLocked(learner.isFinished()); + else + dto.setLocked(false); //if Monitoring does not release marks, then screen this mark and comment content. if(filesUploaded != null){ Iterator iter = filesUploaded.iterator(); Index: lams_tool_sbmt/web/authoring/authoring.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/authoring/authoring.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_sbmt/web/authoring/authoring.jsp 8 Aug 2005 00:42:33 -0000 1.8 +++ lams_tool_sbmt/web/authoring/authoring.jsp 8 Aug 2005 05:30:09 -0000 1.9 @@ -1,21 +1,16 @@ - -<%@ page language="java"%> - +<%@include file="../sharing/share.jsp" %> <%@ taglib uri="fck-editor" prefix="FCK"%> -<%@ taglib uri="tags-html-el" prefix="html"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - -Submit Files - - - - + + Submit Files + + + + + Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/css/aqua.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/css/base.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/css/default.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/css/xp.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `lams_tool_sbmt/web/includes/javascript/common.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/web/learner/sbmtLearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/Attic/sbmtLearner.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/web/learner/sbmtLearner.jsp 3 Aug 2005 06:19:03 -0000 1.3 +++ lams_tool_sbmt/web/learner/sbmtLearner.jsp 8 Aug 2005 05:30:09 -0000 1.4 @@ -1,17 +1,12 @@ - -<%@ page language="java"%> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - +<%@include file="../sharing/share.jsp" %> Submission tool for Learner - + - + + + + + Index: lams_tool_sbmt/web/monitoring/instructions.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/instructions.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_sbmt/web/monitoring/instructions.jsp 1 Aug 2005 06:41:48 -0000 1.1 +++ lams_tool_sbmt/web/monitoring/instructions.jsp 8 Aug 2005 05:30:08 -0000 1.2 @@ -1,18 +1,15 @@ +<%@include file="../sharing/share.jsp" %> -<%@ page language="java"%> -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - - Monitoring Instructions - - + + + +

Index: lams_tool_sbmt/web/monitoring/showactivity.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/showactivity.jsp,v diff -u -r1.1 -r1.2 --- lams_tool_sbmt/web/monitoring/showactivity.jsp 8 Aug 2005 02:24:01 -0000 1.1 +++ lams_tool_sbmt/web/monitoring/showactivity.jsp 8 Aug 2005 05:30:08 -0000 1.2 @@ -1,21 +1,13 @@ +<%@include file="../sharing/share.jsp" %> -<%@ page language="java"%> - -<%@ taglib uri="fck-editor" prefix="FCK"%> -<%@ taglib uri="tags-html-el" prefix="html"%> -<%@ taglib uri="tags-tiles" prefix="tiles"%> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - - -Submit Files - - - - + Submit Files + + + + Index: lams_tool_sbmt/web/monitoring/updatemarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/updatemarks.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/monitoring/updatemarks.jsp 8 Aug 2005 00:42:33 -0000 1.2 +++ lams_tool_sbmt/web/monitoring/updatemarks.jsp 8 Aug 2005 05:30:08 -0000 1.3 @@ -1,19 +1,12 @@ - -<%@ page language="java"%> - +<%@include file="../sharing/share.jsp" %> <%@ taglib uri="fck-editor" prefix="FCK" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> -<%@ taglib uri="tags-tiles" prefix="tiles" %> -<%@ taglib uri="tags-c" prefix="c" %> - Files Submitted - + + @@ -35,7 +28,7 @@

- + /> /> /> Index: lams_tool_sbmt/web/monitoring/usermarkslist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/usermarkslist.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/monitoring/usermarkslist.jsp 8 Aug 2005 00:42:33 -0000 1.2 +++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp 8 Aug 2005 05:30:08 -0000 1.3 @@ -1,17 +1,12 @@ - -<%@ page language="java"%> - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - +<%@include file="../sharing/share.jsp" %> + Files Submitted - - + + @@ -75,7 +70,7 @@


- + > > > Index: lams_tool_sbmt/web/monitoring/viewallmarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/monitoring/Attic/viewallmarks.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/monitoring/viewallmarks.jsp 8 Aug 2005 00:42:33 -0000 1.2 +++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp 8 Aug 2005 05:30:08 -0000 1.3 @@ -1,17 +1,11 @@ - -<%@ page language="java"%> - -<%@ taglib uri="tags-html-el" prefix="html" %> -<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> - +<%@include file="../sharing/share.jsp" %> All Learner Submission Details - - - + + + @@ -84,7 +78,7 @@
- + > > > Index: lams_tool_sbmt/web/sharing/share.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/sharing/Attic/share.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_sbmt/web/sharing/share.jsp 8 Aug 2005 05:30:09 -0000 1.1 @@ -0,0 +1,9 @@ + +<%@ page language="java"%> + +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%> +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt"%> +<% + String LAMS_WEB_ROOT="/lams"; +%>