Index: lams_build/lib/lams/lams-gradebook.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams-gradebook.jar,v diff -u -r1.12 -r1.13 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v diff -u -r1.493 -r1.494 Binary files differ Index: lams_common/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_common/.classpath,v diff -u -r1.26 -r1.27 --- lams_common/.classpath 20 Apr 2016 09:46:59 -0000 1.26 +++ lams_common/.classpath 13 Jun 2016 14:52:29 -0000 1.27 @@ -40,7 +40,7 @@ - + Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml,v diff -u -r1.18 -r1.19 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 20 Apr 2016 09:46:59 -0000 1.18 +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 13 Jun 2016 14:52:29 -0000 1.19 @@ -81,8 +81,6 @@ - - Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java,v diff -u -r1.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java 11 May 2016 07:29:06 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolOutput.java 13 Jun 2016 14:52:29 -0000 1.4 @@ -32,6 +32,11 @@ private String name; private String description; private ToolOutputValue value; + + /** + * User Id. Used when tool returns multiple tool outputs for different users. + */ + private Integer userId; /** * Create a ToolOutput based on a Boolean. This will create a value of type OUTPUT_BOOLEAN @@ -190,4 +195,12 @@ public void setValue(ToolOutputValue value) { this.value = value; } + + public Integer getUserId() { + return userId; + } + + public void setUserId(Integer userId) { + this.userId = userId; + } } Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java,v diff -u -r1.15 -r1.16 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java 11 May 2016 07:29:06 -0000 1.15 +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionManager.java 13 Jun 2016 14:52:29 -0000 1.16 @@ -143,6 +143,18 @@ * Note: the learnerId may not be the userId of the current user as the current user may be a staff member. */ ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId); + + /** + * Returns outputs for all learners that left responses required for this output. Returns nothing for the learners + * that haven't started the activity or haven't provided required results. Method is useful when tool should provide + * results for all users at once rather than on one-by-one basis. + * + * @param name + * tool output name + * @param toolContentId + * @return + */ + List getToolOutputs(String name, Long toolContentId); /** * Notifies tool that the user is force completed. Currently it's been utilized only by leader aware tools, which Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java,v diff -u -r1.34 -r1.35 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java 11 May 2016 07:29:10 -0000 1.34 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java 13 Jun 2016 14:52:29 -0000 1.35 @@ -212,6 +212,18 @@ * @throws ToolException */ ToolOutput getOutputFromTool(String conditionName, ToolSession toolSession, Integer learnerId) throws ToolException; + + /** + * Returns tool outputs for the entire activity. Note, some tools don't support this functionality and will always + * return empty list. + * + * @param conditionName + * @param toolActivity + * @return + * @throws ToolException + */ + List getOutputsFromTool(String conditionName, ToolActivity toolActivity) + throws ToolException; /** * Ask a tool for a set of ToolOutputs, based on the given toolSessionId. Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java,v diff -u -r1.51 -r1.52 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java 11 May 2016 07:29:10 -0000 1.51 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java 13 Jun 2016 14:52:29 -0000 1.52 @@ -416,7 +416,40 @@ throw new ToolException(message, e); } } + + @Override + public List getOutputsFromTool(String conditionName, ToolActivity toolActivity) + throws ToolException { + if (toolActivity == null) { + String error = "The toolActivity is null. Unable to get tool outputs"; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + + Tool tool = toolActivity.getTool(); + if (tool == null) { + String error = "The tool for toolActivity " + toolActivity.getActivityId() + " is missing."; + LamsCoreToolService.log.error(error); + throw new DataMissingException(error); + } + + try { + ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool); + return sessionManager.getToolOutputs(conditionName, toolActivity.getToolContentId()); + } catch (NoSuchBeanDefinitionException e) { + String message = "A tool which is defined in the database appears to missing from the classpath. Unable to grt the tol output. toolActivity " + + toolActivity.getActivityId(); + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } catch (java.lang.AbstractMethodError e) { + String message = "Tool " + tool.getToolDisplayName() + + " doesn't support the getToolOutput(name, toolSessionId, learnerId) method so no output definitions can be accessed."; + LamsCoreToolService.log.error(message, e); + throw new ToolException(message, e); + } + } + @Override public void forceCompleteActivity(ToolSession toolSession, User learner) throws ToolException { Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java,v diff -u -r1.35 -r1.36 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 11 May 2016 07:29:10 -0000 1.35 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 13 Jun 2016 14:52:29 -0000 1.36 @@ -75,8 +75,6 @@ private static final String LEADER_SELECTION_TOOL_OUTPUT_NAME_LEADER_USERID = "leader.user.id"; private IActivityDAO activityDAO; - private ILessonDAO lessonDAO; - private ILearnerProgressDAO learnerProgressDAO; private IToolDAO toolDAO; private IToolSessionDAO toolSessionDAO; private IToolContentDAO toolContentDAO; @@ -198,7 +196,7 @@ // Get the first (only) ActivityEvaluation if it exists ActivityEvaluation activityEvaluation; - boolean isToolOutputDefinitionChanged = false; + boolean isToolOutputDefinitionChanged = true; if (activityEvaluations.isEmpty()) { activityEvaluation = new ActivityEvaluation(); activityEvaluation.setActivity(toolActivity); @@ -221,13 +219,7 @@ //update gradebook marks if required if (isToolOutputDefinitionChanged) { - Lesson lesson = lessonDAO.getLessonForActivity(toolActivity.getActivityId()); - List users = learnerProgressDAO.getLearnersCompletedActivity(toolActivity); - - //update for all users in activity - for (User user : users) { - gradebookService.updateUserActivityGradebookMark(lesson, toolActivity, user); - } + gradebookService.updateUserMarksForActivity(toolActivity); } } @@ -360,14 +352,6 @@ this.activityDAO = activityDAO; } - public void setLearnerProgressDAO(ILearnerProgressDAO learnerProgressDAO) { - this.learnerProgressDAO = learnerProgressDAO; - } - - public void setLessonDAO(ILessonDAO lessonDAO) { - this.lessonDAO = lessonDAO; - } - public void setToolSessionDAO(IToolSessionDAO toolSessionDAO) { this.toolSessionDAO = toolSessionDAO; } Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java,v diff -u -r1.12 -r1.13 --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 11 May 2016 07:53:46 -0000 1.12 +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java 13 Jun 2016 14:51:56 -0000 1.13 @@ -30,6 +30,7 @@ import java.net.URL; import java.net.URLConnection; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -153,6 +154,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java,v diff -u -r1.68 -r1.69 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 11 May 2016 07:53:20 -0000 1.68 +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java 13 Jun 2016 14:53:00 -0000 1.69 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.chat.service; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Hashtable; @@ -201,6 +202,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java,v diff -u -r1.28 -r1.29 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 11 May 2016 07:52:45 -0000 1.28 +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java 13 Jun 2016 14:52:45 -0000 1.29 @@ -653,6 +653,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java,v diff -u -r1.18 -r1.19 --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java 11 May 2016 07:52:10 -0000 1.18 +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java 13 Jun 2016 14:53:05 -0000 1.19 @@ -1217,6 +1217,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.147 -r1.148 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 11 May 2016 07:52:26 -0000 1.147 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 13 Jun 2016 14:52:51 -0000 1.148 @@ -1165,6 +1165,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v diff -u -r1.29 -r1.30 --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 11 May 2016 07:54:25 -0000 1.29 +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 13 Jun 2016 14:52:06 -0000 1.30 @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.gmap.service; import java.io.StringReader; +import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.Hashtable; @@ -175,6 +176,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v diff -u -r1.46 -r1.47 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 11 May 2016 07:52:37 -0000 1.46 +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 13 Jun 2016 14:52:57 -0000 1.47 @@ -1096,6 +1096,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java,v diff -u -r1.15 -r1.16 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 11 May 2016 07:54:20 -0000 1.15 +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java 13 Jun 2016 14:52:20 -0000 1.16 @@ -1067,6 +1067,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java,v diff -u -r1.15 -r1.16 --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java 11 May 2016 07:54:14 -0000 1.15 +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java 13 Jun 2016 14:51:55 -0000 1.16 @@ -25,6 +25,7 @@ package org.lamsfoundation.lams.tool.kaltura.service; import java.sql.Timestamp; +import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; import java.util.Iterator; @@ -175,6 +176,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v diff -u -r1.141 -r1.142 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 11 May 2016 07:53:12 -0000 1.141 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java 13 Jun 2016 14:52:18 -0000 1.142 @@ -1614,6 +1614,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { Long userId = user.getUserId().longValue(); @@ -1667,6 +1672,16 @@ return toolService.isGroupedActivity(toolContentID); } + @Override + public String getActivityEvaluation(Long toolContentId) { + return toolService.getActivityEvaluation(toolContentId); + } + + @Override + public void setActivityEvaluation(Long toolContentId, String toolOutputDefinition) { + toolService.setActivityEvaluation(toolContentId, toolOutputDefinition); + } + /** * @param mcContentDAO * The mcContentDAO to set. Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v diff -u -r1.137 -r1.138 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 11 May 2016 07:53:40 -0000 1.137 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java 13 Jun 2016 14:52:04 -0000 1.138 @@ -1111,6 +1111,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { Long userId = user.getUserId().longValue(); Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java,v diff -u -r1.85 -r1.86 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 11 May 2016 07:54:10 -0000 1.85 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java 13 Jun 2016 14:52:11 -0000 1.86 @@ -1101,6 +1101,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java,v diff -u -r1.11 -r1.12 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java 11 May 2016 07:53:52 -0000 1.11 +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java 13 Jun 2016 14:52:32 -0000 1.12 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.leaderselection.service; +import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; import java.util.List; @@ -157,6 +158,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java,v diff -u -r1.22 -r1.23 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 11 May 2016 07:52:16 -0000 1.22 +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java 13 Jun 2016 14:51:50 -0000 1.23 @@ -159,6 +159,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java,v diff -u -r1.60 -r1.61 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 11 May 2016 08:09:41 -0000 1.60 +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java 13 Jun 2016 14:51:58 -0000 1.61 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.noticeboard.service; +import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; import java.util.Iterator; @@ -532,6 +533,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java,v diff -u -r1.40 -r1.41 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 11 May 2016 08:10:33 -0000 1.40 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java 13 Jun 2016 14:52:22 -0000 1.41 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.notebook.service; +import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.Hashtable; @@ -165,6 +166,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java,v diff -u -r1.18 -r1.19 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 11 May 2016 08:10:36 -0000 1.18 +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java 13 Jun 2016 14:52:39 -0000 1.19 @@ -27,6 +27,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; +import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; import java.util.List; @@ -162,6 +163,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java,v diff -u -r1.10 -r1.11 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 15 Mar 2016 18:38:53 -0000 1.10 +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java 13 Jun 2016 14:52:41 -0000 1.11 @@ -674,6 +674,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.102 -r1.103 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 11 May 2016 08:09:30 -0000 1.102 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 13 Jun 2016 14:52:01 -0000 1.103 @@ -523,6 +523,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java,v diff -u -r1.72 -r1.73 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 11 May 2016 08:10:17 -0000 1.72 +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java 13 Jun 2016 14:52:15 -0000 1.73 @@ -1937,6 +1937,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { Long userId = user.getUserId().longValue(); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java,v diff -u -r1.37 -r1.38 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 11 May 2016 08:09:37 -0000 1.37 +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java 13 Jun 2016 14:51:47 -0000 1.38 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.scribe.service; +import java.util.ArrayList; import java.util.Date; import java.util.HashSet; import java.util.Hashtable; @@ -161,6 +162,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v diff -u -r1.22 -r1.23 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 11 May 2016 08:09:43 -0000 1.22 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 13 Jun 2016 14:52:26 -0000 1.23 @@ -734,6 +734,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v diff -u -r1.50 -r1.51 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 11 May 2016 08:09:46 -0000 1.50 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java 13 Jun 2016 14:52:37 -0000 1.51 @@ -875,6 +875,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java,v diff -u -r1.44 -r1.45 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 11 May 2016 08:10:24 -0000 1.44 +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java 13 Jun 2016 14:51:52 -0000 1.45 @@ -1006,6 +1006,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java,v diff -u -r1.19 -r1.20 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java 11 May 2016 08:10:28 -0000 1.19 +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java 13 Jun 2016 14:53:07 -0000 1.20 @@ -170,6 +170,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java,v diff -u -r1.94 -r1.95 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 5 May 2016 08:09:18 -0000 1.94 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java 13 Jun 2016 14:52:35 -0000 1.95 @@ -1559,6 +1559,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { Long userId = user.getUserId().longValue(); Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java,v diff -u -r1.30 -r1.31 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 11 May 2016 08:09:26 -0000 1.30 +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java 13 Jun 2016 14:52:55 -0000 1.31 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.wiki.service; +import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.HashSet; @@ -223,6 +224,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required } Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java,v diff -u -r1.18 -r1.19 --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java 11 May 2016 08:10:19 -0000 1.18 +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java 13 Jun 2016 14:52:24 -0000 1.19 @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.tool.wookie.service; +import java.util.ArrayList; import java.util.Date; import java.util.Hashtable; import java.util.List; @@ -196,6 +197,11 @@ } @Override + public List getToolOutputs(String name, Long toolContentId) { + return new ArrayList(); + } + + @Override public void forceCompleteUser(Long toolSessionId, User user) { // no actions required }