Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r599997e40ac269606e85484eaf2110bce594a2de --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java (.../ResourceConstants.java) (revision 599997e40ac269606e85484eaf2110bce594a2de) @@ -125,6 +125,8 @@ public static final String ATTR_IS_URL_ITEM_TYPE = "isUrlItemType"; public static final String ATTR_ALLOW_COMMENTS = "allowComments"; + + public static final String ATTR_COMPLETED_SUFFICIENT_TO_FINISH = "hasCompletedMinNumber"; // error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java =================================================================== diff -u -rf2ad75cef0c507a64877942631fee13efbc6ed50 -r599997e40ac269606e85484eaf2110bce594a2de --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision f2ad75cef0c507a64877942631fee13efbc6ed50) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java (.../LearningController.java) (revision 599997e40ac269606e85484eaf2110bce594a2de) @@ -158,17 +158,21 @@ // check whether there is only one resource item and run auto flag is true or not. boolean runAuto = false; Long runAutoItemUid = null; - int itemsNumber = 0; - if (resource.getResourceItems() != null) { - itemsNumber = resource.getResourceItems().size(); - if (resource.isRunAuto() && (itemsNumber == 1)) { - ResourceItem item = (ResourceItem) resource.getResourceItems().iterator().next(); + if (resource.isRunAuto() && items != null ) { + int itemsNumber = 0; + for (ResourceItem item : items) { // only visible item can be run auto. if (!item.isHide()) { - runAuto = true; + itemsNumber++; runAutoItemUid = item.getUid(); } } + // can't autorun if there is more than one! + if ( itemsNumber == 1 ) { + runAuto = true; + } else { + runAutoItemUid = null; + } } // get notebook entry @@ -247,6 +251,15 @@ if (resourceUser != null) { resourceService.retrieveComplete(resourceItemList, resourceUser); } + int numItemsCompleted = 0; + for ( ResourceItem item: resourceItemList ) { + if (item.isComplete()) { + numItemsCompleted++; + } + } + sessionMap.put(ResourceConstants.ATTR_COMPLETED_SUFFICIENT_TO_FINISH, + numItemsCompleted >= resource.getMiniViewResourceNumber()); + sessionMap.put(ResourceConstants.ATTR_RESOURCE, resource); if (runAuto) { Index: lams_tool_larsrc/web/pages/learning/learning.jsp =================================================================== diff -u -raced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194 -r599997e40ac269606e85484eaf2110bce594a2de --- lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision aced7ba6c1e7c5a9a50d3f64d8cdd96dd7e76194) +++ lams_tool_larsrc/web/pages/learning/learning.jsp (.../learning.jsp) (revision 599997e40ac269606e85484eaf2110bce594a2de) @@ -164,6 +164,10 @@ + + + ${resource.miniViewNumberStr} + @@ -261,14 +265,6 @@ - - - - - ${resource.miniViewNumberStr} - - - @@ -314,7 +310,7 @@ - +