Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r11560f31d23605fd4f0b89305d0da0ecf6407569 -r33da76d05725a84e191a5f6dca50b394cca3c1ee Binary files differ Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -283,8 +283,6 @@ index.emailnotifications =Notifications index.emailnotifications.tooltip =Email notifications index.single.activity.lesson.title =Add single activity lesson -index.single.activity.lesson.prompt =Please enter a title for the lesson -index.single.activity.lesson.prompt.blank =You must enter a title. If you do not want to save the lesson, click Cancel index.single.activity.lesson.desc =or one-click activity: label.portrait.please.wait =Please wait label.portrait.take.snapshot.from.webcamera =Take portrait using Webcam Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java =================================================================== diff -u -r430f979ac0574e45242bd6e3df353d8592276121 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision 430f979ac0574e45242bd6e3df353d8592276121) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (.../AuthoringAction.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -44,7 +44,10 @@ import org.lamsfoundation.lams.learningdesign.dto.LicenseDTO; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.monitoring.service.IMonitoringService; +import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutputDefinition; +import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.Role; import org.lamsfoundation.lams.usermanagement.User; @@ -75,13 +78,9 @@ private static IAuditService auditService; private static IMonitoringService monitoringService; private static IUserManagementService userManagementService; + private static ILamsToolService toolService; + private static IAuthoringService authoringService; - public IAuthoringService getAuthoringService() { - WebApplicationContext webContext = WebApplicationContextUtils.getRequiredWebApplicationContext(this - .getServlet().getServletContext()); - return (IAuthoringService) webContext.getBean(AuthoringConstants.AUTHORING_SERVICE_BEAN_NAME); - } - private Integer getUserId() { HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); @@ -349,16 +348,22 @@ Long toolID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_ID); Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); String contentFolderID = request.getParameter(AttributeNames.PARAM_CONTENT_FOLDER_ID); - String learningDesignTitle = request.getParameter(AttributeNames.PARAM_TITLE); Integer organisationID = WebUtil.readIntParam(request, AttributeNames.PARAM_ORGANISATION_ID); + + // get title from tool content + IToolVO tool = getToolService().getToolByID(toolID); + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet() + .getServletContext()); + ToolContentManager toolManager = (ToolContentManager) wac.getBean(tool.getServiceName()); + String title = toolManager.getToolContentTitle(toolContentID); // create the LD and put it in Run Sequences folder in the given organisation - Long learningDesignID = authoringService.insertSingleActivityLearningDesign(learningDesignTitle, toolID, - toolContentID, contentFolderID, organisationID); + Long learningDesignID = authoringService.insertSingleActivityLearningDesign(title, toolID, toolContentID, + contentFolderID, organisationID); if (learningDesignID != null) { Integer userID = getUserId(); User user = (User) getUserManagementService().findById(User.class, userID); - Lesson lesson = getMonitoringService().initializeLessonWithoutLDcopy(learningDesignTitle, "", - learningDesignID, user, null, false, false, true, false, false, false, false, null, null); + Lesson lesson = getMonitoringService().initializeLessonWithoutLDcopy(title, "", learningDesignID, user, + null, false, false, true, false, false, false, false, null, null); Organisation organisation = getMonitoringService().getOrganisation(organisationID); List staffList = new LinkedList(); @@ -433,4 +438,23 @@ } return AuthoringAction.userManagementService; } + + public IAuthoringService getAuthoringService() { + if (AuthoringAction.authoringService == null) { + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet() + .getServletContext()); + AuthoringAction.authoringService = (IAuthoringService) wac + .getBean(AuthoringConstants.AUTHORING_SERVICE_BEAN_NAME); + } + return AuthoringAction.authoringService; + } + + public ILamsToolService getToolService() { + if (AuthoringAction.toolService == null) { + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(getServlet() + .getServletContext()); + AuthoringAction.toolService = (ILamsToolService) wac.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME); + } + return AuthoringAction.toolService; + } } \ No newline at end of file Index: lams_central/web/includes/javascript/groupDisplay.js =================================================================== diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8) +++ lams_central/web/includes/javascript/groupDisplay.js (.../groupDisplay.js) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -65,6 +65,11 @@ .remove(); // initialise single activity lesson dialog + $('#addSingleActivityLessonFrame').load(function(){ + if ($(this).contents().find('span.editForm').length > 0){ + closeAddSingleActivityLessonDialog('save'); + } + }); $('#addSingleActivityLessonDialog').dialog( { 'autoOpen' : false, @@ -426,30 +431,19 @@ var save = action == 'save'; if (save) { - var ldTitle = ''; - while (ldTitle == '') { - ldTitle = prompt(LABELS.SINGLE_ACTIVITY_LESSON_PROMPT); - if (ldTitle == '') { - alert(LABELS.SINGLE_ACTIVITY_LESSON_PROMPT_BLANK); + $.ajax({ + async : false, + cache : false, + url : LAMS_URL + "authoring/author.do", + dataType : 'text', + data : { + 'method' : 'createSingleActivityLesson', + 'organisationID' : dialog.dialog('option', 'orgID'), + 'toolID' : dialog.dialog('option', 'toolID'), + 'toolContentID' : dialog.dialog('option', 'toolContentID'), + 'contentFolderID' : dialog.dialog('option', 'contentFolderID') } - } - - if (ldTitle) { - $.ajax({ - async : false, - cache : false, - url : LAMS_URL + "authoring/author.do", - dataType : 'text', - data : { - 'method' : 'createSingleActivityLesson', - 'organisationID' : dialog.dialog('option', 'orgID'), - 'toolID' : dialog.dialog('option', 'toolID'), - 'toolContentID' : dialog.dialog('option', 'toolContentID'), - 'contentFolderID' : dialog.dialog('option', 'contentFolderID'), - 'title' : ldTitle - } - }); - } + }); } dialog.dialog('option', 'refresh', save).dialog('close'); } Index: lams_central/web/main2.jsp =================================================================== diff -u -r2b350be06485bbfe1da8c66def9fc2cd81e883a8 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_central/web/main2.jsp (.../main2.jsp) (revision 2b350be06485bbfe1da8c66def9fc2cd81e883a8) +++ lams_central/web/main2.jsp (.../main2.jsp) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -50,9 +50,7 @@ REMOVE_LESSON_CONFIRM2 : '', SORTING_ENABLE : '', SORTING_DISABLE : '', - SINGLE_ACTIVITY_LESSON_TITLE : '', - SINGLE_ACTIVITY_LESSON_PROMPT : '', - SINGLE_ACTIVITY_LESSON_PROMTP_BLANK : '' + SINGLE_ACTIVITY_LESSON_TITLE : '' } var tabName = '${tab}'; Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -140,4 +140,9 @@ throws ToolException; public Class[] getSupportedToolOutputDefinitionClasses(int definitionType); + + /** + * Finds title entered in the tool content. + */ + public String getToolContentTitle(Long toolContentId); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java (.../ILamsToolService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -55,6 +55,8 @@ */ Set getAllPotentialLearners(long toolSessionID) throws LamsToolServiceException; + IToolVO getToolByID(Long toolId); + IToolVO getToolBySignature(final String toolSignature); long getToolDefaultContentIdBySignature(final String toolSignature); Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java (.../LamsToolService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -70,6 +70,12 @@ } @Override + public IToolVO getToolByID(Long toolId) { + Tool tool = toolDAO.getToolByID(toolId); + return tool.createBasicToolVO(); + } + + @Override public IToolVO getToolBySignature(final String toolSignature) { Tool tool = toolDAO.getToolBySignature(toolSignature); return tool.createBasicToolVO(); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r093c79d081e1eaa1a2158602d0a946ba94112d64 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 093c79d081e1eaa1a2158602d0a946ba94112d64) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1287,4 +1287,8 @@ public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return getAssessmentOutputFactory().getSupportedDefinitionClasses(definitionType); } + + public String getToolContentTitle(Long toolContentId) { + return getAssessmentByContentId(toolContentId).getTitle(); + } } Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java =================================================================== diff -u -r3469ac37f4f0094274d92c25b84886995305d3df -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 3469ac37f4f0094274d92c25b84886995305d3df) +++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java (.../BbbService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -312,6 +312,10 @@ return new TreeMap(); } + public String getToolContentTitle(Long toolContentId) { + return getBbbByContentId(toolContentId).getTitle(); + } + /* IBbbService Methods */ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -re64a90c0cc74118c5b88f5cbae323065abd59cac -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision e64a90c0cc74118c5b88f5cbae323065abd59cac) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -69,7 +69,6 @@ import org.lamsfoundation.lams.tool.chat.dao.IChatMessageDAO; import org.lamsfoundation.lams.tool.chat.dao.IChatSessionDAO; import org.lamsfoundation.lams.tool.chat.dao.IChatUserDAO; -import org.lamsfoundation.lams.tool.chat.dto.ChatMessageDTO; import org.lamsfoundation.lams.tool.chat.model.Chat; import org.lamsfoundation.lams.tool.chat.model.ChatAttachment; import org.lamsfoundation.lams.tool.chat.model.ChatCondition; @@ -89,9 +88,6 @@ import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * An implementation of the IChatService interface. @@ -275,9 +271,9 @@ * Export the XML fragment for the tool's content, along with any files needed for the content. * * @throws DataMissingException - * if no tool content matches the toolSessionId + * if no tool content matches the toolSessionId * @throws ToolException - * if any other error occurs + * if any other error occurs */ public void exportToolContent(Long toolContentId, String rootPath) throws DataMissingException, ToolException { @@ -311,7 +307,7 @@ * Import the XML fragment for the tool's content, along with any files needed for the content. * * @throws ToolException - * if any other error occurs + * if any other error occurs */ public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { @@ -356,6 +352,10 @@ return getChatOutputFactory().getToolOutputDefinitions(chat, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return getChatByContentId(toolContentId).getTitle(); + } + /* IChatService Methods */ public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; @@ -377,7 +377,8 @@ throw new ChatException(error); } if (defaultContent.getConditions().isEmpty()) { - defaultContent.getConditions().add(getChatOutputFactory().createDefaultUserMessagesCondition(defaultContent)); + defaultContent.getConditions().add( + getChatOutputFactory().createDefaultUserMessagesCondition(defaultContent)); } return defaultContent; } @@ -458,7 +459,7 @@ } public ChatAttachment uploadFileToContent(Long toolContentId, FormFile file, String type) { - if (file == null || StringUtils.isEmpty(file.getFileName())) { + if ((file == null) || StringUtils.isEmpty(file.getFileName())) { throw new ChatException("Could not find upload file: " + file); } @@ -544,7 +545,7 @@ Matcher matcher = pattern.matcher(message); return matcher.replaceAll(ChatConstants.FILTER_REPLACE_TEXT); } - + private Pattern getFilterPattern(Chat chat) { if (!chat.isFilteringEnabled()) { return null; @@ -622,7 +623,7 @@ private NodeKey processFile(FormFile file, String type) { NodeKey node = null; - if (file != null && !StringUtils.isEmpty(file.getFileName())) { + if ((file != null) && !StringUtils.isEmpty(file.getFileName())) { String fileName = file.getFileName(); try { node = getChatToolContentHandler().uploadFile(file.getInputStream(), fileName, file.getContentType(), @@ -764,7 +765,7 @@ public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { List list = coreNotebookService.getEntry(id, idType, signature, userID); - if (list == null || list.isEmpty()) { + if ((list == null) || list.isEmpty()) { return null; } else { return list.get(0); @@ -864,7 +865,7 @@ } public void deleteCondition(ChatCondition condition) { - if (condition != null && condition.getConditionId() != null) { + if ((condition != null) && (condition.getConditionId() != null)) { chatDAO.delete(condition); } } Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -578,6 +578,10 @@ return getDacoOutputFactory().getToolOutputDefinitions(daco, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return getDacoByContentId(toolContentId).getTitle(); + } + public DacoUser getUser(Long uid) { return (DacoUser) dacoUserDao.getObject(DacoUser.class, uid); } Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java =================================================================== diff -u -r1201a49ea259a27ba1f79763f898b8d1cdd2fa08 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision 1201a49ea259a27ba1f79763f898b8d1cdd2fa08) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java (.../DimdimService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -313,6 +313,10 @@ return new TreeMap(); } + public String getToolContentTitle(Long toolContentId) { + return getDimdimByContentId(toolContentId).getTitle(); + } + /* IDimdimService Methods */ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java (.../EadventureServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1104,6 +1104,10 @@ }*/ } + public String getToolContentTitle(Long toolContentId) { + return getEadventureByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Eadventure eadventure = eadventureDao.getByContentId(toolContentId); if (eadventure == null) { Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -936,6 +936,10 @@ return getForumOutputFactory().getToolOutputDefinitions(forum, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return getForumByContentId(toolContentId).getTitle(); + } + /** * @see org.lamsfoundation.lams.tool.ToolSessionManager#createToolSession(java.lang.Long, java.lang.String, * java.lang.Long) Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java =================================================================== diff -u -r714b9e7b785b4cc6b7a37e56938c0858f74138a5 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 714b9e7b785b4cc6b7a37e56938c0858f74138a5) +++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java (.../GmapService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -366,6 +366,10 @@ return new TreeMap(); } + public String getToolContentTitle(Long toolContentId) { + return getGmapByContentId(toolContentId).getTitle(); + } + /* ********** IGmapService Methods ********************************* */ public Long getDefaultContentIdBySignature(String toolSignature) { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -957,6 +957,10 @@ } } + public String getToolContentTitle(Long toolContentId) { + return getImageGalleryByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { ImageGallery imageGallery = imageGalleryDao.getByContentId(toolContentId); if (imageGallery == null) { Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -965,6 +965,10 @@ } } + public String getToolContentTitle(Long toolContentId) { + return getCommonCartridgeByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { CommonCartridge commonCartridge = commonCartridgeDao.getByContentId(toolContentId); if (commonCartridge == null) { Index: lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java =================================================================== diff -u -r29853fdaad688a21b49eb3ba1089de6cdaeaa1d3 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 29853fdaad688a21b49eb3ba1089de6cdaeaa1d3) +++ lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/service/KalturaService.java (.../KalturaService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -327,6 +327,10 @@ return getKalturaOutputFactory().getToolOutputDefinitions(kaltura, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return getKalturaByContentId(toolContentId).getTitle(); + } + /* ********** IKalturaService Methods ********************************* */ @Override public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r9a2c06691bf5157039ae82f36ec2f84c32eda8cb -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 9a2c06691bf5157039ae82f36ec2f84c32eda8cb) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1098,6 +1098,10 @@ return getMcOutputFactory().getToolOutputDefinitions(content, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return mcContentDAO.findMcContentById(toolContentId).getTitle(); + } + /** * it is possible that the tool session id already exists in the tool sessions table as the users from the same * session are involved. existsSession(long toolSessionId) Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -803,6 +803,10 @@ return getQaOutputFactory().getToolOutputDefinitions(qaContent, definitionType); } + public String getToolContentTitle(Long toolContentId) { + return qaDAO.getQaByContentId(toolContentId).getTitle(); + } + /** * it is possible that the tool session id already exists in the tool sessions table as the users from the same * session are involved. existsSession(long toolSessionId) Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1001,7 +1001,11 @@ } } } - + + public String getToolContentTitle(Long toolContentId) { + return getResourceByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Resource resource = resourceDao.getByContentId(toolContentId); if (resource == null) { Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -rf3735a316cb5d75ed51aff791a153820e3bf3173 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision f3735a316cb5d75ed51aff791a153820e3bf3173) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -539,7 +539,11 @@ } return getMindmapOutputFactory().getToolOutputDefinitions(mindmap, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getMindmapByContentId(toolContentId).getTitle(); + } + /* IMindmapService Methods */ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java =================================================================== diff -u -racb0851f5348ca7f4d535d181d6b35fcb539272c -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision acb0851f5348ca7f4d535d181d6b35fcb539272c) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java (.../NoticeboardServicePOJO.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -872,7 +872,11 @@ throws ToolException { return new TreeMap(); } - + + public String getToolContentTitle(Long toolContentId) { + return retrieveNoticeboard(toolContentId).getTitle(); + } + /* ===============Methods implemented from ToolSessionManager =============== */ /** Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -r7817bc4fce30416c9737875ae2d137be0c6aa8ba -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 7817bc4fce30416c9737875ae2d137be0c6aa8ba) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -310,7 +310,11 @@ } return getNotebookOutputFactory().getToolOutputDefinitions(notebook, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getNotebookByContentId(toolContentId).getTitle(); + } + /* ********** INotebookService Methods ********************************* */ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -r6fb9beec407d0532645a9ff3331955bf7e5dd95b -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 6fb9beec407d0532645a9ff3331955bf7e5dd95b) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -422,6 +422,10 @@ } return getPixlrOutputFactory().getToolOutputDefinitions(pixlr, definitionType); } + + public String getToolContentTitle(Long toolContentId) { + return getPixlrByContentId(toolContentId).getTitle(); + } /* ********** IPixlrService Methods ********************************* */ Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -350,7 +350,11 @@ } return getSubmitFilesOutputFactory().getToolOutputDefinitions(content, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getSubmitFilesContent(toolContentId).getTitle(); + } + /* * (non-Javadoc) * Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rc7569597546126af159f169353e68e91241b7f10 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision c7569597546126af159f169353e68e91241b7f10) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1568,7 +1568,11 @@ } } } - + + public String getToolContentTitle(Long toolContentId) { + return getScratchieByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Scratchie scratchie = scratchieDao.getByContentId(toolContentId); if (scratchie == null) { Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -r1a5446e3a1f962f1bb831c1bbaef14acf9d3635c -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 1a5446e3a1f962f1bb831c1bbaef14acf9d3635c) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -316,7 +316,12 @@ throws ToolException { return new TreeMap(); } - + + public String getToolContentTitle(Long toolContentId) { + return getScribeByContentId(toolContentId).getTitle(); + } + + /* ********** IScribeService Methods ************************************** */ public void createReportEntry(Long toolSessionId) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -769,7 +769,11 @@ Spreadsheet toContent = Spreadsheet.newInstance(spreadsheet, toContentId, spreadsheetToolContentHandler); spreadsheetDao.saveObject(toContent); } - + + public String getToolContentTitle(Long toolContentId) { + return getSpreadsheetByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId); if (spreadsheet == null) { Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -786,7 +786,11 @@ } } } - + + public String getToolContentTitle(Long toolContentId) { + return getSurveyByContentId(toolContentId).getTitle(); + } + public void setAsDefineLater(Long toolContentId, boolean value) throws DataMissingException, ToolException { Survey survey = surveyDao.getByContentId(toolContentId); if (survey == null) { Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -rf27a61f86e4f0033d71b51793dc8b4114862865d -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision f27a61f86e4f0033d71b51793dc8b4114862865d) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -902,7 +902,11 @@ } return getTaskListOutputFactory().getToolOutputDefinitions(taskList, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getTaskListByContentId(toolContentId).getTitle(); + } + /** * {@inheritDoc} */ Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java =================================================================== diff -u -rd6240dc20a9f2a3f562adc8b376277ca42715fd3 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision d6240dc20a9f2a3f562adc8b376277ca42715fd3) +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java (.../VideoRecorderService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -368,7 +368,11 @@ } return getVideoRecorderOutputFactory().getToolOutputDefinitions(videoRecorder, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getVideoRecorderByContentId(toolContentId).getTitle(); + } + /* ********** IVideoRecorderService Methods ********************************* */ public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java =================================================================== diff -u -r601fd92095193321a6b2286ef55108fbe5f9dfc4 -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 601fd92095193321a6b2286ef55108fbe5f9dfc4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java (.../VoteServicePOJO.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -1593,7 +1593,11 @@ } return getVoteOutputFactory().getToolOutputDefinitions(content, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return retrieveVote(toolContentId).getTitle(); + } + /** * Get the tool output for the given tool output names. * Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -rb19488eb4b80f01e7dcc599a71a6f8bff477c68c -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision b19488eb4b80f01e7dcc599a71a6f8bff477c68c) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -260,7 +260,11 @@ } return wikiOutputFactory.getToolOutputDefinitions(wiki, definitionType); } - + + public String getToolContentTitle(Long toolContentId) { + return getWikiByContentId(toolContentId).getTitle(); + } + /* ************ Methods from ToolContentManager ************************* */ /** Index: lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java =================================================================== diff -u -rfb5248530c656fdc6731a15e6493fa9050dfbebd -r33da76d05725a84e191a5f6dca50b394cca3c1ee --- lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision fb5248530c656fdc6731a15e6493fa9050dfbebd) +++ lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/service/WookieService.java (.../WookieService.java) (revision 33da76d05725a84e191a5f6dca50b394cca3c1ee) @@ -520,6 +520,10 @@ return getWookieOutputFactory().getToolOutputDefinitions(wookie, definitionType); } + + public String getToolContentTitle(Long toolContentId) { + return getWookieByContentId(toolContentId).getTitle(); + } @SuppressWarnings("unchecked") public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {