Check up all children completion status for a branching activity. Normally + * it will be complete if one branch is complete, but if this is preview, then only complete + * the branch when all branches have been completed.
* - * If there isn't a current child, give it any old branch, otherwise return the NulLActivity (can only do one branch). + * Precondition: the activity should a complex activity that has children. * - * @see org.lamsfoundation.lams.learningdesign.strategy.ComplexActivityStrategy#getNextActivityByParent(Activity, Activity) + * @param activity the complex activity + * @param learnerProgress the progress data that record what has been + * completed + * @return true if all children are completed. */ - public Activity getNextActivityByParent(ComplexActivity activity, Activity currentChild) + public boolean areChildrenCompleted(LearnerProgress learnerProgress) { - - if ( currentChild == null || currentChild.isNull() ) { - Iterator iter = activity.getActivities().iterator(); - if ( iter.hasNext() ) - return (Activity) iter.next(); - } - - return new NullActivity(); + ComplexActivity complexActivity = getComplexActivity(); + boolean isPreview = learnerProgress.getLesson().isPreviewLesson(); + + if ( complexActivity != null && complexActivity.getActivities().size() > 0 ) { + for(Iterator i = complexActivity.getActivities().iterator();i.hasNext();) + { + Activity currentActivity = (Activity)i.next(); + boolean actComplete = learnerProgress.getCompletedActivities().contains(currentActivity); + if ( isPreview && ! actComplete) { + // found one not complete, so can try more branches + return false; + } else if (! isPreview && actComplete) { + // found one complete, so branching is finished + return true; + } + } + // We've checked all the activities. If we are in preview, then they are all + // completed so return true. If we are not in preview (ie normal learner) then + // we haven't found any that were completed so we return false. So we can just + // return isPreview as that is the correct boolean state. + return ( isPreview ); + } + + // didn't find any child activities so we are complete + return true; } /** - * Return the completion status of children activities within a branching - * activity. A branching activity is marked as complete if one child activity (one branch) - * is completed. + * Do not use (for this class only) - isComplete() is not called by the areChildrenCompleted() method in this class. * * @see org.lamsfoundation.lams.learningdesign.strategy.ComplexActivityStrategy#isComplete(int) */ protected boolean isComplete(int numOfCompletedActivities) { - return numOfCompletedActivities == 1; + return true; } /** Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java,v diff -u -r1.67 -r1.68 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 27 Jul 2007 00:36:47 -0000 1.67 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 27 Jul 2007 06:43:48 -0000 1.68 @@ -786,19 +786,21 @@ throw new LearnerServiceException(error); } - // Find the matching branch - all the child activities in the branching activity - // should be sequence activities. - SequenceActivity selectedBranch = null; - Iterator iter = branchingActivity.getActivities().iterator(); - while (selectedBranch==null && iter.hasNext()) { - SequenceActivity aBranch = (SequenceActivity) iter.next(); - if ( aBranch.getActivityId().equals(branchId) ) { - selectedBranch = aBranch; - } - } + Activity activity = activityDAO.getActivityByActivityId(branchId, Activity.class); + if ( activity !=null ) { - if ( selectedBranch != null ) { + if ( !activity.isSequenceActivity() ) { + String error = "selectBranch: activity "+activity+" Is not a sequence activity. Unable to branch."; + log.error(error); + throw new LearnerServiceException(error); + } + if ( activity.getParentActivity() == null || !activity.getParentActivity().equals(branchingActivity) ) { + String error = "selectBranch: activity "+activity+" is not a branch within the branching activity "+branchingActivity+". Unable to branch."; + log.error(error); + throw new LearnerServiceException(error); + } + SequenceActivity selectedBranch = (SequenceActivity) activity; Set