Index: lams_common/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.31 -r1.32 --- lams_common/conf/language/lams/ApplicationResources_en_AU.properties 18 Apr 2014 22:59:44 -0000 1.31 +++ lams_common/conf/language/lams/ApplicationResources_en_AU.properties 22 Apr 2014 19:44:46 -0000 1.32 @@ -64,6 +64,6 @@ email.notifications.lesson =lesson email.notifications.tool =tool email.notifications.activity =activity +error.requires.existing.grouping =Activity {0} requires existing grouping but no group for user {1} exists yet. - #======= End labels: Exported 58 labels for en AU ===== 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.13 -r1.14 --- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 21 Apr 2014 13:34:43 -0000 1.13 +++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml 22 Apr 2014 19:44:46 -0000 1.14 @@ -44,6 +44,7 @@ + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java,v diff -u -r1.43 -r1.44 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 19 Mar 2014 11:08:27 -0000 1.43 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 22 Apr 2014 19:44:46 -0000 1.44 @@ -42,7 +42,9 @@ import org.lamsfoundation.lams.tool.Tool; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.MessageService; /** * @author Manpreet Minhas @@ -186,7 +188,8 @@ * @return the new tool session. */ @SuppressWarnings("unchecked") - public ToolSession createToolSessionForActivity(User learner, Lesson lesson) { + public ToolSession createToolSessionForActivity(MessageService messageService, User learner, Lesson lesson) + throws RequiredGroupMissingException { Date now = new Date(System.currentTimeMillis()); Integer supportType = getGroupingSupportType(); ToolSession session = null; @@ -198,10 +201,12 @@ Group group = null; if (getApplyGrouping().booleanValue()) { group = this.getGroupFor(learner); + + //check if activity requires existing grouping but no group for user exists yet if (group == null || group.isNull()) { - throw new LamsToolServiceException("Activity " + getActivityId() - + " requires existing grouping but no group for user " + learner.getUserId() - + " exists yet."); + String errorMessage = messageService.getMessage("error.requires.existing.grouping", new Object[] { + getActivityId(), learner.getUserId() }); + throw new RequiredGroupMissingException(errorMessage); } for (ToolSession toolSession : (Set) group.getToolSessions()) { Index: lams_common/src/java/org/lamsfoundation/lams/tool/exception/RequiredGroupMissingException.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/exception/RequiredGroupMissingException.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/tool/exception/RequiredGroupMissingException.java 22 Apr 2014 19:44:46 -0000 1.1 @@ -0,0 +1,38 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id: RequiredGroupMissingException.java,v 1.1 2014/04/22 19:44:46 andreyb Exp $ */ +package org.lamsfoundation.lams.tool.exception; + +/** + * Activity requires existing grouping but no group for user exists yet. + */ +public class RequiredGroupMissingException extends ToolException { + + /** + * @param msg + */ + public RequiredGroupMissingException(String msg) { + super(msg); + } + +} \ No newline at end of file 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.26 -r1.27 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java 2 Feb 2014 17:18:38 -0000 1.26 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java 22 Apr 2014 19:44:46 -0000 1.27 @@ -36,9 +36,11 @@ import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.dao.DataIntegrityViolationException; /** *

@@ -72,8 +74,8 @@ * the requested activity. * @return toolSession if a new one created, null otherwise. */ - public ToolSession createToolSession(User learner, ToolActivity activity, Lesson lesson) - throws LamsToolServiceException; + ToolSession createToolSession(User learner, ToolActivity activity, Lesson lesson) + throws DataIntegrityViolationException, RequiredGroupMissingException; /** * Creates LAMS ToolSessions for a set of learners and activity. Checks to see if an appropriate tool session exists @@ -89,7 +91,7 @@ * the requested activity. * @return toolSessions set of newly created ToolSessions */ - public Set createToolSessions(Set learners, ToolActivity activity, Lesson lesson) throws LamsToolServiceException; + Set createToolSessions(Set learners, ToolActivity activity, Lesson lesson) throws LamsToolServiceException; /** * Returns the previously created ToolSession for a learner and activity. It is queried base on learner. @@ -102,7 +104,7 @@ * @throws LamsToolServiceException * the known error condition when we are getting the tool session */ - public ToolSession getToolSessionByLearner(User learner, Activity activity) throws LamsToolServiceException; + ToolSession getToolSessionByLearner(User learner, Activity activity) throws LamsToolServiceException; /** * Returns the tool session according to tool session id. @@ -111,7 +113,7 @@ * the requested tool session id. * @return the tool session object */ - public ToolSession getToolSessionById(Long toolSessionId); + ToolSession getToolSessionById(Long toolSessionId); /** * Get the lams tool session based on activity. It search through all the tool sessions that linked to the requested @@ -125,7 +127,7 @@ * @throws LamsToolServiceException * the known error condition when we are getting the tool session */ - public ToolSession getToolSessionByActivity(User learner, ToolActivity toolActivity) + ToolSession getToolSessionByActivity(User learner, ToolActivity toolActivity) throws LamsToolServiceException; /** @@ -136,7 +138,7 @@ * @param activity * the activity correspondent to that tool session. */ - public void notifyToolsToCreateSession(ToolSession toolSession, ToolActivity activity) throws ToolException; + void notifyToolsToCreateSession(ToolSession toolSession, ToolActivity activity) throws ToolException; /** * Calls the tool to copy the content for an activity. Used when copying a learning design. @@ -149,7 +151,7 @@ * ToolException * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#notifyToolToCopyContent(org.lamsfoundation.lams.learningdesign.ToolActivity) */ - public Long notifyToolToCopyContent(ToolActivity toolActivity, String customCSV) throws DataMissingException, + Long notifyToolToCopyContent(ToolActivity toolActivity, String customCSV) throws DataMissingException, ToolException; /** @@ -165,7 +167,7 @@ * ToolException * @see org.lamsfoundation.lams.tool.service.ILamsCoreToolService#notifyToolToCopyContent(org.lamsfoundation.lams.learningdesign.ToolActivity) */ - public Long notifyToolToCopyContent(Long toolContentId, String customCSV) throws DataMissingException, + Long notifyToolToCopyContent(Long toolContentId, String customCSV) throws DataMissingException, ToolException; /** @@ -175,12 +177,12 @@ * the tool activity defined in the design. * @throws ToolException */ - public void notifyToolToDeleteContent(ToolActivity toolActivity) throws ToolException; + void notifyToolToDeleteContent(ToolActivity toolActivity) throws ToolException; /** * Ask a tool to delete content entered by the given user, if exists. */ - public void notifyToolToDeleteLearnerContent(ToolActivity toolActivity, Integer userId) throws ToolException; + void notifyToolToDeleteLearnerContent(ToolActivity toolActivity, Integer userId) throws ToolException; /** * Ask a tool for its OutputDefinitions, based on the given toolContentId. If the tool doesn't have any content @@ -193,7 +195,7 @@ * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition * @throws ToolException */ - public SortedMap getOutputDefinitionsFromTool(Long toolContentId, int definitionType) + SortedMap getOutputDefinitionsFromTool(Long toolContentId, int definitionType) throws ToolException; /** @@ -206,7 +208,7 @@ * @return * @throws ToolException */ - public SortedMap getOutputDefinitionsFromToolFiltered(Long outputToolContentId, + SortedMap getOutputDefinitionsFromToolFiltered(Long outputToolContentId, int definitionType, Long inputToolContentId) throws ToolException; /** @@ -217,7 +219,7 @@ * * @throws ToolException */ - public ToolOutput getOutputFromTool(String conditionName, Long toolSessionId, Integer learnerId) + ToolOutput getOutputFromTool(String conditionName, Long toolSessionId, Integer learnerId) throws ToolException; /** @@ -228,7 +230,7 @@ * * @throws ToolException */ - public ToolOutput getOutputFromTool(String conditionName, ToolSession toolSession, Integer learnerId) + ToolOutput getOutputFromTool(String conditionName, ToolSession toolSession, Integer learnerId) throws ToolException; /** @@ -247,7 +249,7 @@ * * @throws ToolException */ - public SortedMap getOutputFromTool(List names, Long toolSessionId, Integer learnerId) + SortedMap getOutputFromTool(List names, Long toolSessionId, Integer learnerId) throws ToolException; /** @@ -266,7 +268,7 @@ * * @throws ToolException */ - public SortedMap getOutputFromTool(List names, ToolSession toolSession, + SortedMap getOutputFromTool(List names, ToolSession toolSession, Integer learnerId) throws ToolException; /** @@ -275,7 +277,7 @@ * @param toolSession * the new tool session object. */ - public void updateToolSession(ToolSession toolSession); + void updateToolSession(ToolSession toolSession); /** * Return tool activity url for a learner. See also getToolPreviewURL, getToolLearnerProgressURL @@ -288,7 +290,7 @@ * the current learner. * @return the tool access url with tool session id or activity id */ - public String getToolLearnerURL(Long lessonID, Activity activity, User learner) throws LamsToolServiceException; + String getToolLearnerURL(Long lessonID, Activity activity, User learner) throws LamsToolServiceException; /** * Return tool activity url for running a tool in preview mode. See also getToolLearnerURL, @@ -302,7 +304,7 @@ * the current learner. * @return the tool access url with tool session id or activity id */ - public String getToolLearnerPreviewURL(Long lessonID, Activity activity, User learner) + String getToolLearnerPreviewURL(Long lessonID, Activity activity, User learner) throws LamsToolServiceException; /** @@ -316,7 +318,7 @@ * the current learner. * @return the tool access url with tool session id or activity id */ - public String getToolLearnerProgressURL(Long lessonID, Activity activity, User learner) + String getToolLearnerProgressURL(Long lessonID, Activity activity, User learner) throws LamsToolServiceException; /** @@ -328,7 +330,7 @@ * the requested activity - should be either a ToolActivity or a SystemToolActivity * @return the tool access url with tool session id or activity id */ - public String getToolMonitoringURL(Long lessonID, Activity activity) throws LamsToolServiceException; + String getToolMonitoringURL(Long lessonID, Activity activity) throws LamsToolServiceException; /** * Return the contribution url for monitoring. @@ -339,7 +341,7 @@ * the requested activity - should be either a ToolActivity or a SystemToolActivity * @return the tool access url with tool session id or activity id */ - public String getToolContributionURL(Long lessonID, Activity activity) throws LamsToolServiceException; + String getToolContributionURL(Long lessonID, Activity activity) throws LamsToolServiceException; /** * Return the moderate url for monitoring. @@ -348,20 +350,20 @@ * the requested activity - must be a a ToolActivity. System Activities don't support moderation. * @return the tool access url with tool content id */ - public String getToolModerateURL(ToolActivity activity) throws LamsToolServiceException; + String getToolModerateURL(ToolActivity activity) throws LamsToolServiceException; /** * Get all the tool sessions for a lesson. The resulting list is not sorted. * * @return list of ToolSession objects */ - public List getToolSessionsByLesson(Lesson lesson); + List getToolSessionsByLesson(Lesson lesson); /** * Delete a tool session. Calls the tool to delete its session details and then deletes the main tool session * record. If the tool throws an exception, the main tool session record is still deleted. */ - public void deleteToolSession(ToolSession toolSession); + void deleteToolSession(ToolSession toolSession); /** *

@@ -377,7 +379,7 @@ * @throws LamsToolServiceException * @return the url with tool session id. */ - public String setupToolURLWithToolSession(ToolActivity activity, User learner, String toolURL) + String setupToolURLWithToolSession(ToolActivity activity, User learner, String toolURL) throws LamsToolServiceException; /** @@ -391,7 +393,7 @@ * the target url * @return the url with tool content id. */ - public String setupToolURLWithToolContent(ToolActivity activity, String toolURL); + String setupToolURLWithToolContent(ToolActivity activity, String toolURL); - public Object findToolService(Tool tool) throws NoSuchBeanDefinitionException; + Object findToolService(Tool tool) throws NoSuchBeanDefinitionException; } 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.42 -r1.43 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java 2 Feb 2014 17:18:38 -0000 1.42 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java 22 Apr 2014 19:44:46 -0000 1.43 @@ -49,8 +49,10 @@ import org.lamsfoundation.lams.tool.dao.IToolSessionDAO; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.beans.BeansException; @@ -76,6 +78,7 @@ private ISystemToolDAO systemToolDAO; private ToolContentIDGenerator contentIDGenerator; protected IToolContentDAO toolContentDAO; + private MessageService messageService; // --------------------------------------------------------------------- // Inversion of Control Methods - Method injection @@ -112,14 +115,21 @@ public void setToolContentDAO(IToolContentDAO toolContentDAO) { this.toolContentDAO = toolContentDAO; } + + /** + * Set i18n MessageService + */ + public void setMessageService(MessageService messageService) { + this.messageService = messageService; + } // --------------------------------------------------------------------- // Service Methods // --------------------------------------------------------------------- @Override public synchronized ToolSession createToolSession(User learner, ToolActivity activity, Lesson lesson) - throws LamsToolServiceException, DataIntegrityViolationException { + throws RequiredGroupMissingException, DataIntegrityViolationException { // look for an existing applicable tool session // could be either a grouped (class group or standard group) or an individual. // more likely to be grouped (more tools work that way!) @@ -134,7 +144,7 @@ + lesson.getLessonId() + "," + lesson.getLessonName() + "]."); } - toolSession = activity.createToolSessionForActivity(learner, lesson); + toolSession = activity.createToolSessionForActivity(messageService, learner, lesson); toolSessionDAO.saveToolSession(toolSession); return toolSession; 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.110 -r1.111 --- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 8 Apr 2014 11:33:30 -0000 1.110 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java 22 Apr 2014 19:44:42 -0000 1.111 @@ -82,6 +82,7 @@ import org.lamsfoundation.lams.tool.ToolOutputValue; import org.lamsfoundation.lams.tool.ToolSession; import org.lamsfoundation.lams.tool.exception.LamsToolServiceException; +import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsCoreToolService; import org.lamsfoundation.lams.usermanagement.User; @@ -380,9 +381,9 @@ ToolActivity toolActivity = (ToolActivity) activity; createToolSessionFor(toolActivity, learnerProgress.getUser(), learnerProgress.getLesson()); } - } catch (LamsToolServiceException e) { - LearnerService.log.error("error occurred in 'createToolSessionFor':" + e.getMessage()); - throw new LearnerServiceException(e.getMessage()); + } catch (RequiredGroupMissingException e) { + LearnerService.log.warn("error occurred in 'createToolSessionFor':" + e.getMessage()); + throw e; } catch (ToolException e) { LearnerService.log.error("error occurred in 'createToolSessionFor':" + e.getMessage()); throw new LearnerServiceException(e.getMessage()); @@ -1035,7 +1036,7 @@ * @throws LamsToolServiceException */ private void createToolSessionFor(ToolActivity toolActivity, User learner, Lesson lesson) - throws LamsToolServiceException, ToolException { + throws RequiredGroupMissingException, ToolException { // if the tool session already exists, createToolSession() will return null ToolSession toolSession = null; try { Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java,v diff -u -r1.23 -r1.24 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java 17 Jan 2014 22:37:27 -0000 1.23 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java 22 Apr 2014 19:44:42 -0000 1.24 @@ -41,6 +41,7 @@ import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.lesson.LearnerProgress; +import org.lamsfoundation.lams.tool.exception.RequiredGroupMissingException; import org.springframework.transaction.UnexpectedRollbackException; /** @@ -53,6 +54,7 @@ * @struts:action path="/LoadToolActivity" name="activityForm" validate="false" scope="request" * * @struts:action-forward name="displayTool" path=".loadToolActivity" + * @struts:action-forward name="message" path=".message" * */ public class LoadToolActivityAction extends ActivityAction { @@ -98,8 +100,16 @@ synchronized (toolSessionCreationLock) { try { learnerService.createToolSessionsIfNecessary(activity, learnerProgress); + } catch (UnexpectedRollbackException e) { log.warn("Got exception while trying to create a tool session, but carrying on.", e); + + } catch (RequiredGroupMissingException e) { + + //got here when activity requires existing grouping but no group for user exists yet + log.warn(e.getMessage()); + request.setAttribute("messageKey", e.getMessage()); + return mapping.findForward("message"); } } Index: lams_learning/web/msgContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/msgContent.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_learning/web/msgContent.jsp 22 Apr 2014 19:44:42 -0000 1.1 @@ -0,0 +1,12 @@ +<%@ taglib uri="tags-fmt" prefix="fmt" %> + + + + + +
+
+

+

+
+
Index: lams_learning/web/WEB-INF/tiles-defs.xml =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tiles-defs.xml,v diff -u -r1.3 -r1.4 --- lams_learning/web/WEB-INF/tiles-defs.xml 17 Jan 2014 22:37:27 -0000 1.3 +++ lams_learning/web/WEB-INF/tiles-defs.xml 22 Apr 2014 19:44:42 -0000 1.4 @@ -55,6 +55,11 @@ + + + + +