Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java =================================================================== diff -u -rf744562c66dd81d53ef8ddf2403368e27c8c646d -r1f0a3f8dced9250951b761c71f7e71c1f1db13ec --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision f744562c66dd81d53ef8ddf2403368e27c8c646d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/AuthoringController.java (.../AuthoringController.java) (revision 1f0a3f8dced9250951b761c71f7e71c1f1db13ec) @@ -23,13 +23,6 @@ package org.lamsfoundation.lams.tool.sbmt.web.controller; -import java.lang.reflect.InvocationTargetException; -import java.util.Date; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; - import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringUtils; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -51,6 +44,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; +import java.lang.reflect.InvocationTargetException; +import java.util.Date; + /** * @author Manpreet Minhas * @author Steve Ni @@ -181,6 +180,7 @@ // *********************************************************** // Private/protected methods // *********************************************************** + /** * The private method to get content from ActionForm parameters (web page). */ @@ -196,7 +196,8 @@ content.setReflectOnActivity(authoringForm.isReflectOnActivity()); content.setLimitUpload(authoringForm.isLimitUpload()); content.setLimitUploadNumber(authoringForm.getLimitUploadNumber()); - content.setMinLimitUploadNumber(authoringForm.getMinLimitUploadNumber()); + content.setMinLimitUploadNumber( + authoringForm.isMinLimitUpload() ? authoringForm.getMinLimitUploadNumber() : null); content.setUseSelectLeaderToolOuput(authoringForm.isUseSelectLeaderToolOuput()); content.setNotifyTeachersOnFileSubmit(authoringForm.isNotifyTeachersOnFileSubmit()); return content; Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java =================================================================== diff -u -rf744562c66dd81d53ef8ddf2403368e27c8c646d -r1f0a3f8dced9250951b761c71f7e71c1f1db13ec --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java (.../AuthoringForm.java) (revision f744562c66dd81d53ef8ddf2403368e27c8c646d) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/AuthoringForm.java (.../AuthoringForm.java) (revision 1f0a3f8dced9250951b761c71f7e71c1f1db13ec) @@ -1,9 +1,9 @@ package org.lamsfoundation.lams.tool.sbmt.web.form; -import javax.servlet.http.HttpServletRequest; - import org.lamsfoundation.lams.tool.sbmt.model.SubmitFilesContent; +import javax.servlet.http.HttpServletRequest; + /** * @author Dapeng.Ni */ @@ -29,6 +29,8 @@ private boolean limitUpload; + private boolean minLimitUpload; + private boolean useSelectLeaderToolOuput; private int limitUploadNumber; @@ -62,6 +64,7 @@ limitUpload = content.isLimitUpload(); limitUploadNumber = content.getLimitUploadNumber(); minLimitUploadNumber = content.getMinLimitUploadNumber(); + minLimitUpload = minLimitUploadNumber != null; reflectOnActivity = content.isReflectOnActivity(); reflectInstructions = content.getReflectInstructions(); @@ -151,6 +154,14 @@ this.limitUpload = limitUpload; } + public boolean isMinLimitUpload() { + return minLimitUpload; + } + + public void setMinLimitUpload(boolean minLimitUpload) { + this.minLimitUpload = minLimitUpload; + } + public int getLimitUploadNumber() { return limitUploadNumber; } @@ -182,4 +193,4 @@ public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) { this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; } -} +} \ No newline at end of file Index: lams_tool_sbmt/web/authoring/advance.jsp =================================================================== diff -u -rf744562c66dd81d53ef8ddf2403368e27c8c646d -r1f0a3f8dced9250951b761c71f7e71c1f1db13ec --- lams_tool_sbmt/web/authoring/advance.jsp (.../advance.jsp) (revision f744562c66dd81d53ef8ddf2403368e27c8c646d) +++ lams_tool_sbmt/web/authoring/advance.jsp (.../advance.jsp) (revision 1f0a3f8dced9250951b761c71f7e71c1f1db13ec) @@ -12,18 +12,18 @@ $('.bootstrap-slider').bootstrapSlider(); //force slider to show tick labels setTimeout( - function(){ - //$(".bootstrap-slider").each(function() { + function(){ + //$(".bootstrap-slider").each(function() { //$(this).bootstrapSlider('relayout'); //$(".bootstrap-slider").bootstrapSlider("relayout"); - //}); + //}); - $(".bootstrap-slider").bootstrapSlider("relayout"); - }, - 1200 + $(".bootstrap-slider").bootstrapSlider("relayout"); + }, + 1200 ); - - $('#enable-min-limit').change(function(){ + + $('#minLimitUpload').change(function(){ //toggle visibility of the slider $('#minLimitUploadNumber').parent().toggleClass('hidden'); @@ -54,7 +54,7 @@ $('#limitUploadNumber').val(0); } }); - + $('#reflectInstructions').keyup(function(){ var checked = $(this).val() != null && $(this).val().trim() != ''; $('#reflectOnActivity').prop('checked', checked) @@ -73,23 +73,23 @@
-
- +
- +
-
+ \ No newline at end of file