Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AnswerIntComparator.java
===================================================================
diff -u
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AnswerIntComparator.java	(revision 0)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AnswerIntComparator.java	(revision 77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a)
@@ -0,0 +1,48 @@
+/**************************************************************** 
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) 
+ * ============================================================= 
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/ 
+ * 
+ * This program is free software; you can redistribute it and/or modify 
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation. 
+ * 
+ * This program is distributed in the hope that it will be useful, 
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU General Public License for more details. 
+ * 
+ * You should have received a copy of the GNU General Public License 
+ * along with this program; if not, write to the Free Software 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA 
+ * 
+ * http://www.gnu.org/licenses/gpl.txt 
+ * **************************************************************** 
+ */  
+ 
+/* $Id$ */  
+package org.lamsfoundation.lams.tool.assessment.util;
+
+import java.util.Comparator;
+
+import org.lamsfoundation.lams.tool.assessment.model.AssessmentQuestionOption;
+
+/**
+ * AnswerIntComparator.
+ * 
+ * @author Andrey Balan
+ * 
+ */
+public class AnswerIntComparator implements Comparator<AssessmentQuestionOption> {
+
+    public int compare(AssessmentQuestionOption o1, AssessmentQuestionOption o2) {
+	if ((o1 != null) && (o2 != null)) {
+	    return o1.getAnswerInt() - o2.getAnswerInt();
+	} else if (o1 != null) {
+	    return 1;
+	} else {
+	    return -1;
+	}
+    }
+
+}
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
===================================================================
diff -u -r442a09c392da6bdcbfec970a670a1c5bfe7e986d -r77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 442a09c392da6bdcbfec970a670a1c5bfe7e986d)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java	(.../LearningAction.java)	(revision 77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a)
@@ -71,6 +71,7 @@
 import org.lamsfoundation.lams.tool.assessment.model.QuestionReference;
 import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException;
 import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService;
+import org.lamsfoundation.lams.tool.assessment.util.AnswerIntComparator;
 import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator;
 import org.lamsfoundation.lams.tool.assessment.web.form.ReflectionForm;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
@@ -899,23 +900,20 @@
 				if (option.getUid().equals(optionAnswer.getOptionUid())) {
 				    
 				    option.setAnswerBoolean(optionAnswer.getAnswerBoolean());
-				    if (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
-					option.setSequenceId(optionAnswer.getAnswerInt());
-				    } else {
-					option.setAnswerInt(optionAnswer.getAnswerInt());
-				    }
-				    
+				    option.setAnswerInt(optionAnswer.getAnswerInt());
 				    break;
 				}
 			    }			    
 			}
+			
 			break;
 		    }
 		}
+
 		
 		//sort ordering type of question
 		if (question.getType() == AssessmentConstants.QUESTION_TYPE_ORDERING) {
-		    TreeSet<AssessmentQuestionOption> orderedSet = new TreeSet<AssessmentQuestionOption>(new SequencableComparator());
+		    TreeSet<AssessmentQuestionOption> orderedSet = new TreeSet<AssessmentQuestionOption>(new AnswerIntComparator());
 		    orderedSet.addAll(question.getOptions());
 		    question.setOptions(orderedSet);
 		}
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -r77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a)
@@ -80,8 +80,8 @@
 </p>
 
 <p>
-	<html:checkbox property="assessment.numbered" styleClass="noBorder" styleId="shuffled"/>
-	<label for="shuffled">
+	<html:checkbox property="assessment.numbered" styleClass="noBorder" styleId="questions-numbering"/>
+	<label for="questions-numbering">
 		<fmt:message key="label.authoring.advance.numbered.questions" />
 	</label>
 </p>
Index: lams_tool_assessment/web/pages/learning/parts/essay.jsp
===================================================================
diff -u -r0320fcacdd6f92d378d3eecc575faa08c08c488d -r77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a
--- lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 0320fcacdd6f92d378d3eecc575faa08c08c488d)
+++ lams_tool_assessment/web/pages/learning/parts/essay.jsp	(.../essay.jsp)	(revision 77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a)
@@ -64,31 +64,30 @@
 		<tr>
 			<td class="reg-padding">
 
-                                <c:choose>
-                                  <c:when test="${question.maxWordsLimit != 0 && question.minWordsLimit != 0}">
-                                        <div class="info">
-                                                <fmt:message key="label.info.max.and.min.number.words" >
-                                                        <fmt:param>${question.minWordsLimit}</fmt:param>
-                                                        <fmt:param>${question.maxWordsLimit}</fmt:param>
-                                                </fmt:message>
-                                        </div>
-                                   </c:when>
-                                  <c:when test="${question.maxWordsLimit != 0}">
-                                        <div class="info">
-                                                <fmt:message key="label.info.maximum.number.words" >
-                                                        <fmt:param>${question.maxWordsLimit}</fmt:param>
-                                                </fmt:message>
-                                        </div>
-                                   </c:when>
-                                   <c:when test="${question.minWordsLimit != 0}">
-                                        <div class="info">
-                                                <fmt:message key="label.info.minimum.number.words" >
-                                                        <fmt:param>${question.minWordsLimit}</fmt:param>
-                                                </fmt:message>
-                                        </div>
-                                   </c:when>
-
-                                </c:choose>
+				<c:choose>
+					<c:when test="${question.maxWordsLimit != 0 && question.minWordsLimit != 0}">
+						<div class="info">
+							<fmt:message key="label.info.max.and.min.number.words" >
+								<fmt:param>${question.minWordsLimit}</fmt:param>
+								<fmt:param>${question.maxWordsLimit}</fmt:param>
+							</fmt:message>
+						</div>
+					</c:when>
+					<c:when test="${question.maxWordsLimit != 0}">
+						<div class="info">
+							<fmt:message key="label.info.maximum.number.words" >
+								<fmt:param>${question.maxWordsLimit}</fmt:param>
+							</fmt:message>
+						</div>
+					</c:when>
+					<c:when test="${question.minWordsLimit != 0}">
+						<div class="info">
+							<fmt:message key="label.info.minimum.number.words" >
+								<fmt:param>${question.minWordsLimit}</fmt:param>
+							</fmt:message>
+						</div>
+					</c:when>
+				</c:choose>
 			</td>
 		</tr>
 	</c:if>
Index: lams_tool_assessment/web/pages/learning/parts/ordering.jsp
===================================================================
diff -u -r1e33f64c06430834c80a2b01d42bcdf844c5d958 -r77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a
--- lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 1e33f64c06430834c80a2b01d42bcdf844c5d958)
+++ lams_tool_assessment/web/pages/learning/parts/ordering.jsp	(.../ordering.jsp)	(revision 77b4acbb21c1e869cf55db8614ac8a84d1ea4b9a)
@@ -14,6 +14,20 @@
 	<table class="question-table">
 		<c:forEach var="option" items="${question.options}" varStatus="ordStatus">
 			<tr>
+
+				<c:if test="${finishedLock}">
+					<td class="complete-item-gif">
+					${option.answerInt}!${option.sequenceId}!${ordStatus.index }
+						<c:if test="${assessment.allowRightAnswersAfterQuestion && (option.sequenceId == ordStatus.index)}">
+							<img src="<html:rewrite page='/includes/images/completeitem.gif'/>">	
+						</c:if>
+						<c:if test="${assessment.allowWrongAnswersAfterQuestion && (option.sequenceId != ordStatus.index)}">
+							<img src="<html:rewrite page='/includes/images/incompleteitem.gif'/>">	
+						</c:if>
+							
+					</td>		
+				</c:if>													
+			
 				<td class="reg-padding">
 					<input type="hidden" name="question${status.index}_${option.sequenceId}" value="${option.sequenceId}" />
 					<c:out value="${option.optionString}" escapeXml="false" />
@@ -26,16 +40,14 @@
 								border="0" title="<fmt:message key="label.authoring.basic.up"/>"
 								onclick="upOption(${question.uid},${ordStatus.index})">
 							<c:if test="${ordStatus.last}">
-								<img
-									src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
+								<img src="<html:rewrite page='/includes/images/downarrow_disabled.gif'/>"
 									border="0" title="<fmt:message key="label.authoring.basic.down"/>">
 							</c:if>
 						</c:if>
 			
 						<c:if test="${not ordStatus.last and !finishedLock}">
 							<c:if test="${ordStatus.first}">
-								<img
-									src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
+								<img src="<html:rewrite page='/includes/images/uparrow_disabled.gif'/>"
 									border="0" title="<fmt:message key="label.authoring.basic.up"/>">
 							</c:if>