Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r95bd981c728e305fff9cda4bc8305f9f0cf73a23 --- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java (.../ProgressBuilder.java) (revision 95bd981c728e305fff9cda4bc8305f9f0cf73a23) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.learning.progress; import java.util.ArrayList; @@ -36,6 +35,7 @@ import org.lamsfoundation.lams.learningdesign.ComplexActivity; import org.lamsfoundation.lams.learningdesign.LearningDesignProcessor; import org.lamsfoundation.lams.learningdesign.SimpleActivity; +import org.lamsfoundation.lams.learningdesign.ToolBranchingActivity; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; import org.lamsfoundation.lams.learningdesign.exception.LearningDesignProcessorException; import org.lamsfoundation.lams.lesson.LearnerProgress; @@ -125,7 +125,8 @@ // if a branch has been attempted, then we only want to show its children. boolean branchStarted = false; // always display all branches if in Preview mode - if (!previewMode && activity.isBranchingActivity()) { + if (!previewMode && activity.isBranchingActivity() && !(activity.isToolBranchingActivity() + && ((ToolBranchingActivity) activity).getBranchingOrderedAsc() != null)) { Iterator iter = currentActivityList.iterator(); while (!branchStarted && iter.hasNext()) { ActivityURL sequenceURL = (ActivityURL) iter.next(); @@ -184,6 +185,9 @@ if (activity.isFloatingActivity()) { activityURL.setUrl(null); } + if (activity.isToolBranchingActivity() && ((ToolBranchingActivity) activity).getBranchingOrderedAsc() != null) { + activityURL.setType(activityURL.getType() + "Ordered"); + } return activityURL; } Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== diff -u -r36f567f41d6be3f1894cbd1648baffff0438e622 -r95bd981c728e305fff9cda4bc8305f9f0cf73a23 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 36f567f41d6be3f1894cbd1648baffff0438e622) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java (.../LearnerAction.java) (revision 95bd981c728e305fff9cda4bc8305f9f0cf73a23) @@ -386,7 +386,7 @@ String type = "a"; if (actType.contains("gate")) { type = "g"; - } else if (actType.contains("options")) { + } else if (actType.contains("options") || actType.contains("ordered")) { type = "o"; } else if (actType.contains("branching")) { type = "b";