Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r134b8c6ce9847926aab1420c5adfe0a15b2c78cd -r6b8c709afa957841178a62f129e7d036a2478311 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 134b8c6ce9847926aab1420c5adfe0a15b2c78cd) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 6b8c709afa957841178a62f129e7d036a2478311) @@ -67,4 +67,6 @@ public Tool getPersistToolBySignature(final String toolSignature); public ToolSession getToolSession(Long toolSessionId); + + public Boolean isGroupedActivity(long toolContentID); } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r134b8c6ce9847926aab1420c5adfe0a15b2c78cd -r6b8c709afa957841178a62f129e7d036a2478311 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 134b8c6ce9847926aab1420c5adfe0a15b2c78cd) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 6b8c709afa957841178a62f129e7d036a2478311) @@ -25,12 +25,15 @@ import java.io.IOException; import java.util.HashSet; +import java.util.List; import java.util.Set; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.tool.IToolVO; import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSession; +import org.lamsfoundation.lams.tool.dao.IToolContentDAO; import org.lamsfoundation.lams.tool.dao.IToolDAO; import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; @@ -52,6 +55,7 @@ public IToolDAO toolDAO; public IToolSessionDAO toolSessionDAO; + public IToolContentDAO toolContentDAO; /** * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#getAllPotentialLearners(long) @@ -103,6 +107,22 @@ this.toolSessionDAO = toolSessionDAO; } + /** + * + * @return + */ + public IToolContentDAO getToolContentDAO() { + return toolContentDAO; + } + + /** + * + * @param toolContentDAO + */ + public void setToolContentDAO(IToolContentDAO toolContentDAO) { + this.toolContentDAO = toolContentDAO; + } + public String generateUniqueContentFolder() throws FileUtilException, IOException { return FileUtil.generateUniqueContentFolderID(); @@ -122,4 +142,16 @@ { return toolSessionDAO.getToolSession(toolSessionId); } + + @Override + public Boolean isGroupedActivity(long toolContentID) { + List activities = toolContentDAO.findByProperty(Activity.class, "toolContentId", toolContentID); + if (activities.size() == 1) { + Activity activity = activities.get(0); + return activity.getApplyGrouping(); + } else { + log.debug("ToolContent contains multiple activities, can't test whether grouping applies."); + return null; + } + } } Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java =================================================================== diff -u -ra74ae929e1b5f6e321e7251fb5bf5f93285c5b92 -r6b8c709afa957841178a62f129e7d036a2478311 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java (.../INotebookService.java) (revision a74ae929e1b5f6e321e7251fb5bf5f93285c5b92) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java (.../INotebookService.java) (revision 6b8c709afa957841178a62f129e7d036a2478311) @@ -174,4 +174,6 @@ void releaseConditionsFromCache(Notebook notebook); void deleteCondition(NotebookCondition condition); + + boolean isGroupedActivity(long toolContentID); } \ No newline at end of file Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -rc4dfe712e2f4adc4d448e5653df6430eb2949002 -r6b8c709afa957841178a62f129e7d036a2478311 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision c4dfe712e2f4adc4d448e5653df6430eb2949002) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 6b8c709afa957841178a62f129e7d036a2478311) @@ -653,4 +653,11 @@ notebookDAO.delete(condition); } } + + public boolean isGroupedActivity(long toolContentID) { + + getNotebookByContentId(1L); + + return toolService.isGroupedActivity(toolContentID); + } } \ No newline at end of file