Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java,v diff -u -r1.28 -r1.29 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 14 Nov 2005 13:47:57 -0000 1.28 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java 14 Nov 2005 18:44:10 -0000 1.29 @@ -96,7 +96,9 @@ public static final String LOAD_QUESTIONS ="load"; public static final String LOAD_STARTER ="starter"; public static final String LOAD_LEARNER ="loadLearner"; + public static final String INDIVIDUAL_REPORT ="individualReport"; + public static final String ALL_INSTRUCTIONS ="allInstructions"; public static final String EDIT_OPTS_CONTENT ="editOptsContent"; public static final String ADD_OPTS_CONTENT ="addOptsContent"; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java,v diff -u -r1.50 -r1.51 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 14 Nov 2005 17:54:48 -0000 1.50 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java 14 Nov 2005 18:44:10 -0000 1.51 @@ -2114,17 +2114,12 @@ McContent mcContent=mcService.retrieveMc(toolContentID); logger.debug("mcContent: " + mcContent); - String totalQuestionCount= (String) request.getSession().getAttribute(TOTAL_QUESTION_COUNT); - int totalQCount= new Integer(totalQuestionCount).intValue(); - logger.debug("totalQCount: " +totalQCount); - - /* * fetch question content from content */ logger.debug("newQuestionIndex: " + newQuestionIndex); Iterator contentIterator=mcContent.getMcQueContents().iterator(); - boolean lastQuestion=false; + boolean questionFound=false; while (contentIterator.hasNext()) { McQueContent mcQueContent=(McQueContent)contentIterator.next(); @@ -2145,33 +2140,25 @@ Map mapOptionsContent=McUtils.generateOptionsMap(listMcOptions); request.getSession().setAttribute(MAP_OPTIONS_CONTENT, mapOptionsContent); logger.debug("updated Options Map: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT)); + questionFound=true; } - - if (totalQCount == newQuestionIndex) - { - logger.debug("this is the last question... "); - lastQuestion=true; - } - } } + + if (questionFound == false) + { + logger.debug("no more questions... "); + return (mapping.findForward(INDIVIDUAL_REPORT)); + } + else + { + logger.debug("go back to have more answers..."); + return (mapping.findForward(LOAD_LEARNER)); + } } - - return (mapping.findForward(LOAD_LEARNER)); - } + return (mapping.findForward(LOAD_LEARNER)); + } + + +} - - - - - - - - - - - - - - -} \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 14 Nov 2005 17:54:48 -0000 1.3 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McLearningStarterAction.java 14 Nov 2005 18:44:10 -0000 1.4 @@ -247,6 +247,15 @@ logger.debug("final Options Map for the first question: " + request.getSession().getAttribute(MAP_OPTIONS_CONTENT)); + /*also prepare for combined answers view */ + Map mapGeneralOptionsContent= new TreeMap(new McComparator()); + logger.debug("current mapGeneralOptionsContent: " + mapGeneralOptionsContent); + request.getSession().setAttribute(MAP_GENERAL_OPTIONS_CONTENT, mapGeneralOptionsContent); + + + + + return (mapping.findForward(LOAD_LEARNER)); } Index: lams_tool_lamc/web/CombinedAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/CombinedAnswersContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/web/CombinedAnswersContent.jsp 14 Nov 2005 17:54:48 -0000 1.3 +++ lams_tool_lamc/web/CombinedAnswersContent.jsp 14 Nov 2005 18:44:10 -0000 1.4 @@ -4,30 +4,77 @@ <%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> <%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> - - - + +
+ + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - -
+ +
+ +
+ +
+ ( ) + +
Question : + + + + +
- " size="60" maxlength="255" value=""/> -
 
- -
- - - - -
- - - -
- + + + + + + + + + > + + + + + + + + + +   + + + + + + + + + + + + + Index: lams_tool_lamc/web/IndividualReport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/IndividualReport.jsp,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_tool_lamc/web/IndividualReport.jsp 14 Nov 2005 18:44:10 -0000 1.1 @@ -0,0 +1,33 @@ +<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> +<%@ 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" %> + +<% +String protocol = request.getProtocol(); +if(protocol.startsWith("HTTPS")){ + protocol = "https://"; +}else{ + protocol = "http://"; +} +String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; +String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; +%> + + + + + +Tool + + + +INDIVIDUAL REPORT + + + + + + Index: lams_tool_lamc/web/SequentialAnswersContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/Attic/SequentialAnswersContent.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_lamc/web/SequentialAnswersContent.jsp 14 Nov 2005 17:54:48 -0000 1.3 +++ lams_tool_lamc/web/SequentialAnswersContent.jsp 14 Nov 2005 18:44:10 -0000 1.4 @@ -41,7 +41,7 @@ - + Index: lams_tool_lamc/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/struts-config.xml,v diff -u -r1.9 -r1.10 --- lams_tool_lamc/web/WEB-INF/struts-config.xml 14 Nov 2005 17:54:49 -0000 1.9 +++ lams_tool_lamc/web/WEB-INF/struts-config.xml 14 Nov 2005 18:44:10 -0000 1.10 @@ -134,8 +134,14 @@ path=".answers" redirect="true" /> - + + + + + + + + \ No newline at end of file