Index: lams_tool_assessment/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/build.properties,v diff -u -r1.2.2.1.2.2 -r1.2.2.1.2.3 --- lams_tool_assessment/build.properties 25 Feb 2010 23:47:13 -0000 1.2.2.1.2.2 +++ lams_tool_assessment/build.properties 13 Apr 2011 20:11:54 -0000 1.2.2.1.2.3 @@ -13,7 +13,7 @@ weblib=lib #project version -tool.version=20100225 +tool.version=20110413 # hide tool option hideTool=false Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/xdoclet/struts-actions.xml,v diff -u -r1.12.6.1 -r1.12.6.2 --- lams_tool_assessment/conf/xdoclet/struts-actions.xml 16 Feb 2011 16:56:32 -0000 1.12.6.1 +++ lams_tool_assessment/conf/xdoclet/struts-actions.xml 13 Apr 2011 20:11:54 -0000 1.12.6.2 @@ -240,6 +240,10 @@ + + Index: lams_tool_assessment/db/sql/create_lams_tool_assessment.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/db/sql/create_lams_tool_assessment.sql,v diff -u -r1.12.2.2.2.3 -r1.12.2.2.2.4 --- lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 26 Feb 2010 05:01:08 -0000 1.12.2.2.2.3 +++ lams_tool_assessment/db/sql/create_lams_tool_assessment.sql 13 Apr 2011 20:11:54 -0000 1.12.2.2.2.4 @@ -24,6 +24,7 @@ uid bigint not null auto_increment, create_date datetime, update_date datetime, + submission_deadline datetime, create_by bigint, title varchar(255), run_offline tinyint, Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java,v diff -u -r1.16 -r1.16.6.1 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 27 Mar 2009 16:33:24 -0000 1.16 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java 13 Apr 2011 20:11:54 -0000 1.16.6.1 @@ -191,6 +191,10 @@ public static final String ATTR_USER = "user"; public static final String ATTR_QUESTION_NUMBERING_OFFSET = "questionNumberingOffset"; + + public static final String ATTR_SUBMISSION_DEADLINE = "submissionDeadline"; + + public static final String ATTR_IS_SUBMISSION_DEADLINE_PASSED = "isSubmissionDeadlinePassed"; // error message keys public static final String ERROR_MSG_QUESTION_NAME_BLANK = "error.question.name.blank"; Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Attic/Assessment.hbm.xml,v diff -u -r1.4.6.1 -r1.4.6.2 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml 25 Feb 2010 23:47:12 -0000 1.4.6.1 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml 13 Apr 2011 20:11:54 -0000 1.4.6.2 @@ -41,6 +41,14 @@ column="update_date" /> + + questionList = new TreeSet(new SequencableComparator()); if (questionsFromDB != null) { Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java,v diff -u -r1.8.2.4.2.4 -r1.8.2.4.2.5 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 9 Dec 2010 18:36:50 -0000 1.8.2.4.2.4 +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java 13 Apr 2011 20:11:54 -0000 1.8.2.4.2.5 @@ -31,11 +31,13 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Set; +import java.util.TimeZone; import javax.servlet.ServletException; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; import jxl.JXLException; @@ -61,7 +63,10 @@ import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser; import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService; import org.lamsfoundation.lams.tool.assessment.util.AssessmentExportXLSUtil; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.web.context.WebApplicationContext; @@ -95,6 +100,9 @@ if (param.equals("saveUserGrade")) { return saveUserGrade(mapping, form, request, response); } + if (param.equals("setSubmissionDeadline")) { + return setSubmissionDeadline(mapping, form, request, response); + } if (param.equals("exportSummary")) { return exportSummary(mapping, form, request, response); } @@ -115,6 +123,16 @@ Assessment assessment = service.getAssessmentByContentId(contentId); assessment.toDTO(); + + //set SubmissionDeadline, if any + if (assessment.getSubmissionDeadline() != null) { + Date submissionDeadline = assessment.getSubmissionDeadline(); + HttpSession ss = SessionManager.getSession(); + UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone teacherTimeZone = teacher.getTimeZone(); + Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); + request.setAttribute(AssessmentConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + } // cache into sessionMap sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, summaryList); @@ -184,7 +202,38 @@ return null; } + + /** + * Set Submission Deadline + * + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + private ActionForward setSubmissionDeadline(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + service = getAssessmentService(); + + Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + Assessment assessment = service.getAssessmentByContentId(contentID); + + Long dateParameter = WebUtil.readLongParam(request, AssessmentConstants.ATTR_SUBMISSION_DEADLINE, true); + Date tzSubmissionDeadline = null; + if (dateParameter != null) { + Date submissionDeadline = new Date(dateParameter); + HttpSession ss = SessionManager.getSession(); + UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone teacherTimeZone = teacher.getTimeZone(); + tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + } + assessment.setSubmissionDeadline(tzSubmissionDeadline); + service.saveOrUpdateAssessment(assessment); + return null; + } + /** * Export Excel format survey data. * Index: lams_tool_assessment/web/common/tabbedheader.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/common/tabbedheader.jsp,v diff -u -r1.1 -r1.1.8.1 --- lams_tool_assessment/web/common/tabbedheader.jsp 29 Jan 2009 05:59:05 -0000 1.1 +++ lams_tool_assessment/web/common/tabbedheader.jsp 13 Apr 2011 20:11:54 -0000 1.1.8.1 @@ -10,7 +10,6 @@ - Index: lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp,v diff -u -r1.8.8.2 -r1.8.8.3 --- lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp 1 Mar 2010 21:04:44 -0000 1.8.8.2 +++ lams_tool_assessment/web/pages/authoring/parts/addmultiplechoice.jsp 13 Apr 2011 20:11:54 -0000 1.8.8.3 @@ -50,7 +50,11 @@ }, hasOneHundredGrade: { required: function(element) { - return ($("select[name^='optionGrade'][value='1.0']").length < 1) && !eval($("#multipleAnswersAllowed").val()); + var hasOneHundredGrade = false; + $("select[name^='optionGrade']").each(function() { + hasOneHundredGrade = hasOneHundredGrade || (this.value == '1.0'); + }); + return !hasOneHundredGrade && !eval($("#multipleAnswersAllowed").val()); } } }, Index: lams_tool_assessment/web/pages/learning/learning.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/learning/learning.jsp,v diff -u -r1.10.6.3 -r1.10.6.4 --- lams_tool_assessment/web/pages/learning/learning.jsp 16 Feb 2011 16:56:32 -0000 1.10.6.3 +++ lams_tool_assessment/web/pages/learning/learning.jsp 13 Apr 2011 20:11:54 -0000 1.10.6.4 @@ -153,6 +153,14 @@

+ +
+ + + +
+ +