Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java 21 Feb 2005 05:49:37 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolSessionDAO.java 1 Mar 2005 01:16:10 -0000 1.6 @@ -13,7 +13,7 @@ /** * Inteface defines Lesson DAO Methods - * @author chris + * @author chris, Jacky */ public interface IToolSessionDAO { @@ -32,4 +32,6 @@ public ToolSession getToolSessionByLearner(final User learner,final Activity activity); public ToolSession getToolSessionByGroup(final Group group, final Activity activity); + + public void updateToolSession(ToolSession toolSession); } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java 21 Feb 2005 05:49:38 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolSessionDAO.java 1 Mar 2005 01:16:10 -0000 1.8 @@ -96,6 +96,14 @@ getHibernateTemplate().delete(toolSession); } + /** + * @see org.lamsfoundation.lams.tool.dao.IToolSessionDAO#updateToolSession(org.lamsfoundation.lams.tool.ToolSession) + */ + public void updateToolSession(ToolSession toolSession) + { + getHibernateTemplate().update(toolSession); + } + } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java 28 Feb 2005 23:07:17 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java 1 Mar 2005 01:16:10 -0000 1.6 @@ -58,4 +58,6 @@ public void notifyToolsToCreateSession(Long toolSessionId, ToolActivity activity); public Long copyToolContent(ToolActivity toolActivity); + + public void updateToolSession(ToolSession toolSession); } 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.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 28 Feb 2005 23:07:17 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java 1 Mar 2005 01:16:10 -0000 1.4 @@ -148,6 +148,13 @@ return newToolcontentID; } + /** + * @see org.lamsfoundation.lams.tool.service.ILamsToolService#updateToolSession(org.lamsfoundation.lams.tool.ToolSession) + */ + public void updateToolSession(ToolSession toolSession) + { + toolSessionDAO.updateToolSession(toolSession); + } //--------------------------------------------------------------------- // Helper Methods //--------------------------------------------------------------------- @@ -173,4 +180,6 @@ { return toolActivity.getTool().getServiceName().equals("surveyService"); } + + } Index: lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/Attic/toolApplicationContext.xml,v diff -u -r1.7 -r1.8 --- lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml 28 Feb 2005 23:07:25 -0000 1.7 +++ lams_common/test/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml 1 Mar 2005 01:16:11 -0000 1.8 @@ -46,6 +46,7 @@ PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED + PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED PROPAGATION_REQUIRED,readOnly Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/dao/Attic/TestToolSessionDAO.java,v diff -u -r1.5 -r1.6 --- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java 23 Feb 2005 07:04:25 -0000 1.5 +++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolSessionDAO.java 1 Mar 2005 01:16:10 -0000 1.6 @@ -85,4 +85,16 @@ toolSessionDao.saveToolSession(this.ngToolSession); } + public void testUpdateToolSession() + { + ToolSession toolSession = toolSessionDao.getToolSessionByGroup(testGroup,testGroupedActivity); + assertEquals("verify original state",ToolSession.STARTED_STATE,toolSession.getToolSessionStateId()); + + toolSession.setToolSessionStateId(ToolSession.ENDED_STATE); + toolSessionDao.updateToolSession(toolSession); + ToolSession updatedToolSession = toolSessionDao.getToolSessionByGroup(testGroup,testGroupedActivity); + + assertEquals("verify new state",ToolSession.ENDED_STATE,updatedToolSession.getToolSessionStateId()); + + } }