Index: lams_tool_lamc/db/sql/activity_insert.sql =================================================================== diff -u -rb167ddc872e456372c2ed2ba4c72eb485a6d0918 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision b167ddc872e456372c2ed2ba4c72eb485a6d0918) +++ lams_tool_lamc/db/sql/activity_insert.sql (.../activity_insert.sql) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -73,7 +73,7 @@ , NULL , NULL , NULL -, 'tool/laqa11/images/icon_questionanswer.swf' +, '/tool/laqa11/images/icon_questionanswer.swf' , NULL , NULL , NULL Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== diff -u -rb167ddc872e456372c2ed2ba4c72eb485a6d0918 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision b167ddc872e456372c2ed2ba4c72eb485a6d0918) +++ lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -43,12 +43,12 @@ 1, 1, 0, -'tool/laqa11/learningStarter.do', -'tool/laqa11/authoringStarter.do', -'tool/laqa11/definelater.do', -'tool/laqa11/export.do', -'tool/laqa11/monitoringStarter.do', -'tool/laqa11/monitoringStarter.do', -'tool/laqa11/monitoringStarter.do', +'/tool/laqa11/learningStarter.do', +'/tool/laqa11/authoringStarter.do', +'/tool/laqa11/definelater.do', +'/tool/laqa11/export.do', +'/tool/laqa11/monitoringStarter.do', +'/tool/laqa11/monitoringStarter.do', +'/tool/laqa11/monitoringStarter.do', NOW() ) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== diff -u -rdef7c02eeb52a92c47c04b3f21fe337350aef897 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision def7c02eeb52a92c47c04b3f21fe337350aef897) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java (.../McAppConstants.java) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -57,6 +57,16 @@ public static final String LEARNING_STARTER ="learningStarter"; public static final String MONITORING_STARTER ="monitoringStarter"; + + /** these constants are from org.lamsfoundation.lams.web.util.AttributeNames */ + public static final String USER= "user"; + public static final String TOOL_CONTENT_ID = "toolContentID"; + public static final String TOOL_SESSION_ID = "toolSessionID"; + public static final String MODE = "mode"; + public static final String USER_ID = "userID"; + public static final String ACTIVITY_ID = "activityID"; + + /** * Mock constants below are temporary until the tool gets a User object from the container. */ @@ -174,12 +184,12 @@ /** * the author's current content id */ - public static final String TOOL_CONTENT_ID ="toolContentId"; + //public static final String TOOL_CONTENT_ID ="toolContentId"; /** * the learner or monitoring environment provides toolSessionId */ - public static final String TOOL_SESSION_ID ="toolSessionId"; + //public static final String TOOL_SESSION_ID ="toolSessionId"; public final long ONE_DAY =60 * 60 * 1000 * 24; public final static String NOT_ATTEMPTED ="NOT_ATTEMPTED"; public final static String INCOMPLETE ="INCOMPLETE"; @@ -212,7 +222,6 @@ /** * export portfolio constants */ - public static final String MODE ="mode"; public static final String LEARNER ="learner"; public static final String TEACHER ="teacher"; public static final String USER_EXCEPTION_MODE_REQUIRED ="userExceptionModeRequired"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties =================================================================== diff -u -rdef7c02eeb52a92c47c04b3f21fe337350aef897 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision def7c02eeb52a92c47c04b3f21fe337350aef897) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties (.../McResources.properties) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -40,6 +40,10 @@ radiobox.forceOffline =Force Offline radiobox.usernameVisible =Username Visible radiobox.questionsSequenced =Questions Sequenced +radiobox.passmark =Pass Mark +radiobox.retries =Retries +radiobox.showFeedback =Show Feedback + label.offlineInstructions =Offline Instructions label.onlineInstructions =Online Instructions label.offlineFiles =Offline Files: Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== diff -u -rdef7c02eeb52a92c47c04b3f21fe337350aef897 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision def7c02eeb52a92c47c04b3f21fe337350aef897) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java (.../McAction.java) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -626,7 +626,57 @@ logger.debug("userAction:" + userAction); ActionMessages errors= new ActionMessages(); - + + boolean isQuestionsSequenced=false; + boolean isSynchInMonitor=false; + boolean isUsernameVisible=false; + boolean isRetries=false; + boolean isShowFeedback=false; + String monitoringReportTitle=""; + String reportTitle=""; + String endLearningMessage=""; + int passmark=0; + + logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced()); + if (mcAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON)) + isQuestionsSequenced=true; + + logger.debug("isSynchInMonitor: " + mcAuthoringForm.getSynchInMonitor()); + if (mcAuthoringForm.getSynchInMonitor().equalsIgnoreCase(ON)) + isSynchInMonitor=true; + + logger.debug("isUsernameVisible: " + mcAuthoringForm.getUsernameVisible()); + if (mcAuthoringForm.getUsernameVisible().equalsIgnoreCase(ON)) + isUsernameVisible=true; + + logger.debug("isRetries: " + mcAuthoringForm.getRetries()); + if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON)) + isRetries=true; + + logger.debug("passmark: " + mcAuthoringForm.getPassmark()); + if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0)) + passmark= new Integer(mcAuthoringForm.getPassmark()).intValue(); + + logger.debug("isShowFeedback: " + mcAuthoringForm.getShowFeedback()); + if (mcAuthoringForm.getShowFeedback().equalsIgnoreCase(ON)) + isShowFeedback=true; + + logger.debug("MONITORING_REPORT_TITLE: " + mcAuthoringForm.getMonitoringReportTitle()); + monitoringReportTitle=mcAuthoringForm.getMonitoringReportTitle(); + if ((monitoringReportTitle == null) || (monitoringReportTitle.length() == 0)) + monitoringReportTitle=(String)request.getSession().getAttribute(MONITORING_REPORT_TITLE); + + reportTitle=mcAuthoringForm.getReportTitle(); + logger.debug("REPORT_TITLE: " + mcAuthoringForm.getReportTitle()); + if ((reportTitle == null) || (reportTitle.length() == 0)) + reportTitle=(String)request.getSession().getAttribute(REPORT_TITLE); + + endLearningMessage=mcAuthoringForm.getEndLearningMessage(); + logger.debug("END_LEARNING_MESSAGE: " + mcAuthoringForm.getEndLearningMessage()); + if ((endLearningMessage == null) || (endLearningMessage.length() == 0)) + endLearningMessage=(String)request.getSession().getAttribute(END_LEARNING_MESSAGE); + + String richTextTitle=(String) request.getSession().getAttribute(RICHTEXT_TITLE); logger.debug("richTextTitle: " + richTextTitle); String richTextInstructions=(String) request.getSession().getAttribute(RICHTEXT_INSTRUCTIONS); @@ -647,7 +697,7 @@ if (errors.size() > 0) { - logger.debug("either title or instructions or both is missingr. Returning back to from to fix errors:"); + logger.debug("either title or instructions or both is missing. Returning back to from to fix errors:"); return (mapping.findForward(LOAD_QUESTIONS)); } @@ -666,8 +716,19 @@ logger.debug("updating mcContent title and instructions:" + mcContent); mcContent.setTitle(richTextTitle); mcContent.setInstructions(richTextInstructions); + + mcContent.setQuestionsSequenced(isQuestionsSequenced); + mcContent.setSynchInMonitor(isSynchInMonitor); + mcContent.setUsernameVisible(isUsernameVisible); + mcContent.setRetries(isRetries); + mcContent.setPassMark(new Integer(passmark)); + mcContent.setShowFeedback(isShowFeedback); + mcContent.setEndLearningMessage(endLearningMessage); + mcContent.setReportTitle(reportTitle); + mcContent.setMonitoringReportTitle(monitoringReportTitle); + mcContent.setEndLearningMessage(endLearningMessage); + - mcService.resetAllQuestions(mcContent.getUid()); logger.debug("all question reset for :" + mcContent.getUid()); @@ -701,6 +762,14 @@ mcAuthoringForm.resetUserAction(); return (mapping.findForward(LOAD_QUESTIONS)); } + else if (mcAuthoringForm.getAdvancedTabDone() != null) + { + userAction="advancedTabDone"; + request.setAttribute(USER_ACTION, userAction); + logger.debug("userAction:" + userAction); + mcAuthoringForm.resetUserAction(); + return (mapping.findForward(LOAD_QUESTIONS)); + } mcAuthoringForm.resetUserAction(); @@ -774,7 +843,7 @@ boolean isShowFeedback=false; - logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced()); + logger.debug("isQuestionsSequenced: " + mcAuthoringForm.getQuestionsSequenced()); if (mcAuthoringForm.getQuestionsSequenced().equalsIgnoreCase(ON)) isQuestionsSequenced=true; @@ -790,16 +859,22 @@ if (mcAuthoringForm.getRetries().equalsIgnoreCase(ON)) isRetries=true; + logger.debug("passmark: " + mcAuthoringForm.getPassmark()); + if ((mcAuthoringForm.getPassmark() != null) && (mcAuthoringForm.getPassmark().length() > 0)) + passmark= new Integer(mcAuthoringForm.getPassmark()).intValue(); + logger.debug("isShowFeedback: " + mcAuthoringForm.getShowFeedback()); if (mcAuthoringForm.getShowFeedback().equalsIgnoreCase(ON)) isShowFeedback=true; logger.debug("MONITORING_REPORT_TITLE: " + mcAuthoringForm.getMonitoringReportTitle()); - if (mcAuthoringForm.getMonitoringReportTitle() == null) + monitoringReportTitle=mcAuthoringForm.getMonitoringReportTitle(); + if ((monitoringReportTitle == null) || (monitoringReportTitle.length() == 0)) monitoringReportTitle=(String)request.getSession().getAttribute(MONITORING_REPORT_TITLE); + reportTitle=mcAuthoringForm.getReportTitle(); logger.debug("REPORT_TITLE: " + mcAuthoringForm.getReportTitle()); - if (mcAuthoringForm.getReportTitle() == null) + if ((reportTitle == null) || (reportTitle.length() == 0)) reportTitle=(String)request.getSession().getAttribute(REPORT_TITLE); logger.debug("OFFLINE_INSTRUCTIONS: " + mcAuthoringForm.getOfflineInstructions()); @@ -810,8 +885,9 @@ if (mcAuthoringForm.getOnlineInstructions() == null) onlineInstructions=(String)request.getSession().getAttribute(ONLINE_INSTRUCTIONS); + endLearningMessage=mcAuthoringForm.getEndLearningMessage(); logger.debug("END_LEARNING_MESSAGE: " + mcAuthoringForm.getEndLearningMessage()); - if (mcAuthoringForm.getEndLearningMessage() == null) + if ((endLearningMessage == null) || (endLearningMessage.length() == 0)) endLearningMessage=(String)request.getSession().getAttribute(END_LEARNING_MESSAGE); String richTextTitle=""; @@ -855,7 +931,9 @@ mc.setRunOffline(false); mc.setDefineLater(false); mc.setSynchInMonitor(isSynchInMonitor); + mc.setContentInUse(isContentInUse); mc.setEndLearningMessage(endLearningMessage); + mc.setRunOffline(isRunOffline); mc.setReportTitle(reportTitle); mc.setMonitoringReportTitle(monitoringReportTitle); mc.setEndLearningMessage(endLearningMessage); Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java =================================================================== diff -u -r39778e7509e6bd9114ae3cf2b4f50aea98f8a8e5 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 39778e7509e6bd9114ae3cf2b4f50aea98f8a8e5) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAuthoringForm.java (.../McAuthoringForm.java) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -39,8 +39,8 @@ protected String editDefaultQuestion; protected String removeOptionContent; + protected String advancedTabDone; - protected String addContent; protected String removeContent; protected String removeAllContent; @@ -105,6 +105,7 @@ this.removeOption=null; this.doneOptions=null; this.submitQuestions=null; + this.advancedTabDone=null; this.addContent=null; this.removeContent=null; @@ -133,6 +134,7 @@ this.removeOption=null; this.doneOptions=null; this.submitQuestions=null; + this.advancedTabDone=null; this.addContent=null; this.removeContent=null; @@ -770,4 +772,16 @@ public void setSelectedIndex(String selectedIndex) { this.selectedIndex = selectedIndex; } + /** + * @return Returns the advancedTabDone. + */ + public String getAdvancedTabDone() { + return advancedTabDone; + } + /** + * @param advancedTabDone The advancedTabDone to set. + */ + public void setAdvancedTabDone(String advancedTabDone) { + this.advancedTabDone = advancedTabDone; + } } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java =================================================================== diff -u -r39778e7509e6bd9114ae3cf2b4f50aea98f8a8e5 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 39778e7509e6bd9114ae3cf2b4f50aea98f8a8e5) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McStarterAction.java (.../McStarterAction.java) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -61,6 +61,8 @@ * */ +/** use from org.lamsfoundation.lams.web.util.AttributeNames */ + /* * check back McUtils.configureContentRepository(request); */ @@ -90,6 +92,7 @@ import org.lamsfoundation.lams.tool.mc.McContent; import org.lamsfoundation.lams.tool.mc.McOptsContent; import org.lamsfoundation.lams.tool.mc.McQueContent; +//import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.tool.mc.McUtils; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.service.McServiceProxy; @@ -179,8 +182,8 @@ persistError(request,"error.defaultContent.notSetup"); return (mapping.findForward(LOAD_QUESTIONS)); } + - /** * retrieve uid of the default question content */ @@ -262,6 +265,7 @@ toolContentId=new Long(strToolContentId).longValue(); logger.debug("passed TOOL_CONTENT_ID : " + toolContentId); request.getSession().setAttribute(TOOL_CONTENT_ID, new Long(strToolContentId)); + } catch(NumberFormatException e) { Index: lams_tool_lamc/web/authoringMaincontent.jsp =================================================================== diff -u -rdef7c02eeb52a92c47c04b3f21fe337350aef897 -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/web/authoringMaincontent.jsp (.../authoringMaincontent.jsp) (revision def7c02eeb52a92c47c04b3f21fe337350aef897) +++ lams_tool_lamc/web/authoringMaincontent.jsp (.../authoringMaincontent.jsp) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -5,7 +5,6 @@ <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> <%@ taglib uri="fck-editor" prefix="FCK" %> - <% String protocol = request.getProtocol(); if(protocol.startsWith("HTTPS")){ @@ -195,16 +194,14 @@ - -

Advanced Definitions

+ + + + + + + + + + + + + + + + + @@ -280,7 +318,7 @@ Index: lams_tool_lamc/web/index.jsp =================================================================== diff -u -rb9d979e7f1478db56c700664c515c4036557f29f -r64c79423986902d74a3b2eb5a009c8f24228f65d --- lams_tool_lamc/web/index.jsp (.../index.jsp) (revision b9d979e7f1478db56c700664c515c4036557f29f) +++ lams_tool_lamc/web/index.jsp (.../index.jsp) (revision 64c79423986902d74a3b2eb5a009c8f24228f65d) @@ -7,11 +7,12 @@ + <% String userContentId="1234"; String userId="1111"; - String toolUrl="/authoringStarter?userId=" + userId + "&toolContentId=" + userContentId; + String toolUrl="/authoringStarter?userId=" + userId + "&toolContentID=" + userContentId; %>
- : + : @@ -247,6 +244,47 @@
+ : + + + + + + + + +
+ : + + +
+ : + + + + + + + + +
:
- +