Index: lams_tool_laqa/build.properties =================================================================== diff -u -recaac1c82cbff119b5fa94f2e83095f8b16551b6 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/build.properties (.../build.properties) (revision ecaac1c82cbff119b5fa94f2e83095f8b16551b6) +++ lams_tool_laqa/build.properties (.../build.properties) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -1,4 +1,4 @@ -# Abt properties for building the Lams Submit Files Tool +# properties for building the Lams q/a Tool #name of this project name=lams_tool_laqa11 @@ -30,10 +30,10 @@ db.driver=com.mysql.jdbc.Driver db.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull database.url=jdbc:mysql://localhost/lams?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull -db.username=lams -db.password=lamsdemo -database.userid=lams -database.password=lamsdemo +db.username=root +db.password=root +database.userid=root +database.password=root db.driver.jar=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar db.scripts=${basedir}/db/sql sql=${basedir}/db/sql @@ -76,6 +76,6 @@ testweb=${basedir}/test/web testwebinf=${testweb}/WEB-INF -jboss.home=D:/jboss-3.2.6/ +jboss.home=D:/AppServer/jboss-3.2.6/ jboss.deploy=${jboss.home}/server/default/deploy/lams.ear contentrepository.location = D:/repository Index: lams_tool_laqa/conf/war/META-INF/MANIFEST.MF =================================================================== diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) +++ lams_tool_laqa/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -1,6 +1,6 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.5.3 Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.) -Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./FCKeditor-2.1.jar ./lams-contentrepository.jar ./lams-learning.jar +Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./lams-contentrepository.jar ./lams-learning.jar Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -144,7 +144,7 @@ public static void setDefaultSessionAttributes(HttpServletRequest request, QaContent defaultQaContent, QaAuthoringForm qaAuthoringForm) { - //should never be null anyway as default content MUST exist in the db + /**should never be null anyway as default content MUST exist in the db*/ if (defaultQaContent != null) { qaAuthoringForm.setTitle(defaultQaContent.getTitle()); @@ -157,8 +157,10 @@ request.getSession().setAttribute(TITLE,qaAuthoringForm.getTitle()); request.getSession().setAttribute(INSTRUCTIONS,qaAuthoringForm.getInstructions()); + + request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,defaultQaContent.getOfflineInstructions()); + request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,defaultQaContent.getOnlineInstructions()); } - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -r5ba75a338c76b23778bf80ab835209d38e2316cb -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 5ba75a338c76b23778bf80ab835209d38e2316cb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -30,6 +30,9 @@ import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; import org.lamsfoundation.lams.tool.ToolSessionManager; +import org.lamsfoundation.lams.tool.exception.DataMissingException; +import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; +import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.qa.QaApplicationException; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.QaQueContent; @@ -938,6 +941,13 @@ } } + + public void removeToolContent(Long toolContentId, boolean removeSessionData) throws SessionDataExistsException, ToolException + { + + } + + /** * it is possible that the tool session id already exists in the tool sessions table * as the users from the same session are involved. @@ -1018,6 +1028,13 @@ } + public void removeToolSession(Long toolSessionId) throws DataMissingException, ToolException + { + + } + + + /**FIX THIS ONE!!!! * TO BE TESTED * ToolSessionManager CONTRACT Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -r4447ae1bb802ba8a16df65d880f25575d1174003 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -319,6 +319,18 @@ creationDate=(String)request.getSession().getAttribute(CREATION_DATE); if (creationDate == null) creationDate=new Date(System.currentTimeMillis()).toString(); + + + String richTextOfflineInstructions=""; + richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); + logger.debug("createContent: richTextOfflineInstructions from session: " + richTextOfflineInstructions); + if (richTextOfflineInstructions == null) richTextOfflineInstructions=""; + + String richTextOnlineInstructions=""; + richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); + logger.debug("createContent richTextOnlineInstructions from session: " + richTextOnlineInstructions); + if (richTextOnlineInstructions == null) richTextOnlineInstructions=""; + /**obtain user object from the session*/ User toolUser=(User)request.getSession().getAttribute(TOOL_USER); @@ -339,8 +351,8 @@ qa.setUsernameVisible(isUsernameVisible); qa.setQuestionsSequenced(isQuestionsSequenced); /**the default question listing in learner mode will be all in the same page*/ qa.setSynchInMonitor(isSynchInMonitor); - qa.setOnlineInstructions(onlineInstructions); - qa.setOfflineInstructions(offlineInstructions); + qa.setOnlineInstructions(richTextOnlineInstructions); + qa.setOfflineInstructions(richTextOfflineInstructions); qa.setEndLearningMessage(endLearningMessage); qa.setReportTitle(reportTitle); qa.setMonitoringReportTitle(monitoringReportTitle); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== diff -u -rb767cd01abafe96e9ba61d83ba88cacb5a622558 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision b767cd01abafe96e9ba61d83ba88cacb5a622558) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java (.../QaLearningStarterAction.java) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -217,7 +217,7 @@ /* *for testing only, remove this line in development */ - Long currentToolContentId= new Long(4321); + Long currentToolContentId= new Long(1234); logger.debug("simulating container behaviour: calling createToolSession with toolSessionId : " + new Long(toolSessionId) + " and toolContentId: " + currentToolContentId); qaService.createToolSession(new Long(toolSessionId), currentToolContentId); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -386,6 +386,10 @@ request.getSession().setAttribute(MONITORING_REPORT_TITLE, defaultQaContent.getMonitoringReportTitle()); request.getSession().setAttribute(OFFLINE_INSTRUCTIONS, defaultQaContent.getOfflineInstructions()); request.getSession().setAttribute(ONLINE_INSTRUCTIONS, defaultQaContent.getOnlineInstructions()); + request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS, defaultQaContent.getOfflineInstructions()); + request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS, defaultQaContent.getOnlineInstructions()); + logger.debug("QaStarter set both rich text online and offline instructions: "); + request.getSession().setAttribute(END_LEARNING_MESSSAGE, defaultQaContent.getEndLearningMessage()); request.getSession().setAttribute(CREATION_DATE, defaultQaContent.getCreationDate()); Index: lams_tool_laqa/web/META-INF/MANIFEST.MF =================================================================== diff -u -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd -r65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6 --- lams_tool_laqa/web/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd) +++ lams_tool_laqa/web/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 65dbef6ba8b7c63e1b36662a6ddfb2f352c0dce6) @@ -1,5 +1,5 @@ Manifest-Version: 1.0 Ant-Version: Apache Ant 1.5.3 Created-By: 1.4.2_08-b03 (Sun Microsystems Inc.) -Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./FCKeditor-2.1.jar ./lams-contentrepository.jar ./lams-learning.jar +Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./lams-contentrepository.jar ./lams-learning.jar