Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties 4 Feb 2009 18:03:05 -0000 1.6 +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties 18 Feb 2009 22:09:17 -0000 1.7 @@ -36,6 +36,7 @@ label.authoring.basic.type.numerical =Numerical label.authoring.basic.type.true.false =True/False label.authoring.basic.type.essay =Essay +label.authoring.basic.type.ordering =Ordering label.authoring.basic.resource.url =URL label.authoring.basic.resource.file =File label.authoring.basic.resource.website =Website @@ -95,8 +96,8 @@ label.authoring.numerical.add.answer =Add Blank Answer label.authoring.numerical.add.numerical =Add Numerical Question label.authoring.numerical.add.unit =Add Blank Unit - label.authoring.essay.add.essay =Add Essay +label.authoring.ordering.add.ordering =Add Ordering label.authoring.online.file =Upload online file label.authoring.offline.file =Upload offline file label.authoring.choosefile.button =Choose file 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.4 -r1.5 --- lams_tool_assessment/conf/xdoclet/struts-actions.xml 4 Feb 2009 00:19:20 -0000 1.4 +++ lams_tool_assessment/conf/xdoclet/struts-actions.xml 18 Feb 2009 22:09:17 -0000 1.5 @@ -87,6 +87,7 @@ + + optionList = new TreeSet(new AssessmentAnswerOptionComparator()); + TreeSet optionList = new TreeSet( + new AssessmentAnswerOptionComparator()); for (int i = 0; i < count; i++) { if ((questionType == AssessmentConstants.QUESTION_TYPE_MULTIPLE_CHOICE) - || (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER)) { - + || (questionType == AssessmentConstants.QUESTION_TYPE_SHORT_ANSWER) + || (questionType == AssessmentConstants.QUESTION_TYPE_ORDERING)) { + String answerString = paramMap.get(AssessmentConstants.ATTR_OPTION_ANSWER_PREFIX + i); if ((answerString == null) && isForSaving) { continue; } - + AssessmentAnswerOption option = new AssessmentAnswerOption(); - String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i); + String sequenceId = paramMap.get(AssessmentConstants.ATTR_OPTION_SEQUENCE_ID_PREFIX + i); option.setSequenceId(NumberUtils.stringToInt(sequenceId)); option.setAnswerString(answerString); float grade = Float.valueOf(paramMap.get(AssessmentConstants.ATTR_OPTION_GRADE_PREFIX + i)); - option.setGrade(grade); + option.setGrade(grade); option.setFeedback((String) paramMap.get(AssessmentConstants.ATTR_OPTION_FEEDBACK_PREFIX + i)); optionList.add(option); } else if (questionType == AssessmentConstants.QUESTION_TYPE_MATCHING_PAIRS) { Index: lams_tool_assessment/web/pages/authoring/basic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/basic.jsp,v diff -u -r1.4 -r1.5 --- lams_tool_assessment/web/pages/authoring/basic.jsp 4 Feb 2009 00:19:20 -0000 1.4 +++ lams_tool_assessment/web/pages/authoring/basic.jsp 18 Feb 2009 22:09:16 -0000 1.5 @@ -108,6 +108,7 @@ + Index: lams_tool_assessment/web/pages/authoring/parts/addordering.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/addordering.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_assessment/web/pages/authoring/parts/addordering.jsp 18 Feb 2009 22:09:16 -0000 1.1 @@ -0,0 +1,234 @@ + + +<%@ include file="/common/taglibs.jsp"%> + + + <%@ include file="/common/header.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp 10 Feb 2009 16:14:27 -0000 1.6 +++ lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp 18 Feb 2009 22:09:16 -0000 1.7 @@ -8,7 +8,7 @@ - + <%@ include file="option.jsp"%> Index: lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp 4 Feb 2009 00:19:20 -0000 1.3 +++ lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp 18 Feb 2009 22:09:16 -0000 1.4 @@ -41,6 +41,9 @@ + + +