Submit Files

Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java =================================================================== diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 21677c773e9f0c7e903336013ada9985c2e05800) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 21677c773e9f0c7e903336013ada9985c2e05800) +++ lams_tool_sbmt/web/authoring/authoring.jsp (.../authoring.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd 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 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd 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 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd 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 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd 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 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd 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 =================================================================== diff -u -r87916b2e9c4406342e26149d731a5ab070f4d4e0 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/learner/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision 87916b2e9c4406342e26149d731a5ab070f4d4e0) +++ lams_tool_sbmt/web/learner/sbmtLearner.jsp (.../sbmtLearner.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -rc36eb8bba0958f38d26c34d6cd690e60c934a619 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/monitoring/instructions.jsp (.../instructions.jsp) (revision c36eb8bba0958f38d26c34d6cd690e60c934a619) +++ lams_tool_sbmt/web/monitoring/instructions.jsp (.../instructions.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -re4877b292d485295ac26552e87de062cb761ac18 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/monitoring/showactivity.jsp (.../showactivity.jsp) (revision e4877b292d485295ac26552e87de062cb761ac18) +++ lams_tool_sbmt/web/monitoring/showactivity.jsp (.../showactivity.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision 21677c773e9f0c7e903336013ada9985c2e05800) +++ lams_tool_sbmt/web/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/monitoring/usermarkslist.jsp (.../usermarkslist.jsp) (revision 21677c773e9f0c7e903336013ada9985c2e05800) +++ lams_tool_sbmt/web/monitoring/usermarkslist.jsp (.../usermarkslist.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -r6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd --- lams_tool_sbmt/web/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision 21677c773e9f0c7e903336013ada9985c2e05800) +++ lams_tool_sbmt/web/monitoring/viewallmarks.jsp (.../viewallmarks.jsp) (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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 =================================================================== diff -u --- lams_tool_sbmt/web/sharing/share.jsp (revision 0) +++ lams_tool_sbmt/web/sharing/share.jsp (revision 6dc489ffc6bc1ff7b073f5c98ad518aafcd1e5cd) @@ -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"; +%>