Index: lams_tool_sbmt/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.17 -r1.18 --- lams_tool_sbmt/conf/language/ApplicationResources.properties 1 Sep 2006 06:45:19 -0000 1.17 +++ lams_tool_sbmt/conf/language/ApplicationResources.properties 5 Sep 2006 05:53:55 -0000 1.18 @@ -123,4 +123,5 @@ label.limit.number.upload=Limit number of files to upload label.number.to.upload=Number of files to upload -label.unlimited=Unlimited \ No newline at end of file +label.unlimited=Unlimited +message.left.upload.limit=You could upload another {0} file(s). \ No newline at end of file Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java,v diff -u -r1.1 -r1.2 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java 5 Sep 2006 04:05:23 -0000 1.1 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java 5 Sep 2006 05:53:55 -0000 1.2 @@ -64,6 +64,7 @@ private boolean finishReflection; private String reflect; + private int limitUploadLeft; public SubmitUserDTO(){ @@ -229,4 +230,10 @@ public void setUserID(Integer userID) { this.userID = userID; } + public int getLimitUploadLeft() { + return limitUploadLeft; + } + public void setLimitUploadLeft(int limitUploadLeft) { + this.limitUploadLeft = limitUploadLeft; + } } 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.34 -r1.35 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 5 Sep 2006 05:24:48 -0000 1.34 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 5 Sep 2006 05:53:55 -0000 1.35 @@ -349,6 +349,8 @@ //lock upload: currently, use same lock with "FINISH_ON_LOCK" sessionMap.put(SbmtConstants.ATTR_FINISH_LOCK, true); } + int limitUploadLeft = limit - filesUploaded.size(); + dto.setLimitUploadLeft(limitUploadLeft); } request.setAttribute("learner",dto); Index: lams_tool_sbmt/web/learner/sbmtlearner.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/learner/sbmtlearner.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_sbmt/web/learner/sbmtlearner.jsp 5 Sep 2006 04:05:23 -0000 1.3 +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp 5 Sep 2006 05:53:55 -0000 1.4 @@ -58,6 +58,11 @@ <%@include file="/common/messages.jsp"%> + + + + + @@ -68,10 +73,11 @@ -

- -

- + <%-- +

+ +

+ --%>