Index: lams_tool_sbmt/conf/language/ApplicationResources.properties =================================================================== diff -u -r843aa271bd7b90368cc12ce6547069eaedffa066 -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c --- lams_tool_sbmt/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 843aa271bd7b90368cc12ce6547069eaedffa066) +++ lams_tool_sbmt/conf/language/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c) @@ -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 =================================================================== diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java (.../SubmitUserDTO.java) (revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/SubmitUserDTO.java (.../SubmitUserDTO.java) (revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c) @@ -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 =================================================================== diff -u -r5b5b55640d09c6da2d8c6c16d9be7d89e9387717 -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 5b5b55640d09c6da2d8c6c16d9be7d89e9387717) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c) @@ -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 =================================================================== diff -u -re7f9f5772bf6f3cf2786a65e78d7de441d348c37 -r7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c --- lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision e7f9f5772bf6f3cf2786a65e78d7de441d348c37) +++ lams_tool_sbmt/web/learner/sbmtlearner.jsp (.../sbmtlearner.jsp) (revision 7ddc6c9a3baa2ed1f25dffc9b6f82bc7d08eea3c) @@ -58,6 +58,11 @@ <%@include file="/common/messages.jsp"%> + + + + + @@ -68,10 +73,11 @@ -

- -

- + <%-- +

+ +

+ --%>