Index: lams_tool_laqa/conf/war/META-INF/MANIFEST.MF =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/conf/war/META-INF/MANIFEST.MF (.../MANIFEST.MF) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -1 +1,6 @@ -Class-Path: ./lams.jar ./lams-tool-laqa11.jar ./FCKeditor-2.1.jar ./lams_contentrepository.jar ./lams-learning.jar +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 + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java =================================================================== diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java (.../QaAppConstants.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -99,6 +99,8 @@ public static final String IS_SYNCH_INMONITOR_MONITORING ="isSynchInMonitorMonitoring"; public static final String IS_QUESTIONS_SEQUENCED_MONITORING ="isQuestionsSequencedMonitoring"; public static final String USER_ID ="userId"; + public static final String RICHTEXT_OFFLINEINSTRUCTIONS ="richTextOfflineInstructions"; + public static final String RICHTEXT_ONLINEINSTRUCTIONS ="richTextOnlineInstructions"; /** Fisheye: Tag 4447ae1bb802ba8a16df65d880f25575d1174003 refers to a dead (removed) revision in file `lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConstants.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== diff -u -rb767cd01abafe96e9ba61d83ba88cacb5a622558 -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision b767cd01abafe96e9ba61d83ba88cacb5a622558) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java (.../QaUtils.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -351,4 +351,32 @@ request.getSession().setAttribute(TIMEZONE_ID, timeZone.getID()); } + public static void persistRichText(HttpServletRequest request) + { + String richTextOfflineInstructions=""; + String richTextOnlineInstructions=""; + richTextOfflineInstructions = (String)request.getSession().getAttribute(RICHTEXT_OFFLINEINSTRUCTIONS); + logger.debug("richTextOfflineInstructions from session: " + richTextOfflineInstructions); + + richTextOnlineInstructions = (String)request.getSession().getAttribute(RICHTEXT_ONLINEINSTRUCTIONS); + logger.debug("richTextOnlineInstructions from session: " + richTextOnlineInstructions); + + if ((richTextOfflineInstructions == null) || (richTextOfflineInstructions.equals(""))) + { + richTextOfflineInstructions=request.getParameter(RICHTEXT_OFFLINEINSTRUCTIONS); + logger.debug("read aparameter richTextOfflineInstructions: " + richTextOfflineInstructions); + } + + if ((richTextOnlineInstructions == null) || (richTextOnlineInstructions.equals(""))) + { + richTextOnlineInstructions=request.getParameter(RICHTEXT_ONLINEINSTRUCTIONS); + logger.debug("read aparameter richTextOnlineInstructions: " + richTextOnlineInstructions); + } + + logger.debug("final richTextOfflineInstructions: " + richTextOfflineInstructions); + logger.debug("final richTextOnlineInstructions: " + richTextOnlineInstructions); + request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,richTextOfflineInstructions); + request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,richTextOnlineInstructions); + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -r5ba75a338c76b23778bf80ab835209d38e2316cb -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 5ba75a338c76b23778bf80ab835209d38e2316cb) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -269,7 +269,7 @@ Boolean renderMonitoringEditActivity=(Boolean)request.getSession().getAttribute(RENDER_MONITORING_EDITACTIVITY); if ((renderMonitoringEditActivity != null) && (renderMonitoringEditActivity.booleanValue())) { - logger.debug("getting booleans based on editActivity"); + logger.debug("getting properties based on editActivity: All properties available from the http session."); isQuestionsSequencedBoolean=(Boolean)request.getSession().getAttribute(IS_QUESTIONS_SEQUENCED_MONITORING); isSynchInMonitorBoolean=(Boolean)request.getSession().getAttribute(IS_SYNCH_INMONITOR_MONITORING); isUsernameVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE_MONITORING); @@ -291,7 +291,7 @@ } else { - logger.debug("getting booleans based on normal flow: "); + logger.debug("getting properties based on normal flow: Properties available from form and request parameters."); logger.debug("isQuestionsSequenced: " + qaAuthoringForm.getQuestionsSequenced()); if (qaAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON)) isQuestionsSequenced=true; @@ -308,6 +308,12 @@ monitoringReportTitle=qaAuthoringForm.getMonitoringReportTitle(); offlineInstructions=qaAuthoringForm.getOnlineInstructions(); onlineInstructions=qaAuthoringForm.getOfflineInstructions(); + + /** + * read and persist rich text parameters + */ + QaUtils.persistRichText(request); + endLearningMessage=qaAuthoringForm.getEndLearningMessage(); } creationDate=(String)request.getSession().getAttribute(CREATION_DATE); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java =================================================================== diff -u -rb767cd01abafe96e9ba61d83ba88cacb5a622558 -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision b767cd01abafe96e9ba61d83ba88cacb5a622558) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java (.../QAction.java) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -170,8 +170,6 @@ public class QAction extends DispatchAction implements QaAppConstants { static Logger logger = Logger.getLogger(QAction.class.getName()); - - public static Integer READABLE_TOOL_SESSION_COUNT = new Integer(1); /** *

Struts dispatch method.

@@ -228,11 +226,20 @@ QaAuthoringForm qaAuthoringForm = (QaAuthoringForm) form; /** + * read and persist rich text parameters + */ + QaUtils.persistRichText(request); + logger.debug("QAction: rich text set to session scope"); + + /** * the status of define later is determined from the property inspector and * by now, we know whether it is on or off * * enable-disable tool html elements based on "define later" status */ + /* + * double check QaUtils.getDefineLaterStatus() + */ boolean defineLaterStatus=QaUtils.getDefineLaterStatus(); Boolean defineLater=new Boolean(defineLaterStatus); @@ -296,6 +303,8 @@ else if (userAction.equalsIgnoreCase(SUBMIT_TAB_DONE)) { logger.debug("user is done with this tab."); + QaUtils.persistRichText(request); + logger.debug("SUBMIT_TAB_DONE: rich text set to session scope"); qaAuthoringForm.resetUserAction(); return (mapping.findForward(LOAD_QUESTIONS)); }/**submit questions contained in the Map*/ @@ -529,13 +538,12 @@ logger.debug("simulating container behaviour by calling " + "leaveToolSession() with toolSessionId: " + toolSessionId + " and user: " + user); - /** - * mark the tool session as COMPLETE - */ IQaService qaService =QaUtils.getToolService(request); QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue()); qaSession.setSession_end_date(new Date(System.currentTimeMillis())); - + /** + * ?? mark the tool session as COMPLETE ?? + */ /* * change the logic about completion status */ Index: lams_tool_laqa/test/web/WEB-INF/web.xml =================================================================== diff -u -rc2c90fffd84acacd50458727538e2e934e71d03e -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/test/web/WEB-INF/web.xml (.../web.xml) (revision c2c90fffd84acacd50458727538e2e934e71d03e) +++ lams_tool_laqa/test/web/WEB-INF/web.xml (.../web.xml) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -82,11 +82,27 @@ true 2 - + + + + Connector + com.fredck.FCKeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + action - *.do + *.do + Connector + /editor/filemanager/browser/default/connectors/jsp/connector Index: lams_tool_laqa/web/InstructionsContent.jsp =================================================================== diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 16e844de3f7c34b44baee1b28e67e708f42d00bf) +++ lams_tool_laqa/web/InstructionsContent.jsp (.../InstructionsContent.jsp) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -3,26 +3,39 @@ <%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %> <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> +<%@ taglib uri="fck-editor" prefix="FCK" %> - - - + + + + + - - - - - + +
+
+ + + +
- -
- -
+ + + +
Index: lams_tool_laqa/web/WEB-INF/FCKeditor.tld =================================================================== diff -u --- lams_tool_laqa/web/WEB-INF/FCKeditor.tld (revision 0) +++ lams_tool_laqa/web/WEB-INF/FCKeditor.tld (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -0,0 +1,194 @@ + + + + + 2.1 + 1.1 + FCKeditor + FCKeditor taglib + http://fckeditor.net/tags-fckeditor + + editor + com.fredck.FCKeditor.tags.FCKeditorTag + JSP + + id + true + + + basePath + false + true + + + toolbarSet + false + true + + + width + false + true + + + height + false + true + + + customConfigurationsPath + false + true + + + editorAreaCSS + false + true + + + baseHref + false + true + + + skinPath + false + true + + + pluginsPath + false + true + + + fullPage + false + true + + + debug + false + true + + + autoDetectLanguage + false + true + + + defaultLanguage + false + true + + + contentLangDirection + false + true + + + enableXHTML + false + true + + + enableSourceXHTML + false + true + + + fillEmptyBlocks + false + true + + + formatSource + false + true + + + formatOutput + false + true + + + formatIndentator + false + true + + + geckoUseSPAN + false + true + + + startupFocus + false + true + + + forcePasteAsPlainText + false + true + + + forceSimpleAmpersand + false + true + + + tabSpaces + false + true + + + useBROnCarriageReturn + false + true + + + toolbarStartExpanded + false + true + + + toolbarCanCollapse + false + true + + + fontColors + false + true + + + fontNames + false + true + + + fontSizes + false + true + + + fontFormats + false + true + + + stylesXmlPath + false + true + + + linkBrowserURL + false + true + + + imageBrowserURL + false + true + + + \ No newline at end of file Index: lams_tool_laqa/web/WEB-INF/struts-config.xml =================================================================== diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9) +++ lams_tool_laqa/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -13,9 +13,9 @@ - - - + + + Index: lams_tool_laqa/web/WEB-INF/web.xml =================================================================== diff -u -r0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd -r4447ae1bb802ba8a16df65d880f25575d1174003 --- lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 0e747c5eb46e7a7618f09aaf32c3b7cb700a76dd) +++ lams_tool_laqa/web/WEB-INF/web.xml (.../web.xml) (revision 4447ae1bb802ba8a16df65d880f25575d1174003) @@ -10,11 +10,11 @@ contextConfigLocation - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml + classpath:/org/lamsfoundation/lams/applicationContext.xml + classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml + classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml + classpath:/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml @@ -83,15 +83,40 @@ 2 + + + Connector + com.fredck.FCKeditor.connector.ConnectorServlet + + baseDir + /UserFiles/ + + + debug + false + + 1 + action - *.do + *.do + + Connector + /editor/filemanager/browser/default/connectors/jsp/connector + + + 120 + + + fck-editor + /WEB-INF/fckEditor/tlds/FCKeditor.tld +